commit be4a0494fdaf7ddb70988a0ab8ee6e9bdedd8393
author Clément Béra <clementbera@google.com> Mon May 23 14:08:52 2022 +0200
committer Clément Béra <clementbera@google.com> Mon May 23 12:09:22 2022 +0000
tree 9fdca02d4527104398b05277df64c1452b5daa1d
parent 31537f0fa4b0c402766a0e91dc686c0d45d21360

Fix test expectation

Fix red bot

Change-Id: I3e9f5bc7321f6647cb41794ad63c3a5515476a5f

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ProgramRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ProgramRewritingTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ProgramRewritingTest.java
index 4be3f44..8ed7907 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ProgramRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ProgramRewritingTest.java
@@ -84,7 +84,7 @@
   }
 
   @Test
-  public void testPriorityQueue() throws Throwable {
+  public void testRewriting() throws Throwable {
     Box<String> keepRules = new Box<>();
     SingleTestRunResult<?> run =
         testForDesugaredLibrary(
@@ -101,7 +101,15 @@
                         }))
             .compile()
             .inspect(this::checkRewrittenInvokes)
-            .inspectKeepRules(kr -> keepRules.set(String.join("\n", kr)))
+            .inspectKeepRules(
+                kr -> {
+                  if (parameters.getApiLevel().getLevel() < AndroidApiLevel.N.getLevel()) {
+                    keepRules.set(String.join("\n", kr));
+                  } else {
+                    assert kr == null;
+                    keepRules.set("");
+                  }
+                })
             .run(parameters.getRuntime(), TEST_CLASS);
     assertResultIsCorrect(run.getStdOut(), run.getStdErr(), keepRules.get());
   }