commit ff085535fcdc834bfa38139f514af613944c0166
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 05 15:14:18 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 05 15:14:18 2022 +0200
tree 7eb43a37da0fbd31e03ba4d1fedf02a7b99da36d
parent 287d54149759c3dc8e437db380505ff9775c0a61

Update test expectation after change to marker

Change-Id: Ieffc85f7859e734706f7555d0585e436343118ec

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java
index de28b58..c9b6885 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java
@@ -22,6 +22,7 @@
 import com.android.tools.r8.LibraryDesugaringTestConfiguration;
 import com.android.tools.r8.TestDiagnosticMessages;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
 import com.android.tools.r8.dex.Marker;
 import com.android.tools.r8.dex.Marker.Tool;
@@ -76,18 +77,16 @@
     compileResult
         .run(parameters.getRuntime(), Part1.class)
         .assertSuccessWithOutputLines(getExpected());
+    boolean expectNoSuchMethodError =
+        parameters.isDexRuntime() && parameters.getDexRuntimeVersion().isOlderThan(Version.V7_0_0);
     compileResult
         .run(parameters.getRuntime(), Part2.class)
-        .assertFailureWithErrorThatThrowsIf(!isApiAvailable(), NoSuchMethodError.class)
-        .assertSuccessWithOutputLinesIf(isApiAvailable(), JAVA_RESULT);
-  }
-
-  private boolean isApiAvailable() {
-    return parameters.getApiLevel().getLevel() >= AndroidApiLevel.N.getLevel();
+        .assertFailureWithErrorThatThrowsIf(expectNoSuchMethodError, NoSuchMethodError.class)
+        .assertSuccessWithOutputLinesIf(!expectNoSuchMethodError, JAVA_RESULT);
   }
 
   private String getExpected() {
-    if (isApiAvailable()) {
+    if (parameters.getApiLevel().getLevel() >= AndroidApiLevel.N.getLevel()) {
       return JAVA_RESULT;
     } else {
       return J$_RESULT;