Fix Red Test

Change-Id: I2da5a4ca9dc3797e2c68e71ea48234e58a0976a2

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

diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java b/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java
index 6674761..aa511f6 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java
@@ -6,6 +6,7 @@
 
 import static com.android.tools.r8.utils.FileUtils.JAR_EXTENSION;
 import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assume.assumeTrue;
 
@@ -13,6 +14,7 @@
 import com.android.tools.r8.D8TestBuilder;
 import com.android.tools.r8.D8TestCompileResult;
 import com.android.tools.r8.R8;
+import com.android.tools.r8.TestDiagnosticMessages;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.TestRuntime.CfVm;
@@ -126,12 +128,18 @@
     if (parameters.getApiLevel().getLevel() < AndroidApiLevel.O.getLevel()) {
       d8TestBuilder.addProgramFiles(getPathBackport());
     }
-    return d8TestBuilder
-        .setMinApi(parameters.getApiLevel())
-        .enableCoreLibraryDesugaring(parameters.getApiLevel())
-        .addOptionsModification(opt -> opt.testing.trackDesugaredAPIConversions = true)
-        .compile()
-        .assertNoWarningMessageThatMatches(containsString("andThen"))
+    D8TestCompileResult compile =
+        d8TestBuilder
+            .setMinApi(parameters.getApiLevel())
+            .enableCoreLibraryDesugaring(parameters.getApiLevel())
+            .addOptionsModification(opt -> opt.testing.trackDesugaredAPIConversions = true)
+            .compile();
+    TestDiagnosticMessages diagnosticMessages = compile.getDiagnosticMessages();
+    assertTrue(
+        diagnosticMessages.getWarnings().isEmpty()
+            || diagnosticMessages.getWarnings().stream()
+                .noneMatch(x -> x.getDiagnosticMessage().contains("andThen")));
+    return compile
         .addDesugaredCoreLibraryRunClassPath(
             this::buildDesugaredLibraryWithConversionExtension, parameters.getApiLevel())
         .withArt6Plus64BitsLib()