Fix NewArrayTestRunner failure
Change-Id: I6eeb370df808bdc0deb8e2e64ff66ac367e1e936
diff --git a/src/test/java/com/android/tools/r8/examples/newarray/NewArray.java b/src/test/java/com/android/tools/r8/examples/newarray/NewArray.java
index b1f2693..2f57c56 100644
--- a/src/test/java/com/android/tools/r8/examples/newarray/NewArray.java
+++ b/src/test/java/com/android/tools/r8/examples/newarray/NewArray.java
@@ -16,7 +16,40 @@
}
public static void printArray(int[] array) {
- for (int i : array) System.out.println(i);
+ System.out.print("[");
+ if (array.length > 0) {
+ System.out.print(array[0]);
+ for (int i = 1; i < array.length; i++) {
+ System.out.print(",");
+ System.out.print(i);
+ }
+ }
+ System.out.println("]");
+ }
+
+ static void printIntermediate(boolean b) {
+ System.out.print(b);
+ System.out.print(",");
+ }
+
+ static void printIntermediate(double d) {
+ System.out.print(d);
+ System.out.print(",");
+ }
+
+ static void printIntermediate(float f) {
+ System.out.print(f);
+ System.out.print(",");
+ }
+
+ static void printIntermediate(int i) {
+ System.out.print(i);
+ System.out.print(",");
+ }
+
+ static void printIntermediate(long l) {
+ System.out.print(l);
+ System.out.print(",");
}
public static void test() {
@@ -88,24 +121,24 @@
int[][][][] i4 = new int[n][n][n][n];
int[][][][][] i5 = new int[n][n][n][n][n];
int[][][][][][] i6 = new int[n][n][n][n][n][n];
- System.out.println(i2.length);
- System.out.println(i3.length);
- System.out.println(i4.length);
- System.out.println(i5.length);
+ printIntermediate(i2.length);
+ printIntermediate(i3.length);
+ printIntermediate(i4.length);
+ printIntermediate(i5.length);
System.out.println(i6.length);
}
public static void newMultiDimensionalArrays2(int n1, int n2, int n3, int n4, int n5, int n6) {
int[][] i2 = new int[n1][n2];
- System.out.println(i2.length);
+ printIntermediate(i2.length);
int[][][] i3 = new int[n1][n2][n3];
- System.out.println(i3.length);
+ printIntermediate(i3.length);
int[][][][] i4 = new int[n1][n2][n3][n4];
- System.out.println(i4.length);
+ printIntermediate(i4.length);
int[][][][][] i5 = new int[n1][n2][n3][n4][n5];
- System.out.println(i5.length);
+ printIntermediate(i5.length);
int[][][][][][] i6 = new int[n1][n2][n3][n4][n5][n6];
- System.out.println(i6.length);
+ printIntermediate(i6.length);
int[][][][][][] i7 = new int[n1][n2][n1][n4][n5][n1];
System.out.println(i7.length);
}
@@ -115,9 +148,9 @@
int[][][][] i4 = new int[n][n][][];
int[][][][][][][] i7 = new int[n][n][n][n][n][n][];
int[][][][][][][][] i8 = new int[n][n][n][n][n][n][][];
- System.out.println(i3.length);
- System.out.println(i4.length);
- System.out.println(i7.length);
+ printIntermediate(i3.length);
+ printIntermediate(i4.length);
+ printIntermediate(i7.length);
System.out.println(i8.length);
}
@@ -130,21 +163,21 @@
float[][] a6 = new float[11][12];
double[][] a7 = new double[13][14];
A[][] a8 = new A[15][16];
- System.out.println(a1[0].length);
- System.out.println(a2[0].length);
- System.out.println(a3[0].length);
- System.out.println(a4[0].length);
- System.out.println(a5[0].length);
- System.out.println(a6[0].length);
- System.out.println(a7[0].length);
- System.out.println(a8[0].length);
- System.out.println(a1[0][0]);
- System.out.println(a2[0][0]);
- System.out.println(a3[0][0]);
- System.out.println(a4[0][0]);
- System.out.println(a5[0][0]);
- System.out.println(a6[0][0]);
- System.out.println(a7[0][0]);
+ printIntermediate(a1[0].length);
+ printIntermediate(a2[0].length);
+ printIntermediate(a3[0].length);
+ printIntermediate(a4[0].length);
+ printIntermediate(a5[0].length);
+ printIntermediate(a6[0].length);
+ printIntermediate(a7[0].length);
+ printIntermediate(a8[0].length);
+ printIntermediate(a1[0][0]);
+ printIntermediate(a2[0][0]);
+ printIntermediate(a3[0][0]);
+ printIntermediate(a4[0][0]);
+ printIntermediate(a5[0][0]);
+ printIntermediate(a6[0][0]);
+ printIntermediate(a7[0][0]);
System.out.println(a8[0][0]);
}
diff --git a/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java b/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java
index 4258edb..d980c97 100644
--- a/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java
+++ b/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java
@@ -8,6 +8,7 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
+import com.google.common.collect.ImmutableList;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -21,13 +22,39 @@
private final TestParameters parameters;
private final CompilationMode mode;
- private static final String EXPECTED =
- "0\n0\n1\n0\n1\n2\n0\n1\n2\n3\n0\n1\n2\n3\n4\n0\n1\n2\n3\n4\n5\n0\n1\n2\n3\n4\n5\n6\n0\n1\n"
- + "2\n3\n4\n5\n6\n7\n0\n1\n0\n3\n4\n0\n6\n7\n0\n0\n1\n0\n1\n2\n0\n1\n2\n3\n0\n1\n2\n3\n"
- + "4\n0\n1\n2\n3\n4\n5\n0\n1\n2\n3\n4\n5\n0\n1\n0\n4\n0\n0\n0\n1\n0\n1\n2\n0\n1\n2\n3\n"
- + "0\n1\n2\n3\n4\n0\n1\n2\n3\n4\n5\n0\n1\n2\n3\n4\n5\n6\n0\n1\n2\n0\n3\n4\n5\n6\n6\n6\n"
- + "6\n6\n6\n1\n1\n1\n1\n1\n1\n8\n8\n8\n8\n2\n4\n6\n8\n10\n12\n14\n16\nfalse\n0\n\0\n0\n"
- + "0\n0.0\n0.0\nnull\n";
+ private static final List<String> EXPECTED =
+ ImmutableList.of(
+ "[]",
+ "[0]",
+ "[0,1]",
+ "[0,1,2]",
+ "[0,1,2,3]",
+ "[0,1,2,3,4]",
+ "[0,1,2,3,4,5]",
+ "[0,1,2,3,4,5,6]",
+ "[0,1,2,3,4,5,6,7]",
+ "[0,1,2,3,4,5,6,7]",
+ "[]",
+ "[0]",
+ "[0,1]",
+ "[0,1,2]",
+ "[0,1,2,3]",
+ "[0,1,2,3,4]",
+ "[0,1,2,3,4,5]",
+ "[0,1,2,3,4,5,6,7,8,9,10]",
+ "[]",
+ "[0]",
+ "[0,1]",
+ "[0,1,2]",
+ "[0,1,2,3]",
+ "[0,1,2,3,4]",
+ "[0,1,2,3,4,5]",
+ "[0,1,2,3,4,5,6]",
+ "[0,1,2,3,4,5,6,7]",
+ "6,6,6,6,6",
+ "1,1,1,1,1,1",
+ "8,8,8,8",
+ "2,4,6,8,10,12,14,16,false,0,0,0,0,0.0,0.0,null");
@Parameterized.Parameters(name = "{0}, {1}")
public static List<Object[]> data() {
@@ -46,7 +73,7 @@
testForJvm(getStaticTemp())
.addProgramClassesAndInnerClasses(CLASS)
.run(parameters.getRuntime(), CLASS)
- .assertSuccessWithOutput(EXPECTED);
+ .assertSuccessWithOutputLines(EXPECTED);
}
@Test
@@ -57,7 +84,7 @@
.setMinApi(parameters.getApiLevel())
.setMode(mode)
.run(parameters.getRuntime(), CLASS)
- .assertSuccessWithOutput(EXPECTED);
+ .assertSuccessWithOutputLines(EXPECTED);
}
@Test
@@ -68,6 +95,6 @@
.setMinApi(parameters.getApiLevel())
.setMode(mode)
.run(parameters.getRuntime(), CLASS)
- .assertSuccessWithOutput(EXPECTED);
+ .assertSuccessWithOutputLines(EXPECTED);
}
}
