Update test expectations for Android S
Bug: 204601181
Change-Id: Ibb78c8479bbae80b48973ff2c3d5f2adde334d87
diff --git a/src/test/java/com/android/tools/r8/BackportedMethodListTest.java b/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
index 4ffaaa7..706126c 100644
--- a/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
+++ b/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
@@ -79,10 +79,18 @@
mode == Mode.LIBRARY_DESUGAR || apiLevel >= AndroidApiLevel.N.getLevel(),
backports.contains("java/util/OptionalLong#isEmpty()Z"));
- // Java 9, 10 and 11 methods.
- assertTrue(backports.contains("java/lang/StrictMath#multiplyExact(JI)J"));
- assertTrue(backports.contains("java/util/List#copyOf(Ljava/util/Collection;)Ljava/util/List;"));
+ // Java 9, 10 and 11 methods added at API level S.
+ assertEquals(
+ apiLevel < AndroidApiLevel.S.getLevel(),
+ backports.contains("java/lang/StrictMath#multiplyExact(JI)J"));
+ assertEquals(
+ apiLevel < AndroidApiLevel.S.getLevel(),
+ backports.contains("java/util/List#copyOf(Ljava/util/Collection;)Ljava/util/List;"));
+
+ // 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) {
