[google_sign_in, in_app_purchase_android] Add availability to mock models

AUTHORS

@@ -67,3 +67,4 @@ Rahul Raj <[email protected]>
 Daniel Roek <[email protected]>
 TheOneWithTheBraid <[email protected]>
 Rulong Chen（陈汝龙） <[email protected]>
+Hwanseok Kang <[email protected]>

packages/google_sign_in/google_sign_in/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.3.1
+
+* Enable mocking models by Changing overridden operator == parameter type from `dynamic` to `Object`
+
 ## 5.3.0
 
 * Moves Android and iOS implementations to federated packages.

packages/google_sign_in/google_sign_in/lib/google_sign_in.dart

@@ -129,7 +129,7 @@ class GoogleSignInAccount implements GoogleIdentity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (identical(this, other)) {
       return true;
     }

packages/google_sign_in/google_sign_in/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 5.3.0
+version: 5.3.1
 
 
 environment:
@@ -36,6 +36,7 @@ dev_dependencies:
   http: ^0.13.0
   integration_test:
     sdk: flutter
+  mocktail: ^0.3.0
 
 # The example deliberately includes limited-use secrets.
 false_secrets:

packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart

@@ -9,6 +9,9 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:google_sign_in/testing.dart';
 import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockGoogleSignInAccount extends Mock implements GoogleSignInAccount {}
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 2.1.3
 
+* Enable mocking models by Changing overridden operator == parameter type from `dynamic` to `Object`
 * Removes unnecessary imports.
 
 ## 2.1.2

packages/google_sign_in/google_sign_in_platform_interface/lib/src/types.dart

@@ -79,7 +79,7 @@ class GoogleSignInUserData {
   @override
   // TODO(stuartmorgan): Make this class immutable in the next breaking change.
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (identical(this, other)) {
       return true;
     }
@@ -122,7 +122,7 @@ class GoogleSignInTokenData {
   @override
   // TODO(stuartmorgan): Make this class immutable in the next breaking change.
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (identical(this, other)) {
       return true;
     }

packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 2.1.2
+version: 2.1.3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/google_sign_in/google_sign_in_platform_interface/test/google_sign_in_platform_interface_test.dart

@@ -29,13 +29,54 @@ void main() {
       GoogleSignInPlatform.instance = ImplementsWithIsMock();
     });
   });
+
+  group('GoogleSignInTokenData', () {
+    test('can be compared by == operator', () {
+      final GoogleSignInTokenData firstInstance = GoogleSignInTokenData(
+        accessToken: 'accessToken',
+        idToken: 'idToken',
+        serverAuthCode: 'serverAuthCode',
+      );
+      final GoogleSignInTokenData secondInstance = GoogleSignInTokenData(
+        accessToken: 'accessToken',
+        idToken: 'idToken',
+        serverAuthCode: 'serverAuthCode',
+      );
+      expect(firstInstance == secondInstance, isTrue);
+    });
+  });
+  group('GoogleSignInUserData', () {
+    test('can be compared by == operator', () {
+      final GoogleSignInUserData firstInstance = GoogleSignInUserData(
+        email: 'email',
+        id: 'id',
+        displayName: 'displayName',
+        photoUrl: 'photoUrl',
+        idToken: 'idToken',
+        serverAuthCode: 'serverAuthCode',
+      );
+      final GoogleSignInUserData secondInstance = GoogleSignInUserData(
+        email: 'email',
+        id: 'id',
+        displayName: 'displayName',
+        photoUrl: 'photoUrl',
+        idToken: 'idToken',
+        serverAuthCode: 'serverAuthCode',
+      );
+      expect(firstInstance == secondInstance, isTrue);
+    });
+  });
 }
 
 class ImplementsWithIsMock extends Mock implements GoogleSignInPlatform {
   @override
   bool get isMock => true;
 }
 
+class MockGoogleSignInTokenData extends Mock implements GoogleSignInTokenData {}
+
+class MockGoogleSignInUserData extends Mock implements GoogleSignInUserData {}
+
 class ImplementsGoogleSignInPlatform extends Mock
     implements GoogleSignInPlatform {}
 

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 0.2.2+4
 
+* Enable mocking models by Changing overridden operator == parameter type from `dynamic` to `Object`
 * Removes unnecessary imports.
 
 ## 0.2.2+3

