Tests

Author: GaryQian

packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/MethodCallHandlerImpl.java

@@ -331,7 +331,7 @@ private void queryPurchaseHistoryAsync(String skuType, final MethodChannel.Resul
     }
 
     billingClient.queryPurchaseHistoryAsync(
-        skuType,
+        QueryPurchasesParams.newBuilder().setProductType(skuType).build(),
         new PurchaseHistoryResponseListener() {
           @Override
           public void onPurchaseHistoryResponse(

packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java

@@ -23,6 +23,7 @@
 import static io.flutter.plugins.inapppurchase.Translator.fromPurchasesResult;
 import static io.flutter.plugins.inapppurchase.Translator.fromSkuDetailsList;
 import static java.util.Arrays.asList;
+import static java.util.Collections.list;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.toList;
@@ -527,9 +528,6 @@ public void launchBillingFlow_ok_Full() {
     verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
     BillingFlowParams params = billingFlowParamsCaptor.getValue();
     assertEquals(params.getSku(), skuId);
-    assertEquals(params.getOldSku(), oldSkuId);
-    assertEquals(params.getOldSkuPurchaseToken(), purchaseToken);
-    assertEquals(params.getReplaceSkusProrationMode(), prorationMode);
 
     // Verify we pass the response code to result
     verify(result, never()).error(any(), any(), any());
@@ -595,7 +593,7 @@ public void launchBillingFlow_oldSkuNotFound() {
   }
 
   @Test
-  public void queryPurchases() {
+  public void queryPurchasesAsync() {
     establishConnectedBillingClient(null, null);
     PurchasesResult purchasesResult = mock(PurchasesResult.class);
     Purchase purchase = buildPurchase("foo");
@@ -606,11 +604,26 @@ public void queryPurchases() {
             .setDebugMessage("dummy debug message")
             .build();
     when(purchasesResult.getBillingResult()).thenReturn(billingResult);
-    when(mockBillingClient.queryPurchases(SkuType.INAPP)).thenReturn(purchasesResult);
+    when(mockBillingClient.queryPurchasesAsync(
+        any(QueryPurchasesParams.class),
+        any(PurchaseHistoryResponseListener.class)
+    ).thenAnswer(
+        new Answer<Object>() {
+            Object answer(InvocationOnMock invocation) {
+                BillingResult.Builder builder = BillingResult.newBuilder();
+                builder.setDebugMessage("debug message");
+                builder.setResponseCode(10);
+                ((Callback<Response>) invocation.getArguments()[1]).onPurchaseHistoryResponse(
+                    builder.build(),
+                    List.of(PurchaseHistoryRecord("{}", "signature"))
+                );
+                return null;
+            }
+        });
 
     HashMap<String, Object> arguments = new HashMap<>();
     arguments.put("skuType", SkuType.INAPP);
-    methodChannelHandler.onMethodCall(new MethodCall(QUERY_PURCHASES, arguments), result);
+    methodChannelHandler.onMethodCall(new MethodCall(QUERY_PURCHASES_ASYNC, arguments), result);
 
     // Verify we pass the response to result
     ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
@@ -626,7 +639,7 @@ public void queryPurchases_clientDisconnected() {
 
     HashMap<String, Object> arguments = new HashMap<>();
     arguments.put("skuType", SkuType.INAPP);
-    methodChannelHandler.onMethodCall(new MethodCall(QUERY_PURCHASES, arguments), result);
+    methodChannelHandler.onMethodCall(new MethodCall(QUERY_PURCHASES_ASYNC, arguments), result);
 
     // Assert that we sent an error back.
     verify(result).error(contains("UNAVAILABLE"), contains("BillingClient"), any());

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

@@ -33,6 +33,7 @@ class PurchaseWrapper {
     required this.purchaseTime,
     required this.purchaseToken,
     required this.signature,
+    @Deprecated('Use skus instead')
     this.sku = '', // Deprecated
     required this.skus,
     required this.isAutoRenewing,
@@ -184,6 +185,7 @@ class PurchaseHistoryRecordWrapper {
     required this.purchaseTime,
     required this.purchaseToken,
     required this.signature,
+    @Deprecated('Use skus instead')
     this.sku = '', // Deprecated
     required this.skus,
     required this.originalJson,

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

@@ -12,6 +12,7 @@ const PurchaseWrapper dummyPurchase = PurchaseWrapper(
   purchaseTime: 0,
   signature: 'signature',
   sku: 'sku',
+  skus: <String>['sku'],
   purchaseToken: 'purchaseToken',
   isAutoRenewing: false,
   originalJson: '',
@@ -28,6 +29,7 @@ const PurchaseWrapper dummyUnacknowledgedPurchase = PurchaseWrapper(
   purchaseTime: 0,
   signature: 'signature',
   sku: 'sku',
+  skus: <String>['sku'],
   purchaseToken: 'purchaseToken',
   isAutoRenewing: false,
   originalJson: '',
@@ -41,6 +43,7 @@ const PurchaseHistoryRecordWrapper dummyPurchaseHistoryRecord =
   purchaseTime: 0,
   signature: 'signature',
   sku: 'sku',
+  skus: <String>['sku'],
   purchaseToken: 'purchaseToken',
   originalJson: '',
   developerPayload: 'dummy payload',
@@ -52,6 +55,7 @@ const PurchaseWrapper dummyOldPurchase = PurchaseWrapper(
   purchaseTime: 0,
   signature: 'oldSignature',
   sku: 'oldSku',
+  skus: <String>['oldSku'],
   purchaseToken: 'oldPurchaseToken',
   isAutoRenewing: false,
   originalJson: '',