Skip to content

[in_app_purchase_android] Bump org.mockito:mockito-core from 4.7.0 to 5.3.1 #4224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 5 commits into from
Jun 22, 2023
Merged

[in_app_purchase_android] Bump org.mockito:mockito-core from 4.7.0 to 5.3.1 #4224

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a266f3b
Changing ArgumentCaptor type in tests and removing warning suppressions
Jun 15, 2023
9c08727
Merge branch 'flutter:main' into dependabot_mockito_4_to_5
gmackall Jun 15, 2023
e5d7d66
undoing accidental newline removal
Jun 15, 2023
e6a1cff
Merge branch 'main' into dependabot_mockito_4_to_5
gmackall Jun 22, 2023
61d777a
Update pubspec.yaml
gmackall Jun 22, 2023
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
4 changes: 4 additions & 0 deletions packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.0+6

* Bumps org.mockito:mockito-core from 4.7.0 to 5.3.1.

## 0.3.0+5

* Bumps org.jetbrains.kotlin:kotlin-bom from 1.8.0 to 1.8.21.
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ dependencies {
implementation 'com.android.billingclient:billing:5.2.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.json:json:20230227'
testImplementation 'org.mockito:mockito-core:4.7.0'
testImplementation 'org.mockito:mockito-core:5.3.1'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
10 changes: 2 additions & 8 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 @@ -74,6 +74,7 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
Expand All @@ -88,6 +89,7 @@ public class MethodCallHandlerTest {
@Mock Activity activity;
@Mock Context context;
@Mock ActivityPluginBinding mockActivityPluginBinding;
@Captor ArgumentCaptor<HashMap<String, Object>> resultCaptor;

@Before
public void setUp() {
Expand Down Expand Up @@ -240,8 +242,6 @@ public void queryProductDetailsAsync() {
.setDebugMessage("dummy debug message")
.build();
listenerCaptor.getValue().onProductDetailsResponse(billingResult, productDetailsResponse);
@SuppressWarnings("unchecked")
ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
verify(result).success(resultCaptor.capture());
HashMap<String, Object> resultData = resultCaptor.getValue();
assertEquals(resultData.get("billingResult"), fromBillingResult(billingResult));
Expand Down Expand Up @@ -652,8 +652,6 @@ public void queryPurchases_returns_success() throws Exception {
public void queryPurchaseHistoryAsync() {
// Set up an established billing client and all our mocked responses
establishConnectedBillingClient(null, null);
@SuppressWarnings("unchecked")
ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
BillingResult billingResult =
BillingResult.newBuilder()
.setResponseCode(100)
Expand Down Expand Up @@ -704,8 +702,6 @@ public void onPurchasesUpdatedListener() {
.setDebugMessage("dummy debug message")
.build();
List<Purchase> purchasesList = asList(buildPurchase("foo"));
@SuppressWarnings("unchecked")
ArgumentCaptor<HashMap<String, Object>> resultCaptor = ArgumentCaptor.forClass(HashMap.class);
doNothing()
.when(mockMethodChannel)
.invokeMethod(eq(ON_PURCHASES_UPDATED), resultCaptor.capture());
Expand All @@ -719,7 +715,6 @@ public void onPurchasesUpdatedListener() {
@Test
public void consumeAsync() {
establishConnectedBillingClient(null, null);
ArgumentCaptor<BillingResult> resultCaptor = ArgumentCaptor.forClass(BillingResult.class);
BillingResult billingResult =
BillingResult.newBuilder()
.setResponseCode(100)
Expand Down Expand Up @@ -749,7 +744,6 @@ public void consumeAsync() {
@Test
public void acknowledgePurchase() {
establishConnectedBillingClient(null, null);
ArgumentCaptor<BillingResult> resultCaptor = ArgumentCaptor.forClass(BillingResult.class);
BillingResult billingResult =
BillingResult.newBuilder()
.setResponseCode(100)
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/packages/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.3.0+5
version: 0.3.0+6

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down