Merge "Add a test that we do not remove abstract methods if they only shadow library methods."
diff --git a/src/test/java/com/android/tools/r8/smali/CheckSwitchInTestClass.java b/src/test/java/com/android/tools/r8/smali/CheckSwitchInTestClass.java
index 53ee6dd..f47025a 100644
--- a/src/test/java/com/android/tools/r8/smali/CheckSwitchInTestClass.java
+++ b/src/test/java/com/android/tools/r8/smali/CheckSwitchInTestClass.java
@@ -5,9 +5,8 @@
package com.android.tools.r8.smali;
import java.lang.reflect.Method;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
public class CheckSwitchInTestClass {
public static void main(String[] args) throws Exception {
@@ -16,10 +15,10 @@
Method method = test.getMethod("test", int.class);
// Get keys and default value from arguments.
- List<Integer> keys = Arrays.stream(Arrays.copyOfRange(args, 0, args.length - 1))
- .map(Integer::parseInt)
- .sorted()
- .collect(Collectors.toList());
+ List<Integer> keys = new ArrayList<>();
+ for (int i = 0; i < args.length - 1; i++) {
+ keys.add(Integer.parseInt(args[i]));
+ }
int defaultValue = Integer.parseInt(args[args.length - 1]);
// Run over all keys and test a small interval around each.
diff --git a/src/test/java/com/android/tools/r8/smali/SwitchRewritingTest.java b/src/test/java/com/android/tools/r8/smali/SwitchRewritingTest.java
index e4ae46c..c256920 100644
--- a/src/test/java/com/android/tools/r8/smali/SwitchRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/smali/SwitchRewritingTest.java
@@ -534,4 +534,4 @@
runConvertCasesToIf(ImmutableList.of(
Integer.MIN_VALUE, 1000, 1001, 1002, 1003, 1004, Integer.MAX_VALUE), -100, 2);
}
-}
+}
\ No newline at end of file
