commit f9b85a0a3e6d43791465feac1476d60753d6522d
author Tamas Kenez <tamaskenez@google.com> Mon Aug 06 11:52:14 2018 +0200
committer Tamas Kenez <tamaskenez@google.com> Mon Aug 06 10:33:13 2018 +0000
tree c365dcfdc0b839a16e084927e6fa69197a91432c
parent 14a548c3776a81b6a6065b60abd9641b15a948ce

Enable CF for AdaptResourceFileNamesTest.

Change-Id: Idc87a8aa2597c8c88d6b95ded100e93890d13b49

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index ecaae31..2af67a4 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -828,9 +828,9 @@
   }
 
   public static R8Command.Builder prepareR8CommandBuilder(
-      AndroidApp app, DiagnosticsHandler diagnosticsHandler) {
+      AndroidApp app, ProgramConsumer programConsumer, DiagnosticsHandler diagnosticsHandler) {
     return R8Command.builder(app, diagnosticsHandler)
-        .setProgramConsumer(DexIndexedConsumer.emptyConsumer())
+        .setProgramConsumer(programConsumer)
         .setProguardMapConsumer(StringConsumer.emptyConsumer());
   }
 

src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java b/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java
index dbe6541..ce44e58 100644
--- a/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.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.StringConsumer;
@@ -33,6 +35,8 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -40,9 +44,23 @@
 import java.util.stream.Collectors;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
+@RunWith(Parameterized.class)
 public class AdaptResourceFileNamesTest extends ProguardCompatabilityTestBase {
 
+  private Backend backend;
+
+  @Parameterized.Parameters(name = "Backend: {0}")
+  public static Collection<Backend> data() {
+    return Arrays.asList(Backend.values());
+  }
+
+  public AdaptResourceFileNamesTest(Backend backend) {
+    this.backend = backend;
+  }
+
   private static final Path CF_DIR =
       Paths.get(ToolHelper.EXAMPLES_CF_DIR).resolve("adaptresourcefilenames");
   private static final Path TEST_JAR =
@@ -238,10 +256,20 @@
       StringConsumer proguardMapConsumer,
       List<DataEntryResource> dataResources)
       throws CompilationFailedException, IOException {
+    assert backend == Backend.DEX || backend == Backend.CF;
     R8Command command =
         ToolHelper.allowTestProguardOptions(
-                ToolHelper.prepareR8CommandBuilder(getAndroidApp(dataResources), diagnosticsHandler)
+                ToolHelper.prepareR8CommandBuilder(
+                        getAndroidApp(dataResources),
+                        backend == Backend.DEX
+                            ? DexIndexedConsumer.emptyConsumer()
+                            : ClassFileConsumer.emptyConsumer(),
+                        diagnosticsHandler)
                     .addProguardConfiguration(ImmutableList.of(proguardConfig), Origin.unknown()))
+            .addLibraryFiles(
+                backend == Backend.DEX
+                    ? ToolHelper.getDefaultAndroidJar()
+                    : ToolHelper.getJava8RuntimeJar())
             .build();
     return ToolHelper.runR8(
         command,
@@ -251,6 +279,7 @@
           options.enableClassMerging = true;
           options.dataResourceConsumer = dataResourceConsumer;
           options.proguardMapConsumer = proguardMapConsumer;
+          options.testing.suppressExperimentalCfBackendWarning = true;
         });
   }