commit 870b990d15680f3fff4a2cc94cdb7bb501788155
author Ian Zerny <zerny@google.com> Wed May 19 12:06:17 2021 +0200
committer Ian Zerny <zerny@google.com> Wed May 19 18:30:09 2021 +0000
tree 036698206f638fadd7e1e70fc41bde8cc43aa551
parent 54ec60be3f4320a5605c57ac04ae2f904e973163

Check diagnostics in backport tests.

Change-Id: I95e42a81b9d5812de540787752f703ab01d29309

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

diff --git a/src/test/java/com/android/tools/r8/DiagnosticsMatcher.java b/src/test/java/com/android/tools/r8/DiagnosticsMatcher.java
index a800801..6517f6e 100644
--- a/src/test/java/com/android/tools/r8/DiagnosticsMatcher.java
+++ b/src/test/java/com/android/tools/r8/DiagnosticsMatcher.java
@@ -100,6 +100,16 @@
     explain(description.appendText("a diagnostic "));
   }
 
+  @Override
+  protected void describeMismatchSafely(Diagnostic item, Description mismatchDescription) {
+    mismatchDescription
+        .appendText("was ")
+        .appendText(item.getClass().getName())
+        .appendText(" with message(")
+        .appendValue(item.getDiagnosticMessage())
+        .appendText(")");
+  }
+
   protected abstract boolean eval(Diagnostic diagnostic);
 
   protected abstract void explain(Description description);

src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
index e4dd6d9..7f77265 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
@@ -4,14 +4,18 @@
 
 package com.android.tools.r8.desugar.backports;
 
+import static com.android.tools.r8.DiagnosticsMatcher.diagnosticMessage;
+import static com.android.tools.r8.DiagnosticsMatcher.diagnosticType;
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static java.util.stream.Collectors.toList;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestBuilder;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -148,7 +152,23 @@
           .setMinApi(parameters.getApiLevel())
           .apply(this::configureProgram)
           .setIncludeClassesChecksum(true)
-          .compile()
+          .compileWithExpectedDiagnostics(
+              diagnostics -> {
+                if (diagnostics.getWarnings().isEmpty()) {
+                  diagnostics.assertNoMessages();
+                  return;
+                }
+                // When compiling with an old android.jar some tests refer to non-present types.
+                // Check only java.util types are missing and that none of them are about the target
+                // type that is being backported.
+                diagnostics
+                    .assertOnlyWarnings()
+                    .assertAllWarningsMatch(
+                        diagnosticType(InterfaceDesugarMissingTypeDiagnostic.class))
+                    .assertAllWarningsMatch(diagnosticMessage(containsString("java.util")))
+                    .assertNoWarningsMatch(
+                        diagnosticMessage(containsString(targetClass.getName())));
+              })
           .run(parameters.getRuntime(), testClassName)
           .assertSuccess()
           .inspect(this::assertDesugaring);