commit ed81c781fa4cc279687caa7c29cc4a7cb750e6b2
author Jeff Sharkey <jsharkey@google.com> Thu Jan 11 13:29:07 2024 -0700
committer Jeff Sharkey <jsharkey@google.com> Thu Jan 11 15:24:53 2024 -0700
tree 3399aee6b9d618565ff8daa9b73b27d8611964a1
parent 7c49507efe2cd8c3126b4a0cfb9020e90d84c46a

Offer Mockito under Ravenwood.

Thankfully the source tree already has a prebuilt variant of Mockito
that is well-supported for mocking on the host side, so this change
transparently offers that under the Ravenwood environment.

Bug: 319647875
Test: atest SystemUiRavenTests
Change-Id: Id87c25ec18cee454defe0dfbd609eb4cbeca5a95

Ravenwood.bp

diff --git a/Ravenwood.bp b/Ravenwood.bp
index 3fab7c7..d13c4d7 100644
--- a/Ravenwood.bp
+++ b/Ravenwood.bp
@@ -75,6 +75,22 @@
     ],
 }
 
+java_library {
+    name: "mockito-ravenwood-prebuilt",
+    installable: false,
+    static_libs: [
+        "mockito-robolectric-prebuilt",
+    ],
+}
+
+java_library {
+    name: "inline-mockito-ravenwood-prebuilt",
+    installable: false,
+    static_libs: [
+        "inline-mockito-robolectric-prebuilt",
+    ],
+}
+
 android_ravenwood_libgroup {
     name: "ravenwood-runtime",
     libs: [
@@ -86,6 +102,8 @@
         "truth",
         "ravenwood-junit-impl",
         "android.test.mock.ravenwood",
+        "mockito-ravenwood-prebuilt",
+        "inline-mockito-ravenwood-prebuilt",
     ],
 }
 
@@ -95,5 +113,7 @@
         "junit",
         "truth",
         "ravenwood-junit",
+        "mockito-ravenwood-prebuilt",
+        "inline-mockito-ravenwood-prebuilt",
     ],
 }

core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java

diff --git a/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java b/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java
index 84c93c2..80061a5 100644
--- a/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java
@@ -18,7 +18,6 @@
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.os.FileUtils;
 
@@ -73,8 +72,7 @@
     @Test
     public void testReadNonexistentFile() throws Exception {
         mStoragedUidIoStatsReader.readAbsolute(mCallback);
-        verifyZeroInteractions(mCallback);
-
+        verifyNoMoreInteractions(mCallback);
     }
 
     /**