Remove DXTestBuilder and update last test using it
Bug: 185205222
Change-Id: I5fa15e25b9638fad05a47c57765e0dfd2e8d1040
diff --git a/src/test/java/com/android/tools/r8/DXTestBuilder.java b/src/test/java/com/android/tools/r8/DXTestBuilder.java
deleted file mode 100644
index fcef696..0000000
--- a/src/test/java/com/android/tools/r8/DXTestBuilder.java
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2018, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8;
-
-import com.android.tools.r8.ClassFileConsumer.ArchiveConsumer;
-import com.android.tools.r8.D8Command.Builder;
-import com.android.tools.r8.TestBase.Backend;
-import com.android.tools.r8.ToolHelper.ProcessResult;
-import com.android.tools.r8.benchmarks.BenchmarkResults;
-import com.android.tools.r8.errors.Unimplemented;
-import com.android.tools.r8.utils.AndroidApp;
-import com.android.tools.r8.utils.InternalOptions;
-import com.android.tools.r8.utils.ListUtils;
-import com.android.tools.r8.utils.StringUtils;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-// The type arguments D8Command, Builder is not relevant for running DX.
-public class DXTestBuilder
- extends TestCompilerBuilder<
- D8Command, Builder, DXTestCompileResult, DXTestRunResult, DXTestBuilder> {
-
- // Ordered list of injar entries.
- private List<Path> injars = new ArrayList<>();
-
- private DXTestBuilder(TestState state) {
- super(state, D8Command.builder(), Backend.DEX);
- }
-
- public static DXTestBuilder create(TestState state) {
- return new DXTestBuilder(state);
- }
-
- @Override
- DXTestBuilder self() {
- return this;
- }
-
- @Override
- DXTestCompileResult internalCompile(
- Builder builder,
- Consumer<InternalOptions> optionsConsumer,
- Supplier<AndroidApp> app,
- BenchmarkResults benchmarkResults)
- throws CompilationFailedException {
- assert benchmarkResults == null;
- assert !libraryDesugaringTestConfiguration.isEnabled();
- try {
- Path dxOutputFolder = getState().getNewTempFolder();
- Path outJar = dxOutputFolder.resolve("output.jar");
-
- List<String> args = new ArrayList<>();
- args.add("--min-sdk-version=" + getMinApiLevel());
- args.add("--output=" + outJar.toString());
- args.addAll(injars.stream().map(Path::toString).collect(Collectors.toList()));
- ProcessResult result =
- ToolHelper.runProcess(
- ToolHelper.createProcessBuilderForRunningDx(args.toArray(StringUtils.EMPTY_ARRAY)),
- getStdoutForTesting());
- if (result.exitCode != 0) {
- throw new CompilationFailedException(result.toString());
- }
- return new DXTestCompileResult(
- getState(), AndroidApp.builder().addProgramFile(outJar).build(), getMinApiLevel());
- } catch (IOException e) {
- throw new CompilationFailedException(e);
- }
- }
-
- @Override
- public DXTestBuilder addClasspathClasses(Collection<Class<?>> classes) {
- throw new Unimplemented("No support for adding classpath data directly");
- }
-
- @Override
- public DXTestBuilder addClasspathFiles(Collection<Path> files) {
- throw new Unimplemented("No support for adding classpath data directly");
- }
-
- @Override
- public DXTestBuilder addProgramClasses(Collection<Class<?>> classes) {
- return addProgramClassFileData(
- ListUtils.map(
- classes,
- c -> {
- try {
- return ToolHelper.getClassAsBytes(c);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }));
- }
-
- @Override
- public DXTestBuilder addProgramClassFileData(Collection<byte[]> classes) {
- try {
- Path out = getState().getNewTempFolder().resolve("out.jar");
- ArchiveConsumer consumer = new ArchiveConsumer(out);
- for (byte[] clazz : classes) {
- String descriptor = TestBase.extractClassDescriptor(clazz);
- consumer.accept(ByteDataView.of(clazz), descriptor, null);
- }
- consumer.finished(null);
- addProgramFiles(out);
- return self();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public DXTestBuilder addProgramDexFileData(Collection<byte[]> data) {
- throw new Unimplemented("No support for adding dex file data directly");
- }
-
- @Override
- public DXTestBuilder addProgramFiles(Collection<Path> files) {
- injars.addAll(files);
- return self();
- }
-}
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index e3e84a0..bc5a0d8 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -187,10 +187,6 @@
return D8TestBuilder.create(new TestState(temp), Backend.DEX);
}
- public static DXTestBuilder testForDX(TemporaryFolder temp) {
- return DXTestBuilder.create(new TestState(temp));
- }
-
public static JvmTestBuilder testForJvm(TemporaryFolder temp) {
return JvmTestBuilder.create(new TestState(temp));
}
@@ -231,10 +227,6 @@
return testForD8(temp, backend);
}
- public DXTestBuilder testForDX() {
- return testForDX(temp);
- }
-
@Deprecated
public JvmTestBuilder testForJvm() {
return testForJvm(temp);
diff --git a/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java b/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
index e5ce137..6734ad6 100644
--- a/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
@@ -12,7 +12,6 @@
import static org.hamcrest.CoreMatchers.equalTo;
import com.android.tools.r8.D8TestRunResult;
-import com.android.tools.r8.DXTestRunResult;
import com.android.tools.r8.ProguardTestRunResult;
import com.android.tools.r8.R8TestRunResult;
import com.android.tools.r8.TestParameters;
@@ -37,7 +36,6 @@
public class InvalidTypesTest extends JasminTestBase {
private enum Compiler {
- DX,
D8,
JAVAC,
PROGUARD,
@@ -71,7 +69,6 @@
case JAVAC:
return StringUtils.joinLines("Hello!", "Goodbye!", "");
- case DX:
case D8:
switch (parameters.getDexRuntimeVersion()) {
case V4_0_4:
@@ -278,13 +275,6 @@
} else {
assert parameters.isDexRuntime();
- DXTestRunResult dxResult =
- testForDX()
- .addProgramFiles(inputJar)
- .setMinApi(parameters)
- .run(parameters.getRuntime(), mainClass.name);
- checkTestRunResult(dxResult, Compiler.DX);
-
D8TestRunResult d8Result =
testForD8()
.addProgramFiles(inputJar)
