Merge "Upgrade to Robolectric 4.6.1" into androidx-main

liutikas · Gerrit Code Review · commit cbd1c9f5476e · 2021-07-27T17:08:57.000Z
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
@@ -61,6 +61,11 @@ android {
     testOptions.unitTests.includeAndroidResources = true
 }
 
+// Robolectric requires more memory than Gradle default
+tasks.withType(Test) { t ->
+    t.maxHeapSize = "1024m"
+}
+
 androidx {
     name = "Biometric"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/biometric/biometric/src/test/java/androidx/biometric/CancellationSignalProviderTest.java b/biometric/biometric/src/test/java/androidx/biometric/CancellationSignalProviderTest.java
@@ -36,6 +36,7 @@
 import org.robolectric.annotation.internal.DoNotInstrument;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(instrumentedPackages = { "androidx.core.os" })
 @DoNotInstrument
 public class CancellationSignalProviderTest {
     @Mock private android.os.CancellationSignal mBiometricCancellationSignal;
diff --git a/browser/browser/src/test/java/androidx/browser/trusted/ConnectionHolderTest.java b/browser/browser/src/test/java/androidx/browser/trusted/ConnectionHolderTest.java
@@ -34,6 +34,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.annotation.internal.DoNotInstrument;
 
 import java.util.concurrent.CountDownLatch;
@@ -45,6 +46,7 @@
  * Tests for {@link ConnectionHolder}.
  */
 @RunWith(RobolectricTestRunner.class)
+@Config(instrumentedPackages = { "androidx.browser.trusted" })
 @DoNotInstrument
 public class ConnectionHolderTest {
     private final TestWrapperFactory mWrapperFactory = new TestWrapperFactory();
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -199,7 +199,10 @@ class AndroidXPlugin : Plugin<Project> {
         }
         task.systemProperty("robolectric.offline", "true")
         val robolectricDependencies =
-            File(project.getPrebuiltsRoot(), "androidx/external/org/robolectric/android-all")
+            File(
+                project.getPrebuiltsRoot(),
+                "androidx/external/org/robolectric/android-all-instrumented"
+            )
         task.systemProperty(
             "robolectric.dependency.dir",
             robolectricDependencies.absolutePath
diff --git a/camera/build.gradle b/camera/build.gradle
@@ -1,6 +1,6 @@
 // b/155305020 , b/157663450 : temporarily increase test memory to see if it affects crash rate
 allprojects { pr ->
   pr.tasks.withType(Test) { t ->
-    t.maxHeapSize = "1024m"
+    t.maxHeapSize = "2048m"
   }
 }
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java
@@ -70,7 +70,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = {"androidx.camera.camera2.internal"})
 public class Camera2CameraInfoImplTest {
     private static final String CAMERA0_ID = "0";
     private static final int CAMERA0_SUPPORTED_HARDWARE_LEVEL =
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2SessionOptionUnpackerTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2SessionOptionUnpackerTest.java
@@ -47,7 +47,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@org.robolectric.annotation.Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@org.robolectric.annotation.Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.impl" })
 public final class Camera2SessionOptionUnpackerTest {
 
     private Camera2SessionOptionUnpacker mUnpacker;
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CameraSelectionOptimizerTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CameraSelectionOptimizerTest.java
@@ -51,7 +51,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.internal" })
 public class CameraSelectionOptimizerTest {
     private Camera2CameraFactory mCamera2CameraFactory;
 
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CaptureSessionRepositoryTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/CaptureSessionRepositoryTest.java
@@ -50,7 +50,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.internal.compat.params" })
 public class CaptureSessionRepositoryTest {
     private static final int NUM_OUTPUTS = 3;
 
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/FocusMeteringControlTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/FocusMeteringControlTest.java
@@ -87,7 +87,8 @@
 import java.util.concurrent.TimeoutException;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.core" })
 @DoNotInstrument
 public class FocusMeteringControlTest {
     @ParameterizedRobolectricTestRunner.Parameters
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SynchronizedCaptureSessionBaseTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SynchronizedCaptureSessionBaseTest.java
@@ -50,7 +50,8 @@
 @SuppressWarnings({"deprecation", "unchecked"})
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.internal.compat.params" })
 public class SynchronizedCaptureSessionBaseTest {
 
     private static final int NUM_OUTPUTS = 3;
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SynchronizedCaptureSessionTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SynchronizedCaptureSessionTest.java
@@ -49,7 +49,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.internal.compat.params" })
 public class SynchronizedCaptureSessionTest {
     private static final int NUM_OUTPUTS = 3;
 
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/CameraDeviceCompatTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/CameraDeviceCompatTest.java
@@ -49,7 +49,8 @@
 @SuppressWarnings("deprecation")
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.internal.compat.params" })
 public final class CameraDeviceCompatTest {
 
     private static final int NUM_OUTPUTS = 3;
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/CameraManagerCompatTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/CameraManagerCompatTest.java
@@ -222,7 +222,7 @@ public void unregisterAvailabilityCallback_unregistersCorrectCallback_afterApi27
             value = CameraManager.class,
             minSdk = 21
     )
-    static final class ShadowInteractionCameraManager {
+    public static final class ShadowInteractionCameraManager {
 
         private static final String[] EMPTY_ID_LIST = new String[]{};
         private final List<Callback> mCallbacks = new ArrayList<>();
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/interop/Camera2CameraInfoTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/interop/Camera2CameraInfoTest.java
@@ -41,7 +41,9 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.camera2.interop",
+                "androidx.camera.camera2.internal" })
 @OptIn(markerClass = ExperimentalCamera2Interop.class)
 public final class Camera2CameraInfoTest {
 
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/ImageAnalysisNonBlockingAnalyzerTest.java b/camera/camera-core/src/test/java/androidx/camera/core/ImageAnalysisNonBlockingAnalyzerTest.java
@@ -50,7 +50,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP, instrumentedPackages = { "androidx.camera.core" })
 public class ImageAnalysisNonBlockingAnalyzerTest {
     private ImageAnalysisNonBlockingAnalyzer mImageAnalysisNonBlockingAnalyzer;
     private static final AtomicInteger ROTATION = new AtomicInteger(0);
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/impl/utils/ExifTest.java b/camera/camera-core/src/test/java/androidx/camera/core/impl/utils/ExifTest.java
@@ -37,7 +37,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = { "androidx.camera.core.impl.utils" })
 public class ExifTest {
     private static final InputStream FAKE_INPUT_STREAM =
             new InputStream() {
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/ExtensionVersionTest.java b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/ExtensionVersionTest.java
@@ -41,7 +41,10 @@
 
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+@Config(
+        minSdk = Build.VERSION_CODES.LOLLIPOP,
+        instrumentedPackages = {"androidx.camera.extensions.internal"} // to override CURRENT
+)
 public class ExtensionVersionTest {
 
     @Before
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppViewModelTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppViewModelTest.java
@@ -33,11 +33,13 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.annotation.internal.DoNotInstrument;
 import org.robolectric.shadows.ShadowLooper;
 
 /** Tests for {@link CarAppViewModel} */
 @RunWith(RobolectricTestRunner.class)
+@Config(instrumentedPackages = { "androidx.car.app.activity" })
 @DoNotInstrument
 public class CarAppViewModelTest {
     private static final ComponentName TEST_COMPONENT_NAME = new ComponentName(
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/activity/ResultManagerAutomotiveTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/ResultManagerAutomotiveTest.java
@@ -36,10 +36,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.annotation.internal.DoNotInstrument;
 
 /** Tests for {@link ResultManagerAutomotive}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(instrumentedPackages = { "androidx.car.app.activity" })
 @DoNotInstrument
 public class ResultManagerAutomotiveTest {
     private final ComponentName mRendererComponent = new ComponentName(
diff --git a/car/app/app/src/test/java/androidx/car/app/AppManagerTest.java b/car/app/app/src/test/java/androidx/car/app/AppManagerTest.java
@@ -47,10 +47,12 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.annotation.internal.DoNotInstrument;
 
 /** Tests for {@link AppManager}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(instrumentedPackages = { "androidx.activity" })
 @DoNotInstrument
 public final class AppManagerTest {
     @Mock
diff --git a/car/app/app/src/test/java/androidx/car/app/CarContextTest.java b/car/app/app/src/test/java/androidx/car/app/CarContextTest.java
@@ -57,6 +57,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.annotation.internal.DoNotInstrument;
 import org.robolectric.shadows.ShadowApplication;
 
@@ -67,6 +68,7 @@
 
 /** Tests for {@link CarContext}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(instrumentedPackages = { "androidx.activity" })
 @DoNotInstrument
 public class CarContextTest {
     private static final String APP_SERVICE = "app";
diff --git a/car/app/app/src/test/java/androidx/car/app/managers/ManagerTest.java b/car/app/app/src/test/java/androidx/car/app/managers/ManagerTest.java
@@ -30,22 +30,22 @@
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
 public class ManagerTest {
-    private static class MockManager implements Manager {
+    public static class MockManager implements Manager {
         @Nullable
         public final Integer mFoo;
         @Nullable
         public final String mBar;
 
         /** Accessed via reflection */
         @SuppressWarnings("unused")
-        MockManager() {
+        public MockManager() {
             mFoo = null;
             mBar = null;
         }
 
         /** Accessed via reflection */
         @SuppressWarnings("unused")
-        MockManager(@NonNull Integer foo, @NonNull String bar) {
+        public MockManager(@NonNull Integer foo, @NonNull String bar) {
             mFoo = foo;
             mBar = bar;
         }
diff --git a/enterprise/enterprise-feedback/build.gradle b/enterprise/enterprise-feedback/build.gradle
@@ -22,6 +22,12 @@ android {
 
     testOptions.unitTests.includeAndroidResources = true
 }
+
+// Robolectric requires more memory than Gradle default
+tasks.withType(Test) { t ->
+    t.maxHeapSize = "1024m"
+}
+
 androidx {
     name = "Enterprise Feedback"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesServiceTest.java b/enterprise/enterprise-feedback/src/test/java/androidx/enterprise/feedback/KeyedAppStatesServiceTest.java
@@ -65,7 +65,7 @@
 @SuppressWarnings("UnstableApiUsage") // PausedExecutorService and ShadowPausedAsyncTask are @Beta
 @RunWith(RobolectricTestRunner.class)
 @DoNotInstrument
-@Config(minSdk = 21)
+@Config(minSdk = 21, instrumentedPackages = { "androidx.enterprise.feedback" })
 public class KeyedAppStatesServiceTest {
 
     private static class TestKeyedAppStatesService extends KeyedAppStatesService {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -141,7 +141,7 @@ protobufGradlePlugin = { module = "com.google.protobuf:protobuf-gradle-plugin",
 protobufLite = { module = "com.google.protobuf:protobuf-javalite", version = "3.10.0" }
 reactiveStreams = { module = "org.reactivestreams:reactive-streams", version = "1.0.0" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version = "2.7.2" }
-robolectric = { module = "org.robolectric:robolectric", version = "4.5.1" }
+robolectric = { module = "org.robolectric:robolectric", version = "4.6.1" }
 rxjava2 = { module = "io.reactivex.rxjava2:rxjava", version = "2.2.9" }
 rxjava3 = { module = "io.reactivex.rxjava3:rxjava", version = "3.0.0" }
 shadow = { module = "com.github.jengelman.gradle.plugins:shadow", version = "6.1.0" }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// b/155305020 , b/157663450 : temporarily increase test memory to see if it affects crash rate`
`2`	`2`	`allprojects { pr ->`
`3`	`3`	`pr.tasks.withType(Test) { t ->`
`4`		`- t.maxHeapSize = "1024m"`
	`4`	`+ t.maxHeapSize = "2048m"`
`5`	`5`	`}`
`6`	`6`	`}`