commit f7353e9970917f5ca92eb6405700abc380630055
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 27 09:29:24 2023 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Feb 27 08:42:27 2023 +0000
tree bc0d4871fe2e3cc5d4c386bfdc1ffd4cd02ae63f
parent 64f15215a96fa0254daca368a68df1279b84774b

Remove setMinApi(TestRuntime)

Fixes: b/270671159
Change-Id: Ideedb92ee230931826b0cdf8b7cbd3d43e2ebf8e

src/test/java/com/android/tools/r8/TestCompilerBuilder.java

diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index 9704399..33911ae 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -387,15 +387,6 @@
     return self();
   }
 
-  /** @deprecated use {@link #setMinApi(AndroidApiLevel)} instead. */
-  @Deprecated
-  public T setMinApi(TestRuntime runtime) {
-    if (runtime.isDex()) {
-      setMinApi(runtime.asDex().getMinApiLevel());
-    }
-    return self();
-  }
-
   public T setOptimizeMultidexForLinearAlloc() {
     this.optimizeMultidexForLinearAlloc = true;
     return self();

src/test/java/com/android/tools/r8/TestShrinkerBuilder.java

diff --git a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
index 409d93f..1523915 100644
--- a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -74,16 +74,6 @@
     }
   }
 
-  // TODO(b/270021825): Remove all uses of this.
-  @Deprecated
-  @Override
-  public T setMinApi(TestRuntime runtime) {
-    if (runtime.isDex()) {
-      setMinApi(runtime.asDex().getMinApiLevel());
-    }
-    return self();
-  }
-
   // TODO(b/270021825): Look into if we can assert backend is DEX.
   @Override
   public T setMinApi(int minApiLevel) {

src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
index 5204a8f..7e61ae9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
@@ -9,13 +9,12 @@
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.TestRuntime;
-import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.utils.codeinspector.InvokeInstructionSubject;
 import com.android.tools.r8.utils.codeinspector.MethodSubject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
 // Test whether a single-caller method, called through a single-target library interface,
@@ -25,14 +24,11 @@
 
   @Parameters(name = "{0}")
   public static TestParametersCollection data() {
-    return getTestParameters().withDexRuntime(DexVm.ART_DEFAULT.getVersion()).build();
+    return getTestParameters().withAllRuntimesAndApiLevels().build();
   }
 
-  private final TestParameters parameters;
-
-  public InlineLibraryInterfaceMethodTest(TestParameters parameters) {
-    this.parameters = parameters;
-  }
+  @Parameter(0)
+  public TestParameters parameters;
 
   @Test
   public void test() throws Exception {
@@ -41,13 +37,12 @@
       private long println = 0;
     }
     Counts counts = new Counts();
-    TestRuntime testRuntime = parameters.getRuntime();
-    testForR8(Backend.DEX)
+    testForR8(parameters.getBackend())
         .addInnerClasses(InlineLibraryInterfaceMethodTest.class)
         .addKeepMainRule(TestClass.class)
-        .setMinApi(testRuntime)
+        .setMinApi(parameters)
         .addDontObfuscate()
-        .run(testRuntime, TestClass.class)
+        .run(parameters.getRuntime(), TestClass.class)
         .assertSuccess()
         .inspect(
             inspector -> {