Move builder() to TestParameters.
Change-Id: I7d6e68dd134c8c97854e003ddd40f1ca9895be95
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index 4daa6a9..3a482a5 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -416,7 +416,7 @@
}
public static TestParametersBuilder getTestParameters() {
- return TestParametersBuilder.builder();
+ return TestParameters.builder();
}
public static KotlinTestParameters.Builder getKotlinTestParameters() {
diff --git a/src/test/java/com/android/tools/r8/TestParameters.java b/src/test/java/com/android/tools/r8/TestParameters.java
index 555c7fa..7853170 100644
--- a/src/test/java/com/android/tools/r8/TestParameters.java
+++ b/src/test/java/com/android/tools/r8/TestParameters.java
@@ -31,8 +31,12 @@
this.apiLevel = apiLevel;
}
+ public static TestParametersBuilder builder() {
+ return new TestParametersBuilder();
+ }
+
public static TestParametersCollection justNoneRuntime() {
- return TestParametersBuilder.builder().withNoneRuntime().build();
+ return builder().withNoneRuntime().build();
}
public boolean canUseDefaultAndStaticInterfaceMethods() {
diff --git a/src/test/java/com/android/tools/r8/TestParametersBuilder.java b/src/test/java/com/android/tools/r8/TestParametersBuilder.java
index 375f6f8..cb24356 100644
--- a/src/test/java/com/android/tools/r8/TestParametersBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestParametersBuilder.java
@@ -26,11 +26,7 @@
private Predicate<TestParameters> filter = param -> false;
private boolean hasDexRuntimeFilter = false;
- private TestParametersBuilder() {}
-
- public static TestParametersBuilder builder() {
- return new TestParametersBuilder();
- }
+ TestParametersBuilder() {}
private TestParametersBuilder withFilter(Predicate<TestParameters> predicate) {
filter = filter.or(predicate);
diff --git a/src/test/java/com/android/tools/r8/bisect/BisectTest.java b/src/test/java/com/android/tools/r8/bisect/BisectTest.java
index bd1d3c4..3b34747 100644
--- a/src/test/java/com/android/tools/r8/bisect/BisectTest.java
+++ b/src/test/java/com/android/tools/r8/bisect/BisectTest.java
@@ -7,7 +7,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.bisect.BisectOptions.Result;
import com.android.tools.r8.dex.ApplicationReader;
@@ -34,7 +33,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection parameters() {
- return TestParametersBuilder.builder().withNoneRuntime().build();
+ return TestParameters.builder().withNoneRuntime().build();
}
public BisectTest(TestParameters parameters) {
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 ebba822..2c3a478 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -13,7 +13,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestDiagnosticMessages;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.utils.AndroidApiLevel;
import java.util.List;
@@ -31,7 +30,7 @@
@Parameters(name = "{0}, kotlinc: {1}")
public static List<Object[]> setup() {
return buildParameters(
- TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build(),
+ TestParameters.builder().withAllRuntimesAndApiLevels().build(),
getKotlinTestParameters().withAllCompilers().withNoTargetVersion().build());
}
diff --git a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
index d227ea3..af193de 100644
--- a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
@@ -9,7 +9,6 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.R8TestCompileResult;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.utils.InternalOptions.LineNumberOptimization;
import org.junit.Test;
@@ -34,7 +33,7 @@
@Parameterized.Parameters(name = "{0}")
public static TestParametersCollection setup() {
- return TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build();
+ return TestParameters.builder().withAllRuntimesAndApiLevels().build();
}
public LineNumberOptimizationTest(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java b/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java
index 008d3cf..416cada 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java
@@ -8,7 +8,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.graph.DexDebugEvent.SetFile;
import com.android.tools.r8.smali.SmaliBuilder;
@@ -30,10 +29,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection parameters() {
- return TestParametersBuilder.builder()
- .withDexRuntimes()
- .withApiLevel(AndroidApiLevel.B)
- .build();
+ return TestParameters.builder().withDexRuntimes().withApiLevel(AndroidApiLevel.B).build();
}
private static final String CLASS_NAME = "Test";
diff --git a/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java
index b683d7d..6af4440 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.debuginfo.InliningWithoutPositionsTestSourceDump.Location;
import com.android.tools.r8.naming.retrace.StackTrace;
import com.android.tools.r8.naming.retrace.StackTrace.StackTraceLine;
@@ -44,7 +43,7 @@
public static Collection<Object[]> data() {
List<Object[]> testCases = new ArrayList<>();
for (TestParameters parameters :
- TestParametersBuilder.builder().withAllRuntimes().withApiLevel(AndroidApiLevel.B).build()) {
+ TestParameters.builder().withAllRuntimes().withApiLevel(AndroidApiLevel.B).build()) {
for (int i = 0; i < 16; ++i) {
for (Location throwLocation : Location.values()) {
if (throwLocation != Location.MAIN) {
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileB156591935.java b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileB156591935.java
index 674f288..e288d12 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileB156591935.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileB156591935.java
@@ -8,7 +8,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.cf.code.CfStackInstruction.Opcode;
import com.android.tools.r8.utils.AndroidApiLevel;
@@ -29,7 +28,7 @@
@Parameterized.Parameters(name = "{0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withCfRuntimes().withAllApiLevelsAlsoForCf().build();
+ return TestParameters.builder().withCfRuntimes().withAllApiLevelsAlsoForCf().build();
}
private final AndroidApiLevel apiLevel;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java
index 5162100..1433f2e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java
@@ -7,7 +7,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.utils.FileUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
@@ -38,7 +37,7 @@
@Parameterized.Parameters(name = "Backend: {1}")
public static List<Object[]> data() {
return buildParameters(
- TestParametersBuilder.builder().withNoneRuntime().build(), ToolHelper.getBackends());
+ TestParameters.builder().withNoneRuntime().build(), ToolHelper.getBackends());
}
public MemberValuePropagationTest(TestParameters parameters, TestBase.Backend backend) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java
index 1b3e93e..4d032c7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java
@@ -9,7 +9,6 @@
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
@@ -30,7 +29,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build();
+ return TestParameters.builder().withAllRuntimesAndApiLevels().build();
}
public LambdaInstantiatedTypeTest(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java
index d88a978..822f9f9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.utils.BooleanUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -36,8 +35,7 @@
@Parameters(name = "{0}, minification:{1}")
public static Collection<Object[]> data() {
return buildParameters(
- TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build(),
- BooleanUtils.values());
+ TestParameters.builder().withAllRuntimesAndApiLevels().build(), BooleanUtils.values());
}
public void configure(R8FullTestBuilder builder) {
diff --git a/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java b/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java
index 4fb3d8b..11f560d 100644
--- a/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java
@@ -6,7 +6,6 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.utils.StringUtils;
import org.junit.Test;
@@ -75,7 +74,7 @@
@Parameterized.Parameters(name = "Backend: {0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build();
+ return TestParameters.builder().withAllRuntimesAndApiLevels().build();
}
public PublicFieldInnerClassTest(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java b/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java
index c61d7fa..029fc63 100644
--- a/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java
+++ b/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.resolution.b123730538.runner.PublicClassExtender;
@@ -40,7 +39,7 @@
@Parameterized.Parameters(name = "Backend: {0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build();
+ return TestParameters.builder().withAllRuntimesAndApiLevels().build();
}
public B123730538(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/resource/KeepDirectoriesTest.java b/src/test/java/com/android/tools/r8/resource/KeepDirectoriesTest.java
index 416835f..fedfb29 100644
--- a/src/test/java/com/android/tools/r8/resource/KeepDirectoriesTest.java
+++ b/src/test/java/com/android/tools/r8/resource/KeepDirectoriesTest.java
@@ -16,7 +16,6 @@
import com.android.tools.r8.DiagnosticsHandler;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.naming.ClassNameMapper;
@@ -55,7 +54,7 @@
return buildParameters(
ToolHelper.getBackends(),
BooleanUtils.values(),
- TestParametersBuilder.builder().withNoneRuntime().build());
+ TestParameters.builder().withNoneRuntime().build());
}
public KeepDirectoriesTest(Backend backend, boolean minify, TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestBase.java b/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestBase.java
index 4dcd86a..9196e6a 100644
--- a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestBase.java
+++ b/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestBase.java
@@ -6,7 +6,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -18,7 +17,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withNoneRuntime().build();
+ return TestParameters.builder().withNoneRuntime().build();
}
public RetraceApiTestBase(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/rewrite/switchmaps/RewriteSwitchMapsTest.java b/src/test/java/com/android/tools/r8/rewrite/switchmaps/RewriteSwitchMapsTest.java
index cfffbac..c6c5cc2 100644
--- a/src/test/java/com/android/tools/r8/rewrite/switchmaps/RewriteSwitchMapsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/switchmaps/RewriteSwitchMapsTest.java
@@ -8,7 +8,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.google.common.collect.ImmutableList;
@@ -26,7 +25,7 @@
@Parameterized.Parameters(name = "{0}, backend: {1}")
public static List<Object[]> data() {
return buildParameters(
- TestParametersBuilder.builder().withNoneRuntime().build(), ToolHelper.getBackends());
+ TestParameters.builder().withNoneRuntime().build(), ToolHelper.getBackends());
}
public RewriteSwitchMapsTest(TestParameters parameters, Backend backend) {
diff --git a/src/test/java/com/android/tools/r8/shaking/TreeShakingSpecificTest.java b/src/test/java/com/android/tools/r8/shaking/TreeShakingSpecificTest.java
index f42443d..eacb522 100644
--- a/src/test/java/com/android/tools/r8/shaking/TreeShakingSpecificTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/TreeShakingSpecificTest.java
@@ -14,7 +14,6 @@
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic;
import com.android.tools.r8.utils.AndroidApiLevel;
@@ -43,8 +42,7 @@
@Parameters(name = "Backend: {1}")
public static List<Object[]> data() {
- return buildParameters(
- TestParametersBuilder.builder().withNoneRuntime().build(), Backend.values());
+ return buildParameters(TestParameters.builder().withNoneRuntime().build(), Backend.values());
}
public TreeShakingSpecificTest(TestParameters parameters, Backend backend) {
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReachableSubclassTest.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReachableSubclassTest.java
index b848b1c..ae37674 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReachableSubclassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReachableSubclassTest.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.NoVerticalClassMerging;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.Reference;
@@ -33,7 +32,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withCfRuntimes().build();
+ return TestParameters.builder().withCfRuntimes().build();
}
public KeptByReachableSubclassTest(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSingletonIsNotCyclicTest.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSingletonIsNotCyclicTest.java
index b34d36d..f6f59dd 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSingletonIsNotCyclicTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSingletonIsNotCyclicTest.java
@@ -14,7 +14,6 @@
import com.android.tools.r8.NeverPropagateValue;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.ClassReference;
@@ -41,7 +40,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withCfRuntimes().build();
+ return TestParameters.builder().withCfRuntimes().build();
}
public KeptSingletonIsNotCyclicTest(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSubclassKeepsSuperTest.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSubclassKeepsSuperTest.java
index 12d1f35..cd34b55 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSubclassKeepsSuperTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptSubclassKeepsSuperTest.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.NoVerticalClassMerging;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.references.Reference;
@@ -33,7 +32,7 @@
@Parameters(name = "{0}")
public static TestParametersCollection data() {
- return TestParametersBuilder.builder().withCfRuntimes().build();
+ return TestParameters.builder().withCfRuntimes().build();
}
public KeptSubclassKeepsSuperTest(TestParameters parameters) {
diff --git a/src/test/java/com/android/tools/r8/utils/TestParametersTest.java b/src/test/java/com/android/tools/r8/utils/TestParametersTest.java
index 7d26b86..a217b8c 100644
--- a/src/test/java/com/android/tools/r8/utils/TestParametersTest.java
+++ b/src/test/java/com/android/tools/r8/utils/TestParametersTest.java
@@ -31,7 +31,7 @@
assumeFalse(
"Test is only valid when no runtimes property is set",
TestParametersBuilder.isRuntimesPropertySet());
- TestParametersCollection params = TestParametersBuilder.builder().withNoneRuntime().build();
+ TestParametersCollection params = TestParameters.builder().withNoneRuntime().build();
assertTrue(params.stream().anyMatch(TestParameters::isNoneRuntime));
}
@@ -40,7 +40,7 @@
assumeFalse(
"Test is only valid when no runtimes property is set",
TestParametersBuilder.isRuntimesPropertySet());
- TestParametersCollection params = TestParametersBuilder.builder().withAllRuntimes().build();
+ TestParametersCollection params = TestParameters.builder().withAllRuntimes().build();
assertTrue(params.stream().noneMatch(TestParameters::isNoneRuntime));
assertTrue(params.stream().anyMatch(TestParameters::isDexRuntime));
assertTrue(params.stream().anyMatch(TestParameters::isCfRuntime));
@@ -53,7 +53,7 @@
TestParametersBuilder.isRuntimesPropertySet());
// This test may also fail once the tests can be configured for with API levels to run.
TestParametersCollection params =
- TestParametersBuilder.builder().withAllRuntimesAndApiLevels().build();
+ TestParameters.builder().withAllRuntimesAndApiLevels().build();
assertTrue(params.stream().noneMatch(TestParameters::isNoneRuntime));
assertTrue(params.stream().anyMatch(p -> p.isCfRuntime() && p.getApiLevel() == null));
// Default API levels are min and max for each DEX VM.
@@ -79,12 +79,9 @@
public void testJdk9Presence() {
assumeTrue(!TestParametersBuilder.isRuntimesPropertySet()
|| TestParametersBuilder.getRuntimesProperty().contains("jdk9"));
- assertTrue(TestParametersBuilder
- .builder()
- .withAllRuntimesAndApiLevels()
- .build()
- .stream()
- .anyMatch(parameter -> parameter.getRuntime().equals(TestRuntime.getCheckedInJdk9())));
+ assertTrue(
+ TestParameters.builder().withAllRuntimesAndApiLevels().build().stream()
+ .anyMatch(parameter -> parameter.getRuntime().equals(TestRuntime.getCheckedInJdk9())));
}
@Test
@@ -92,12 +89,9 @@
assumeTrue(ToolHelper.isLinux());
assumeTrue(!TestParametersBuilder.isRuntimesPropertySet()
|| TestParametersBuilder.getRuntimesProperty().contains("dex-default"));
- assertTrue(TestParametersBuilder
- .builder()
- .withAllRuntimesAndApiLevels()
- .build()
- .stream()
- .anyMatch(parameter -> parameter.getRuntime().name().equals("dex-default")));
+ assertTrue(
+ TestParameters.builder().withAllRuntimesAndApiLevels().build().stream()
+ .anyMatch(parameter -> parameter.getRuntime().name().equals("dex-default")));
}
@Test
@@ -105,11 +99,8 @@
assumeTrue(ToolHelper.isLinux());
assumeTrue(!TestParametersBuilder.isRuntimesPropertySet()
|| TestParametersBuilder.getRuntimesProperty().contains("dex-4.4.4"));
- assertTrue(TestParametersBuilder
- .builder()
- .withAllRuntimesAndApiLevels()
- .build()
- .stream()
- .anyMatch(parameter -> parameter.getRuntime().name().equals("dex-4.4.4")));
+ assertTrue(
+ TestParameters.builder().withAllRuntimesAndApiLevels().build().stream()
+ .anyMatch(parameter -> parameter.getRuntime().name().equals("dex-4.4.4")));
}
}
