Enable CF for AdaptResourceFileContentsTest.
Change-Id: I41078065e244abb880a464516f00c3d7446d8e9f
diff --git a/src/test/java/com/android/tools/r8/naming/AdaptResourceFileContentsTest.java b/src/test/java/com/android/tools/r8/naming/AdaptResourceFileContentsTest.java
index e3f6eac..51b8d46 100644
--- a/src/test/java/com/android/tools/r8/naming/AdaptResourceFileContentsTest.java
+++ b/src/test/java/com/android/tools/r8/naming/AdaptResourceFileContentsTest.java
@@ -11,11 +11,13 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import com.android.tools.r8.ClassFileConsumer;
import com.android.tools.r8.CompilationFailedException;
import com.android.tools.r8.DataDirectoryResource;
import com.android.tools.r8.DataEntryResource;
import com.android.tools.r8.DataResourceConsumer;
import com.android.tools.r8.DataResourceProvider.Visitor;
+import com.android.tools.r8.DexIndexedConsumer;
import com.android.tools.r8.DiagnosticsHandler;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.ToolHelper;
@@ -33,6 +35,7 @@
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -40,9 +43,23 @@
import java.util.Set;
import java.util.stream.Collectors;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+@RunWith(Parameterized.class)
public class AdaptResourceFileContentsTest extends ProguardCompatabilityTestBase {
+ private Backend backend;
+
+ @Parameterized.Parameters(name = "Backend: {0}")
+ public static Collection<Backend> data() {
+ return Arrays.asList(Backend.values());
+ }
+
+ public AdaptResourceFileContentsTest(Backend backend) {
+ this.backend = backend;
+ }
+
protected static class CustomDataResourceConsumer implements DataResourceConsumer {
private final Map<String, ImmutableList<String>> resources = new HashMap<>();
@@ -302,10 +319,19 @@
private AndroidApp compileWithR8(String proguardConfig, DataResourceConsumer dataResourceConsumer)
throws CompilationFailedException, IOException {
+ assert backend == Backend.DEX || backend == Backend.CF;
R8Command command =
ToolHelper.allowTestProguardOptions(
- ToolHelper.prepareR8CommandBuilder(getAndroidApp())
+ ToolHelper.prepareR8CommandBuilder(
+ getAndroidApp(),
+ backend == Backend.DEX
+ ? DexIndexedConsumer.emptyConsumer()
+ : ClassFileConsumer.emptyConsumer())
.addProguardConfiguration(ImmutableList.of(proguardConfig), Origin.unknown()))
+ .addLibraryFiles(
+ backend == Backend.DEX
+ ? ToolHelper.getDefaultAndroidJar()
+ : ToolHelper.getJava8RuntimeJar())
.build();
return ToolHelper.runR8(
command,
