Rewrite @IgnoreIfVmOlderThan to assumeTrue
@IgnoreIfVmOlderThan can only be used with the VmTestRunner.
Bug: 124655989i
Change-Id: I24a6ab53a16ba136a2473d785de0842444fd63b3
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java
index 344721f..50ee3e2 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java
@@ -9,13 +9,13 @@
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.NeverClassInline;
import com.android.tools.r8.NeverMerge;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.DexVm.Version;
-import com.android.tools.r8.VmTestRunner.IgnoreIfVmOlderThan;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.MethodReference;
import com.android.tools.r8.shaking.WhyAreYouKeepingConsumer;
@@ -67,7 +67,6 @@
}
}
- private static final Class<?> CLASS = Main.class;
private static final String EXPECTED = StringUtils.lines("I'm an A");
private final Backend backend;
@@ -82,8 +81,9 @@
}
@Test
- @IgnoreIfVmOlderThan(Version.V7_0_0)
public void testKeptMethod() throws Exception {
+ assumeTrue(ToolHelper.getDexVm().getVersion().isAtLeast(Version.V7_0_0));
+
MethodReference mainMethod =
methodFromMethod(Main.class.getDeclaredMethod("main", String[].class));
@@ -116,7 +116,7 @@
assertThat(baos.toString(), containsString("is kept for unknown reason"));
// TODO(b/124499108): Currently synthetic lambda classes are referenced,
- // should be their originating context.
+ // should be their originating context.
if (backend == Backend.DEX) {
assertThat(baos.toString(), containsString("-$$Lambda$"));
} else {
