From 4ed0ab9ba486567610ca443c962930fd8f908bcd Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 22 Sep 2022 10:49:45 +0700 Subject: [PATCH] Remove `/jmap` path segment and update unit test --- lib/jmap/jmap_request.dart | 2 +- test/jmap/email/changes/get_changes_email_test.dart | 9 ++------- test/jmap/email/get_list_email_test.dart | 4 ++-- .../email/query/query_with_operator_emails_test.dart | 4 ++-- .../use_case_test/search_by_after_use_case_test.dart | 4 ++-- .../use_case_test/search_by_form_use_case_test.dart | 4 ++-- .../search_by_time_and_text_use_case_test.dart | 4 ++-- .../use_case_test/search_emails_inbox_use_case_test.dart | 4 ++-- test/jmap/email/set/set_email_method_test.dart | 8 ++++---- test/jmap/email/sort_list_email_test.dart | 4 ++-- .../submission/set_email_submission_method_test.dart | 8 ++++---- test/jmap/identities/get_identity_method_test.dart | 4 ++-- test/jmap/identities/set_identity_method_test.dart | 4 ++-- test/jmap/mailbox/changes/get_changes_mailbox_test.dart | 4 ++-- test/jmap/mailbox/set/set_mailbox_method_test.dart | 4 ++-- test/jmap/push/get_push_subscription_method_test.dart | 4 ++-- test/jmap/push/set_push_subscription_method_test.dart | 4 ++-- test/jmap/vacation/get_vacation_method_test.dart | 4 ++-- test/jmap/vacation/set_vacation_method_test.dart | 4 ++-- 19 files changed, 41 insertions(+), 46 deletions(-) diff --git a/lib/jmap/jmap_request.dart b/lib/jmap/jmap_request.dart index 936e17c..967ec52 100644 --- a/lib/jmap/jmap_request.dart +++ b/lib/jmap/jmap_request.dart @@ -26,7 +26,7 @@ class JmapRequest { ..methodCalls(_invocations.values.toList())) .build(); - return _httpClient.post('/jmap', data: _requestObject?.toJson()) + return _httpClient.post('', data: _requestObject?.toJson()) .then((value) => extractData(value)) .catchError((error) => throw error); } diff --git a/test/jmap/email/changes/get_changes_email_test.dart b/test/jmap/email/changes/get_changes_email_test.dart index 9b376ae..b3b6aee 100644 --- a/test/jmap/email/changes/get_changes_email_test.dart +++ b/test/jmap/email/changes/get_changes_email_test.dart @@ -13,7 +13,6 @@ import 'package:jmap_dart_client/jmap/core/unsigned_int.dart'; import 'package:jmap_dart_client/jmap/core/utc_date.dart'; import 'package:jmap_dart_client/jmap/jmap_request.dart'; import 'package:jmap_dart_client/jmap/mail/email/changes/changes_email_method.dart'; -import 'package:jmap_dart_client/jmap/mail/email/changes/changes_email_response.dart'; import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart'; @@ -59,10 +58,10 @@ void main() { test('get changes email', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ @@ -262,10 +261,6 @@ void main() { .build() .execute(); - final resultChanges = result.parse( - changesEmailInvocation.methodCallId, - ChangesEmailResponse.deserialize); - final resultUpdated = result.parse( getEmailForUpdateInvocation.methodCallId, GetEmailResponse.deserialize); diff --git a/test/jmap/email/get_list_email_test.dart b/test/jmap/email/get_list_email_test.dart index 06d144b..2cdbe21 100644 --- a/test/jmap/email/get_list_email_test.dart +++ b/test/jmap/email/get_list_email_test.dart @@ -76,10 +76,10 @@ void main() { test('get email in a mailbox correctly', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/query/query_with_operator_emails_test.dart b/test/jmap/email/query/query_with_operator_emails_test.dart index 6efa900..3dc8c95 100644 --- a/test/jmap/email/query/query_with_operator_emails_test.dart +++ b/test/jmap/email/query/query_with_operator_emails_test.dart @@ -73,10 +73,10 @@ void main() { test('get email in a mailbox correctly', () async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/search/use_case_test/search_by_after_use_case_test.dart b/test/jmap/email/search/use_case_test/search_by_after_use_case_test.dart index fc5b58a..18a005e 100644 --- a/test/jmap/email/search/use_case_test/search_by_after_use_case_test.dart +++ b/test/jmap/email/search/use_case_test/search_by_after_use_case_test.dart @@ -32,10 +32,10 @@ void main() { Future?> searchMailByCondition(Comparator comparator) async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/search/use_case_test/search_by_form_use_case_test.dart b/test/jmap/email/search/use_case_test/search_by_form_use_case_test.dart index f060612..0f4a98d 100644 --- a/test/jmap/email/search/use_case_test/search_by_form_use_case_test.dart +++ b/test/jmap/email/search/use_case_test/search_by_form_use_case_test.dart @@ -32,10 +32,10 @@ void main() { Future?> searchMailByCondition(Comparator comparator) async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/search/use_case_test/search_by_time_and_text_use_case_test.dart b/test/jmap/email/search/use_case_test/search_by_time_and_text_use_case_test.dart index eee3b09..bfe28e1 100644 --- a/test/jmap/email/search/use_case_test/search_by_time_and_text_use_case_test.dart +++ b/test/jmap/email/search/use_case_test/search_by_time_and_text_use_case_test.dart @@ -32,10 +32,10 @@ void main() { Future?> searchMailByCondition(Comparator comparator) async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/search/use_case_test/search_emails_inbox_use_case_test.dart b/test/jmap/email/search/use_case_test/search_emails_inbox_use_case_test.dart index 3388b50..5b90bd5 100644 --- a/test/jmap/email/search/use_case_test/search_emails_inbox_use_case_test.dart +++ b/test/jmap/email/search/use_case_test/search_emails_inbox_use_case_test.dart @@ -69,10 +69,10 @@ void main() { Future?> searchMailByCondition(Comparator comparator) async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/set/set_email_method_test.dart b/test/jmap/email/set/set_email_method_test.dart index c5fa529..417ac60 100644 --- a/test/jmap/email/set/set_email_method_test.dart +++ b/test/jmap/email/set/set_email_method_test.dart @@ -29,10 +29,10 @@ void main() { test('set email method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [[ @@ -146,10 +146,10 @@ void main() { test('set email method and response parsing with header User-Agent', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [[ diff --git a/test/jmap/email/sort_list_email_test.dart b/test/jmap/email/sort_list_email_test.dart index b9ac170..f578983 100644 --- a/test/jmap/email/sort_list_email_test.dart +++ b/test/jmap/email/sort_list_email_test.dart @@ -82,10 +82,10 @@ void main() { Future?> getListEmailAndSortBy(Comparator comparator) async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/email/submission/set_email_submission_method_test.dart b/test/jmap/email/submission/set_email_submission_method_test.dart index 2b763b5..1797762 100644 --- a/test/jmap/email/submission/set_email_submission_method_test.dart +++ b/test/jmap/email/submission/set_email_submission_method_test.dart @@ -36,10 +36,10 @@ void main() { test('set email submission method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ @@ -225,10 +225,10 @@ void main() { test('set email submission method and response parsing with header User-Agent', () async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/identities/get_identity_method_test.dart b/test/jmap/identities/get_identity_method_test.dart index 603a7f1..d8af66f 100644 --- a/test/jmap/identities/get_identity_method_test.dart +++ b/test/jmap/identities/get_identity_method_test.dart @@ -34,9 +34,9 @@ void main() { test('get identity method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); - dioAdapter.onPost('/jmap', (server) => server.reply(200, { + dioAdapter.onPost('', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ [ diff --git a/test/jmap/identities/set_identity_method_test.dart b/test/jmap/identities/set_identity_method_test.dart index 323a449..3f73461 100644 --- a/test/jmap/identities/set_identity_method_test.dart +++ b/test/jmap/identities/set_identity_method_test.dart @@ -18,10 +18,10 @@ void main() { test('set identity method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/mailbox/changes/get_changes_mailbox_test.dart b/test/jmap/mailbox/changes/get_changes_mailbox_test.dart index c047806..aa73ea6 100644 --- a/test/jmap/mailbox/changes/get_changes_mailbox_test.dart +++ b/test/jmap/mailbox/changes/get_changes_mailbox_test.dart @@ -42,10 +42,10 @@ void main() { test('get changes email', () async { final baseOption = BaseOptions(method: 'POST'); - final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com'; + final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/mailbox/set/set_mailbox_method_test.dart b/test/jmap/mailbox/set/set_mailbox_method_test.dart index 8fd4316..5f3765c 100644 --- a/test/jmap/mailbox/set/set_mailbox_method_test.dart +++ b/test/jmap/mailbox/set/set_mailbox_method_test.dart @@ -18,10 +18,10 @@ void main() { test('set mailbox method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/push/get_push_subscription_method_test.dart b/test/jmap/push/get_push_subscription_method_test.dart index 01558cf..7885632 100644 --- a/test/jmap/push/get_push_subscription_method_test.dart +++ b/test/jmap/push/get_push_subscription_method_test.dart @@ -17,9 +17,9 @@ void main() { test('get pushSubscription method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); - dioAdapter.onPost('/jmap', (server) => server.reply(200, { + dioAdapter.onPost('', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ [ diff --git a/test/jmap/push/set_push_subscription_method_test.dart b/test/jmap/push/set_push_subscription_method_test.dart index 2efc962..c5078bf 100644 --- a/test/jmap/push/set_push_subscription_method_test.dart +++ b/test/jmap/push/set_push_subscription_method_test.dart @@ -17,10 +17,10 @@ void main() { test('set pushSubscription method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/vacation/get_vacation_method_test.dart b/test/jmap/vacation/get_vacation_method_test.dart index 47060dd..cce9603 100644 --- a/test/jmap/vacation/get_vacation_method_test.dart +++ b/test/jmap/vacation/get_vacation_method_test.dart @@ -22,10 +22,10 @@ void main() { test('get vacation method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [ diff --git a/test/jmap/vacation/set_vacation_method_test.dart b/test/jmap/vacation/set_vacation_method_test.dart index c8d74ed..0f277db 100644 --- a/test/jmap/vacation/set_vacation_method_test.dart +++ b/test/jmap/vacation/set_vacation_method_test.dart @@ -24,10 +24,10 @@ void main() { test('set vacation method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) - ..options.baseUrl = 'http://domain.com'; + ..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); dioAdapter.onPost( - '/jmap', + '', (server) => server.reply(200, { "sessionState": "2c9f1b12-b35a-43e6-9af2-0106fb53a943", "methodResponses": [