From 377d504cbfffbb530676ba8fc775104250b9119d Mon Sep 17 00:00:00 2001
From: Rene Floor <rene@baseflow.com>
Date: Fri, 26 Mar 2021 14:42:28 +0100
Subject: [PATCH 1/4] Move iap android unit tests to plugin folder

---
 .../in_app_purchase/android/build.gradle      |  5 ++++
 .../src/test/java/android/text/TextUtils.java | 11 ++++++++
 .../src/test/java/android/util/Log.java       | 27 +++++++++++++++++++
 .../InAppPurchasePluginTest.java              |  0
 .../inapppurchase/MethodCallHandlerTest.java  |  0
 .../plugins/inapppurchase/TranslatorTest.java |  0
 6 files changed, 43 insertions(+)
 create mode 100644 packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java
 create mode 100644 packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java
 rename packages/in_app_purchase/in_app_purchase/{example/android/app => android}/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java (100%)
 rename packages/in_app_purchase/in_app_purchase/{example/android/app => android}/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java (100%)
 rename packages/in_app_purchase/in_app_purchase/{example/android/app => android}/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java (100%)

diff --git a/packages/in_app_purchase/in_app_purchase/android/build.gradle b/packages/in_app_purchase/in_app_purchase/android/build.gradle
index 8d5840b4daff..a36f70137129 100644
--- a/packages/in_app_purchase/in_app_purchase/android/build.gradle
+++ b/packages/in_app_purchase/in_app_purchase/android/build.gradle
@@ -31,12 +31,17 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.0.0'
     implementation 'com.android.billingclient:billing:3.0.2'
     testImplementation 'junit:junit:4.12'
+    testImplementation 'org.json:json:20180813'
     testImplementation 'org.mockito:mockito-core:3.6.0'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
diff --git a/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java
new file mode 100644
index 000000000000..c7dc87c6ed21
--- /dev/null
+++ b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java
@@ -0,0 +1,11 @@
+// Copyright 2017 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package android.text;
+
+public class TextUtils {
+    public static boolean isEmpty(CharSequence str) {
+        return str == null || str.length() == 0;
+    }
+}
\ No newline at end of file
diff --git a/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java
new file mode 100644
index 000000000000..344651fb4b4e
--- /dev/null
+++ b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java
@@ -0,0 +1,27 @@
+// Copyright 2017 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package android.util;
+
+public class Log {
+    public static int d(String tag, String msg) {
+        System.out.println("DEBUG: " + tag + ": " + msg);
+        return 0;
+    }
+
+    public static int i(String tag, String msg) {
+        System.out.println("INFO: " + tag + ": " + msg);
+        return 0;
+    }
+
+    public static int w(String tag, String msg) {
+        System.out.println("WARN: " + tag + ": " + msg);
+        return 0;
+    }
+
+    public static int e(String tag, String msg) {
+        System.out.println("ERROR: " + tag + ": " + msg);
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/packages/in_app_purchase/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
similarity index 100%
rename from packages/in_app_purchase/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
rename to packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
diff --git a/packages/in_app_purchase/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
similarity index 100%
rename from packages/in_app_purchase/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
rename to packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
diff --git a/packages/in_app_purchase/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
similarity index 100%
rename from packages/in_app_purchase/in_app_purchase/example/android/app/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java
rename to packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/TranslatorTest.java

From 8ceca4ac271331d19b888f4b8e48b75803e1a13d Mon Sep 17 00:00:00 2001
From: Rene Floor <rene@baseflow.com>
Date: Fri, 26 Mar 2021 14:53:17 +0100
Subject: [PATCH 2/4] Formatting

---
 .../src/test/java/android/text/TextUtils.java | 10 +++---
 .../src/test/java/android/util/Log.java       | 36 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java
index c7dc87c6ed21..d997ae1dcaa0 100644
--- a/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java
+++ b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/text/TextUtils.java
@@ -1,11 +1,11 @@
-// Copyright 2017 The Flutter Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package android.text;
 
 public class TextUtils {
-    public static boolean isEmpty(CharSequence str) {
-        return str == null || str.length() == 0;
-    }
-}
\ No newline at end of file
+  public static boolean isEmpty(CharSequence str) {
+    return str == null || str.length() == 0;
+  }
+}
diff --git a/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java
index 344651fb4b4e..310b9ad89cdf 100644
--- a/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java
+++ b/packages/in_app_purchase/in_app_purchase/android/src/test/java/android/util/Log.java
@@ -1,27 +1,27 @@
-// Copyright 2017 The Flutter Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package android.util;
 
 public class Log {
-    public static int d(String tag, String msg) {
-        System.out.println("DEBUG: " + tag + ": " + msg);
-        return 0;
-    }
+  public static int d(String tag, String msg) {
+    System.out.println("DEBUG: " + tag + ": " + msg);
+    return 0;
+  }
 
-    public static int i(String tag, String msg) {
-        System.out.println("INFO: " + tag + ": " + msg);
-        return 0;
-    }
+  public static int i(String tag, String msg) {
+    System.out.println("INFO: " + tag + ": " + msg);
+    return 0;
+  }
 
-    public static int w(String tag, String msg) {
-        System.out.println("WARN: " + tag + ": " + msg);
-        return 0;
-    }
+  public static int w(String tag, String msg) {
+    System.out.println("WARN: " + tag + ": " + msg);
+    return 0;
+  }
 
-    public static int e(String tag, String msg) {
-        System.out.println("ERROR: " + tag + ": " + msg);
-        return 0;
-    }
-}
\ No newline at end of file
+  public static int e(String tag, String msg) {
+    System.out.println("ERROR: " + tag + ": " + msg);
+    return 0;
+  }
+}

From 8eade0162117c5ea7a638d4b7265997b292d468c Mon Sep 17 00:00:00 2001
From: Rene Floor <rene@baseflow.com>
Date: Fri, 26 Mar 2021 16:00:16 +0100
Subject: [PATCH 3/4] add failing test

---
 .../io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
index 4d7a02220cf5..dc792a5e79a1 100644
--- a/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
+++ b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
@@ -107,7 +107,7 @@ public void isReady_true() {
     MethodCall call = new MethodCall(IS_READY, null);
     when(mockBillingClient.isReady()).thenReturn(true);
     methodChannelHandler.onMethodCall(call, result);
-    verify(result).success(true);
+    verify(result).success(false);
   }
 
   @Test

From c61da0a04cf5b308b57d4b0ddf88841a09556f13 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene@baseflow.com>
Date: Fri, 26 Mar 2021 16:08:02 +0100
Subject: [PATCH 4/4] Revert "add failing test"

This reverts commit 8eade0162117c5ea7a638d4b7265997b292d468c.
---
 .../io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
index dc792a5e79a1..4d7a02220cf5 100644
--- a/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
+++ b/packages/in_app_purchase/in_app_purchase/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
@@ -107,7 +107,7 @@ public void isReady_true() {
     MethodCall call = new MethodCall(IS_READY, null);
     when(mockBillingClient.isReady()).thenReturn(true);
     methodChannelHandler.onMethodCall(call, result);
-    verify(result).success(false);
+    verify(result).success(true);
   }
 
   @Test