Fix JDK11 time test expectation Bug: b:233554025 Change-Id: I9534daaf8b0f27d350f75d60f79e7ca3f42391a7
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeAbstractTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeAbstractTests.java index bc89176..6cf5f77 100644 --- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeAbstractTests.java +++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeAbstractTests.java
@@ -176,7 +176,7 @@ }; static final String[] RAW_TEMPORAL_SUCCESSES_IF_BRIDGE = new String[] {"tck.java.time.TestIsoChronology"}; - static final String[] RAW_TEMPORAL_SUCCESSES_BUT_12 = + static final String[] RAW_TEMPORAL_SUCCESSES_UP_TO_11 = new String[] {"test.java.time.temporal.TestIsoWeekFields"}; static final String[] FORMAT_CHRONO_SUCCESSES = new String[] {
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeRawTemporalTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeRawTemporalTests.java index 2b9b95c..aa1f537 100644 --- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeRawTemporalTests.java +++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TimeRawTemporalTests.java
@@ -28,9 +28,9 @@ @Test public void testTime() throws Exception { testTime(RAW_TEMPORAL_SUCCESSES); - if (!parameters.getDexRuntimeVersion().isEqualTo(Version.V12_0_0)) { + if (parameters.getDexRuntimeVersion().isOlderThan(Version.V12_0_0)) { // In 12 some ISO is supported that other versions do not support. - testTime(RAW_TEMPORAL_SUCCESSES_BUT_12); + testTime(RAW_TEMPORAL_SUCCESSES_UP_TO_11); } // The bridge is always present with JDK11 due to partial desugaring between 26 and 33. // On JDK8 the bridge is absent in between 26 and 33.