commit 9ae7d721e651e47f48334cc15a06980d194bbcc8
author Clément Béra <clementbera@google.com> Tue May 17 12:57:32 2022 +0200
committer Clément Béra <clementbera@google.com> Tue May 17 12:57:32 2022 +0200
tree 96cd9fd282d5e1256446b279c9d643c6e0e867cf
parent 6e82a709f0b4dabc1b1d8b7c9c31f64d59660642

Fix test expectations

Bug: b:232780224
Change-Id: I89f50b18b3e004c695a2dd9a25b6ecacb3d16541

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLocalDateReflectedTypePassedToStaticType.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLocalDateReflectedTypePassedToStaticType.java
index 9f7e5e7..5d63b50 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLocalDateReflectedTypePassedToStaticType.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLocalDateReflectedTypePassedToStaticType.java
@@ -5,14 +5,15 @@
 package com.android.tools.r8.desugar.desugaredlibrary;
 
 import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.DEFAULT_SPECIFICATIONS;
+import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK8;
 import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
 import static org.hamcrest.core.StringContains.containsString;
 
 import com.android.tools.r8.SingleTestRunResult;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
 import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
-import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.StringUtils;
 import java.time.LocalDate;
 import java.util.List;
@@ -33,7 +34,7 @@
   @Parameters(name = "{0}, spec: {1}, {2}")
   public static List<Object[]> data() {
     return buildParameters(
-        getTestParameters().withDexRuntimes().withAllApiLevels().build(),
+        getTestParameters().withDexRuntime(Version.DEFAULT).withAllApiLevels().build(),
         getJdk8Jdk11(),
         DEFAULT_SPECIFICATIONS);
   }
@@ -55,17 +56,11 @@
             .addInnerClasses(DesugaredLocalDateReflectedTypePassedToStaticType.class)
             .addKeepMainRule(Main.class)
             .run(parameters.getRuntime(), Main.class);
-    if (compilationSpecification.isL8Shrink() && requiresTimeDesugaring(parameters)) {
+    if (compilationSpecification.isL8Shrink()
+        && requiresTimeDesugaring(parameters, libraryDesugaringSpecification != JDK8)) {
       run.assertFailureWithErrorThatMatches(containsString("java.lang.NoSuchMethodException"));
     } else {
-      // TODO(b/232780224): Evaluate this.
-      if (compilationSpecification.isL8Shrink()
-          && libraryDesugaringSpecification.isJdk11Based()
-          && parameters.getApiLevel().betweenBothIncluded(AndroidApiLevel.O, AndroidApiLevel.Q)) {
-        run.assertFailureWithErrorThatMatches(containsString("java.lang.NoSuchMethodException"));
-      } else {
-        run.assertSuccessWithOutput(EXPECTED);
-      }
+      run.assertSuccessWithOutput(EXPECTED);
     }
   }