commit 4566dc799336fdd83cd0847c3c3cf593342c53c1
author Morten Krogh-Jespersen <mkroghj@google.com> Thu May 27 23:22:35 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu May 27 23:22:35 2021 +0200
tree c563781c79ac0785ce8e7cedbf6ebcf324d0d19d
parent 5d126c68b9d7445f85e2b5071e93f96c4137181e

Add expectation for invalid argument count to ChromeProtoRewritingTest

Change-Id: I5c859a269f621595e714a588e9d66461c97fe61f

src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java b/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java
index 4e784a3..ff19143 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/ChromeProtoRewritingTest.java
@@ -8,6 +8,7 @@
 import static com.android.tools.r8.internal.proto.ProtoShrinkingTestBase.keepAllProtosRule;
 import static com.android.tools.r8.internal.proto.ProtoShrinkingTestBase.keepDynamicMethodSignatureRule;
 import static com.android.tools.r8.internal.proto.ProtoShrinkingTestBase.keepNewMessageInfoSignatureRule;
+import static com.android.tools.r8.utils.codeinspector.Matchers.invalidGenericArgumentApplicationCount;
 import static com.android.tools.r8.utils.codeinspector.Matchers.proguardConfigurationRuleDoesNotMatch;
 import static com.android.tools.r8.utils.codeinspector.Matchers.typeVariableNotInScope;
 import static org.hamcrest.CoreMatchers.anyOf;
@@ -57,7 +58,10 @@
         .inspectDiagnosticMessages(
             diagnostics ->
                 diagnostics.assertAllInfosMatch(
-                    anyOf(typeVariableNotInScope(), proguardConfigurationRuleDoesNotMatch())))
+                    anyOf(
+                        typeVariableNotInScope(),
+                        invalidGenericArgumentApplicationCount(),
+                        proguardConfigurationRuleDoesNotMatch())))
         .inspect(this::inspect);
   }
 

src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java

diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java b/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
index 4f4b656..cbbbb14 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/Matchers.java
@@ -227,6 +227,12 @@
     return DiagnosticsMatcher.diagnosticMessage(containsString("A type variable is not in scope"));
   }
 
+  public static Matcher<Diagnostic> invalidGenericArgumentApplicationCount() {
+    return DiagnosticsMatcher.diagnosticMessage(
+        containsString(
+            "The applied generic arguments have different count than the expected formals"));
+  }
+
   public static Matcher<Diagnostic> proguardConfigurationRuleDoesNotMatch() {
     return DiagnosticsMatcher.diagnosticMessage(
         containsString("Proguard configuration rule does not match anything"));