commit 01096409267b651d46874b9c692bfc6ed06876ab
author Clément Béra <clementbera@google.com> Mon May 23 14:50:07 2022 +0200
committer Clément Béra <clementbera@google.com> Mon May 23 14:50:07 2022 +0200
tree 4b5cb678e19938a4dae618ae105ea18c49eb3a7c
parent be4a0494fdaf7ddb70988a0ab8ee6e9bdedd8393

Fix InvalidLibraryTest expectation

fix red bot

Bug: b:233555819
Change-Id: I2cabbaa89206fccd676f32f05b208a33285b0096

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/InvalidLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/InvalidLibraryTest.java
index 397a46f..d22793d 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/InvalidLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/InvalidLibraryTest.java
@@ -6,7 +6,6 @@
 
 import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.D8_L8DEBUG;
 import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.D8_L8SHRINK;
-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;
 
@@ -83,8 +82,8 @@
   @Test
   public void testClasspathSupertype() throws Exception {
     Assume.assumeTrue(
-        requiresAnyCoreLibDesugaring(
-            parameters.getApiLevel(), libraryDesugaringSpecification != JDK8));
+        "Date is present in the library above O",
+        parameters.getApiLevel().isLessThan(AndroidApiLevel.O));
     testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
         .addProgramClasses(Executor.class, LocalClass.class, LocalClassOverride.class)
         .addClasspathClasses(SuperLibraryClass.class)
@@ -104,8 +103,8 @@
   @Test
   public void testNullSupertype() throws Exception {
     Assume.assumeTrue(
-        requiresAnyCoreLibDesugaring(
-            parameters.getApiLevel(), libraryDesugaringSpecification != JDK8));
+        "Date is present in the library above O",
+        parameters.getApiLevel().isLessThan(AndroidApiLevel.O));
     testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
         .addProgramClasses(Executor.class, LocalClass.class, LocalClassOverride.class)
         .setCustomLibrarySpecification(