commit e80cf5909fb4d2ab373e95bfe57cb36aa605d873
author Morten Krogh-Jespersen <mkroghj@google.com> Fri May 28 08:02:20 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri May 28 08:02:20 2021 +0200
tree f066ff6f1708b2ebba093735f014744ff32b1b38
parent 4566dc799336fdd83cd0847c3c3cf593342c53c1

Remove desugaring info expectation in NonNamedMemberClassTest

Change-Id: I8ce6b8246de73533610c17548f4c77bc35c02d12

src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java

diff --git a/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java b/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java
index a505c4f..9bb37c4 100644
--- a/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java
+++ b/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java
@@ -5,11 +5,9 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 
-import com.android.tools.r8.D8TestCompileResult;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.ToolHelper.DexVm;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -25,7 +23,7 @@
 
   @Parameterized.Parameters(name = "{0}")
   public static TestParametersCollection data() {
-    return getTestParameters().withDexRuntimes().build();
+    return getTestParameters().withDexRuntimes().withAllApiLevels().build();
   }
 
   public NonNamedMemberClassTest(TestParameters parameters) {
@@ -34,17 +32,12 @@
 
   @Test
   public void testD8() throws Exception {
-    D8TestCompileResult result =
-        testForD8()
-            .addProgramClassFileData(Dump.dump())
-            .setMinApi(parameters.getRuntime())
-            .compile();
-    if (parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_6_0_1_HOST)) {
-      result.assertWarningMessageThatMatches(containsString("desugaring"));
-    } else {
-      result.assertOnlyInfos();
-    }
-    result.assertInfoMessageThatMatches(containsString("missing EnclosingMethod"));
+    testForD8()
+        .addProgramClassFileData(Dump.dump())
+        .setMinApi(parameters.getApiLevel())
+        .compile()
+        .assertOnlyInfos()
+        .assertInfoMessageThatMatches(containsString("missing EnclosingMethod"));
   }
 
   // Compiled the following kt code: