commit acb4f328b242584c016eee0cca657657c949abd7
author Ian Zerny <zerny@google.com> Fri Apr 08 12:40:00 2022 +0200
committer Ian Zerny <zerny@google.com> Fri Apr 08 12:40:00 2022 +0200
tree b4c72f9a2df39741cd8a7ddefb2f279eeefd64ff
parent 2670afdfbe599810a972545ede635760665197ff

Remove junit usage from mockito test code.

Change-Id: I3d58f7fdca9e1b209d9e16663e1b3243986d345a

src/test/examples/mockito_interface/InterfaceTest.java

diff --git a/src/test/examples/mockito_interface/InterfaceTest.java b/src/test/examples/mockito_interface/InterfaceTest.java
index 2502b13..f6ea73c 100644
--- a/src/test/examples/mockito_interface/InterfaceTest.java
+++ b/src/test/examples/mockito_interface/InterfaceTest.java
@@ -6,15 +6,11 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-@RunWith(Parameterized.class)
 public class InterfaceTest {
+
   @Mock
   private Interface fld;
 
@@ -22,22 +18,23 @@
 
   private boolean flag;
 
-  @Parameterized.Parameters(name = "flag: {0}")
-  public static Boolean[] data() {
-    return new Boolean[] {true, false};
+  public static void main(String[] args) {
+    for (boolean flag : new boolean[] {true, false}) {
+      InterfaceTest test = new InterfaceTest(flag);
+      test.setUp();
+      test.test();
+    }
   }
 
   public InterfaceTest(boolean flag) {
     this.flag = flag;
   }
 
-  @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
     user = new InterfaceUser(fld);
   }
 
-  @Test
   public void test() {
     if (flag) {
       user.consume();

src/test/examples/mockito_interface/keep-rules-conditional-on-mock.txt

diff --git a/src/test/examples/mockito_interface/keep-rules-conditional-on-mock.txt b/src/test/examples/mockito_interface/keep-rules-conditional-on-mock.txt
index edb4c08..e82228a 100644
--- a/src/test/examples/mockito_interface/keep-rules-conditional-on-mock.txt
+++ b/src/test/examples/mockito_interface/keep-rules-conditional-on-mock.txt
@@ -8,7 +8,7 @@
   public static void main(...);
 }
 
--keep @**.RunWith class * { *; }
+-keep class **.InterfaceTest { *; }
 
 # Mockito generates mocks of interface types at runtime. If interface methods are optimized, i.e.,
 # stripped out, mock-based tests will fail. So, keep all methods of interfaces if they are used as

src/test/examples/mockito_interface/keep-rules.txt

diff --git a/src/test/examples/mockito_interface/keep-rules.txt b/src/test/examples/mockito_interface/keep-rules.txt
index b398a9b..f821af4 100644
--- a/src/test/examples/mockito_interface/keep-rules.txt
+++ b/src/test/examples/mockito_interface/keep-rules.txt
@@ -8,4 +8,4 @@
   public static void main(...);
 }
 
--keep @**.RunWith class * { *; }
\ No newline at end of file
+-keep class **.InterfaceTest { *; }
\ No newline at end of file

src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java b/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java
index d31da79..8a4113a 100644
--- a/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java
@@ -51,7 +51,7 @@
         testForR8(parameters.getBackend())
             .addProgramFiles(MOCKITO_INTERFACE_JAR)
             .addKeepRuleFiles(flagToKeepTestRunner)
-            .addDontWarn("org.junit.**", "org.mockito.**")
+            .addDontWarn("org.mockito.**")
             .minification(minify)
             .setMinApi(parameters.getApiLevel())
             .compile()
@@ -70,7 +70,7 @@
         testForR8(parameters.getBackend())
             .addProgramFiles(MOCKITO_INTERFACE_JAR)
             .addKeepRuleFiles(flagToKeepInterfaceConditionally)
-            .addDontWarn("org.junit.**", "org.mockito.**")
+            .addDontWarn("org.mockito.**")
             .minification(minify)
             .setMinApi(parameters.getApiLevel())
             .compile()