packages/in_app_purchase/in_app_purchase_android/lib/src/billing_client_wrappers/sku_details_wrapper.dart

@@ -135,7 +135,7 @@ class SkuDetailsWrapper {
   final int originalPriceAmountMicros;
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) {
       return false;
     }
@@ -203,7 +203,7 @@ class SkuDetailsResponseWrapper {
   final List<SkuDetailsWrapper> skuDetailsList;
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) {
       return false;
     }
@@ -248,7 +248,7 @@ class BillingResultWrapper {
   final String? debugMessage;
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) {
       return false;
     }

packages/in_app_purchase/in_app_purchase_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: in_app_purchase_android
 description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs.
 repository: https://github.com/flutter/plugins/tree/main/packages/in_app_purchase/in_app_purchase_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
-version: 0.2.2+3
+version: 0.2.2+4
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
@@ -28,4 +28,5 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   json_serializable: ^6.0.0
-  test: ^1.16.0
+  mocktail: ^0.3.0
+  test: ^1.16.0

packages/in_app_purchase/in_app_purchase_android/test/billing_client_wrappers/sku_details_wrapper_test.dart

@@ -4,8 +4,16 @@
 
 import 'package:in_app_purchase_android/billing_client_wrappers.dart';
 import 'package:in_app_purchase_android/src/types/google_play_product_details.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
+class MockSkuDetailsWrapper extends Mock implements SkuDetailsWrapper {}
+
+class MockSkuDetailsResponseWrapper extends Mock
+    implements SkuDetailsResponseWrapper {}
+
+class MockBillingResultWrapper extends Mock implements BillingResultWrapper {}
+
 const SkuDetailsWrapper dummySkuDetails = SkuDetailsWrapper(
   description: 'description',
   freeTrialPeriod: 'freeTrialPeriod',
@@ -125,6 +133,60 @@ void main() {
       expect(billingResult.debugMessage, kInvalidBillingResultErrorMessage);
       expect(billingResult.responseCode, BillingResponse.error);
     });
+
+    test('operator == of SkuDetailsWrapper works fine', () {
+      const SkuDetailsWrapper firstSkuDetailsInstance = SkuDetailsWrapper(
+        description: 'description',
+        freeTrialPeriod: 'freeTrialPeriod',
+        introductoryPrice: 'introductoryPrice',
+        introductoryPriceAmountMicros: 990000,
+        introductoryPriceCycles: 1,
+        introductoryPricePeriod: 'introductoryPricePeriod',
+        price: 'price',
+        priceAmountMicros: 1000,
+        priceCurrencyCode: 'priceCurrencyCode',
+        priceCurrencySymbol: r'$',
+        sku: 'sku',
+        subscriptionPeriod: 'subscriptionPeriod',
+        title: 'title',
+        type: SkuType.inapp,
+        originalPrice: 'originalPrice',
+        originalPriceAmountMicros: 1000,
+      );
+      const SkuDetailsWrapper secondSkuDetailsInstance = SkuDetailsWrapper(
+        description: 'description',
+        freeTrialPeriod: 'freeTrialPeriod',
+        introductoryPrice: 'introductoryPrice',
+        introductoryPriceAmountMicros: 990000,
+        introductoryPriceCycles: 1,
+        introductoryPricePeriod: 'introductoryPricePeriod',
+        price: 'price',
+        priceAmountMicros: 1000,
+        priceCurrencyCode: 'priceCurrencyCode',
+        priceCurrencySymbol: r'$',
+        sku: 'sku',
+        subscriptionPeriod: 'subscriptionPeriod',
+        title: 'title',
+        type: SkuType.inapp,
+        originalPrice: 'originalPrice',
+        originalPriceAmountMicros: 1000,
+      );
+      expect(firstSkuDetailsInstance == secondSkuDetailsInstance, isTrue);
+    });
+
+    test('operator == of BillingResultWrapper works fine', () {
+      const BillingResultWrapper firstBillingResultInstance =
+          BillingResultWrapper(
+        responseCode: BillingResponse.ok,
+        debugMessage: 'debugMessage',
+      );
+      const BillingResultWrapper secondBillingResultInstance =
+          BillingResultWrapper(
+        responseCode: BillingResponse.ok,
+        debugMessage: 'debugMessage',
+      );
+      expect(firstBillingResultInstance == secondBillingResultInstance, isTrue);
+    });
   });
 }