commit d0fd2784a108d452ace6aa3a6c0ca8b92d5bcf70
author Søren Gjesse <sgjesse@google.com> Tue Feb 28 10:19:51 2023 +0100
committer Søren Gjesse <sgjesse@google.com> Wed Mar 01 11:51:30 2023 +0000
tree 12a82429f09030c91e19bb99e8c541a727d9c7e6
parent 3bad06137b24e18dbc7f2e98f94e5c6c16aef788

Include latest API level when checking backported methods list

Change-Id: I20a08c7f30fe8b23c61bb0800ca472f0969cff47

src/test/java/com/android/tools/r8/BackportedMethodListTest.java

diff --git a/src/test/java/com/android/tools/r8/BackportedMethodListTest.java b/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
index 22d1e0a..5ef5e9c 100644
--- a/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
+++ b/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
@@ -75,17 +75,21 @@
         apiLevel < AndroidApiLevel.O.getLevel(),
         backports.contains("java/lang/Short#toUnsignedLong(S)J"));
 
-    // Java 9, 10 and 11 Optional methods which require Android N or library desugaring.
+    // Java 9, 10 and 11 Optional methods added at API level T
+    // They require Android N or library desugaring to be backported.
     // The methods are not backported in desugared library JDK 11 (already present).
     assertEquals(
-        (mode == Mode.LIBRARY_DESUGAR) || apiLevel >= AndroidApiLevel.N.getLevel(),
+        apiLevel < AndroidApiLevel.T.getLevel()
+            && (mode == Mode.LIBRARY_DESUGAR || apiLevel >= AndroidApiLevel.N.getLevel()),
         backports.contains(
             "java/util/Optional#or(Ljava/util/function/Supplier;)Ljava/util/Optional;"));
     assertEquals(
-        (mode == Mode.LIBRARY_DESUGAR) || apiLevel >= AndroidApiLevel.N.getLevel(),
+        apiLevel < AndroidApiLevel.T.getLevel()
+            && (mode == Mode.LIBRARY_DESUGAR || apiLevel >= AndroidApiLevel.N.getLevel()),
         backports.contains("java/util/OptionalInt#orElseThrow()I"));
     assertEquals(
-        (mode == Mode.LIBRARY_DESUGAR) || apiLevel >= AndroidApiLevel.N.getLevel(),
+        apiLevel < AndroidApiLevel.T.getLevel()
+            && (mode == Mode.LIBRARY_DESUGAR || apiLevel >= AndroidApiLevel.N.getLevel()),
         backports.contains("java/util/OptionalLong#isEmpty()Z"));
 
     // Java 9, 10 and 11 method added at API level S.
@@ -97,10 +101,16 @@
         apiLevel < AndroidApiLevel.S.getLevel(),
         backports.contains("java/util/List#copyOf(Ljava/util/Collection;)Ljava/util/List;"));
 
+    // Java 9, 10 and 11 method added at API level T.
+    assertEquals(
+        apiLevel < AndroidApiLevel.T.getLevel(),
+        backports.contains("java/lang/Integer#parseInt(Ljava/lang/CharSequence;III)I"));
+    assertEquals(
+        apiLevel < AndroidApiLevel.T.getLevel(),
+        backports.contains("java/lang/String#repeat(I)Ljava/lang/String;"));
+
     // Java 9, 10 and 11 methods not yet added.
-    assertTrue(backports.contains("java/lang/Integer#parseInt(Ljava/lang/CharSequence;III)I"));
     assertTrue(backports.contains("java/lang/Character#toString(I)Ljava/lang/String;"));
-    assertTrue(backports.contains("java/lang/String#repeat(I)Ljava/lang/String;"));
   }
 
   private void addLibraryDesugaring(BackportedMethodListCommand.Builder builder) {
@@ -129,7 +139,7 @@
 
   @Test
   public void testFile() throws Exception {
-    for (int apiLevel = 1; apiLevel < AndroidApiLevel.LATEST.getLevel(); apiLevel++) {
+    for (int apiLevel = 1; apiLevel <= AndroidApiLevel.LATEST.getLevel(); apiLevel++) {
       Path output = temp.newFile().toPath();
       BackportedMethodListCommand.Builder builder =
           BackportedMethodListCommand.builder().setMinApiLevel(apiLevel).setOutputPath(output);