commit a08b38e8c1ccf2730b575a0d18fc0dc33044ff93
author Christoffer Adamsen <christofferqa@google.com> Mon Mar 24 11:15:28 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Mon Mar 24 11:15:28 2025 +0000
tree 1e1528ad6808a5b0aaf6adb0023d70aaa0e07b22
parent 5573470c5af2b78b61052f56bd2f09d2aa6b4e59

Update D8 tests that do not configure partial to fail

Change-Id: I03fec20185b81b328fef666328d4f80902ad1647

src/test/java23/com/android/tools/r8/java23/switchpatternmatching/EnumSwitchOldSyntaxTest.java

diff --git a/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/EnumSwitchOldSyntaxTest.java b/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/EnumSwitchOldSyntaxTest.java
index b07ac87..d3e530b 100644
--- a/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/EnumSwitchOldSyntaxTest.java
+++ b/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/EnumSwitchOldSyntaxTest.java
@@ -44,9 +44,8 @@
 
   @Test
   public void testD8() throws Exception {
-    testForD8(parameters.getBackend())
+    testForD8(parameters)
         .addInnerClassesAndStrippedOuter(getClass())
-        .setMinApi(parameters)
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }
@@ -59,7 +58,6 @@
         .applyIf(
             parameters.isCfRuntime(),
             b -> b.addLibraryProvider(JdkClassFileProvider.fromSystemJdk()))
-        .setMinApi(parameters)
         .addKeepMainRule(Main.class)
         .addKeepEnumsRule()
         .run(parameters.getRuntime(), Main.class)

src/test/java23/com/android/tools/r8/java23/switchpatternmatching/StringSwitchOldSyntaxTest.java

diff --git a/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/StringSwitchOldSyntaxTest.java b/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/StringSwitchOldSyntaxTest.java
index 798d3d6..33c7e42 100644
--- a/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/StringSwitchOldSyntaxTest.java
+++ b/src/test/java23/com/android/tools/r8/java23/switchpatternmatching/StringSwitchOldSyntaxTest.java
@@ -43,9 +43,8 @@
 
   @Test
   public void testD8() throws Exception {
-    testForD8(parameters.getBackend())
+    testForD8(parameters)
         .addInnerClassesAndStrippedOuter(getClass())
-        .setMinApi(parameters)
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);
   }
@@ -58,7 +57,6 @@
         .applyIf(
             parameters.isCfRuntime(),
             b -> b.addLibraryProvider(JdkClassFileProvider.fromSystemJdk()))
-        .setMinApi(parameters)
         .addKeepMainRule(Main.class)
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutput(EXPECTED_OUTPUT);

src/test/testbase/java/com/android/tools/r8/TestBase.java

diff --git a/src/test/testbase/java/com/android/tools/r8/TestBase.java b/src/test/testbase/java/com/android/tools/r8/TestBase.java
index 3e0f4fd..a7c4dc6 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestBase.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestBase.java
@@ -280,6 +280,7 @@
   }
 
   public D8TestBuilder testForD8(Backend backend) {
+    assert verifyNoPartialCompilationTestParameters();
     return testForD8(temp, backend);
   }