commit 35119572001fc0237e3d01b5310c6b06cf281236
author clementbera <clementbera@google.com> Wed Jul 31 14:01:42 2019 +0200
committer Clément Béra <clementbera@google.com> Wed Jul 31 12:02:22 2019 +0000
tree 0eb3f67d4eb697cbbcc41102ce3eebd48b820aef
parent 2122fcc03c372c73f634e322d41d62a302cbd14c

Fix tests

- Typos + Fixes in error messages in
  R8/L8 commands
- Merging error in testProgramR8

Change-Id: I12e5e5817e464047c57353dcaffede1adafa2750

src/main/java/com/android/tools/r8/R8Command.java

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index b4043b2..2032bec 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -389,7 +389,7 @@
       }
       if (getSpecialLibraryConfiguration() != null
           && !getSpecialLibraryConfiguration().equals("default")) {
-        reporter.error("R8 currently require the special library configuration to be \"default\"");
+        reporter.error("R8 currently requires the special library configuration to be \"default\"");
       }
       super.validate();
     }

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

diff --git a/src/test/java/com/android/tools/r8/L8CommandTest.java b/src/test/java/com/android/tools/r8/L8CommandTest.java
index 25c57aa..55a8314 100644
--- a/src/test/java/com/android/tools/r8/L8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/L8CommandTest.java
@@ -111,7 +111,7 @@
   @Test(expected = CompilationFailedException.class)
   public void specialLibraryConfgurationMustBeDefault() throws Throwable {
     DiagnosticsChecker.checkErrorsContains(
-        "L8 currently require special library configuration to be \"default\"",
+        "L8 currently requires the special library configuration to be \"default\"",
         (handler) ->
             prepareBuilder(handler)
                 .addSpecialLibraryConfiguration("not default")

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

diff --git a/src/test/java/com/android/tools/r8/R8CommandTest.java b/src/test/java/com/android/tools/r8/R8CommandTest.java
index f30f6f5..aa29a22 100644
--- a/src/test/java/com/android/tools/r8/R8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/R8CommandTest.java
@@ -626,15 +626,14 @@
   }
 
   @Test(expected = CompilationFailedException.class)
-  public void specialLibraryConfigurationNotSupported() throws Throwable {
-    Path emptyZip = temp.getRoot().toPath().resolve("empty.zip");
+  public void specialLibraryConfgurationMustBeDefault() throws Throwable {
     DiagnosticsChecker.checkErrorsContains(
-        "R8 does not support special library configuration",
+        "R8 currently requires the special library configuration to be \"default\"",
         handler ->
             R8.run(
                 R8Command.builder(handler)
-                    .addSpecialLibraryConfiguration("default")
-                    .setOutput(emptyZip, OutputMode.DexIndexed)
+                    .addSpecialLibraryConfiguration("not default")
+                    .setProgramConsumer(DexIndexedConsumer.emptyConsumer())
                     .build()));
   }
 

src/test/java/com/android/tools/r8/desugar/corelib/EmulateLibraryInterfaceTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/EmulateLibraryInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/corelib/EmulateLibraryInterfaceTest.java
index 7f748f4..19763ad 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/EmulateLibraryInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/EmulateLibraryInterfaceTest.java
@@ -175,8 +175,8 @@
   @Test
   public void testProgramR8() throws Exception {
     Assume.assumeTrue("No desugaring for high API levels", requiresCoreLibDesugaring(parameters));
-    Box<String> keepRulesHolder = new Box<>("");
     for (Boolean minifying : BooleanUtils.values()) {
+      Box<String> keepRulesHolder = new Box<>("");
       R8TestRunResult r8TestRunResult =
           testForR8(parameters.getBackend())
               .minification(minifying)