diff --git a/.gitignore b/.gitignore index b475f4f6a..77a53b29b 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ app.*.symbols #generated file *.g.dart messages_*.dart +*.mocks.dart diff --git a/contact/pubspec.lock b/contact/pubspec.lock index 8b0fd986d..7137d5586 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -492,7 +492,7 @@ packages: description: path: "." ref: upgrade-latest-flutter-version - resolved-ref: "75ad24397dee8606a648a1858f6bba009c1aa1d8" + resolved-ref: "9be1a7b3b4a8fbe93fa4b8cf12795f8110de0c06" url: "https://github.com/linagora/jmap-dart-client.git" source: git version: "0.0.1" diff --git a/contact/test/contact/autocomplete_tmail_contact_method_test.dart b/contact/test/contact/autocomplete_tmail_contact_method_test.dart index 7c5e02aad..399823e7a 100644 --- a/contact/test/contact/autocomplete_tmail_contact_method_test.dart +++ b/contact/test/contact/autocomplete_tmail_contact_method_test.dart @@ -81,8 +81,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 245 + "content-length": 330 }); final httpClient = HttpClient(dio); diff --git a/contact/test/datasource/tmail_contact_datasource_impl_test.dart b/contact/test/datasource/tmail_contact_datasource_impl_test.dart index 582b4a384..8ccd0f75e 100644 --- a/contact/test/datasource/tmail_contact_datasource_impl_test.dart +++ b/contact/test/datasource/tmail_contact_datasource_impl_test.dart @@ -28,22 +28,22 @@ void main() { ); group('tmail_contact_datasource_impl_test', () { - late ContactAPI _contactAPI; - late TMailContactDataSourceImpl _tmailContactDataSourceImpl; + late ContactAPI contactAPI; + late TMailContactDataSourceImpl tmailContactDataSourceImpl; setUp(() { - _contactAPI = MockContactAPI(); - _tmailContactDataSourceImpl = TMailContactDataSourceImpl(_contactAPI); + contactAPI = MockContactAPI(); + tmailContactDataSourceImpl = TMailContactDataSourceImpl(contactAPI); }); test('getAutoComplete should return success with valid data', () async { - when(_contactAPI.getAutoComplete( + when(contactAPI.getAutoComplete( AutoCompletePattern( word: 'marie', accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6'))) )).thenAnswer((_) async => [contact1, contact2]); - final result = await _tmailContactDataSourceImpl.getAutoComplete( + final result = await tmailContactDataSourceImpl.getAutoComplete( AutoCompletePattern( word: 'marie', accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6'))) diff --git a/fcm/pubspec.lock b/fcm/pubspec.lock index 171109c27..80b569f85 100644 --- a/fcm/pubspec.lock +++ b/fcm/pubspec.lock @@ -296,7 +296,7 @@ packages: description: path: "." ref: upgrade-latest-flutter-version - resolved-ref: "75ad24397dee8606a648a1858f6bba009c1aa1d8" + resolved-ref: "9be1a7b3b4a8fbe93fa4b8cf12795f8110de0c06" url: "https://github.com/linagora/jmap-dart-client.git" source: git version: "0.0.1" diff --git a/fcm/test/method/firebase_subscription_get_method_test.dart b/fcm/test/method/firebase_subscription_get_method_test.dart index df122b4d8..c91da43b7 100644 --- a/fcm/test/method/firebase_subscription_get_method_test.dart +++ b/fcm/test/method/firebase_subscription_get_method_test.dart @@ -76,8 +76,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 133 + "content-length": 162 } ); diff --git a/fcm/test/method/firebase_subscription_set_method_test.dart b/fcm/test/method/firebase_subscription_set_method_test.dart index bb50212b5..86379c17f 100644 --- a/fcm/test/method/firebase_subscription_set_method_test.dart +++ b/fcm/test/method/firebase_subscription_set_method_test.dart @@ -69,8 +69,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 253 + "content-length": 424 } ); diff --git a/forward/lib/forward/converter/forward_id_coverter.dart b/forward/lib/forward/converter/forward_id_coverter.dart deleted file mode 100644 index a0c8b4a68..000000000 --- a/forward/lib/forward/converter/forward_id_coverter.dart +++ /dev/null @@ -1,13 +0,0 @@ -import 'package:forward/forward/forward_id.dart'; -import 'package:jmap_dart_client/jmap/core/id.dart'; -import 'package:json_annotation/json_annotation.dart'; - -class ForwardIdConverter implements JsonConverter { - const ForwardIdConverter(); - - @override - ForwardId fromJson(String json) => ForwardId(id: Id(json)); - - @override - String toJson(ForwardId object) => object.id.value; -} diff --git a/forward/lib/forward/get/get_forward_method.dart b/forward/lib/forward/get/get_forward_method.dart index 81976cba5..9ed2b1ab1 100644 --- a/forward/lib/forward/get/get_forward_method.dart +++ b/forward/lib/forward/get/get_forward_method.dart @@ -1,5 +1,4 @@ import 'package:forward/forward/capability_forward.dart'; -import 'package:forward/forward/converter/forward_id_coverter.dart'; import 'package:jmap_dart_client/http/converter/account_id_converter.dart'; import 'package:jmap_dart_client/http/converter/id_converter.dart'; import 'package:jmap_dart_client/http/converter/properties_converter.dart'; @@ -13,7 +12,6 @@ import 'package:json_annotation/json_annotation.dart'; part 'get_forward_method.g.dart'; @IdConverter() -@ForwardIdConverter() @AccountIdConverter() @PropertiesConverter() @JsonSerializable(explicitToJson: true) diff --git a/forward/lib/forward/tmail_forward.dart b/forward/lib/forward/tmail_forward.dart index 28011d881..6952aaa87 100644 --- a/forward/lib/forward/tmail_forward.dart +++ b/forward/lib/forward/tmail_forward.dart @@ -1,4 +1,3 @@ -import 'package:forward/forward/converter/forward_id_coverter.dart'; import 'package:forward/forward/converter/forward_id_nullable_converter.dart'; import 'package:forward/forward/forward.dart'; import 'package:forward/forward/forward_id.dart'; @@ -6,7 +5,6 @@ import 'package:json_annotation/json_annotation.dart'; part 'tmail_forward.g.dart'; -@ForwardIdConverter() @ForwardIdNullableConverter() @JsonSerializable(explicitToJson: true, includeIfNull: false) class TMailForward extends Forward { diff --git a/forward/pubspec.lock b/forward/pubspec.lock index 171109c27..80b569f85 100644 --- a/forward/pubspec.lock +++ b/forward/pubspec.lock @@ -296,7 +296,7 @@ packages: description: path: "." ref: upgrade-latest-flutter-version - resolved-ref: "75ad24397dee8606a648a1858f6bba009c1aa1d8" + resolved-ref: "9be1a7b3b4a8fbe93fa4b8cf12795f8110de0c06" url: "https://github.com/linagora/jmap-dart-client.git" source: git version: "0.0.1" diff --git a/forward/test/forward/get_forward_method_test.dart b/forward/test/forward/get_forward_method_test.dart index 53956aa1e..64fcee0a1 100644 --- a/forward/test/forward/get_forward_method_test.dart +++ b/forward/test/forward/get_forward_method_test.dart @@ -64,8 +64,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 212 + "content-length": 292 }); final httpClient = HttpClient(dio); diff --git a/forward/test/forward/set_forward_method_test.dart b/forward/test/forward/set_forward_method_test.dart index c7cff7591..9a3010a73 100644 --- a/forward/test/forward/set_forward_method_test.dart +++ b/forward/test/forward/set_forward_method_test.dart @@ -98,8 +98,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 420 + "content-length": 765 } ); diff --git a/model/pubspec.lock b/model/pubspec.lock index 28e090d05..d98954965 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -10,7 +10,7 @@ packages: source: hosted version: "54.0.0" analyzer: - dependency: "direct dev" + dependency: transitive description: name: analyzer sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427" @@ -484,7 +484,7 @@ packages: description: path: "." ref: upgrade-latest-flutter-version - resolved-ref: "75ad24397dee8606a648a1858f6bba009c1aa1d8" + resolved-ref: "9be1a7b3b4a8fbe93fa4b8cf12795f8110de0c06" url: "https://github.com/linagora/jmap-dart-client.git" source: git version: "0.0.1" diff --git a/model/pubspec.yaml b/model/pubspec.yaml index d2340258e..108c3b319 100644 --- a/model/pubspec.yaml +++ b/model/pubspec.yaml @@ -62,8 +62,6 @@ dev_dependencies: build_runner: 2.3.3 json_serializable: 6.6.1 - - analyzer: 5.6.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/rule_filter/pubspec.lock b/rule_filter/pubspec.lock index 171109c27..80b569f85 100644 --- a/rule_filter/pubspec.lock +++ b/rule_filter/pubspec.lock @@ -296,7 +296,7 @@ packages: description: path: "." ref: upgrade-latest-flutter-version - resolved-ref: "75ad24397dee8606a648a1858f6bba009c1aa1d8" + resolved-ref: "9be1a7b3b4a8fbe93fa4b8cf12795f8110de0c06" url: "https://github.com/linagora/jmap-dart-client.git" source: git version: "0.0.1" diff --git a/rule_filter/test/rule_filter/get_rule_filter_method_test.dart b/rule_filter/test/rule_filter/get_rule_filter_method_test.dart index bafa1be0e..7d226a9f6 100644 --- a/rule_filter/test/rule_filter/get_rule_filter_method_test.dart +++ b/rule_filter/test/rule_filter/get_rule_filter_method_test.dart @@ -95,8 +95,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 182 + "content-length": 250 }); final httpClient = HttpClient(dio); diff --git a/rule_filter/test/rule_filter/set_rule_filter_method_test.dart b/rule_filter/test/rule_filter/set_rule_filter_method_test.dart index 26b65ee66..3aed41597 100644 --- a/rule_filter/test/rule_filter/set_rule_filter_method_test.dart +++ b/rule_filter/test/rule_filter/set_rule_filter_method_test.dart @@ -104,8 +104,7 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-type": "application/json; charset=utf-8", - "content-length": 340 + "content-length": 753 }); final setRuleFilterMethod = SetRuleFilterMethod(AccountId(Id( diff --git a/test/features/caching/email_cache_client_test.dart b/test/features/caching/email_cache_client_test.dart index 3e6fb935b..f0bd0e464 100644 --- a/test/features/caching/email_cache_client_test.dart +++ b/test/features/caching/email_cache_client_test.dart @@ -11,37 +11,37 @@ import '../../fixtures/email_fixtures.dart'; void main() { - late EmailCacheClient _emailCacheClient; + late EmailCacheClient emailCacheClient; setUpAll(() { HiveCacheConfig().setUp(cachePath: Directory.current.path); }); setUp(() { - _emailCacheClient = EmailCacheClient(); + emailCacheClient = EmailCacheClient(); }); group('[delete]', () { test('cache should delete item successfully when cache empty', () async { - await _emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); + await emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(0)); }); test('cache should not delete item which not in the list', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email2.id.toString(), EmailFixtures.email2.toEmailCache()); - await _emailCacheClient.deleteItem(EmailFixtures.email3.id.toString()); + await emailCacheClient.deleteItem(EmailFixtures.email3.id.toString()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(2)); expect( @@ -53,35 +53,35 @@ void main() { }); test('cache should delete item successfully', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email2.id.toString(), EmailFixtures.email2.toEmailCache()); - await _emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); + await emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems.first, equals(EmailFixtures.email2.toEmailCache())); }); test('cache should not delete item twice', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email2.id.toString(), EmailFixtures.email2.toEmailCache()); - await _emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); - await _emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); + await emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); + await emailCacheClient.deleteItem(EmailFixtures.email1.id.toString()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems.first, equals(EmailFixtures.email2.toEmailCache())); @@ -90,26 +90,26 @@ void main() { group('[add]', () { test('cache should add item when cache empty', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems.first, equals(EmailFixtures.email1.toEmailCache())); }); test('cache should add item when cache not empty', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email2.id.toString(), EmailFixtures.email2.toEmailCache()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(2)); expect( @@ -121,15 +121,15 @@ void main() { }); test('cache should not add item twice', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect( @@ -142,30 +142,30 @@ void main() { group('[update]', () { test('cache should update item when update to iem which not in cache', () async { - await _emailCacheClient.updateItem( + await emailCacheClient.updateItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems.first, equals(EmailFixtures.email1.toEmailCache())); }); test('cache should update correctly item', () async { - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email1.id.toString(), EmailFixtures.email1.toEmailCache()); - await _emailCacheClient.insertItem( + await emailCacheClient.insertItem( EmailFixtures.email2.id.toString(), EmailFixtures.email2.toEmailCache()); - await _emailCacheClient.updateItem( + await emailCacheClient.updateItem( EmailFixtures.email1.id.toString(), EmailFixtures.email3.toEmailCache()); - final remainingItems = await _emailCacheClient.getAll(); + final remainingItems = await emailCacheClient.getAll(); expect(remainingItems.length, equals(2)); expect( @@ -178,6 +178,6 @@ void main() { }); tearDown(() async { - await _emailCacheClient.deleteBox(); + await emailCacheClient.deleteBox(); }); } \ No newline at end of file diff --git a/test/features/caching/mailbox_cache_client_test.dart b/test/features/caching/mailbox_cache_client_test.dart index 6663f6c9b..671d98552 100644 --- a/test/features/caching/mailbox_cache_client_test.dart +++ b/test/features/caching/mailbox_cache_client_test.dart @@ -11,37 +11,37 @@ import '../../fixtures/mailbox_fixtures.dart'; void main() { - late MailboxCacheClient _mailboxCacheClient; + late MailboxCacheClient mailboxCacheClient; setUpAll(() { HiveCacheConfig().setUp(cachePath: Directory.current.path); }); setUp(() { - _mailboxCacheClient = MailboxCacheClient(); + mailboxCacheClient = MailboxCacheClient(); }); group('[delete]', () { test('cache should delete item successfully when cache empty', () async { - await _mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); + await mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(0)); }); test('cache should not delete item which not in the list', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.sentMailbox.id.toString(), MailboxFixtures.sentMailbox.toMailboxCache()); - await _mailboxCacheClient.deleteItem(MailboxFixtures.folder1.id.toString()); + await mailboxCacheClient.deleteItem(MailboxFixtures.folder1.id.toString()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(2)); expect( @@ -53,35 +53,35 @@ void main() { }); test('cache should delete item successfully', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.sentMailbox.id.toString(), MailboxFixtures.sentMailbox.toMailboxCache()); - await _mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); + await mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems[0], equals(MailboxFixtures.sentMailbox.toMailboxCache())); }); test('cache should not delete item twice', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.sentMailbox.id.toString(), MailboxFixtures.sentMailbox.toMailboxCache()); - await _mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); - await _mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); + await mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); + await mailboxCacheClient.deleteItem(MailboxFixtures.inboxMailbox.id.toString()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems[0], equals(MailboxFixtures.sentMailbox.toMailboxCache())); @@ -90,26 +90,26 @@ void main() { group('[add]', () { test('cache should add item when cache empty', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems[0], equals(MailboxFixtures.inboxMailbox.toMailboxCache())); }); test('cache should add item when cache not empty', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.sentMailbox.id.toString(), MailboxFixtures.sentMailbox.toMailboxCache()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(2)); expect( @@ -121,15 +121,15 @@ void main() { }); test('cache should not add item twice', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect( @@ -142,30 +142,30 @@ void main() { group('[update]', () { test('cache should update item when update to iem which not in cache', () async { - await _mailboxCacheClient.updateItem( + await mailboxCacheClient.updateItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(1)); expect(remainingItems[0], equals(MailboxFixtures.inboxMailbox.toMailboxCache())); }); test('cache should update correctly item', () async { - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.inboxMailbox.toMailboxCache()); - await _mailboxCacheClient.insertItem( + await mailboxCacheClient.insertItem( MailboxFixtures.sentMailbox.id.toString(), MailboxFixtures.sentMailbox.toMailboxCache()); - await _mailboxCacheClient.updateItem( + await mailboxCacheClient.updateItem( MailboxFixtures.inboxMailbox.id.toString(), MailboxFixtures.folder1.toMailboxCache()); - final remainingItems = await _mailboxCacheClient.getAll(); + final remainingItems = await mailboxCacheClient.getAll(); expect(remainingItems.length, equals(2)); expect( @@ -178,6 +178,6 @@ void main() { }); tearDown(() async { - await _mailboxCacheClient.deleteBox(); + await mailboxCacheClient.deleteBox(); }); } \ No newline at end of file diff --git a/test/features/manage_account/identity/identity_utils_test.dart b/test/features/manage_account/identity/identity_utils_test.dart index cfe1ff3bd..ec7c2e8d5 100644 --- a/test/features/manage_account/identity/identity_utils_test.dart +++ b/test/features/manage_account/identity/identity_utils_test.dart @@ -4,12 +4,12 @@ import 'package:jmap_dart_client/jmap/identities/identity.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/profiles/identities/utils/identity_utils.dart'; void main() { - final _identityUtils = IdentityUtils(); + final identityUtils = IdentityUtils(); group('get smallest sortOrder identity test', () { test('getSmallestOrderedIdentity return identity with sortOrder equals to 1', () { final sortOrders = [1,99, 999, 100, 201]; final listIdentities1 = sortOrders.map((e) => Identity(sortOrder: UnsignedInt(e))).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1, [listIdentities1[0]]); }); @@ -17,7 +17,7 @@ void main() { test('getSmallestOrderedIdentity return list identities with sortOrder equals to 1', () { final sortOrders = [1, 1, 23, 2, 3, 4]; final listIdentities1 = sortOrders.map((e) => Identity(sortOrder: UnsignedInt(e))).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1, [listIdentities1[0], listIdentities1[1]]); }); @@ -30,7 +30,7 @@ void main() { } return Identity(); }).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1, [listIdentities1[1]]); }); @@ -43,7 +43,7 @@ void main() { } return Identity(); }).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1, [listIdentities1[2]]); }); @@ -56,7 +56,7 @@ void main() { } return Identity(); }).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1!.length, 5); expect(actual1[1], Identity(sortOrder: null)); @@ -65,12 +65,9 @@ void main() { test('getSmallestOrderedIdentity return list identities with sortOrder equals to 0', () { final sortOrders = [0, 0, 0, 0 ,0 ,0]; final listIdentities1 = sortOrders.map((e) { - if(e != null){ - return Identity(sortOrder: UnsignedInt(e)); - } - return Identity(); + return Identity(sortOrder: UnsignedInt(e)); }).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1!.length, 6); expect(actual1[1], Identity(sortOrder: UnsignedInt(0))); @@ -79,7 +76,7 @@ void main() { test('getSmallestOrderedIdentity return identity with sortOrder equals to 0', () { final sortOrders = [0, 99, 999, 100, 12]; final listIdentities1 = sortOrders.map((e) => Identity(sortOrder: UnsignedInt(e))).toList(); - final actual1 = _identityUtils.getSmallestOrderedIdentity(listIdentities1); + final actual1 = identityUtils.getSmallestOrderedIdentity(listIdentities1); expect(actual1, [listIdentities1[0]]); }); @@ -89,7 +86,7 @@ void main() { test('should return a list of identities with increasing sortOrder of identities', () { final sortOrders = [9, 1, 99, 98, 95, 0, 12]; final listIdentities1 = sortOrders.map((e) => Identity(sortOrder: UnsignedInt(e))).toList(); - _identityUtils.sortListIdentities(listIdentities1); + identityUtils.sortListIdentities(listIdentities1); expect(listIdentities1, [0, 1, 9, 12, 95, 98, 99].map((e) => Identity(sortOrder: UnsignedInt(e))).toList()); }); @@ -101,7 +98,7 @@ void main() { } return Identity(); }).toList(); - _identityUtils.sortListIdentities(listIdentities1); + identityUtils.sortListIdentities(listIdentities1); expect(listIdentities1, [1, 9, 12, 95, 98, 99, null].map((e) => Identity(sortOrder: e != null ? UnsignedInt(e) : null)).toList()); }); @@ -113,7 +110,7 @@ void main() { } return Identity(); }).toList(); - _identityUtils.sortListIdentities(listIdentities1); + identityUtils.sortListIdentities(listIdentities1); expect(listIdentities1, [999, null, null, null, null, null, null].map((e) => Identity(sortOrder: e != null ? UnsignedInt(e) : null)).toList()); }); @@ -125,7 +122,7 @@ void main() { } return Identity(); }).toList(); - _identityUtils.sortListIdentities(listIdentities1); + identityUtils.sortListIdentities(listIdentities1); expect(listIdentities1, [null, null, null, null, null, null, null].map((e) => Identity()).toList()); }); }); diff --git a/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart b/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart deleted file mode 100644 index 1b6caae09..000000000 --- a/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart +++ /dev/null @@ -1,179 +0,0 @@ -// Mocks generated by Mockito 5.3.2 from annotations -// in tmail_ui_user/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.dart. -// Do not manually edit this file. - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:async' as _i4; - -import 'package:jmap_dart_client/jmap/account_id.dart' as _i6; -import 'package:jmap_dart_client/jmap/core/filter/filter.dart' as _i14; -import 'package:jmap_dart_client/jmap/core/properties/properties.dart' as _i10; -import 'package:jmap_dart_client/jmap/core/sort/comparator.dart' as _i8; -import 'package:jmap_dart_client/jmap/core/state.dart' as _i11; -import 'package:jmap_dart_client/jmap/core/unsigned_int.dart' as _i7; -import 'package:jmap_dart_client/jmap/mail/email/email.dart' as _i13; -import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart' as _i15; -import 'package:mockito/mockito.dart' as _i1; -import 'package:model/email/presentation_email.dart' as _i2; -import 'package:tmail_ui_user/features/thread/domain/model/email_filter.dart' - as _i9; -import 'package:tmail_ui_user/features/thread/domain/model/email_response.dart' - as _i5; -import 'package:tmail_ui_user/features/thread/domain/model/get_email_request.dart' - as _i12; -import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart' - as _i3; - -// ignore_for_file: type=lint -// ignore_for_file: avoid_redundant_argument_values -// ignore_for_file: avoid_setters_without_getters -// ignore_for_file: comment_references -// ignore_for_file: implementation_imports -// ignore_for_file: invalid_use_of_visible_for_testing_member -// ignore_for_file: prefer_const_constructors -// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: camel_case_types -// ignore_for_file: subtype_of_sealed_class - -class _FakePresentationEmail_0 extends _i1.SmartFake - implements _i2.PresentationEmail { - _FakePresentationEmail_0( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -/// A class which mocks [ThreadRepository]. -/// -/// See the documentation for Mockito's code generation for more information. -class MockThreadRepository extends _i1.Mock implements _i3.ThreadRepository { - MockThreadRepository() { - _i1.throwOnMissingStub(this); - } - - @override - _i4.Stream<_i5.EmailsResponse> getAllEmail( - _i6.AccountId? accountId, { - _i7.UnsignedInt? limit, - Set<_i8.Comparator>? sort, - _i9.EmailFilter? emailFilter, - _i10.Properties? propertiesCreated, - _i10.Properties? propertiesUpdated, - }) => - (super.noSuchMethod( - Invocation.method( - #getAllEmail, - [accountId], - { - #limit: limit, - #sort: sort, - #emailFilter: emailFilter, - #propertiesCreated: propertiesCreated, - #propertiesUpdated: propertiesUpdated, - }, - ), - returnValue: _i4.Stream<_i5.EmailsResponse>.empty(), - ) as _i4.Stream<_i5.EmailsResponse>); - @override - _i4.Stream<_i5.EmailsResponse> refreshChanges( - _i6.AccountId? accountId, - _i11.State? currentState, { - Set<_i8.Comparator>? sort, - _i9.EmailFilter? emailFilter, - _i10.Properties? propertiesCreated, - _i10.Properties? propertiesUpdated, - }) => - (super.noSuchMethod( - Invocation.method( - #refreshChanges, - [ - accountId, - currentState, - ], - { - #sort: sort, - #emailFilter: emailFilter, - #propertiesCreated: propertiesCreated, - #propertiesUpdated: propertiesUpdated, - }, - ), - returnValue: _i4.Stream<_i5.EmailsResponse>.empty(), - ) as _i4.Stream<_i5.EmailsResponse>); - @override - _i4.Stream<_i5.EmailsResponse> loadMoreEmails( - _i12.GetEmailRequest? emailRequest) => - (super.noSuchMethod( - Invocation.method( - #loadMoreEmails, - [emailRequest], - ), - returnValue: _i4.Stream<_i5.EmailsResponse>.empty(), - ) as _i4.Stream<_i5.EmailsResponse>); - @override - _i4.Future> searchEmails( - _i6.AccountId? accountId, { - _i7.UnsignedInt? limit, - Set<_i8.Comparator>? sort, - _i14.Filter? filter, - _i10.Properties? properties, - }) => - (super.noSuchMethod( - Invocation.method( - #searchEmails, - [accountId], - { - #limit: limit, - #sort: sort, - #filter: filter, - #properties: properties, - }, - ), - returnValue: _i4.Future>.value(<_i13.Email>[]), - ) as _i4.Future>); - @override - _i4.Future> emptyTrashFolder( - _i6.AccountId? accountId, - _i15.MailboxId? trashMailboxId, - ) => - (super.noSuchMethod( - Invocation.method( - #emptyTrashFolder, - [ - accountId, - trashMailboxId, - ], - ), - returnValue: _i4.Future>.value(<_i13.EmailId>[]), - ) as _i4.Future>); - @override - _i4.Future<_i2.PresentationEmail> getEmailById( - _i6.AccountId? accountId, - _i13.EmailId? emailId, { - _i10.Properties? properties, - }) => - (super.noSuchMethod( - Invocation.method( - #getEmailById, - [ - accountId, - emailId, - ], - {#properties: properties}, - ), - returnValue: - _i4.Future<_i2.PresentationEmail>.value(_FakePresentationEmail_0( - this, - Invocation.method( - #getEmailById, - [ - accountId, - emailId, - ], - {#properties: properties}, - ), - )), - ) as _i4.Future<_i2.PresentationEmail>); -} diff --git a/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.dart b/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.dart index 1c4fcee8b..7bee43737 100644 --- a/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.dart +++ b/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.dart @@ -38,7 +38,7 @@ void main() { when(threadRepository.refreshChanges( AccountFixtures.aliceAccountId, StateFixtures.currentEmailState, - sort: Set()..add(EmailComparator(EmailComparatorProperty.sentAt)..setIsAscending(false)), + sort: {}..add(EmailComparator(EmailComparatorProperty.sentAt)..setIsAscending(false)), propertiesCreated: ThreadConstants.propertiesDefault, propertiesUpdated: ThreadConstants.propertiesUpdatedDefault, emailFilter: EmailFilter( @@ -58,7 +58,7 @@ void main() { final streamStates = refreshChangesEmailsInMailboxInteractor.execute( AccountFixtures.aliceAccountId, StateFixtures.currentEmailState, - sort: Set()..add(EmailComparator(EmailComparatorProperty.sentAt)..setIsAscending(false)), + sort: {}..add(EmailComparator(EmailComparatorProperty.sentAt)..setIsAscending(false)), propertiesCreated: ThreadConstants.propertiesDefault, propertiesUpdated: ThreadConstants.propertiesUpdatedDefault, emailFilter: EmailFilter( diff --git a/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart b/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart deleted file mode 100644 index 1daa0d335..000000000 --- a/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart +++ /dev/null @@ -1,179 +0,0 @@ -// Mocks generated by Mockito 5.3.2 from annotations -// in tmail_ui_user/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.dart. -// Do not manually edit this file. - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:async' as _i4; - -import 'package:jmap_dart_client/jmap/account_id.dart' as _i6; -import 'package:jmap_dart_client/jmap/core/filter/filter.dart' as _i14; -import 'package:jmap_dart_client/jmap/core/properties/properties.dart' as _i10; -import 'package:jmap_dart_client/jmap/core/sort/comparator.dart' as _i8; -import 'package:jmap_dart_client/jmap/core/state.dart' as _i11; -import 'package:jmap_dart_client/jmap/core/unsigned_int.dart' as _i7; -import 'package:jmap_dart_client/jmap/mail/email/email.dart' as _i13; -import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart' as _i15; -import 'package:mockito/mockito.dart' as _i1; -import 'package:model/email/presentation_email.dart' as _i2; -import 'package:tmail_ui_user/features/thread/domain/model/email_filter.dart' - as _i9; -import 'package:tmail_ui_user/features/thread/domain/model/email_response.dart' - as _i5; -import 'package:tmail_ui_user/features/thread/domain/model/get_email_request.dart' - as _i12; -import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart' - as _i3; - -// ignore_for_file: type=lint -// ignore_for_file: avoid_redundant_argument_values -// ignore_for_file: avoid_setters_without_getters -// ignore_for_file: comment_references -// ignore_for_file: implementation_imports -// ignore_for_file: invalid_use_of_visible_for_testing_member -// ignore_for_file: prefer_const_constructors -// ignore_for_file: unnecessary_parenthesis -// ignore_for_file: camel_case_types -// ignore_for_file: subtype_of_sealed_class - -class _FakePresentationEmail_0 extends _i1.SmartFake - implements _i2.PresentationEmail { - _FakePresentationEmail_0( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -/// A class which mocks [ThreadRepository]. -/// -/// See the documentation for Mockito's code generation for more information. -class MockThreadRepository extends _i1.Mock implements _i3.ThreadRepository { - MockThreadRepository() { - _i1.throwOnMissingStub(this); - } - - @override - _i4.Stream<_i5.EmailsResponse> getAllEmail( - _i6.AccountId? accountId, { - _i7.UnsignedInt? limit, - Set<_i8.Comparator>? sort, - _i9.EmailFilter? emailFilter, - _i10.Properties? propertiesCreated, - _i10.Properties? propertiesUpdated, - }) => - (super.noSuchMethod( - Invocation.method( - #getAllEmail, - [accountId], - { - #limit: limit, - #sort: sort, - #emailFilter: emailFilter, - #propertiesCreated: propertiesCreated, - #propertiesUpdated: propertiesUpdated, - }, - ), - returnValue: _i4.Stream<_i5.EmailsResponse>.empty(), - ) as _i4.Stream<_i5.EmailsResponse>); - @override - _i4.Stream<_i5.EmailsResponse> refreshChanges( - _i6.AccountId? accountId, - _i11.State? currentState, { - Set<_i8.Comparator>? sort, - _i9.EmailFilter? emailFilter, - _i10.Properties? propertiesCreated, - _i10.Properties? propertiesUpdated, - }) => - (super.noSuchMethod( - Invocation.method( - #refreshChanges, - [ - accountId, - currentState, - ], - { - #sort: sort, - #emailFilter: emailFilter, - #propertiesCreated: propertiesCreated, - #propertiesUpdated: propertiesUpdated, - }, - ), - returnValue: _i4.Stream<_i5.EmailsResponse>.empty(), - ) as _i4.Stream<_i5.EmailsResponse>); - @override - _i4.Stream<_i5.EmailsResponse> loadMoreEmails( - _i12.GetEmailRequest? emailRequest) => - (super.noSuchMethod( - Invocation.method( - #loadMoreEmails, - [emailRequest], - ), - returnValue: _i4.Stream<_i5.EmailsResponse>.empty(), - ) as _i4.Stream<_i5.EmailsResponse>); - @override - _i4.Future> searchEmails( - _i6.AccountId? accountId, { - _i7.UnsignedInt? limit, - Set<_i8.Comparator>? sort, - _i14.Filter? filter, - _i10.Properties? properties, - }) => - (super.noSuchMethod( - Invocation.method( - #searchEmails, - [accountId], - { - #limit: limit, - #sort: sort, - #filter: filter, - #properties: properties, - }, - ), - returnValue: _i4.Future>.value(<_i13.Email>[]), - ) as _i4.Future>); - @override - _i4.Future> emptyTrashFolder( - _i6.AccountId? accountId, - _i15.MailboxId? trashMailboxId, - ) => - (super.noSuchMethod( - Invocation.method( - #emptyTrashFolder, - [ - accountId, - trashMailboxId, - ], - ), - returnValue: _i4.Future>.value(<_i13.EmailId>[]), - ) as _i4.Future>); - @override - _i4.Future<_i2.PresentationEmail> getEmailById( - _i6.AccountId? accountId, - _i13.EmailId? emailId, { - _i10.Properties? properties, - }) => - (super.noSuchMethod( - Invocation.method( - #getEmailById, - [ - accountId, - emailId, - ], - {#properties: properties}, - ), - returnValue: - _i4.Future<_i2.PresentationEmail>.value(_FakePresentationEmail_0( - this, - Invocation.method( - #getEmailById, - [ - accountId, - emailId, - ], - {#properties: properties}, - ), - )), - ) as _i4.Future<_i2.PresentationEmail>); -}