commit a3f13ca720cd53b9511b07920bde12b575d192df
author Morten Krogh-Jespersen <mkroghj@google.com> Sat Oct 03 08:52:56 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Sat Oct 03 08:52:56 2020 +0200
tree d9a9b0e7fb6abaf60160fe1caf0529bd273fe79d
parent 6732a7a05956444b0e5cff442c498b0a7de46a98

Fix test expectation for GSON map test

Change-Id: I7bccf6cd93b0735798d0bc657201121590e0335e

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonMapTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonMapTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonMapTest.java
index d2ea8c4..fa5c6d3 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonMapTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonMapTest.java
@@ -4,8 +4,10 @@
 
 package com.android.tools.r8.desugar.desugaredlibrary.gson;
 
+import com.android.tools.r8.R8TestRunResult;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryTestBase;
+import com.android.tools.r8.desugar.desugaredlibrary.gson.TestClasses.TestClass;
 import com.android.tools.r8.utils.BooleanUtils;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -40,25 +42,30 @@
   public void testGsonMap() throws Exception {
     Assume.assumeTrue(requiresEmulatedInterfaceCoreLibDesugaring(parameters));
     KeepRuleConsumer keepRuleConsumer = createKeepRuleConsumer(parameters);
-    testForR8(parameters.getBackend())
-        .addProgramClassesAndInnerClasses(TestClasses.class)
-        .addProgramFiles(GSON_2_8_1_JAR)
-        .addKeepMainRule(TestClasses.TestClass.class)
-        .addKeepRuleFiles(GSON_CONFIGURATION)
-        .allowUnusedProguardConfigurationRules()
-        .addOptionsModification(opt -> opt.ignoreMissingClasses = true)
-        .allowDiagnosticMessages()
-        .enableCoreLibraryDesugaring(parameters.getApiLevel(), keepRuleConsumer)
-        .setMinApi(parameters.getApiLevel())
-        .compile()
-        .addDesugaredCoreLibraryRunClassPath(
-            this::buildDesugaredLibrary,
-            parameters.getApiLevel(),
-            keepRuleConsumer.get(),
-            shrinkDesugaredLibrary)
-        .run(parameters.getRuntime(), TestClasses.TestClass.class)
-        .assertSuccessWithOutputLines("true", "true", "false", "false", "false");
+    R8TestRunResult runResult =
+        testForR8(parameters.getBackend())
+            .addProgramClassesAndInnerClasses(TestClasses.class)
+            .addProgramFiles(GSON_2_8_1_JAR)
+            .addKeepMainRule(TestClass.class)
+            .addKeepRuleFiles(GSON_CONFIGURATION)
+            .allowUnusedProguardConfigurationRules()
+            .addOptionsModification(opt -> opt.ignoreMissingClasses = true)
+            .allowDiagnosticMessages()
+            .enableCoreLibraryDesugaring(parameters.getApiLevel(), keepRuleConsumer)
+            .setMinApi(parameters.getApiLevel())
+            .compile()
+            .addDesugaredCoreLibraryRunClassPath(
+                this::buildDesugaredLibrary,
+                parameters.getApiLevel(),
+                keepRuleConsumer.get(),
+                shrinkDesugaredLibrary)
+            .run(parameters.getRuntime(), TestClass.class);
     // TODO(b/167649682): Should be always true.
     // .assertSuccessWithOutputLines("true", "true", "true", "true", "true");
+    if (shrinkDesugaredLibrary) {
+      runResult.assertSuccessWithOutputLines("true", "true", "false", "false", "false");
+    } else {
+      runResult.assertSuccessWithOutputLines("true", "true", "false", "true", "false");
+    }
   }
 }