From fdda936ac2810b11250b53e02c977173a679923e Mon Sep 17 00:00:00 2001 From: dab246 Date: Mon, 15 Dec 2025 12:01:59 +0700 Subject: [PATCH] TF-4136 Remove all content-length in header request of mock unit test avoid run test fail --- .../autocomplete_tmail_contact_method_test.dart | 1 - .../get_email_recovery_action_method_test.dart | 1 - .../set_email_recovery_action_method_test.dart | 2 -- .../firebase_registration_get_method_test.dart | 1 - .../firebase_registration_set_method_test.dart | 1 - .../test/forward/get_forward_method_test.dart | 1 - .../test/forward/set_forward_method_test.dart | 1 - .../rule_filter/get_rule_filter_method_test.dart | 1 - .../rule_filter/set_rule_filter_method_test.dart | 1 - .../get/get_server_settings_method_test.dart | 1 - .../set/set_server_settings_method_test.dart | 1 - .../authorization_interceptor_test.dart | 16 ++++++++-------- .../data/network/oidc_http_client_test.dart | 10 +++++----- .../data/network/server_settings_api_test.dart | 1 - .../thread/data/network/thread_api_test.dart | 8 ++++---- 15 files changed, 17 insertions(+), 30 deletions(-) diff --git a/contact/test/contact/autocomplete_tmail_contact_method_test.dart b/contact/test/contact/autocomplete_tmail_contact_method_test.dart index 399823e7a..e972dd528 100644 --- a/contact/test/contact/autocomplete_tmail_contact_method_test.dart +++ b/contact/test/contact/autocomplete_tmail_contact_method_test.dart @@ -81,7 +81,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 330 }); final httpClient = HttpClient(dio); diff --git a/email_recovery/test/method/get_email_recovery_action_method_test.dart b/email_recovery/test/method/get_email_recovery_action_method_test.dart index 42e383ce6..198a00cda 100644 --- a/email_recovery/test/method/get_email_recovery_action_method_test.dart +++ b/email_recovery/test/method/get_email_recovery_action_method_test.dart @@ -56,7 +56,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 162 } ); diff --git a/email_recovery/test/method/set_email_recovery_action_method_test.dart b/email_recovery/test/method/set_email_recovery_action_method_test.dart index dde8bfc13..fcd8df368 100644 --- a/email_recovery/test/method/set_email_recovery_action_method_test.dart +++ b/email_recovery/test/method/set_email_recovery_action_method_test.dart @@ -69,7 +69,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 868 } ); @@ -163,7 +162,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 256 } ); diff --git a/fcm/test/method/firebase_registration_get_method_test.dart b/fcm/test/method/firebase_registration_get_method_test.dart index 923c58e2f..c869f5a1a 100644 --- a/fcm/test/method/firebase_registration_get_method_test.dart +++ b/fcm/test/method/firebase_registration_get_method_test.dart @@ -76,7 +76,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 162 } ); diff --git a/fcm/test/method/firebase_registration_set_method_test.dart b/fcm/test/method/firebase_registration_set_method_test.dart index fee8cf0d4..29b8309b1 100644 --- a/fcm/test/method/firebase_registration_set_method_test.dart +++ b/fcm/test/method/firebase_registration_set_method_test.dart @@ -69,7 +69,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 424 } ); diff --git a/forward/test/forward/get_forward_method_test.dart b/forward/test/forward/get_forward_method_test.dart index 64fcee0a1..b581a18ed 100644 --- a/forward/test/forward/get_forward_method_test.dart +++ b/forward/test/forward/get_forward_method_test.dart @@ -64,7 +64,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "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 0162e1bbb..b1bb09f04 100644 --- a/forward/test/forward/set_forward_method_test.dart +++ b/forward/test/forward/set_forward_method_test.dart @@ -105,7 +105,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 765 } ); 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 7d226a9f6..e1f7a30c7 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,7 +95,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "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 2e6f9c833..40232ab80 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 @@ -141,7 +141,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 753 }); final setRuleFilterMethod = SetRuleFilterMethod(AccountId(Id( diff --git a/server_settings/test/server_settings/get/get_server_settings_method_test.dart b/server_settings/test/server_settings/get/get_server_settings_method_test.dart index 59ea26729..8bb464bb7 100644 --- a/server_settings/test/server_settings/get/get_server_settings_method_test.dart +++ b/server_settings/test/server_settings/get/get_server_settings_method_test.dart @@ -62,7 +62,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 233 }, ); diff --git a/server_settings/test/server_settings/set/set_server_settings_method_test.dart b/server_settings/test/server_settings/set/set_server_settings_method_test.dart index 678d57e63..e44d4aa97 100644 --- a/server_settings/test/server_settings/set/set_server_settings_method_test.dart +++ b/server_settings/test/server_settings/set/set_server_settings_method_test.dart @@ -88,7 +88,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 503 }, ); diff --git a/test/features/interceptor/authorization_interceptor_test.dart b/test/features/interceptor/authorization_interceptor_test.dart index 63c4c1e2a..c102c8afa 100644 --- a/test/features/interceptor/authorization_interceptor_test.dart +++ b/test/features/interceptor/authorization_interceptor_test.dart @@ -41,14 +41,14 @@ void main() { const responseStatusCode500 = 500; const responseStatusCode200 = 200; - final dioError401 = DioError( + final dioError401 = DioException( error: {'message': 'Token Expired'}, requestOptions: RequestOptions(path: baseUrl, method: 'POST'), response: Response( statusCode: responseStatusCode401, requestOptions: RequestOptions(path: baseUrl) ), - type: DioErrorType.badResponse, + type: DioExceptionType.badResponse, ); final dataRequestSuccessfully = {'message': 'Request successfully!'}; @@ -240,24 +240,24 @@ void main() { expect( () async => await dio.post(baseUrl), - throwsA(predicate((error) => error.response?.statusCode == responseStatusCode401)) + throwsA(predicate((error) => error.response?.statusCode == responseStatusCode401)) ); }); }); }); group('AuthorizationInterceptor: multiple requests queued on onError', () { - final requestOneDioError401 = DioError( + final requestOneDioError401 = DioException( error: {'message': 'Token Expired'}, requestOptions: RequestOptions(path: '$baseUrl/1', method: 'POST'), response: Response( statusCode: responseStatusCode401, requestOptions: RequestOptions(path: '$baseUrl/1') ), - type: DioErrorType.badResponse, + type: DioExceptionType.badResponse, ); - final requestTwoDioError401 = DioError( + final requestTwoDioError401 = DioException( error: {'message': 'Token Expired'}, requestOptions: RequestOptions( path: '$baseUrl/2', @@ -268,7 +268,7 @@ void main() { statusCode: responseStatusCode401, requestOptions: RequestOptions(path: '$baseUrl/2') ), - type: DioErrorType.badResponse, + type: DioExceptionType.badResponse, ); test('GIVEN 2 requests have token expired\n' @@ -367,7 +367,7 @@ void main() { dio.post('$baseUrl/1',), dio.post('$baseUrl/2',) ]), - throwsA(predicate( + throwsA(predicate( (dioError) => dioError.error is AccessTokenInvalidException)) ); diff --git a/test/features/login/data/network/oidc_http_client_test.dart b/test/features/login/data/network/oidc_http_client_test.dart index d60ddd0ce..1282f1b78 100644 --- a/test/features/login/data/network/oidc_http_client_test.dart +++ b/test/features/login/data/network/oidc_http_client_test.dart @@ -20,11 +20,11 @@ void main() { test( 'should throw CanNotFoundOIDCLinks ' 'when checkOIDCIsAvailable() is called ' - 'and dioClient throw DioError ' + 'and dioClient throw DioException ' 'and status code is 404', () { // arrange - when(dioClient.get(any)).thenThrow(DioError( + when(dioClient.get(any)).thenThrow(DioException( requestOptions: requestOptions, response: Response(requestOptions: requestOptions, statusCode: 404))); @@ -37,11 +37,11 @@ void main() { test( 'should throw CanRetryOIDCException ' 'when checkOIDCIsAvailable() is called ' - 'and dioClient throw DioError ' + 'and dioClient throw DioException ' 'and status code is not 404', () { // arrange - when(dioClient.get(any)).thenThrow(DioError( + when(dioClient.get(any)).thenThrow(DioException( requestOptions: requestOptions, response: Response(requestOptions: requestOptions, statusCode: 403))); @@ -54,7 +54,7 @@ void main() { test( 'should throw CanRetryOIDCException ' 'when checkOIDCIsAvailable() is called ' - 'and dioClient throw exception that is not DioError', + 'and dioClient throw exception that is not DioException', () { // arrange when(dioClient.get(any)).thenThrow(Exception()); diff --git a/test/features/server_settings/data/network/server_settings_api_test.dart b/test/features/server_settings/data/network/server_settings_api_test.dart index f9ddaa197..4122b31aa 100644 --- a/test/features/server_settings/data/network/server_settings_api_test.dart +++ b/test/features/server_settings/data/network/server_settings_api_test.dart @@ -87,7 +87,6 @@ void main() { }, headers: { "accept": "application/json;jmapVersion=rfc-8621", - "content-length": 503 }, ); diff --git a/test/features/thread/data/network/thread_api_test.dart b/test/features/thread/data/network/thread_api_test.dart index 8532f89f5..9537eb595 100644 --- a/test/features/thread/data/network/thread_api_test.dart +++ b/test/features/thread/data/network/thread_api_test.dart @@ -613,7 +613,7 @@ void main() { propertiesCreated: defaultCreatedProperties, propertiesUpdated: defaultUpdatedProperties, ), - headers: dioAdapterHeaders..addAll({'content-length': 1245}), + headers: dioAdapterHeaders, ); // act @@ -662,7 +662,7 @@ void main() { propertiesCreated: defaultCreatedProperties, propertiesUpdated: defaultUpdatedProperties, ), - headers: dioAdapterHeaders..addAll({'content-length': 1245}), + headers: dioAdapterHeaders ); // act @@ -714,7 +714,7 @@ void main() { data: generateRequest( propertiesCreated: defaultCreatedProperties, ), - headers: dioAdapterHeaders..addAll({'content-length': 798}), + headers: dioAdapterHeaders ); // act @@ -752,7 +752,7 @@ void main() { generateResponse(), ), data: generateRequest(), - headers: dioAdapterHeaders..addAll({'content-length': 355}), + headers: dioAdapterHeaders ); // act