From a2e8830df078132ddd5302a8a45e39fe83cb3602 Mon Sep 17 00:00:00 2001 From: td Date: Tue, 30 Apr 2024 17:42:36 +0530 Subject: [PATCH] chore: expose fake matrix api --- {test => lib}/fake_matrix_api.dart | 32 ++++++++++--------- lib/matrix.dart | 2 ++ test/client_test.dart | 1 - test/commands_test.dart | 1 - test/device_keys_list_test.dart | 1 - test/encryption/cross_signing_test.dart | 1 - .../encrypt_decrypt_to_device_test.dart | 1 - test/encryption/key_manager_test.dart | 1 - test/encryption/key_request_test.dart | 1 - test/encryption/key_verification_test.dart | 1 - test/encryption/olm_manager_test.dart | 1 - test/encryption/online_key_backup_test.dart | 1 - test/encryption/ssss_test.dart | 1 - test/event_test.dart | 1 - test/fake_client.dart | 1 - .../msc_3814_dehydrated_devices_test.dart | 2 +- test/mxc_uri_extension_test.dart | 1 - test/room_test.dart | 1 - test/timeline_context_test.dart | 1 - test/user_test.dart | 1 - 20 files changed, 20 insertions(+), 33 deletions(-) rename {test => lib}/fake_matrix_api.dart (99%) diff --git a/test/fake_matrix_api.dart b/lib/fake_matrix_api.dart similarity index 99% rename from test/fake_matrix_api.dart rename to lib/fake_matrix_api.dart index 355207f8..ae4c63b3 100644 --- a/test/fake_matrix_api.dart +++ b/lib/fake_matrix_api.dart @@ -240,26 +240,28 @@ class FakeMatrixApi extends BaseClient { } @override - Future send(BaseRequest baseRequest) async { - final bodyStream = baseRequest.finalize(); + Future send(BaseRequest request) async { + final bodyStream = request.finalize(); final bodyBytes = await bodyStream.toBytes(); - final request = Request(baseRequest.method, baseRequest.url) - ..persistentConnection = baseRequest.persistentConnection - ..followRedirects = baseRequest.followRedirects - ..maxRedirects = baseRequest.maxRedirects - ..headers.addAll(baseRequest.headers) + final r = Request(request.method, request.url) + ..persistentConnection = request.persistentConnection + ..followRedirects = request.followRedirects + ..maxRedirects = request.maxRedirects + ..headers.addAll(request.headers) ..bodyBytes = bodyBytes ..finalize(); - final response = await mockIntercept(request); + final response = await mockIntercept(r); return StreamedResponse( - ByteStream.fromBytes(response.bodyBytes), response.statusCode, - contentLength: response.contentLength, - request: baseRequest, - headers: response.headers, - isRedirect: response.isRedirect, - persistentConnection: response.persistentConnection, - reasonPhrase: response.reasonPhrase); + ByteStream.fromBytes(response.bodyBytes), + response.statusCode, + contentLength: response.contentLength, + request: request, + headers: response.headers, + isRedirect: response.isRedirect, + persistentConnection: response.persistentConnection, + reasonPhrase: response.reasonPhrase, + ); } FakeMatrixApi() { diff --git a/lib/matrix.dart b/lib/matrix.dart index e09b315f..3e52aa84 100644 --- a/lib/matrix.dart +++ b/lib/matrix.dart @@ -21,6 +21,8 @@ library matrix; export 'matrix_api_lite.dart'; +export 'fake_matrix_api.dart' show FakeMatrixApi; + export 'src/client.dart'; export 'src/database/database_api.dart'; export 'src/database/hive_database.dart'; diff --git a/test/client_test.dart b/test/client_test.dart index d290c800..4618f8a7 100644 --- a/test/client_test.dart +++ b/test/client_test.dart @@ -29,7 +29,6 @@ import 'package:matrix/matrix.dart'; import 'package:matrix/src/utils/client_init_exception.dart'; import 'fake_client.dart'; import 'fake_database.dart'; -import 'fake_matrix_api.dart'; void main() { late Client matrix; diff --git a/test/commands_test.dart b/test/commands_test.dart index 4a0e6180..c78fa50d 100644 --- a/test/commands_test.dart +++ b/test/commands_test.dart @@ -23,7 +23,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import 'fake_client.dart'; -import 'fake_matrix_api.dart'; void main() { group('Commands', tags: 'olm', () { diff --git a/test/device_keys_list_test.dart b/test/device_keys_list_test.dart index cd6ca90f..c0663d7b 100644 --- a/test/device_keys_list_test.dart +++ b/test/device_keys_list_test.dart @@ -22,7 +22,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import './fake_client.dart'; -import './fake_matrix_api.dart'; void main() { /// All Tests related to device keys diff --git a/test/encryption/cross_signing_test.dart b/test/encryption/cross_signing_test.dart index dcfa5dd2..8ac7178b 100644 --- a/test/encryption/cross_signing_test.dart +++ b/test/encryption/cross_signing_test.dart @@ -23,7 +23,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; void main() { group('Cross Signing', tags: 'olm', () { diff --git a/test/encryption/encrypt_decrypt_to_device_test.dart b/test/encryption/encrypt_decrypt_to_device_test.dart index ecd826e8..5916e0ec 100644 --- a/test/encryption/encrypt_decrypt_to_device_test.dart +++ b/test/encryption/encrypt_decrypt_to_device_test.dart @@ -22,7 +22,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; import '../fake_database.dart'; -import '../fake_matrix_api.dart'; void main() { // key @othertest:fakeServer.notExisting diff --git a/test/encryption/key_manager_test.dart b/test/encryption/key_manager_test.dart index d5eb0433..0270dfa3 100644 --- a/test/encryption/key_manager_test.dart +++ b/test/encryption/key_manager_test.dart @@ -23,7 +23,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; void main() { group('Key Manager', tags: 'olm', () { diff --git a/test/encryption/key_request_test.dart b/test/encryption/key_request_test.dart index 9b87f5cf..307aee7b 100644 --- a/test/encryption/key_request_test.dart +++ b/test/encryption/key_request_test.dart @@ -23,7 +23,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; Map jsonDecode(dynamic payload) { if (payload is String) { diff --git a/test/encryption/key_verification_test.dart b/test/encryption/key_verification_test.dart index e67c9321..8bfdea0a 100644 --- a/test/encryption/key_verification_test.dart +++ b/test/encryption/key_verification_test.dart @@ -27,7 +27,6 @@ import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; import '../fake_database.dart'; -import '../fake_matrix_api.dart'; EventUpdate getLastSentEvent(KeyVerification req) { final entry = FakeMatrixApi.calledEndpoints.entries diff --git a/test/encryption/olm_manager_test.dart b/test/encryption/olm_manager_test.dart index 3ec1c1e6..c6fa2039 100644 --- a/test/encryption/olm_manager_test.dart +++ b/test/encryption/olm_manager_test.dart @@ -24,7 +24,6 @@ import 'package:test/test.dart'; import 'package:matrix/encryption/utils/json_signature_check_extension.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; void main() { group('Olm Manager', tags: 'olm', () { diff --git a/test/encryption/online_key_backup_test.dart b/test/encryption/online_key_backup_test.dart index cbf45f6e..cbabe316 100644 --- a/test/encryption/online_key_backup_test.dart +++ b/test/encryption/online_key_backup_test.dart @@ -23,7 +23,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; void main() { group('Online Key Backup', tags: 'olm', () { diff --git a/test/encryption/ssss_test.dart b/test/encryption/ssss_test.dart index 4d914a5a..7141b4e4 100644 --- a/test/encryption/ssss_test.dart +++ b/test/encryption/ssss_test.dart @@ -26,7 +26,6 @@ import 'package:test/test.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; Uint8List secureRandomBytes(int len) { final rng = Random.secure(); diff --git a/test/event_test.dart b/test/event_test.dart index 46c4c92c..56da26d9 100644 --- a/test/event_test.dart +++ b/test/event_test.dart @@ -25,7 +25,6 @@ import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; import 'package:matrix/src/models/timeline_chunk.dart'; import 'fake_client.dart'; -import 'fake_matrix_api.dart'; void main() { /// All Tests related to the Event diff --git a/test/fake_client.dart b/test/fake_client.dart index e4cc81b6..cee178d0 100644 --- a/test/fake_client.dart +++ b/test/fake_client.dart @@ -18,7 +18,6 @@ import 'package:matrix/matrix.dart'; import 'fake_database.dart'; -import 'fake_matrix_api.dart'; const ssssPassphrase = 'nae7ahDiequ7ohniufah3ieS2je1thohX4xeeka7aixohsho9O'; const ssssKey = 'EsT9 RzbW VhPW yqNp cC7j ViiW 5TZB LuY4 ryyv 9guN Ysmr WDPH'; diff --git a/test/msc_extensions/msc_3814_dehydrated_devices_test.dart b/test/msc_extensions/msc_3814_dehydrated_devices_test.dart index fcc681b4..a0c6b9da 100644 --- a/test/msc_extensions/msc_3814_dehydrated_devices_test.dart +++ b/test/msc_extensions/msc_3814_dehydrated_devices_test.dart @@ -23,9 +23,9 @@ import 'package:test/test.dart'; +import 'package:matrix/fake_matrix_api.dart'; import 'package:matrix/msc_extensions/msc_3814_dehydrated_devices/api.dart'; import '../fake_client.dart'; -import '../fake_matrix_api.dart'; void main() { /// All Tests related to device keys diff --git a/test/mxc_uri_extension_test.dart b/test/mxc_uri_extension_test.dart index 290265b2..e26d917e 100644 --- a/test/mxc_uri_extension_test.dart +++ b/test/mxc_uri_extension_test.dart @@ -19,7 +19,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; -import 'fake_matrix_api.dart'; void main() { /// All Tests related to the MxContent diff --git a/test/room_test.dart b/test/room_test.dart index 7d8e066a..67c19f42 100644 --- a/test/room_test.dart +++ b/test/room_test.dart @@ -24,7 +24,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import 'fake_client.dart'; -import 'fake_matrix_api.dart'; Future updateLastEvent(Event event) { if (event.room.client.getRoomById(event.room.id) == null) { diff --git a/test/timeline_context_test.dart b/test/timeline_context_test.dart index 31c8f707..6b306801 100644 --- a/test/timeline_context_test.dart +++ b/test/timeline_context_test.dart @@ -23,7 +23,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; import 'package:matrix/src/models/timeline_chunk.dart'; import 'fake_client.dart'; -import 'fake_matrix_api.dart'; void main() { group('Timeline context', tags: 'olm', () { diff --git a/test/user_test.dart b/test/user_test.dart index a00708a5..309cacb4 100644 --- a/test/user_test.dart +++ b/test/user_test.dart @@ -19,7 +19,6 @@ import 'package:test/test.dart'; import 'package:matrix/matrix.dart'; -import 'fake_matrix_api.dart'; void main() { /// All Tests related to the Event