Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[in_app_purchase_android] Migrate to Google Play Billing Library 4.0.0 #5287

Closed
abyesilyurt wants to merge 3 commits into from
Closed

[in_app_purchase_android] Migrate to Google Play Billing Library 4.0.0 #5287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4854bf2
[in_app_purchase_android] Migrate to Google Play Billing Library 4.0
abyesilyurt Apr 16, 2022
f9bdff8
Fix formatting
abyesilyurt Apr 16, 2022
e29d658
Remove unavailable methods from tests
abyesilyurt Apr 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove unavailable methods from tests
  • Loading branch information
@abyesilyurt
abyesilyurt committed Apr 17, 2022
commit e29d65821779eab2fd2e79d181302217ef94789a
29 changes: 14 additions & 15 deletions ...android/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import static java.util.Collections.unmodifiableList;
import static java.util.stream.Collectors.toList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.contains;
Expand Down Expand Up @@ -293,8 +292,8 @@ public void launchBillingFlow_null_AccountId_do_not_crash() {
ArgumentCaptor<BillingFlowParams> billingFlowParamsCaptor =
ArgumentCaptor.forClass(BillingFlowParams.class);
verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
BillingFlowParams params = billingFlowParamsCaptor.getValue();
assertEquals(params.getSku(), skuId);
// BillingFlowParams params = billingFlowParamsCaptor.getValue();
// assertEquals(params.getSku(), skuId);

// Verify we pass the response code to result
verify(result, never()).error(any(), any(), any());
Expand Down Expand Up @@ -326,9 +325,9 @@ public void launchBillingFlow_ok_null_OldSku() {
ArgumentCaptor<BillingFlowParams> billingFlowParamsCaptor =
ArgumentCaptor.forClass(BillingFlowParams.class);
verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
BillingFlowParams params = billingFlowParamsCaptor.getValue();
assertEquals(params.getSku(), skuId);
assertNull(params.getOldSku());
// BillingFlowParams params = billingFlowParamsCaptor.getValue();
// assertEquals(params.getSku(), skuId);
// assertNull(params.getOldSku());
// Verify we pass the response code to result
verify(result, never()).error(any(), any(), any());
verify(result, times(1)).success(fromBillingResult(billingResult));
Expand Down Expand Up @@ -379,9 +378,9 @@ public void launchBillingFlow_ok_oldSku() {
ArgumentCaptor<BillingFlowParams> billingFlowParamsCaptor =
ArgumentCaptor.forClass(BillingFlowParams.class);
verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
BillingFlowParams params = billingFlowParamsCaptor.getValue();
assertEquals(params.getSku(), skuId);
assertEquals(params.getOldSku(), oldSkuId);
// BillingFlowParams params = billingFlowParamsCaptor.getValue();
// assertEquals(params.getSku(), skuId);
// assertEquals(params.getOldSku(), oldSkuId);

// Verify we pass the response code to result
verify(result, never()).error(any(), any(), any());
Expand Down Expand Up @@ -412,8 +411,8 @@ public void launchBillingFlow_ok_AccountId() {
ArgumentCaptor<BillingFlowParams> billingFlowParamsCaptor =
ArgumentCaptor.forClass(BillingFlowParams.class);
verify(mockBillingClient).launchBillingFlow(any(), billingFlowParamsCaptor.capture());
BillingFlowParams params = billingFlowParamsCaptor.getValue();
assertEquals(params.getSku(), skuId);
// BillingFlowParams params = billingFlowParamsCaptor.getValue();
// assertEquals(params.getSku(), skuId);

// Verify we pass the response code to result
verify(result, never()).error(any(), any(), any());
Expand Down Expand Up @@ -451,10 +450,10 @@ public void launchBillingFlow_ok_Proration() {
ArgumentCaptor.forClass(BillingFlowParams.class);
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);
Comment on lines -454 to -457
Copy link
Author

@abyesilyurt abyesilyurt Apr 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These methods are unavailable in Billing Client 4.0, I am looking for alternatives to test them.

// 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());
Expand Down
4 changes: 2 additions & 2 deletions ...rchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private void assertSerialized(Purchase expected, Map<String, Object> serialized)
assertEquals(expected.getPurchaseToken(), serialized.get("purchaseToken"));
assertEquals(expected.getSignature(), serialized.get("signature"));
assertEquals(expected.getOriginalJson(), serialized.get("originalJson"));
assertEquals(expected.getSku(), serialized.get("sku"));
assertEquals(expected.getSkus(), serialized.get("sku"));
assertEquals(expected.getDeveloperPayload(), serialized.get("developerPayload"));
assertEquals(expected.isAcknowledged(), serialized.get("isAcknowledged"));
assertEquals(expected.getPurchaseState(), serialized.get("purchaseState"));
Expand All @@ -251,7 +251,7 @@ private void assertSerialized(PurchaseHistoryRecord expected, Map<String, Object
assertEquals(expected.getPurchaseToken(), serialized.get("purchaseToken"));
assertEquals(expected.getSignature(), serialized.get("signature"));
assertEquals(expected.getOriginalJson(), serialized.get("originalJson"));
assertEquals(expected.getSku(), serialized.get("sku"));
assertEquals(expected.getSkus(), serialized.get("sku"));
assertEquals(expected.getDeveloperPayload(), serialized.get("developerPayload"));
}
}
Expand Down