From 50b00d365f1bfb300a677773d2587d9bf8bbfcfb Mon Sep 17 00:00:00 2001 From: littleGnAl Date: Tue, 13 Aug 2024 12:45:55 +0800 Subject: [PATCH] First commit for RTM 2.x --- example/lib/src/log_sink.dart | 2 +- .../testcase_gen/lib/default_generator.dart | 5 +- .../testcase_gen/lib/templated_generator.dart | 50 +-- .../android/app/build.gradle | 2 +- .../binding_apis_call_fake_test.dart | 6 +- ...rtmclient_binding_fake_test.generated.dart | 2 +- ...t_rtmeventhandler_testcases.generated.dart | 296 +++--------------- .../rtmlock_binding_fake_test.generated.dart | 2 +- ...mpresence_binding_fake_test.generated.dart | 2 +- ...tmstorage_binding_fake_test.generated.dart | 2 +- ...amchannel_binding_fake_test.generated.dart | 2 +- test_shard/integration_test_app/lib/main.dart | 75 ++--- .../integration_test_app/test/all_mocks.dart | 6 +- .../rtmclient_unit_test.generated.dart | 2 +- .../rtmlock_unit_test.generated.dart | 2 +- .../rtmpresence_unit_test.generated.dart | 2 +- .../rtmstorage_unit_test.generated.dart | 2 +- .../streamchannel_unit_test.generated.dart | 2 +- .../lib/src/platform/io/iris_tester_io.dart | 21 +- .../web/iris_tester_bindings_web.dart | 3 +- 20 files changed, 134 insertions(+), 352 deletions(-) diff --git a/example/lib/src/log_sink.dart b/example/lib/src/log_sink.dart index d5b25c0..7c71355 100644 --- a/example/lib/src/log_sink.dart +++ b/example/lib/src/log_sink.dart @@ -92,7 +92,7 @@ class _LogActionWidgetState extends State { ), ); }); - Overlay.of(context)?.insert(_overlayEntry!); + Overlay.of(context).insert(_overlayEntry!); } _isOverlayShowed = !_isOverlayShowed; // setState(() { diff --git a/scripts/testcase_gen/lib/default_generator.dart b/scripts/testcase_gen/lib/default_generator.dart index 93647a3..02cd813 100644 --- a/scripts/testcase_gen/lib/default_generator.dart +++ b/scripts/testcase_gen/lib/default_generator.dart @@ -3,7 +3,10 @@ import 'package:testcase_gen/generator.dart'; const ignoreForFile = '// ignore_for_file: ' 'deprecated_member_use,' - 'constant_identifier_names'; + 'constant_identifier_names,' + 'unused_local_variable,' + 'unused_import,' + 'unnecessary_import'; const defaultHeader = ''' /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. diff --git a/scripts/testcase_gen/lib/templated_generator.dart b/scripts/testcase_gen/lib/templated_generator.dart index 1a37a38..25468ab 100644 --- a/scripts/testcase_gen/lib/templated_generator.dart +++ b/scripts/testcase_gen/lib/templated_generator.dart @@ -294,31 +294,31 @@ class TemplatedGenerator extends DefaultGenerator { parseResult, pb, field.type.parameters, []); jsonBuffer.writeln('final eventJson = {'); - for (final parameter in field.type.parameters) { - if (parameter.isPrimitiveType) { - final parameterType = getParamType(parameter); - - if (parameterType == 'Uint8List') { - jsonBuffer - .writeln('\'${parameter.name}\': ${parameter.name}.toList(),'); - } else { - jsonBuffer.writeln('\'${parameter.name}\': ${parameter.name},'); - } - } else { - final bool isEnum = parseResult.hasEnum(parameter.type.type); - if (isEnum) { - jsonBuffer - .writeln('\'${parameter.name}\': ${parameter.name}.value(),'); - } else { - final parameterClass = parseResult.getClazz(parameter.type.type)[0]; - if (parameterClass.constructors.isEmpty) { - continue; - } - jsonBuffer - .writeln('\'${parameter.name}\': ${parameter.name}.toJson(),'); - } - } - } + // for (final parameter in field.type.parameters) { + // if (parameter.isPrimitiveType) { + // final parameterType = getParamType(parameter); + + // if (parameterType == 'Uint8List') { + // jsonBuffer + // .writeln('\'${parameter.name}\': ${parameter.name}.toList(),'); + // } else { + // jsonBuffer.writeln('\'${parameter.name}\': ${parameter.name},'); + // } + // } else { + // final bool isEnum = parseResult.hasEnum(parameter.type.type); + // if (isEnum) { + // jsonBuffer + // .writeln('\'${parameter.name}\': ${parameter.name}.value(),'); + // } else { + // final parameterClass = parseResult.getClazz(parameter.type.type)[0]; + // if (parameterClass.constructors.isEmpty) { + // continue; + // } + // jsonBuffer + // .writeln('\'${parameter.name}\': ${parameter.name}.toJson(),'); + // } + // } + // } jsonBuffer.writeln('};'); final eventCompleterName = '${field.name}Completer'; diff --git a/test_shard/integration_test_app/android/app/build.gradle b/test_shard/integration_test_app/android/app/build.gradle index c4e9db1..486f3e4 100644 --- a/test_shard/integration_test_app/android/app/build.gradle +++ b/test_shard/integration_test_app/android/app/build.gradle @@ -46,7 +46,7 @@ android { applicationId "io.agora.integration_test_app.integration_test_app" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 19 + minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/test_shard/integration_test_app/integration_test/binding_apis_call_fake_test.dart b/test_shard/integration_test_app/integration_test/binding_apis_call_fake_test.dart index 553147a..149b058 100644 --- a/test_shard/integration_test_app/integration_test/binding_apis_call_fake_test.dart +++ b/test_shard/integration_test_app/integration_test/binding_apis_call_fake_test.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; @@ -17,8 +15,8 @@ import 'generated/bindings/rtmstorage_binding_fake_test.generated.dart' as rtmstorage_binding_fake_test; import 'generated/bindings/streamchannel_binding_fake_test.generated.dart' as streamchannel_binding_fake_test; -import 'generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart' - as rtmclient_rtmeventhandler_testcases; +// import 'generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart' +// as rtmclient_rtmeventhandler_testcases; import 'package:agora_rtm/src/impl/agora_rtm_client_impl_override.dart' as rtm_client_impl_override; diff --git a/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_binding_fake_test.generated.dart b/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_binding_fake_test.generated.dart index a8abdd4..e6469b6 100644 --- a/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_binding_fake_test.generated.dart +++ b/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_binding_fake_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException; import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart'; diff --git a/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart b/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart index e414e4a..ddba715 100644 --- a/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart +++ b/test_shard/integration_test_app/integration_test/generated/bindings/rtmclient_rtmeventhandler_testcases.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'dart:async'; import 'dart:typed_data'; @@ -71,9 +71,7 @@ void testCases( timestamp: eventTimestamp, ); - final eventJson = { - 'event': event.toJson(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onLinkStateEvent'] ?? []; @@ -139,9 +137,7 @@ void testCases( timestamp: eventTimestamp, ); - final eventJson = { - 'event': event.toJson(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onMessageEvent'] ?? []; @@ -227,9 +223,7 @@ void testCases( timestamp: eventTimestamp, ); - final eventJson = { - 'event': event.toJson(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onPresenceEvent'] ?? []; @@ -287,9 +281,7 @@ void testCases( timestamp: eventTimestamp, ); - final eventJson = { - 'event': event.toJson(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onTopicEvent'] ?? []; for (final event in eventIds) { @@ -346,9 +338,7 @@ void testCases( timestamp: eventTimestamp, ); - final eventJson = { - 'event': event.toJson(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onLockEvent'] ?? []; for (final event in eventIds) { @@ -413,9 +403,7 @@ void testCases( timestamp: eventTimestamp, ); - final eventJson = { - 'event': event.toJson(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onStorageEvent'] ?? []; @@ -466,12 +454,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onJoinResult'] ?? []; for (final event in eventIds) { @@ -521,12 +504,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onLeaveResult'] ?? []; for (final event in eventIds) { @@ -576,12 +554,7 @@ void testCases( String topic = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'topic': topic, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onPublishTopicMessageResult'] ?? @@ -635,14 +608,7 @@ void testCases( String meta = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'userId': userId, - 'topic': topic, - 'meta': meta, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onJoinTopicResult'] ?? []; @@ -695,14 +661,7 @@ void testCases( String meta = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'userId': userId, - 'topic': topic, - 'meta': meta, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onLeaveTopicResult'] ?? []; @@ -767,15 +726,7 @@ void testCases( ); RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'userId': userId, - 'topic': topic, - 'succeedUsers': succeedUsers.toJson(), - 'failedUsers': failedUsers.toJson(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onSubscribeTopicResult'] ?? []; @@ -826,12 +777,7 @@ void testCases( String topic = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'topic': topic, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onUnsubscribeTopicResult'] ?? []; @@ -886,13 +832,7 @@ void testCases( ); RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'topic': topic, - 'users': users.toJson(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onGetSubscribedUserListResult'] ?? @@ -945,11 +885,7 @@ void testCases( RtmConnectionChangeReason reason = RtmConnectionChangeReason.rtmConnectionChangedConnecting; - final eventJson = { - 'channelName': channelName, - 'state': state.value(), - 'reason': reason.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onConnectionStateChanged'] ?? []; @@ -996,9 +932,7 @@ void testCases( { String channelName = "hello"; - final eventJson = { - 'channelName': channelName, - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onTokenPrivilegeWillExpire'] ?? []; @@ -1048,11 +982,7 @@ void testCases( String channelName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onSubscribeResult'] ?? []; @@ -1102,11 +1032,7 @@ void testCases( String channelName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onUnsubscribeResult'] ?? []; @@ -1154,10 +1080,7 @@ void testCases( int requestId = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onPublishResult'] ?? []; @@ -1205,10 +1128,7 @@ void testCases( int requestId = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onLoginResult'] ?? []; for (final event in eventIds) { @@ -1255,10 +1175,7 @@ void testCases( int requestId = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onLogoutResult'] ?? []; @@ -1309,12 +1226,7 @@ void testCases( String channelName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'serverType': serverType.value(), - 'channelName': channelName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onRenewTokenResult'] ?? []; @@ -1365,12 +1277,7 @@ void testCases( RtmChannelType channelType = RtmChannelType.rtmChannelTypeNone; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onSetChannelMetadataResult'] ?? []; @@ -1421,12 +1328,7 @@ void testCases( RtmChannelType channelType = RtmChannelType.rtmChannelTypeNone; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onUpdateChannelMetadataResult'] ?? @@ -1478,12 +1380,7 @@ void testCases( RtmChannelType channelType = RtmChannelType.rtmChannelTypeNone; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onRemoveChannelMetadataResult'] ?? @@ -1541,13 +1438,7 @@ void testCases( ); RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'data': data.toJson(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onGetChannelMetadataResult'] ?? []; @@ -1597,11 +1488,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onSetUserMetadataResult'] ?? []; @@ -1651,11 +1538,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onUpdateUserMetadataResult'] ?? []; @@ -1705,11 +1588,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onRemoveUserMetadataResult'] ?? []; @@ -1765,12 +1644,7 @@ void testCases( ); RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userId': userId, - 'data': data.toJson(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onGetUserMetadataResult'] ?? []; @@ -1820,11 +1694,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onSubscribeUserMetadataResult'] ?? @@ -1875,11 +1745,7 @@ void testCases( String userId = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userId': userId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping[ 'RtmEventHandler_onUnsubscribeUserMetadataResult'] ?? @@ -1935,13 +1801,7 @@ void testCases( String lockName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'lockName': lockName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onSetLockResult'] ?? []; @@ -1996,13 +1856,7 @@ void testCases( String lockName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'lockName': lockName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onRemoveLockResult'] ?? []; @@ -2057,13 +1911,7 @@ void testCases( String lockName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'lockName': lockName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onReleaseLockResult'] ?? []; @@ -2120,14 +1968,7 @@ void testCases( RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; String errorDetails = "hello"; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'lockName': lockName, - 'errorCode': errorCode.value(), - 'errorDetails': errorDetails, - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onAcquireLockResult'] ?? []; @@ -2182,13 +2023,7 @@ void testCases( String lockName = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'lockName': lockName, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onRevokeLockResult'] ?? []; @@ -2257,14 +2092,7 @@ void testCases( int count = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channelName': channelName, - 'channelType': channelType.value(), - 'lockDetailList': lockDetailList, - 'count': count, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onGetLocksResult'] ?? []; @@ -2326,13 +2154,7 @@ void testCases( String nextPage = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userStateList': userStateList, - 'count': count, - 'nextPage': nextPage, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onWhoNowResult'] ?? []; @@ -2394,13 +2216,7 @@ void testCases( String nextPage = "hello"; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'userStateList': userStateList, - 'count': count, - 'nextPage': nextPage, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onGetOnlineUsersResult'] ?? []; @@ -2456,12 +2272,7 @@ void testCases( int count = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channels': channels.toJson(), - 'count': count, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onWhereNowResult'] ?? []; @@ -2517,12 +2328,7 @@ void testCases( int count = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'channels': channels.toJson(), - 'count': count, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onGetUserChannelsResult'] ?? []; @@ -2570,10 +2376,7 @@ void testCases( int requestId = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onPresenceSetStateResult'] ?? []; @@ -2621,10 +2424,7 @@ void testCases( int requestId = 5; RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onPresenceRemoveStateResult'] ?? @@ -2680,11 +2480,7 @@ void testCases( ); RtmErrorCode errorCode = RtmErrorCode.rtmErrorOk; - final eventJson = { - 'requestId': requestId, - 'state': state.toJson(), - 'errorCode': errorCode.value(), - }; + final eventJson = {}; final eventIds = eventIdsMapping['RtmEventHandler_onPresenceGetStateResult'] ?? []; diff --git a/test_shard/integration_test_app/integration_test/generated/bindings/rtmlock_binding_fake_test.generated.dart b/test_shard/integration_test_app/integration_test/generated/bindings/rtmlock_binding_fake_test.generated.dart index d988b5f..7723612 100644 --- a/test_shard/integration_test_app/integration_test/generated/bindings/rtmlock_binding_fake_test.generated.dart +++ b/test_shard/integration_test_app/integration_test/generated/bindings/rtmlock_binding_fake_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException; import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart'; diff --git a/test_shard/integration_test_app/integration_test/generated/bindings/rtmpresence_binding_fake_test.generated.dart b/test_shard/integration_test_app/integration_test/generated/bindings/rtmpresence_binding_fake_test.generated.dart index 5205c98..f9da01f 100644 --- a/test_shard/integration_test_app/integration_test/generated/bindings/rtmpresence_binding_fake_test.generated.dart +++ b/test_shard/integration_test_app/integration_test/generated/bindings/rtmpresence_binding_fake_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException; import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart'; diff --git a/test_shard/integration_test_app/integration_test/generated/bindings/rtmstorage_binding_fake_test.generated.dart b/test_shard/integration_test_app/integration_test/generated/bindings/rtmstorage_binding_fake_test.generated.dart index 744556a..48c97ab 100644 --- a/test_shard/integration_test_app/integration_test/generated/bindings/rtmstorage_binding_fake_test.generated.dart +++ b/test_shard/integration_test_app/integration_test/generated/bindings/rtmstorage_binding_fake_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException; import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart'; diff --git a/test_shard/integration_test_app/integration_test/generated/bindings/streamchannel_binding_fake_test.generated.dart b/test_shard/integration_test_app/integration_test/generated/bindings/streamchannel_binding_fake_test.generated.dart index 0091658..470ad7d 100644 --- a/test_shard/integration_test_app/integration_test/generated/bindings/streamchannel_binding_fake_test.generated.dart +++ b/test_shard/integration_test_app/integration_test/generated/bindings/streamchannel_binding_fake_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException; import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart'; diff --git a/test_shard/integration_test_app/lib/main.dart b/test_shard/integration_test_app/lib/main.dart index 7b342f1..aea4658 100644 --- a/test_shard/integration_test_app/lib/main.dart +++ b/test_shard/integration_test_app/lib/main.dart @@ -1,24 +1,11 @@ import 'package:flutter/material.dart'; import 'dart:async'; -import 'dart:async'; - -import 'package:agora_rtm/agora_rtm.dart' show AgoraRtmException; -import 'package:agora_rtm/src/bindings/gen/binding_forward_export.dart'; -import 'package:agora_rtm/src/impl/rtm_result_handler_impl.dart'; -import 'package:agora_rtm/src/bindings/native_iris_api_engine_binding_delegate.dart'; -import 'package:agora_rtm/src/bindings/agora_rtm_client_impl_override.dart'; - import 'package:flutter_test/flutter_test.dart'; -import 'dart:typed_data'; -import 'package:flutter/foundation.dart'; import 'package:iris_method_channel/iris_method_channel.dart'; import 'package:iris_tester/iris_tester.dart'; -import 'package:agora_rtm/src/impl/agora_rtm_client_impl_override.dart' - as rtm_client_impl_override; - class TestInitilizationArgProvider implements InitilizationArgProvider { TestInitilizationArgProvider(this.testerArgs); TestInitilizationArgProvider.fromValue(IrisHandle this.value) @@ -51,40 +38,40 @@ class _MyAppState extends State { // Platform messages are asynchronous, so we initialize in an async method. Future initPlatformState() async { - List irisMethodChannelInitilizationArgs = []; - IrisTester? irisTester; - irisTester = createIrisTester(); - irisTester!.initialize(); - if (kIsWeb) { - rtm_client_impl_override.setMockSharedNativeHandleProvider( - TestInitilizationArgProvider(irisTester!.getTesterArgs())); - } else { - // On IO, the function return from the `irisTester.getTesterArgs()` capture - // the `Pointer` from `IrisTester`, which is invalid to pass to the `Isolate`, - // so directly pass the `ObjectIrisHandle` as value to the `setMockSharedNativeHandleProvider` - final value = - irisTester!.getTesterArgs()[0](const IrisApiEngineHandle(0)); - // rtm_client_impl_override.setMockSharedNativeHandleProvider( - // TestInitilizationArgProvider.fromValue(ObjectIrisHandle(value))); + // List irisMethodChannelInitilizationArgs = []; + // IrisTester? irisTester; + // irisTester = createIrisTester(); + // irisTester!.initialize(); + // if (kIsWeb) { + // rtm_client_impl_override.setMockSharedNativeHandleProvider( + // TestInitilizationArgProvider(irisTester!.getTesterArgs())); + // } else { + // // On IO, the function return from the `irisTester.getTesterArgs()` capture + // // the `Pointer` from `IrisTester`, which is invalid to pass to the `Isolate`, + // // so directly pass the `ObjectIrisHandle` as value to the `setMockSharedNativeHandleProvider` + // final value = + // irisTester!.getTesterArgs()[0](const IrisApiEngineHandle(0)); + // // rtm_client_impl_override.setMockSharedNativeHandleProvider( + // // TestInitilizationArgProvider.fromValue(ObjectIrisHandle(value))); - irisMethodChannelInitilizationArgs = [ - TestInitilizationArgProvider.fromValue(ObjectIrisHandle(value)) - ]; - } + // irisMethodChannelInitilizationArgs = [ + // TestInitilizationArgProvider.fromValue(ObjectIrisHandle(value)) + // ]; + // } - Future _createBindingRtmClient() async { - String appId = const String.fromEnvironment('TEST_APP_ID', - defaultValue: ''); - final rtmResultHandler = RtmResultHandlerImpl(); - return RtmClientImplOverride.create( - IrisMethodChannel(IrisApiEngineNativeBindingDelegateProvider()), - RtmConfig(appId: appId), - rtmResultHandler.rtmEventHandler, - args: irisMethodChannelInitilizationArgs, - ); - } + // Future _createBindingRtmClient() async { + // String appId = const String.fromEnvironment('TEST_APP_ID', + // defaultValue: ''); + // final rtmResultHandler = RtmResultHandlerImpl(); + // return RtmClientImplOverride.create( + // IrisMethodChannel(IrisApiEngineNativeBindingDelegateProvider()), + // RtmConfig(appId: appId), + // rtmResultHandler.rtmEventHandler, + // args: irisMethodChannelInitilizationArgs, + // ); + // } - await _createBindingRtmClient(); + // await _createBindingRtmClient(); } @override diff --git a/test_shard/integration_test_app/test/all_mocks.dart b/test_shard/integration_test_app/test/all_mocks.dart index d785b5e..87de7b8 100644 --- a/test_shard/integration_test_app/test/all_mocks.dart +++ b/test_shard/integration_test_app/test/all_mocks.dart @@ -1,19 +1,14 @@ import 'package:mockito/annotations.dart'; -import 'package:mockito/mockito.dart'; import 'package:agora_rtm/src/bindings/agora_rtm_client_impl_override.dart' as rtm_client_impl_native_binding; -// /Users/admin/codes/agora_rtm_flutter/lib/src/bindings/gen/agora_rtm_storage_impl.dart -// /Users/admin/codes/agora_rtm_flutter/lib/src/bindings/gen/agora_rtm_lock_impl.dart import 'package:agora_rtm/src/bindings/gen/agora_rtm_lock_impl.dart' as rtm_lock_impl_native_binding; -// /Users/admin/codes/agora_rtm_flutter/lib/src/bindings/gen/agora_rtm_presence_impl.dart import 'package:agora_rtm/src/bindings/gen/agora_rtm_presence_impl.dart' as rtm_presence_impl_native_binding; import 'package:agora_rtm/src/bindings/gen/agora_rtm_storage_impl.dart' as rtm_storage_impl_native_binding; -// /Users/admin/codes/agora_rtm_flutter/lib/src/bindings/gen/agora_stream_channel_impl.dart import 'package:agora_rtm/src/bindings/gen/agora_stream_channel_impl.dart' as stream_channel_impl_native_binding; @@ -28,4 +23,5 @@ import 'package:agora_rtm/src/impl/rtm_result_handler_impl.dart'; // RtmResultHandlerImpl MockSpec(), ]) +// ignore: unused_import import 'all_mocks.mocks.dart'; diff --git a/test_shard/integration_test_app/test/generated/rtmclient_unit_test.generated.dart b/test_shard/integration_test_app/test/generated/rtmclient_unit_test.generated.dart index b41030f..acb5170 100644 --- a/test_shard/integration_test_app/test/generated/rtmclient_unit_test.generated.dart +++ b/test_shard/integration_test_app/test/generated/rtmclient_unit_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart'; import 'package:agora_rtm/src/impl/agora_rtm_client_impl_override.dart' diff --git a/test_shard/integration_test_app/test/generated/rtmlock_unit_test.generated.dart b/test_shard/integration_test_app/test/generated/rtmlock_unit_test.generated.dart index ab7c2e4..253d07d 100644 --- a/test_shard/integration_test_app/test/generated/rtmlock_unit_test.generated.dart +++ b/test_shard/integration_test_app/test/generated/rtmlock_unit_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart'; import 'package:agora_rtm/src/impl/gen/agora_rtm_lock_impl.dart' diff --git a/test_shard/integration_test_app/test/generated/rtmpresence_unit_test.generated.dart b/test_shard/integration_test_app/test/generated/rtmpresence_unit_test.generated.dart index 68bb80f..6b19bc6 100644 --- a/test_shard/integration_test_app/test/generated/rtmpresence_unit_test.generated.dart +++ b/test_shard/integration_test_app/test/generated/rtmpresence_unit_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart'; import 'package:agora_rtm/src/impl/gen/agora_rtm_presence_impl.dart' diff --git a/test_shard/integration_test_app/test/generated/rtmstorage_unit_test.generated.dart b/test_shard/integration_test_app/test/generated/rtmstorage_unit_test.generated.dart index 973fe34..8c94a1d 100644 --- a/test_shard/integration_test_app/test/generated/rtmstorage_unit_test.generated.dart +++ b/test_shard/integration_test_app/test/generated/rtmstorage_unit_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart'; import 'package:agora_rtm/src/impl/gen/agora_rtm_storage_impl.dart' diff --git a/test_shard/integration_test_app/test/generated/streamchannel_unit_test.generated.dart b/test_shard/integration_test_app/test/generated/streamchannel_unit_test.generated.dart index 0237f38..1343928 100644 --- a/test_shard/integration_test_app/test/generated/streamchannel_unit_test.generated.dart +++ b/test_shard/integration_test_app/test/generated/streamchannel_unit_test.generated.dart @@ -1,6 +1,6 @@ /// GENERATED BY testcase_gen. DO NOT MODIFY BY HAND. -// ignore_for_file: deprecated_member_use,constant_identifier_names +// ignore_for_file: deprecated_member_use,constant_identifier_names,unused_local_variable,unused_import,unnecessary_import import 'package:agora_rtm/agora_rtm.dart'; import 'package:agora_rtm/src/impl/gen/agora_stream_channel_impl.dart' diff --git a/test_shard/iris_tester/lib/src/platform/io/iris_tester_io.dart b/test_shard/iris_tester/lib/src/platform/io/iris_tester_io.dart index 9e2db1d..1d2ebd2 100644 --- a/test_shard/iris_tester/lib/src/platform/io/iris_tester_io.dart +++ b/test_shard/iris_tester/lib/src/platform/io/iris_tester_io.dart @@ -32,6 +32,7 @@ class IrisTesterIO implements IrisTester { } late final NativeIrisTesterRtmBinding _nativeIrisTesterBinding; late ffi.Pointer _fakeRtcEngineHandle; + late ffi.Pointer _fakeRtmEngineHandle; @override List getTesterArgs() { @@ -44,7 +45,7 @@ class IrisTesterIO implements IrisTester { @override void initialize() { - // _fakeRtcEngineHandle = _nativeIrisTesterBinding.CreateFakeRtmClient(); + _fakeRtmEngineHandle = _nativeIrisTesterBinding.CreateFakeRtmClient(); _fakeRtcEngineHandle = _nativeIrisTesterBinding.GetDebugProcTableRtm().cast(); @@ -58,16 +59,16 @@ class IrisTesterIO implements IrisTester { @override void expectCalled(String funcName, String params) { final isCalled = using((Arena arena) { - final ffi.Pointer funcNamePointer = - funcName.toNativeUtf8(allocator: arena).cast(); + // final ffi.Pointer funcNamePointer = + // funcName.toNativeUtf8(allocator: arena).cast(); - final ffi.Pointer paramsPointerUtf8 = - params.toNativeUtf8(allocator: arena); - final paramsPointerUtf8Length = paramsPointerUtf8.length; - final ffi.Pointer paramsPointer = - paramsPointerUtf8.cast(); + // final ffi.Pointer paramsPointerUtf8 = + // params.toNativeUtf8(allocator: arena); + // final paramsPointerUtf8Length = paramsPointerUtf8.length; + // final ffi.Pointer paramsPointer = + // paramsPointerUtf8.cast(); - ffi.Pointer> bufferListPtr = ffi.nullptr; + // ffi.Pointer> bufferListPtr = ffi.nullptr; // return _nativeIrisTesterBinding.ExpectCalled(funcNamePointer, // paramsPointer, paramsPointerUtf8Length, bufferListPtr, 0) == @@ -109,7 +110,7 @@ class IrisTesterIO implements IrisTester { ..ref.buffer_count = bufferLength; final ret = _nativeIrisTesterBinding.TriggerEventWithFakeRtmClient( - _fakeRtcEngineHandle, apiParam); + _fakeRtmEngineHandle, apiParam); if (ret != 0) { debugPrint( diff --git a/test_shard/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart b/test_shard/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart index f6b39fb..1bea242 100644 --- a/test_shard/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart +++ b/test_shard/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart @@ -1,3 +1,5 @@ +// ignore_for_file: non_constant_identifier_names + @JS() library iris_tester_web; @@ -35,7 +37,6 @@ external void irisMock(); @JS('triggerEventWithFakeApiEngine') external int triggerEventWithFakeApiEngine( - // ignore: non_constant_identifier_names String func_name, EventParam parameters, );