From 9b238b3aeb4667c78ee60bbbb7e10d92e3e97091 Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Mon, 30 Sep 2024 12:07:56 -0400 Subject: [PATCH 1/6] Hold this for me --- .../google_maps_flutter_android/android/build.gradle | 1 + .../java/io/flutter/plugins/googlemaps/ConvertTest.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index bdc23f5aa794..4cc184472a79 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -49,6 +49,7 @@ android { testImplementation 'org.mockito:mockito-core:5.1.1' testImplementation 'androidx.test:core:1.2.0' testImplementation "org.robolectric:robolectric:4.10.3" + testImplementation "androidx.test.ext:junit:1.2.1" } compileOptions { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java index a7331b89f798..c93a0eb07b35 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java @@ -58,7 +58,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(minSdk = Build.VERSION_CODES.P) +@Config(minSdk = 23) public class ConvertTest { @Mock private AssetManager assetManager; @@ -85,6 +85,11 @@ public void tearDown() throws Exception { mockCloseable.close(); } + @Test + public void trivial() { + Assert.assertEquals(1.0, 1.1, 0.5); + } + @Test public void ConvertPointsFromPigeonConvertsThePointsWithFullPrecision() { double latitude = 43.03725568057; From 087b1131a1f65cdfdd827d7386a4a8e32789f273 Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Fri, 4 Oct 2024 08:38:31 -0400 Subject: [PATCH 2/6] Found it --- .../google_maps_flutter_android/android/build.gradle | 1 + .../test/java/io/flutter/plugins/googlemaps/ConvertTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index 4cc184472a79..16eb30367c9f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -66,6 +66,7 @@ android { outputs.upToDateWhen {false} showStandardStreams = true } + jvmArgs "-Xmx1g" } } } diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java index c93a0eb07b35..ae41f2c2841c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java @@ -58,7 +58,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(minSdk = 23) +@Config(minSdk = 21) public class ConvertTest { @Mock private AssetManager assetManager; From badb99de3c52bc98b5036d497f466510ea6014ce Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Mon, 7 Oct 2024 09:20:19 -0400 Subject: [PATCH 3/6] Lower minSdk to LOLLIPOP --- .../google_maps_flutter_android/android/build.gradle | 1 - .../plugins/googlemaps/ClusterManagersControllerTest.java | 2 +- .../test/java/io/flutter/plugins/googlemaps/ConvertTest.java | 2 +- .../io/flutter/plugins/googlemaps/GoogleMapControllerTest.java | 2 +- .../io/flutter/plugins/googlemaps/GoogleMapInitializerTest.java | 2 +- .../io/flutter/plugins/googlemaps/HeatmapsControllerTest.java | 2 +- .../io/flutter/plugins/googlemaps/MarkersControllerTest.java | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index 16eb30367c9f..bd014bc22b04 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -49,7 +49,6 @@ android { testImplementation 'org.mockito:mockito-core:5.1.1' testImplementation 'androidx.test:core:1.2.0' testImplementation "org.robolectric:robolectric:4.10.3" - testImplementation "androidx.test.ext:junit:1.2.1" } compileOptions { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ClusterManagersControllerTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ClusterManagersControllerTest.java index dd41a3fbd027..55f45f06f189 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ClusterManagersControllerTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ClusterManagersControllerTest.java @@ -47,7 +47,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.P) +@Config(minSdk = Build.VERSION_CODES.LOLLIPOP) public class ClusterManagersControllerTest { private Context context; private MapsCallbackApi flutterApi; diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java index ae41f2c2841c..90aff3aa9a96 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java @@ -58,7 +58,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(minSdk = 21) +@Config(minSdk = Build.VERSION_CODES.LOLLIPOP) public class ConvertTest { @Mock private AssetManager assetManager; diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java index c0d54ba19584..48d8b619bebc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java @@ -34,7 +34,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.P) +@Config(minSdk = Build.VERSION_CODES.LOLLIPOP) public class GoogleMapControllerTest { private Context context; diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapInitializerTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapInitializerTest.java index 374964cbad61..302e48cb720a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapInitializerTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapInitializerTest.java @@ -26,7 +26,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.P) +@Config(minSdk = Build.VERSION_CODES.LOLLIPOP) public class GoogleMapInitializerTest { private GoogleMapInitializer googleMapInitializer; diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/HeatmapsControllerTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/HeatmapsControllerTest.java index 752472c4286f..59c4560f97d4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/HeatmapsControllerTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/HeatmapsControllerTest.java @@ -33,7 +33,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.P) +@Config(minSdk = Build.VERSION_CODES.LOLLIPOP) public class HeatmapsControllerTest { private HeatmapsController controller; private GoogleMap googleMap; diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java index 9df0b8d523db..86077e368ab1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java @@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.P) +@Config(minSdk = Build.VERSION_CODES.LOLLIPOP) public class MarkersControllerTest { private Context context; private MapsCallbackApi flutterApi; From be087f660997ee31b5bb9c03acb1fa769ebca925 Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Mon, 7 Oct 2024 09:26:09 -0400 Subject: [PATCH 4/6] Remove test test --- .../test/java/io/flutter/plugins/googlemaps/ConvertTest.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java index 90aff3aa9a96..bc42e0f5708b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java @@ -85,11 +85,6 @@ public void tearDown() throws Exception { mockCloseable.close(); } - @Test - public void trivial() { - Assert.assertEquals(1.0, 1.1, 0.5); - } - @Test public void ConvertPointsFromPigeonConvertsThePointsWithFullPrecision() { double latitude = 43.03725568057; From d21d81bdd635a41b420b0b74ccef6247c3a7c149 Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Thu, 17 Oct 2024 16:53:14 -0400 Subject: [PATCH 5/6] Comment build.gradle --- .../google_maps_flutter_android/android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index bd014bc22b04..18ed2cf0b2a5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -65,6 +65,10 @@ android { outputs.upToDateWhen {false} showStandardStreams = true } + // The org.gradle.jvmargs property that may be set in gradle.properties does not impact + // the Java heap size when running the Android unit tests. The following property here + // sets the heap size to a size large enough to run the robolectric tests across + // multiple SDK levels. jvmArgs "-Xmx1g" } } From 2942b372e1ac33bf7d78469f56497d4b03b16d03 Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Fri, 18 Oct 2024 12:40:02 -0400 Subject: [PATCH 6/6] Comment for camera_android --- packages/camera/camera_android/android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 6ea5b3c121bf..ce8464e600de 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -54,6 +54,10 @@ buildFeatures { unitTests.includeAndroidResources = true unitTests.returnDefaultValues = true unitTests.all { + // The org.gradle.jvmargs property that may be set in gradle.properties does not impact + // the Java heap size when running the Android unit tests. The following property here + // sets the heap size to a size large enough to run the robolectric tests across + // multiple SDK levels. jvmArgs "-Xmx1g" testLogging { events "passed", "skipped", "failed", "standardOut", "standardError"