From 8e1b97de3905bd9e147fc2cc2c4a6497742e02ea Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 15 Nov 2022 18:01:48 +0700 Subject: [PATCH] TF-1204 Rename `Registration` to `Subscription` --- ...se_registration_id_nullable_converter.dart | 13 ------- ...se_subscription_id_nullable_converter.dart | 13 +++++++ ... => firebase_subscription_get_method.dart} | 14 ++++---- ...> firebase_subscription_get_response.dart} | 20 +++++------ ... => firebase_subscription_set_method.dart} | 10 +++--- ...> firebase_subscription_set_response.dart} | 18 +++++----- fcm/lib/model/firebase_capability.dart | 8 +++++ ...ration.dart => firebase_subscription.dart} | 18 +++++----- ..._id.dart => firebase_subscription_id.dart} | 4 +-- fcm/lib/utils/firebase_utils.dart | 6 ---- ...irebase_subscription_get_method_test.dart} | 34 +++++++++---------- ...irebase_subscription_set_method_test.dart} | 34 +++++++++---------- 12 files changed, 97 insertions(+), 95 deletions(-) delete mode 100644 fcm/lib/converter/firebase_registration_id_nullable_converter.dart create mode 100644 fcm/lib/converter/firebase_subscription_id_nullable_converter.dart rename fcm/lib/method/get/{firebase_registration_get_method.dart => firebase_subscription_get_method.dart} (67%) rename fcm/lib/method/get/{firebase_registration_get_response.dart => firebase_subscription_get_response.dart} (50%) rename fcm/lib/method/set/{firebase_registration_set_method.dart => firebase_subscription_set_method.dart} (81%) rename fcm/lib/method/set/{firebase_registration_set_response.dart => firebase_subscription_set_response.dart} (77%) create mode 100644 fcm/lib/model/firebase_capability.dart rename fcm/lib/model/{firebase_registration.dart => firebase_subscription.dart} (69%) rename fcm/lib/model/{firebase_registration_id.dart => firebase_subscription_id.dart} (65%) delete mode 100644 fcm/lib/utils/firebase_utils.dart rename fcm/test/method/{firebase_registration_get_method_test.dart => firebase_subscription_get_method_test.dart} (72%) rename fcm/test/method/{firebase_registration_set_method_test.dart => firebase_subscription_set_method_test.dart} (71%) diff --git a/fcm/lib/converter/firebase_registration_id_nullable_converter.dart b/fcm/lib/converter/firebase_registration_id_nullable_converter.dart deleted file mode 100644 index 07b5b3ffc..000000000 --- a/fcm/lib/converter/firebase_registration_id_nullable_converter.dart +++ /dev/null @@ -1,13 +0,0 @@ -import 'package:fcm/model/firebase_registration_id.dart'; -import 'package:jmap_dart_client/jmap/core/id.dart'; -import 'package:json_annotation/json_annotation.dart'; - -class FirebaseRegistrationIdNullableConverter implements JsonConverter { - const FirebaseRegistrationIdNullableConverter(); - - @override - FirebaseRegistrationId? fromJson(String? json) => json != null ? FirebaseRegistrationId(Id(json)) : null; - - @override - String? toJson(FirebaseRegistrationId? object) => object?.id.value; -} diff --git a/fcm/lib/converter/firebase_subscription_id_nullable_converter.dart b/fcm/lib/converter/firebase_subscription_id_nullable_converter.dart new file mode 100644 index 000000000..816e71763 --- /dev/null +++ b/fcm/lib/converter/firebase_subscription_id_nullable_converter.dart @@ -0,0 +1,13 @@ +import 'package:fcm/model/firebase_subscription_id.dart'; +import 'package:jmap_dart_client/jmap/core/id.dart'; +import 'package:json_annotation/json_annotation.dart'; + +class FirebaseSubscriptionIdNullableConverter implements JsonConverter { + const FirebaseSubscriptionIdNullableConverter(); + + @override + FirebaseSubscriptionId? fromJson(String? json) => json != null ? FirebaseSubscriptionId(Id(json)) : null; + + @override + String? toJson(FirebaseSubscriptionId? object) => object?.id.value; +} diff --git a/fcm/lib/method/get/firebase_registration_get_method.dart b/fcm/lib/method/get/firebase_subscription_get_method.dart similarity index 67% rename from fcm/lib/method/get/firebase_registration_get_method.dart rename to fcm/lib/method/get/firebase_subscription_get_method.dart index 5f2298184..3b9de2eda 100644 --- a/fcm/lib/method/get/firebase_registration_get_method.dart +++ b/fcm/lib/method/get/firebase_subscription_get_method.dart @@ -1,4 +1,4 @@ -import 'package:fcm/utils/firebase_utils.dart'; +import 'package:fcm/model/firebase_capability.dart'; import 'package:jmap_dart_client/http/converter/id_converter.dart'; import 'package:jmap_dart_client/http/converter/properties_converter.dart'; import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; @@ -7,14 +7,14 @@ import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart'; import 'package:jmap_dart_client/jmap/core/request/result_reference.dart'; import 'package:json_annotation/json_annotation.dart'; -part 'firebase_registration_get_method.g.dart'; +part 'firebase_subscription_get_method.g.dart'; @IdConverter() @PropertiesConverter() @JsonSerializable(explicitToJson: true) -class FirebaseRegistrationGetMethod extends GetMethodNoNeedAccountId { +class FirebaseSubscriptionGetMethod extends GetMethodNoNeedAccountId { - FirebaseRegistrationGetMethod() : super(); + FirebaseSubscriptionGetMethod() : super(); @override MethodName get methodName => MethodName('FirebaseRegistration/get'); @@ -22,14 +22,14 @@ class FirebaseRegistrationGetMethod extends GetMethodNoNeedAccountId { @override Set get requiredCapabilities => { CapabilityIdentifier.jmapCore, - FirebaseUtils.capabilityLinagoraFirebase, + FirebaseCapability.identifier, }; @override List get props => [methodName, ids, requiredCapabilities]; - factory FirebaseRegistrationGetMethod.fromJson(Map json) => _$FirebaseRegistrationGetMethodFromJson(json); + factory FirebaseSubscriptionGetMethod.fromJson(Map json) => _$FirebaseSubscriptionGetMethodFromJson(json); @override - Map toJson() => _$FirebaseRegistrationGetMethodToJson(this); + Map toJson() => _$FirebaseSubscriptionGetMethodToJson(this); } \ No newline at end of file diff --git a/fcm/lib/method/get/firebase_registration_get_response.dart b/fcm/lib/method/get/firebase_subscription_get_response.dart similarity index 50% rename from fcm/lib/method/get/firebase_registration_get_response.dart rename to fcm/lib/method/get/firebase_subscription_get_response.dart index 5cf04d62c..0eabb55b3 100644 --- a/fcm/lib/method/get/firebase_registration_get_response.dart +++ b/fcm/lib/method/get/firebase_subscription_get_response.dart @@ -1,30 +1,30 @@ -import 'package:fcm/model/firebase_registration.dart'; +import 'package:fcm/model/firebase_subscription.dart'; import 'package:jmap_dart_client/http/converter/id_converter.dart'; import 'package:jmap_dart_client/http/converter/state_converter.dart'; import 'package:jmap_dart_client/jmap/core/id.dart'; import 'package:jmap_dart_client/jmap/core/method/response/get_response.dart'; import 'package:json_annotation/json_annotation.dart'; -part 'firebase_registration_get_response.g.dart'; +part 'firebase_subscription_get_response.g.dart'; @StateConverter() @IdConverter() @JsonSerializable(explicitToJson: true) -class FirebaseRegistrationGetResponse extends GetResponseNoAccountId { +class FirebaseSubscriptionGetResponse extends GetResponseNoAccountId { - FirebaseRegistrationGetResponse( - List list, + FirebaseSubscriptionGetResponse( + List list, List? notFound ) : super(list, notFound); - factory FirebaseRegistrationGetResponse.fromJson(Map json) => - _$FirebaseRegistrationGetResponseFromJson(json); + factory FirebaseSubscriptionGetResponse.fromJson(Map json) => + _$FirebaseSubscriptionGetResponseFromJson(json); - static FirebaseRegistrationGetResponse deserialize(Map json) { - return FirebaseRegistrationGetResponse.fromJson(json); + static FirebaseSubscriptionGetResponse deserialize(Map json) { + return FirebaseSubscriptionGetResponse.fromJson(json); } - Map toJson() => _$FirebaseRegistrationGetResponseToJson(this); + Map toJson() => _$FirebaseSubscriptionGetResponseToJson(this); @override List get props => [list, notFound]; diff --git a/fcm/lib/method/set/firebase_registration_set_method.dart b/fcm/lib/method/set/firebase_subscription_set_method.dart similarity index 81% rename from fcm/lib/method/set/firebase_registration_set_method.dart rename to fcm/lib/method/set/firebase_subscription_set_method.dart index 4681eda3f..1e9884b07 100644 --- a/fcm/lib/method/set/firebase_registration_set_method.dart +++ b/fcm/lib/method/set/firebase_subscription_set_method.dart @@ -1,14 +1,14 @@ -import 'package:fcm/model/firebase_registration.dart'; -import 'package:fcm/utils/firebase_utils.dart'; +import 'package:fcm/model/firebase_subscription.dart'; +import 'package:fcm/model/firebase_capability.dart'; import 'package:jmap_dart_client/http/converter/id_converter.dart'; import 'package:jmap_dart_client/http/converter/set/set_method_properties_converter.dart'; import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; import 'package:jmap_dart_client/jmap/core/method/request/set_method.dart'; import 'package:jmap_dart_client/jmap/core/request/request_invocation.dart'; -class FirebaseRegistrationSetMethod extends SetMethodNoNeedAccountId { +class FirebaseSubscriptionSetMethod extends SetMethodNoNeedAccountId { - FirebaseRegistrationSetMethod() : super(); + FirebaseSubscriptionSetMethod() : super(); @override MethodName get methodName => MethodName('FirebaseRegistration/set'); @@ -16,7 +16,7 @@ class FirebaseRegistrationSetMethod extends SetMethodNoNeedAccountId get requiredCapabilities => { CapabilityIdentifier.jmapCore, - FirebaseUtils.capabilityLinagoraFirebase, + FirebaseCapability.identifier }; @override diff --git a/fcm/lib/method/set/firebase_registration_set_response.dart b/fcm/lib/method/set/firebase_subscription_set_response.dart similarity index 77% rename from fcm/lib/method/set/firebase_registration_set_response.dart rename to fcm/lib/method/set/firebase_subscription_set_response.dart index b9dd2813f..8d093b4be 100644 --- a/fcm/lib/method/set/firebase_registration_set_response.dart +++ b/fcm/lib/method/set/firebase_subscription_set_response.dart @@ -1,13 +1,13 @@ -import 'package:fcm/model/firebase_registration.dart'; +import 'package:fcm/model/firebase_subscription.dart'; import 'package:jmap_dart_client/http/converter/id_converter.dart'; import 'package:jmap_dart_client/jmap/core/error/set_error.dart'; import 'package:jmap_dart_client/jmap/core/id.dart'; import 'package:jmap_dart_client/jmap/core/method/response/set_response.dart'; -class FirebaseRegistrationSetResponse extends SetResponseNoAccount { - FirebaseRegistrationSetResponse({ - Map? created, - Map? updated, +class FirebaseSubscriptionSetResponse extends SetResponseNoAccount { + FirebaseSubscriptionSetResponse({ + Map? created, + Map? updated, Set? destroyed, Map? notCreated, Map? notUpdated, @@ -21,15 +21,15 @@ class FirebaseRegistrationSetResponse extends SetResponseNoAccount json) { - return FirebaseRegistrationSetResponse( + static FirebaseSubscriptionSetResponse deserialize(Map json) { + return FirebaseSubscriptionSetResponse( created: (json['created'] as Map?)?.map((key, value) => MapEntry( const IdConverter().fromJson(key), - FirebaseRegistration.fromJson(value as Map) + FirebaseSubscription.fromJson(value as Map) )), updated: (json['updated'] as Map?)?.map((key, value) => MapEntry( const IdConverter().fromJson(key), - value != null ? FirebaseRegistration.fromJson(value as Map) : null + value != null ? FirebaseSubscription.fromJson(value as Map) : null )), destroyed: (json['destroyed'] as List?)?.map((id) => const IdConverter().fromJson(id)).toSet(), notCreated: (json['notCreated'] as Map?)?.map((key, value) => MapEntry( diff --git a/fcm/lib/model/firebase_capability.dart b/fcm/lib/model/firebase_capability.dart new file mode 100644 index 000000000..a20708dfd --- /dev/null +++ b/fcm/lib/model/firebase_capability.dart @@ -0,0 +1,8 @@ + +import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; + +class FirebaseCapability extends CapabilityIdentifier { + static final identifier = FirebaseCapability(Uri.parse('com:linagora:params:jmap:firebase:push')); + + FirebaseCapability(super.value); +} \ No newline at end of file diff --git a/fcm/lib/model/firebase_registration.dart b/fcm/lib/model/firebase_subscription.dart similarity index 69% rename from fcm/lib/model/firebase_registration.dart rename to fcm/lib/model/firebase_subscription.dart index d01a3ea35..054601746 100644 --- a/fcm/lib/model/firebase_registration.dart +++ b/fcm/lib/model/firebase_subscription.dart @@ -2,33 +2,33 @@ import 'package:equatable/equatable.dart'; import 'package:fcm/converter/device_client_id_nullable_converter.dart'; import 'package:fcm/converter/firebase_expired_time_nullable_converter.dart'; -import 'package:fcm/converter/firebase_registration_id_nullable_converter.dart'; +import 'package:fcm/converter/firebase_subscription_id_nullable_converter.dart'; import 'package:fcm/converter/firebase_token_nullable_converter.dart'; import 'package:fcm/converter/type_name_converter.dart'; import 'package:fcm/model/device_client_id.dart'; import 'package:fcm/model/firebase_expired_time.dart'; -import 'package:fcm/model/firebase_registration_id.dart'; +import 'package:fcm/model/firebase_subscription_id.dart'; import 'package:fcm/model/firebase_token.dart'; import 'package:fcm/model/type_name.dart'; import 'package:json_annotation/json_annotation.dart'; -part 'firebase_registration.g.dart'; +part 'firebase_subscription.g.dart'; @DeviceClientIdNullableConverter() -@FirebaseRegistrationIdNullableConverter() +@FirebaseSubscriptionIdNullableConverter() @FirebaseTokenNullableConverter() @FirebaseExpiredTimeNullableConverter() @TypeNameConverter() @JsonSerializable(explicitToJson: true, includeIfNull: false) -class FirebaseRegistration with EquatableMixin { +class FirebaseSubscription with EquatableMixin { - final FirebaseRegistrationId? id; + final FirebaseSubscriptionId? id; final FirebaseToken? token; final DeviceClientId? deviceClientId; final FirebaseExpiredTime? expires; final List? types; - FirebaseRegistration({ + FirebaseSubscription({ this.id, this.token, this.deviceClientId, @@ -36,9 +36,9 @@ class FirebaseRegistration with EquatableMixin { this.types }); - factory FirebaseRegistration.fromJson(Map json) => _$FirebaseRegistrationFromJson(json); + factory FirebaseSubscription.fromJson(Map json) => _$FirebaseSubscriptionFromJson(json); - Map toJson() => _$FirebaseRegistrationToJson(this); + Map toJson() => _$FirebaseSubscriptionToJson(this); @override List get props => [id, token, deviceClientId, expires, types]; diff --git a/fcm/lib/model/firebase_registration_id.dart b/fcm/lib/model/firebase_subscription_id.dart similarity index 65% rename from fcm/lib/model/firebase_registration_id.dart rename to fcm/lib/model/firebase_subscription_id.dart index 2f06b6784..267952546 100644 --- a/fcm/lib/model/firebase_registration_id.dart +++ b/fcm/lib/model/firebase_subscription_id.dart @@ -2,11 +2,11 @@ import 'package:equatable/equatable.dart'; import 'package:jmap_dart_client/jmap/core/id.dart'; -class FirebaseRegistrationId with EquatableMixin { +class FirebaseSubscriptionId with EquatableMixin { final Id id; - FirebaseRegistrationId(this.id); + FirebaseSubscriptionId(this.id); @override List get props => [id]; diff --git a/fcm/lib/utils/firebase_utils.dart b/fcm/lib/utils/firebase_utils.dart deleted file mode 100644 index 4866fa0df..000000000 --- a/fcm/lib/utils/firebase_utils.dart +++ /dev/null @@ -1,6 +0,0 @@ - -import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart'; - -class FirebaseUtils { - static final capabilityLinagoraFirebase = CapabilityIdentifier(Uri.parse('com:linagora:params:jmap:firebase:push')); -} \ No newline at end of file diff --git a/fcm/test/method/firebase_registration_get_method_test.dart b/fcm/test/method/firebase_subscription_get_method_test.dart similarity index 72% rename from fcm/test/method/firebase_registration_get_method_test.dart rename to fcm/test/method/firebase_subscription_get_method_test.dart index a228d5527..df122b4d8 100644 --- a/fcm/test/method/firebase_registration_get_method_test.dart +++ b/fcm/test/method/firebase_subscription_get_method_test.dart @@ -1,10 +1,10 @@ import 'package:dio/dio.dart'; -import 'package:fcm/method/get/firebase_registration_get_method.dart'; -import 'package:fcm/method/get/firebase_registration_get_response.dart'; +import 'package:fcm/method/get/firebase_subscription_get_method.dart'; +import 'package:fcm/method/get/firebase_subscription_get_response.dart'; import 'package:fcm/model/device_client_id.dart'; import 'package:fcm/model/firebase_expired_time.dart'; -import 'package:fcm/model/firebase_registration.dart'; -import 'package:fcm/model/firebase_registration_id.dart'; +import 'package:fcm/model/firebase_subscription.dart'; +import 'package:fcm/model/firebase_subscription_id.dart'; import 'package:fcm/model/type_name.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http_mock_adapter/http_mock_adapter.dart'; @@ -14,22 +14,22 @@ import 'package:jmap_dart_client/jmap/core/utc_date.dart'; import 'package:jmap_dart_client/jmap/jmap_request.dart'; void main() { - group('test to json firebase registration get method', () { - final expectFirebaseRegistration1 = FirebaseRegistration( - id: FirebaseRegistrationId(Id('e50b2c1d-9553-41a3-b0a7-a7d26b599ee1')), + group('test to json firebase subscription get method', () { + final expectFirebaseSubscription1 = FirebaseSubscription( + id: FirebaseSubscriptionId(Id('e50b2c1d-9553-41a3-b0a7-a7d26b599ee1')), deviceClientId: DeviceClientId('b37ff8001ca0'), expires: FirebaseExpiredTime(UTCDate(DateTime.parse('2018-07-31T00:13:21Z'))), types: [TypeName.mailboxType], ); - final expectFirebaseRegistration2 = FirebaseRegistration( - id: FirebaseRegistrationId(Id('f2d0aab5-e976-4e8b-ad4b-b380a5b987e4')), + final expectFirebaseSubscription2 = FirebaseSubscription( + id: FirebaseSubscriptionId(Id('f2d0aab5-e976-4e8b-ad4b-b380a5b987e4')), deviceClientId: DeviceClientId('X8980fc'), expires: FirebaseExpiredTime(UTCDate(DateTime.parse('2018-07-12T05:55:00Z'))), types: [TypeName.mailboxType, TypeName.emailType, TypeName.emailDelivery], ); - test('firebase registration get method and response parsing', () async { + test('firebase subscription get method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption)..options.baseUrl = 'http://domain.com/jmap'; final dioAdapter = DioAdapter(dio: dio); @@ -85,20 +85,20 @@ void main() { final processingInvocation = ProcessingInvocation(); final requestBuilder = JmapRequestBuilder(httpClient, processingInvocation); - final firebaseRegistrationGetMethod = FirebaseRegistrationGetMethod(); - final firebaseRegistrationGetInvocation = requestBuilder.invocation(firebaseRegistrationGetMethod); + final firebaseSubscriptionGetMethod = FirebaseSubscriptionGetMethod(); + final firebaseSubscriptionGetInvocation = requestBuilder.invocation(firebaseSubscriptionGetMethod); final response = await (requestBuilder - ..usings(firebaseRegistrationGetMethod.requiredCapabilities)) + ..usings(firebaseSubscriptionGetMethod.requiredCapabilities)) .build() .execute(); - final resultList = response.parse( - firebaseRegistrationGetInvocation.methodCallId, - FirebaseRegistrationGetResponse.deserialize + final resultList = response.parse( + firebaseSubscriptionGetInvocation.methodCallId, + FirebaseSubscriptionGetResponse.deserialize ); expect(resultList?.list.length, equals(2)); - expect(resultList?.list, containsAll([expectFirebaseRegistration1, expectFirebaseRegistration2])); + expect(resultList?.list, containsAll([expectFirebaseSubscription1, expectFirebaseSubscription2])); }); }); } \ No newline at end of file diff --git a/fcm/test/method/firebase_registration_set_method_test.dart b/fcm/test/method/firebase_subscription_set_method_test.dart similarity index 71% rename from fcm/test/method/firebase_registration_set_method_test.dart rename to fcm/test/method/firebase_subscription_set_method_test.dart index ab8e426e9..f6db27c7a 100644 --- a/fcm/test/method/firebase_registration_set_method_test.dart +++ b/fcm/test/method/firebase_subscription_set_method_test.dart @@ -1,10 +1,10 @@ import 'package:dio/dio.dart'; -import 'package:fcm/method/set/firebase_registration_set_method.dart'; -import 'package:fcm/method/set/firebase_registration_set_response.dart'; +import 'package:fcm/method/set/firebase_subscription_set_method.dart'; +import 'package:fcm/method/set/firebase_subscription_set_response.dart'; import 'package:fcm/model/device_client_id.dart'; import 'package:fcm/model/firebase_expired_time.dart'; -import 'package:fcm/model/firebase_registration.dart'; -import 'package:fcm/model/firebase_registration_id.dart'; +import 'package:fcm/model/firebase_subscription.dart'; +import 'package:fcm/model/firebase_subscription_id.dart'; import 'package:fcm/model/firebase_token.dart'; import 'package:fcm/model/type_name.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -15,13 +15,13 @@ import 'package:jmap_dart_client/jmap/core/utc_date.dart'; import 'package:jmap_dart_client/jmap/jmap_request.dart'; void main() { - group('test to json firebase registration set method', () { - final expectedFirebaseRegistrationCreated = FirebaseRegistration( - id: FirebaseRegistrationId(Id('175dbd70-93d1-11ec-984e-e3f8b83572b4')), + group('test to json firebase subscription set method', () { + final expectedFirebaseSubscriptionCreated = FirebaseSubscription( + id: FirebaseSubscriptionId(Id('175dbd70-93d1-11ec-984e-e3f8b83572b4')), expires: FirebaseExpiredTime(UTCDate(DateTime.parse('2022-03-31T02:14:29Z'))), ); - test('firebase registration set method and response parsing', () async { + test('firebase subscription set method and response parsing', () async { final baseOption = BaseOptions(method: 'POST'); final dio = Dio(baseOption) ..options.baseUrl = 'http://domain.com/jmap'; @@ -75,10 +75,10 @@ void main() { final createRequestId = Id('dab246'); - final firebaseRegistrationSetMethod = FirebaseRegistrationSetMethod() + final firebaseSubscriptionSetMethod = FirebaseSubscriptionSetMethod() ..addCreate( createRequestId, - FirebaseRegistration( + FirebaseSubscription( deviceClientId: DeviceClientId('a123-b123-c123'), token: FirebaseToken('token1'), types: [TypeName.mailboxType] @@ -87,19 +87,19 @@ void main() { final httpClient = HttpClient(dio); final requestBuilder = JmapRequestBuilder(httpClient, ProcessingInvocation()); - final firebaseRegistrationSetInvocation = requestBuilder.invocation(firebaseRegistrationSetMethod); + final firebaseSubscriptionSetInvocation = requestBuilder.invocation(firebaseSubscriptionSetMethod); final response = await (requestBuilder - ..usings(firebaseRegistrationSetMethod.requiredCapabilities)) + ..usings(firebaseSubscriptionSetMethod.requiredCapabilities)) .build() .execute(); - final firebaseRegistrationSetResponse = response.parse( - firebaseRegistrationSetInvocation.methodCallId, - FirebaseRegistrationSetResponse.deserialize); + final firebaseSubscriptionSetResponse = response.parse( + firebaseSubscriptionSetInvocation.methodCallId, + FirebaseSubscriptionSetResponse.deserialize); expect( - firebaseRegistrationSetResponse!.created![createRequestId]!.id, - equals(expectedFirebaseRegistrationCreated.id) + firebaseSubscriptionSetResponse!.created![createRequestId]!.id, + equals(expectedFirebaseSubscriptionCreated.id) ); }); });