Replace assumeTrue(parameters.isDexRuntime()) with parameters.assumeDexRuntime()
Change-Id: I5ae3acd4a50c591c044f0bb201383e52868072d1
diff --git a/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java b/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java
index a2c5897..cbfc40b 100644
--- a/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java
+++ b/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java
@@ -41,7 +41,7 @@
@Test
public void testSupplierD8NotSupported()
throws ExecutionException, CompilationFailedException, IOException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeTrue(parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_6_0_1_HOST));
testForD8()
.addProgramClasses(Main.class)
@@ -79,7 +79,7 @@
@Test
public void testSupplierD8Supported()
throws ExecutionException, CompilationFailedException, IOException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeTrue(parameters.getRuntime().asDex().getVm().isNewerThan(DexVm.ART_6_0_1_HOST));
testForD8()
.addProgramClasses(Main.class)
diff --git a/src/test/java/com/android/tools/r8/annotations/TypeUseAnnotationWithGenericsTest.java b/src/test/java/com/android/tools/r8/annotations/TypeUseAnnotationWithGenericsTest.java
index 307e052..fc2ac0a 100644
--- a/src/test/java/com/android/tools/r8/annotations/TypeUseAnnotationWithGenericsTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/TypeUseAnnotationWithGenericsTest.java
@@ -80,7 +80,7 @@
@Test
public void testD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addProgramClasses(
MainWithTypeAndGeneric.class,
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelAndroidxApiImplTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelAndroidxApiImplTest.java
index d52052b..d30d62b 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelAndroidxApiImplTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelAndroidxApiImplTest.java
@@ -11,7 +11,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.notIf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -97,7 +96,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -112,7 +111,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java
index 98c6fde..d3514ae 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java
@@ -116,7 +116,7 @@
@Test
public void testD8DebugWithMerge() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8(
CompilationMode.DEBUG,
this::inspectNumberOfClassesFromOutput,
@@ -125,7 +125,7 @@
@Test
public void testD8ReleaseForApiLevelWithOutlining() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeTrue(willHorizontallyMergeOutlines());
testD8(
CompilationMode.RELEASE,
@@ -135,7 +135,7 @@
@Test
public void testD8ReleaseForApiLevelWithNoOutlining() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeFalse(willHorizontallyMergeOutlines());
testD8(
CompilationMode.RELEASE,
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldAssignNewInstanceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldAssignNewInstanceTest.java
index 14f996d..e6a6458 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldAssignNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldAssignNewInstanceTest.java
@@ -91,7 +91,7 @@
@Test
public void testD8WithoutModeling() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(Helper.class, Main.class)
.addLibraryClasses(LibraryClass.class, SubLibraryClass.class)
@@ -106,7 +106,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -119,7 +119,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelManualOutlineWithUnknownReturnTypeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelManualOutlineWithUnknownReturnTypeTest.java
index 6df9998..dd26dcd 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelManualOutlineWithUnknownReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelManualOutlineWithUnknownReturnTypeTest.java
@@ -69,7 +69,7 @@
@Test
public void testD8WithModeling() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addProgramClasses(Main.class, ProgramClass.class, ManualOutline.class)
.addDefaultRuntimeLibrary(parameters)
@@ -87,7 +87,7 @@
@Test
public void testD8NoModeling() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
boolean willHaveVerifyError =
(parameters.getDexRuntimeVersion().isDalvik()
|| parameters.isDexRuntimeVersion(Version.V12_0_0))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java
index 6185e26..a4aa543 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java
@@ -9,7 +9,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
@@ -74,7 +73,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -87,7 +86,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
@@ -100,19 +99,19 @@
@Test
public void testD8MergeIndexed() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8Merge(OutputMode.DexIndexed);
}
@Test
public void testD8MergeFilePerClass() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8Merge(OutputMode.DexFilePerClass);
}
@Test
public void testD8MergeFilePerClassFile() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8Merge(OutputMode.DexFilePerClassFile);
}
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java
index 5931ef7..949c3b2 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java
@@ -9,7 +9,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -63,7 +62,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -76,7 +75,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java
index fff6c4a..7b98e5c 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java
@@ -9,7 +9,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.OutputMode;
@@ -91,7 +90,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -106,7 +105,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
@@ -121,19 +120,19 @@
@Test
public void testD8MergeIndexed() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8Merge(OutputMode.DexIndexed);
}
@Test
public void testD8MergeFilePerClass() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8Merge(OutputMode.DexFilePerClass);
}
@Test
public void testD8MergeFilePerClassFile() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testD8Merge(OutputMode.DexFilePerClassFile);
}
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java
index 739600d..4049b7a 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForDefaultInstanceInitializer;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -59,7 +58,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -72,7 +71,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java
index 9ef1d91..ea7530e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForDefaultInstanceInitializer;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -69,7 +68,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -87,7 +86,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java
index 35bc4ed..f544c9a 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java
@@ -12,7 +12,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
@@ -73,7 +72,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -86,7 +85,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java
index f5642b5..fe844f9 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java
@@ -10,7 +10,6 @@
import static com.android.tools.r8.utils.codeinspector.CodeMatchers.invokesMethodWithName;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
@@ -87,7 +86,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -120,7 +119,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java
index 9f19726..0ebcaef 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java
@@ -8,7 +8,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForDefaultInstanceInitializer;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForField;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -65,7 +64,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -78,7 +77,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java
index 5bc13cc..d9ec40c 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -62,7 +61,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -75,7 +74,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java
index ab3716d..4846bec 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -68,7 +67,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -83,7 +82,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java
index 8fd5ba1..e9171703 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java
@@ -9,7 +9,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -69,7 +68,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -82,7 +81,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiMultipleExtensionPackagesTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiMultipleExtensionPackagesTest.java
index 0c3555a..eebab11 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiMultipleExtensionPackagesTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiMultipleExtensionPackagesTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.TestBase;
@@ -70,7 +69,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -83,7 +82,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiSubpackageTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiSubpackageTest.java
index 896793f..d40af72 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiSubpackageTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiSubpackageTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.TestBase;
@@ -87,7 +86,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -100,7 +99,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiTest.java
index 2dd7acd..6057fab 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodExtensionApiTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
@@ -74,7 +73,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -87,7 +86,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java
index 2866954..e00065b 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java
@@ -12,7 +12,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
@@ -81,7 +80,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -94,7 +93,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodProtectedTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodProtectedTest.java
index 4883f17..f2552c2 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodProtectedTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodProtectedTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForDefaultInstanceInitializer;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverClassInline;
@@ -91,7 +90,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -103,7 +102,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java
index de5ce66..9b6ea0e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.apimodel;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -54,7 +53,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -68,7 +67,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java
index 4810c56..b4e4f2c 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java
@@ -6,7 +6,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.D8TestCompileResult;
@@ -43,7 +42,7 @@
@Test
public void testD8BootClassPath() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
compileOnD8()
.addBootClasspathClasses(LibraryClass.class)
.run(parameters.getRuntime(), Main.class)
@@ -52,7 +51,7 @@
@Test
public void testD8RuntimeClasspath() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
compileOnD8()
.addRunClasspathClasses(LibraryClass.class)
.run(parameters.getRuntime(), Main.class)
@@ -88,7 +87,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -102,7 +101,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.apply(this::setupTestBuilder)
.compile()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java
index 6ec514c..cf2eb9f 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForField;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.SingleTestRunResult;
@@ -63,7 +62,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -76,7 +75,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.RELEASE)
.apply(this::setupTestBuilder)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java
index 675d28e..107c8ff 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForClass;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.setMockApiLevelForMethod;
import static com.android.tools.r8.apimodel.ApiModelingTestHelper.verifyThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.D8TestCompileResult;
@@ -47,7 +46,7 @@
@Test
public void testD8BootClassPath() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
compileOnD8()
.addBootClasspathClasses(LibraryClass.class)
.run(parameters.getRuntime(), Main.class)
@@ -56,7 +55,7 @@
@Test
public void testD8RuntimeClasspath() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
compileOnD8()
.addRunClasspathClasses(LibraryClass.class)
.run(parameters.getRuntime(), Main.class)
@@ -90,7 +89,7 @@
@Test
public void testD8Debug() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMode(CompilationMode.DEBUG)
.apply(this::setupTestBuilder)
@@ -103,7 +102,7 @@
@Test
public void testD8Release() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.apply(this::setupTestBuilder)
.compile()
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java
index 351a79a..622f02c 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java
@@ -8,7 +8,6 @@
import static com.android.tools.r8.references.Reference.classFromClass;
import static com.android.tools.r8.references.Reference.methodFromMethod;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -61,7 +60,7 @@
@Test
public void testD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(Main.class, I.class, Super.class)
.addProgramClassFileData(getInvokeCustomTransform())
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java
index a7082e1..6e9644c 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java
@@ -86,7 +86,7 @@
@Test
public void testD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeFalse(
"TODO(b/204855476): The default VM throws unsupported. Ignore it and reconsider for 8.0.0",
parameters.isDexRuntimeVersion(Version.DEFAULT));
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java
index 3d0484c..5e7bf92 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java
@@ -178,7 +178,7 @@
// TODO(b/247076137: Also turn on VarHandle desugaring for R8 tests.
@Test
public void testD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addProgramClassFileData(getProgramClassFileData())
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
index 0eba6d4..723e674 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
@@ -11,7 +11,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.KeepUnusedReturnValue;
@@ -757,7 +756,7 @@
// merging, R8 should not rewrite the invoke-super instruction into invoke-direct.
@Test
public void testSuperCallNotRewrittenToDirect() throws Throwable {
- assumeTrue(parameters.isDexRuntime()); // Due to smali input.
+ parameters.assumeDexRuntime(); // Due to smali input.
String main = "classmerging.SuperCallRewritingTest";
Path[] programFiles =
@@ -847,7 +846,7 @@
// }
@Test
public void testSuperCallToMergedClassIsRewritten() throws Throwable {
- assumeTrue(parameters.isDexRuntime()); // Due to smali input.
+ parameters.assumeDexRuntime(); // Due to smali input.
assumeFalse(parameters.getRuntime().asDex().getVm().getVersion() == Version.V5_1_1);
assumeFalse(parameters.getRuntime().asDex().getVm().getVersion() == Version.V6_0_1);
diff --git a/src/test/java/com/android/tools/r8/debug/ExceptionTest.java b/src/test/java/com/android/tools/r8/debug/ExceptionTest.java
index 024745c..6778a46 100644
--- a/src/test/java/com/android/tools/r8/debug/ExceptionTest.java
+++ b/src/test/java/com/android/tools/r8/debug/ExceptionTest.java
@@ -52,7 +52,7 @@
@Test
public void testStepOnCatchD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// ART/Dalvik jumps to 'move-exception' which initializes the local variable with the pending
// exception. Thus it is "attached" to the line declaring the exception in the catch handler.
runDebugTest(
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
index 19d0631..7a10656 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.debug;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.CompilationMode;
@@ -49,7 +48,7 @@
@Test
public void testD8() throws CompilationFailedException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramFiles(kotlinTestParameters.getCompiler().getKotlinStdlibJar())
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
index 130b7fe..ce5f0bd 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
@@ -6,7 +6,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.D8TestCompileResult;
import com.android.tools.r8.Disassemble;
@@ -114,7 +113,7 @@
@Test
public void testD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
Path out1 = temp.newFolder().toPath().resolve("out1.zip");
testForD8()
.addProgramClassesAndInnerClasses(CLASS)
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java
index b2b2fc8..6bcd9f0 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.desugar;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.R8FullTestBuilder;
@@ -94,7 +93,7 @@
@Test
public void testD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClassesAndInnerClasses(CLASS)
.setMinApiThreshold(AndroidApiLevel.K)
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java
index 9c9013b..9284fa8 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java
@@ -8,7 +8,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.ByteDataView;
import com.android.tools.r8.ClassFileConsumer;
@@ -80,7 +79,7 @@
@Test
public void testR8() throws Exception {
// R8 does not support desugaring with class file output so this test is only valid for DEX.
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runR8(false);
runR8(true);
}
@@ -183,13 +182,13 @@
@Test
public void testD8FilePerClassFile() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8FilePerMode(OutputMode.DexFilePerClassFile);
}
@Test
public void testD8FilePerClass() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8FilePerMode(OutputMode.DexFilePerClass);
}
@@ -231,7 +230,7 @@
@Test
public void testPerFileNonIntermediateDex() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
try {
runDoublePerFileCompilation(Backend.DEX, false);
fail("Should expect the compilation to fail.");
@@ -390,7 +389,7 @@
@Test
public void testDoubleCompileSyntheticInputsD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// This is a regression test for the pathological case of recompiling intermediates in
// intermediate mode, but where the second round of compilation can share more than what was
// originally shared. Such a case should never be hit by any reasonable compilation pipeline,
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
index 235ce97..b99aea1 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
@@ -89,7 +89,7 @@
@Test
public void testR8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.setMinApi(parameters)
@@ -103,7 +103,7 @@
@Test
public void testR8KeepBootstrapMethod() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java
index cd8e897..c601b56 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java
@@ -95,7 +95,7 @@
@Test
public void testR8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
index e9c4466..0839ce8 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
@@ -27,7 +27,6 @@
import java.io.IOException;
import java.time.LocalDate;
import java.util.Collection;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -66,7 +65,7 @@
@Test
public void testR8() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.R))
.addProgramClasses(DesugarLocalDate.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/WrapperPlacementTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/WrapperPlacementTest.java
index 658b2f3..d4e8306 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/WrapperPlacementTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/WrapperPlacementTest.java
@@ -9,7 +9,6 @@
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryTestBase;
@@ -76,7 +75,7 @@
@Test
public void testNoWrappers() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// No wrappers are made during program compilation.
Path path1 = compileWithCoreLibraryDesugaring(MyArrays1.class);
Path path2 = compileWithCoreLibraryDesugaring(MyArrays2.class);
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java
index bf651f1..a33995b 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java
@@ -60,7 +60,7 @@
@Test
public void testR8() throws Exception {
// R8 does not support desugaring with class file output so this test is only valid for DEX.
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runR8(false);
runR8(true);
}
@@ -168,13 +168,13 @@
@Test
public void testD8FilePerClassFile() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8FilePerMode(OutputMode.DexFilePerClassFile);
}
@Test
public void testD8FilePerClass() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8FilePerMode(OutputMode.DexFilePerClass);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java
index fae9f61..0581c23 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java
@@ -60,7 +60,7 @@
@Test
public void testR8() throws Exception {
// R8 does not support desugaring with class file output so this test is only valid for DEX.
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runR8(false);
runR8(true);
}
@@ -166,13 +166,13 @@
@Test
public void testD8FilePerClassFile() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8FilePerMode(OutputMode.DexFilePerClassFile);
}
@Test
public void testD8FilePerClass() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8FilePerMode(OutputMode.DexFilePerClass);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java
index 31823c7..e4ba6bf 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java
@@ -3,7 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.desugar.lambdas;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.D8TestCompileResult;
import com.android.tools.r8.TestBase;
@@ -51,7 +50,7 @@
@Test
public void testD8() throws Exception {
// Merging legacy lambdas is only valid for DEX inputs, thus also not R8 applicable.
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
D8TestCompileResult lambda =
testForD8().setMinApi(parameters).addProgramClassFileData(getTransformedLambda()).compile();
testForD8()
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
index 762d1df..bb32170 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
@@ -8,7 +8,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestBase;
@@ -110,7 +109,7 @@
@Test
public void testD8WithClasspathAndMerge() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
@@ -198,7 +197,7 @@
@Test
public void testD8WithoutMembersOnClasspath() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
@@ -219,7 +218,7 @@
@Test
public void testD8WithoutHostOnClasspath() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java
index 279b975..1894fa6 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java
@@ -100,7 +100,7 @@
@Test
public void testD8WithClasspathAndMerge() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
@@ -187,7 +187,7 @@
@Test
public void testD8WithoutMembersOnClasspath() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
@@ -208,7 +208,7 @@
@Test
public void testD8WithoutHostOnClasspath() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
index 8de9a22..d2c83a5 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
@@ -100,7 +100,7 @@
@Test
public void testD8WithClasspathAndMerge() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
@@ -187,7 +187,7 @@
@Test
public void testD8WithoutMembersOnClasspath() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
@@ -208,7 +208,7 @@
@Test
public void testD8WithoutHostOnClasspath() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// TODO(b/247047415): Update test when a DEX VM natively supporting nests is added.
assertFalse(parameters.getApiLevel().getLevel() > 35);
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java
index 74ea12f..43668e8 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java
@@ -127,7 +127,7 @@
@Test
public void testD8NoDesugar() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java
index 91ea754..464e2c1 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java
@@ -26,7 +26,6 @@
import java.nio.file.Path;
import java.util.List;
import org.hamcrest.Matcher;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -48,7 +47,7 @@
@Test
public void testD8MethodBridgesPresent() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// 1 inner class.
D8TestCompileResult singleInner =
compileClassesWithD8ProgramClassesMatching(
@@ -67,7 +66,7 @@
@Test
public void testD8ConstructorBridgesPresent() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
D8TestCompileResult inner =
compileClassesWithD8ProgramClassesMatching(
containsString("BasicNestHostWithInnerClassConstructors$BasicNestedClass"));
@@ -89,7 +88,7 @@
@Test
public void testD8ConstructorNestMergeCorrect() throws Exception {
// Multiple Nest Constructor classes have to be merged here.
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
D8TestCompileResult inner =
compileClassesWithD8ProgramClassesMatching(
containsString("BasicNestHostWithInnerClassConstructors$BasicNestedClass"));
diff --git a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java b/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java
index 88bb9a8..7b1065a 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.desugar.records;
import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -74,7 +73,7 @@
@Test
public void testR8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordInterfaceTest.java
index 7e1d2c7..8eb35d5 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordInterfaceTest.java
@@ -74,7 +74,7 @@
@Test
public void testD8Intermediate() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
DesugarGraphTestConsumer consumer = new DesugarGraphTestConsumer();
GlobalSyntheticsTestingConsumer globals = new GlobalSyntheticsTestingConsumer();
Path path = compileIntermediate(globals);
@@ -98,7 +98,7 @@
@Test
public void testD8IntermediateNoDesugaringInStep2() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
DesugarGraphTestConsumer consumer = new DesugarGraphTestConsumer();
GlobalSyntheticsTestingConsumer globals = new GlobalSyntheticsTestingConsumer();
Path path = compileIntermediate(globals);
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
index 428563a..bcf4294 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.desugar.records;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestBase;
@@ -95,7 +94,7 @@
.compile()
.writeToZip();
// TODO(b/288360309): Correctly deal with non-identity lenses in R8 record rewriting.
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramFiles(desugared)
.apply(this::configureR8)
diff --git a/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java b/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
index 24757af..31cf89a 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
@@ -94,7 +94,7 @@
@Test
public void testD8Intermediate() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeFalse(forceInvokeRangeForInvokeCustom);
GlobalSyntheticsTestingConsumer globals = new GlobalSyntheticsTestingConsumer();
Path path = compileIntermediate(globals);
@@ -112,7 +112,7 @@
@Test
public void testD8IntermediateNoDesugaringInStep2() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeFalse(forceInvokeRangeForInvokeCustom);
GlobalSyntheticsTestingConsumer globals = new GlobalSyntheticsTestingConsumer();
Path path = compileIntermediate(globals);
diff --git a/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
index 62f069e..b5b8444 100644
--- a/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.desugar.twr;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -129,7 +128,7 @@
@Test
public void testR8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramFiles(getProgramInputs())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
index 6a4a983..1f4df6a 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.desugaring.interfacemethods;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -71,7 +70,7 @@
@Test
public void testDesugaringWithApiLevelCheck() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterFieldTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterFieldTypeStrengtheningTest.java
index 5c94d28..e1deccc 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterFieldTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterFieldTypeStrengtheningTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestParameters;
@@ -42,7 +41,7 @@
@Test
public void testOnR8Splitter() throws IOException, CompilationFailedException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
ProcessResult processResult =
testR8Splitter(
parameters,
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java
index 186346f..3462d9c 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.dexsplitter;
import static junit.framework.TestCase.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.NoVerticalClassMerging;
@@ -41,7 +40,7 @@
@Test
public void testOnR8Splitter() throws IOException, CompilationFailedException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
ThrowableConsumer<R8FullTestBuilder> configurator =
r8FullTestBuilder ->
r8FullTestBuilder
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMemberValuePropagationRegression.java b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMemberValuePropagationRegression.java
index ad8ab38..6b71354 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMemberValuePropagationRegression.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMemberValuePropagationRegression.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.dexsplitter;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.NeverInline;
@@ -40,7 +39,7 @@
@Test
public void testOnR8Splitter() throws IOException, CompilationFailedException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
ProcessResult processResult =
testR8Splitter(
parameters,
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java
index efd1f73..02d7220 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java
@@ -6,7 +6,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.NeverInline;
@@ -43,7 +42,7 @@
@Test
public void testOnR8Splitter() throws IOException, CompilationFailedException {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
ThrowableConsumer<R8FullTestBuilder> configurator =
r8FullTestBuilder ->
r8FullTestBuilder
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java b/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java
index af67cbb..2f118d7 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java
@@ -8,7 +8,6 @@
import static junit.framework.TestCase.assertEquals;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.NoVerticalClassMerging;
import com.android.tools.r8.R8FullTestBuilder;
@@ -48,7 +47,7 @@
@Test
public void testInlining() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
ThrowableConsumer<R8FullTestBuilder> configurator =
r8FullTestBuilder ->
r8FullTestBuilder
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java b/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
index 5ce196f..bc46b80 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
@@ -7,7 +7,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.R8FullTestBuilder;
@@ -49,7 +48,7 @@
@Test
public void testDistribution() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
ThrowableConsumer<R8TestCompileResult> ensureLambdaNotInBase =
r8TestCompileResult ->
r8TestCompileResult.inspect(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java
index e40f3e3..f1e8709 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
import static com.android.tools.r8.KotlinTestBase.getCompileMemoizer;
import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.KotlinTestBase.KotlinCompileMemoizer;
import com.android.tools.r8.KotlinTestParameters;
@@ -62,7 +61,7 @@
@Test
public void testEnumUnboxing() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramFiles(
jars.getForConfiguration(kotlinParameters),
diff --git a/src/test/java/com/android/tools/r8/internal/Regression127524985.java b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
index d52a80f..8bfef9e 100644
--- a/src/test/java/com/android/tools/r8/internal/Regression127524985.java
+++ b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
@@ -54,7 +54,7 @@
@Test
public void testD8() throws Throwable {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramFiles(JAR)
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java
index 783d197..72df230 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java
@@ -6,7 +6,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -100,7 +99,7 @@
@Test
public void testTypeStructure() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// Set the min API and create the raw app.
InternalOptions options = new InternalOptions();
options.setMinApiLevel(parameters.getApiLevel());
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java
index b8bfd17..a70c32b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java
@@ -65,7 +65,7 @@
@Test
public void testR8_includeKotlinStdlib() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
String pkg = getClass().getPackage().getName();
String folder = DescriptorUtils.getBinaryNameFromJavaType(pkg);
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java
index 29f2f79..ffd18ff 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java
@@ -82,7 +82,7 @@
@Test
public void testMainDexTracing() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
assumeTrue(parameters.getDexRuntimeVersion().isDalvik());
runTest(
r8FullTestBuilder -> r8FullTestBuilder.addMainDexKeepClassRules(Main.class, I.class),
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
index 2cc6ad2..d29d7f3 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
@@ -8,7 +8,6 @@
import static org.hamcrest.CoreMatchers.allOf;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.D8TestCompileResult;
@@ -75,7 +74,7 @@
@Test
public void testIntermediate() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
D8TestCompileResult intermediateResult =
testForD8()
.addInnerClasses(MainDexWithSynthesizedClassesTest.class)
@@ -93,7 +92,7 @@
@Test
public void testSupportedMainDexListD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// It remains a supported mode to first compile to DEX and then use tracing on the compiled
// output. Neither the compilation, the trace or the merge should issue any diagnostics.
Path dexed =
@@ -131,7 +130,7 @@
*/
@Test
public void testDeprecatedSyntheticsFromMainDexListD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
Path mainDexFile = temp.newFile("maindex.list").toPath();
FileUtils.writeTextFile(mainDexFile, binaryName(A.class) + ".class");
assertThrows(
diff --git a/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java b/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
index b28280d..49ebe1a 100644
--- a/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
@@ -10,7 +10,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.R8TestCompileResult;
@@ -87,7 +86,7 @@
@Test()
public void testR8WithReferenceToNotMapped() {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
R8TestCompileResult libraryCompileResult = compilationResults.apply(parameters);
assertThrows(
CompilationFailedException.class,
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java
index 5787486..f53726e 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/DesugarLambdaRetraceTest.java
@@ -83,7 +83,7 @@
@Test
public void testLineNumberTableOnly() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of("-keepattributes LineNumberTable"), this::checkIsSameExceptForFileName);
}
@@ -91,7 +91,7 @@
@Test
public void testNoLineNumberTable() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(ImmutableList.of(), this::checkIsSameExceptForFileNameAndLineNumber);
}
}
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/InliningRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/InliningRetraceTest.java
index ef6f5a7..bd5e3bc 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/InliningRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/InliningRetraceTest.java
@@ -60,7 +60,7 @@
@Test
public void testLineNumberTableOnly() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of("-keepattributes LineNumberTable"),
(StackTrace actualStackTrace, StackTrace retracedStackTrace) -> {
@@ -73,7 +73,7 @@
@Test
public void testNoLineNumberTable() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of(),
(StackTrace actualStackTrace, StackTrace retracedStackTrace) -> {
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java
index 34b7502..ebf25d9 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java
@@ -101,7 +101,7 @@
@Test
public void testLineNumberTableOnly() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of("-keepattributes LineNumberTable"),
(StackTrace actualStackTrace, StackTrace retracedStackTrace) -> {
@@ -141,7 +141,7 @@
// at com.android.tools.r8.naming.retraceproguard.MainApp.main(MainApp.java:7)
// since the synthetic bridge belongs to ResourceWrapper.foo.
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of(),
(StackTrace actualStackTrace, StackTrace retracedStackTrace) -> {
diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java
index 016d4ac..95e39d1 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java
@@ -68,7 +68,7 @@
@Test
public void testLineNumberTableOnly() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of("-keepattributes LineNumberTable"),
(StackTrace actualStackTrace, StackTrace retracedStackTrace) -> {
@@ -80,7 +80,7 @@
@Test
public void testNoLineNumberTable() throws Exception {
assumeTrue(compat);
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runTest(
ImmutableList.of(),
(StackTrace actualStackTrace, StackTrace retracedStackTrace) -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java
index 6e78fc6..d0fb8cf 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java
@@ -8,7 +8,6 @@
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.DataEntryResource;
import com.android.tools.r8.TestBase;
@@ -69,7 +68,7 @@
@Test
public void testMainDex() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForMainDexListGenerator()
.addProgramClasses(TestClass.class)
.addLibraryFiles(ToolHelper.getFirstSupportedAndroidJar(parameters.getApiLevel()))
diff --git a/src/test/java/com/android/tools/r8/regress/B341476044Test.java b/src/test/java/com/android/tools/r8/regress/B341476044Test.java
index baa690b..89d48ef 100644
--- a/src/test/java/com/android/tools/r8/regress/B341476044Test.java
+++ b/src/test/java/com/android/tools/r8/regress/B341476044Test.java
@@ -58,7 +58,7 @@
@Test
public void testD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/regress/B341618078Test.java b/src/test/java/com/android/tools/r8/regress/B341618078Test.java
index a0a14ed..dee949e 100644
--- a/src/test/java/com/android/tools/r8/regress/B341618078Test.java
+++ b/src/test/java/com/android/tools/r8/regress/B341618078Test.java
@@ -41,7 +41,7 @@
@Test
public void testD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/regress/B342067836Test.java b/src/test/java/com/android/tools/r8/regress/B342067836Test.java
index 06a2b7f..bddfbe8 100644
--- a/src/test/java/com/android/tools/r8/regress/B342067836Test.java
+++ b/src/test/java/com/android/tools/r8/regress/B342067836Test.java
@@ -40,7 +40,7 @@
@Test
public void testD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
index b0686db..d052107 100644
--- a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
+++ b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
@@ -7,7 +7,6 @@
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.AsmTestBase;
import com.android.tools.r8.D8TestRunResult;
@@ -83,7 +82,7 @@
}
private void testR8(boolean treeShake) throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
R8TestRunResult result =
testForR8(parameters.getBackend())
.addProgramClasses(CLASSES)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java
index e3c041e..3f8effa 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java
@@ -40,7 +40,7 @@
@Test
public void testR8WithDebugDex() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
.setMode(CompilationMode.DEBUG)
diff --git a/src/test/java/com/android/tools/r8/resolution/ArrayCloneInDefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/resolution/ArrayCloneInDefaultInterfaceMethodTest.java
index 23b27be..b92dbde 100644
--- a/src/test/java/com/android/tools/r8/resolution/ArrayCloneInDefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/ArrayCloneInDefaultInterfaceMethodTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.resolution;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.SingleTestRunResult;
import com.android.tools.r8.TestBase;
@@ -40,7 +39,7 @@
@Test
public void testDexNoDesugar() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addProgramClasses(I.class, A.class, B.class, TestClass.class)
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/resolution/ArrayCloneInStaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/resolution/ArrayCloneInStaticInterfaceMethodTest.java
index 21f8ed2..1392288 100644
--- a/src/test/java/com/android/tools/r8/resolution/ArrayCloneInStaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/ArrayCloneInStaticInterfaceMethodTest.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.resolution;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.SingleTestRunResult;
import com.android.tools.r8.TestBase;
@@ -60,7 +59,7 @@
@Test
public void testDexNoDesugar() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.addProgramClasses(I.class, TestClass.class)
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/resolution/ObjectCloneInStaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/resolution/ObjectCloneInStaticInterfaceMethodTest.java
index 64d0f14..3f081a4 100644
--- a/src/test/java/com/android/tools/r8/resolution/ObjectCloneInStaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/ObjectCloneInStaticInterfaceMethodTest.java
@@ -5,7 +5,6 @@
package com.android.tools.r8.resolution;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.SingleTestRunResult;
import com.android.tools.r8.TestBase;
@@ -62,7 +61,7 @@
@Test
public void testDexNoDesugar() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.apply(this::addProgramInputs)
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java
index b6cc9de..1f61577 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java
@@ -5,7 +5,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
@@ -60,7 +59,7 @@
};
@Test public void d8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java
index 7583503..1eb6031 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.rewrite.arrays;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -43,7 +42,7 @@
@Test
public void testReleaseD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.release()
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java
index 5ed624e..13c7558 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.rewrite.arrays;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -46,7 +45,7 @@
@Test
public void testReleaseD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8(parameters.getBackend())
.release()
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java b/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java
index 6316441..9db9c42 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.rewrite.assertionerror;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.TestBase;
@@ -38,7 +37,7 @@
@Test
public void d8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(Main.class)
.setMinApi(parameters)
@@ -49,7 +48,7 @@
@Test
public void d8NoDesugar() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(Main.class)
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java
index fbd50f4..265f593 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java
@@ -21,7 +21,6 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -47,7 +46,7 @@
@Test
public void testD8() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(TestClass.class, MockJacocoInit.class)
.addProgramClassFileData(transformClassWithJacocoInstrumentation(A.class))
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java
index e8001a8..e4b5196 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java
@@ -185,7 +185,7 @@
@Test
public void testAssertionsForDex() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// Leaving assertions in or disabling them on Dalvik/Art means no assertions.
runD8Test(
builder ->
@@ -287,7 +287,7 @@
@Test
public void testEnableForPackageForDex() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8Test(
builder ->
builder.addAssertionsConfiguration(
@@ -316,7 +316,7 @@
@Test
public void testEnableForClassForDex() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8Test(
builder ->
builder
@@ -357,7 +357,7 @@
@Test
public void testMixedForDex() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
runD8Test(
builder ->
builder
@@ -406,7 +406,7 @@
@Test
public void testUnnamedPackageForDex() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(class1, class2)
.addProgramClassFileData(
@@ -457,7 +457,7 @@
@Test
public void testInnerClassForDex() throws Exception {
- Assume.assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addProgramClasses(TestClassForInnerClass.class, TestClassForInnerClass.InnerClass.class)
.setMinApi(parameters)
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
index f6d3dbe..e8bfc88 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
@@ -294,7 +294,7 @@
@Test
public void test() throws Exception {
// TODO(mkroghj) Why does this fail on JDK?
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
// Run with R8, but avoid inlining to really validate that the methods "condition"
// and "<clinit>" are gone.
CompilationResults results = compilationResults.apply(parameters.getBackend());
@@ -323,7 +323,7 @@
@Test
public void regress110887293() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
CompilationResults results = compilationResults.apply(parameters.getBackend());
// Assertions removed for default assertion code.
checkResultWithAssertionsInactive(results.withoutAssertions);
@@ -387,14 +387,14 @@
@Test
public void testD8Regress110887293() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
checkResultWithChromiumAssertions(
compileD8Regress110887293(RemoveAssertionsTest::chromiumAssertionEnabler));
}
@Test
public void testR8FollowedByD8() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
checkResultWithAssertionsInactive(
compileR8FollowedByD8(builder -> builder.setCompileTimeDisable().setScopeAll().build()));
checkResultWithAssertionsInactive(
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/SynthesizedRulesFromApiLevelTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/SynthesizedRulesFromApiLevelTest.java
index 76b2019..25541c6 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumevalues/SynthesizedRulesFromApiLevelTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/SynthesizedRulesFromApiLevelTest.java
@@ -355,7 +355,7 @@
@Test
public void testUnknownApiLevelRule() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
List<ProguardConfigurationRule> rules =
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/testing/StackTraceTest.java b/src/test/java/com/android/tools/r8/testing/StackTraceTest.java
index 987572f..1cb04b5 100644
--- a/src/test/java/com/android/tools/r8/testing/StackTraceTest.java
+++ b/src/test/java/com/android/tools/r8/testing/StackTraceTest.java
@@ -8,7 +8,6 @@
import static com.android.tools.r8.naming.retrace.StackTrace.isSameExceptForFileName;
import static com.android.tools.r8.naming.retrace.StackTrace.isSameExceptForFileNameAndLineNumber;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeTrue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -185,7 +184,7 @@
@Test
public void testArtStackTraceFromRunning() throws Exception {
- assumeTrue(parameters.isDexRuntime());
+ parameters.assumeDexRuntime();
testForD8()
.addInnerClasses(StackTraceTest.class)
.setMinApi(parameters)
