From 8aa5270666c7bf1f588edf9b3286352ae3fa867a Mon Sep 17 00:00:00 2001 From: Alex Light Date: Mon, 12 Jun 2017 08:48:28 -0700 Subject: Remove method reference from test 988 It was causing the test to fail if we tried to build it with javac-dx toolchain. Rewrite it to use a normal anonymous inner class. Test: ./test/run-test --build-with-javac-dx --host 988-method-trace Change-Id: I1ac3b6a3db79cc9c09ee2f7e9558c278fc7fc88f --- test/988-method-trace/expected.txt | 32 +++++++++++++++--------------- test/988-method-trace/src/art/Test988.java | 6 +++++- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/test/988-method-trace/expected.txt b/test/988-method-trace/expected.txt index 8c67d66b7c..d3d9249b1f 100644 --- a/test/988-method-trace/expected.txt +++ b/test/988-method-trace/expected.txt @@ -142,10 +142,10 @@ fibonacci(5)=5 ......=> private static native java.lang.Object java.lang.Throwable.nativeFillInStackTrace() ......<= private static native java.lang.Object java.lang.Throwable.nativeFillInStackTrace() -> > .....<= public synchronized java.lang.Throwable java.lang.Throwable.fillInStackTrace() -> ....<= public java.lang.Throwable(java.lang.String) -> @@ -162,10 +162,10 @@ fibonacci(5)=5 ...<= private void java.util.ArrayList.ensureExplicitCapacity(int) -> ..<= private void java.util.ArrayList.ensureCapacityInternal(int) -> fibonacci(-19) -> java.lang.Error: Bad argument: -19 < 0 - at art.Test988.iter_fibonacci(Test988.java:203) - at art.Test988$IterOp.applyAsInt(Test988.java:198) - at art.Test988.doFibTest(Test988.java:291) - at art.Test988.run(Test988.java:261) + at art.Test988.iter_fibonacci(Test988.java:207) + at art.Test988$IterOp.applyAsInt(Test988.java:202) + at art.Test988.doFibTest(Test988.java:295) + at art.Test988.run(Test988.java:265) at Main.main(Main.java:19) .<= public boolean java.util.ArrayList.add(java.lang.Object) -> @@ -243,10 +243,10 @@ fibonacci(-19) -> java.lang.Error: Bad argument: -19 < 0 ......=> private static native java.lang.Object java.lang.Throwable.nativeFillInStackTrace() ......<= private static native java.lang.Object java.lang.Throwable.nativeFillInStackTrace() -> > .....<= public synchronized java.lang.Throwable java.lang.Throwable.fillInStackTrace() -> ....<= public java.lang.Throwable(java.lang.String) -> @@ -263,10 +263,10 @@ fibonacci(-19) -> java.lang.Error: Bad argument: -19 < 0 ...<= private void java.util.ArrayList.ensureExplicitCapacity(int) -> ..<= private void java.util.ArrayList.ensureCapacityInternal(int) -> fibonacci(-19) -> java.lang.Error: Bad argument: -19 < 0 - at art.Test988.fibonacci(Test988.java:225) - at art.Test988$RecurOp.applyAsInt(Test988.java:220) - at art.Test988.doFibTest(Test988.java:291) - at art.Test988.run(Test988.java:262) + at art.Test988.fibonacci(Test988.java:229) + at art.Test988$RecurOp.applyAsInt(Test988.java:224) + at art.Test988.doFibTest(Test988.java:295) + at art.Test988.run(Test988.java:266) at Main.main(Main.java:19) .<= public boolean java.util.ArrayList.add(java.lang.Object) -> diff --git a/test/988-method-trace/src/art/Test988.java b/test/988-method-trace/src/art/Test988.java index 6ac7b11313..37ff136b6c 100644 --- a/test/988-method-trace/src/art/Test988.java +++ b/test/988-method-trace/src/art/Test988.java @@ -89,7 +89,11 @@ public class Test988 { Class klass = val.getClass(); if ((new Object[0]).getClass().isAssignableFrom(klass)) { return Arrays.toString( - Arrays.stream((Object[])val).map(Test988::genericToString).toArray()); + Arrays.stream((Object[])val).map(new Function() { + public String apply(Object o) { + return Test988.genericToString(o); + } + }).toArray()); } else if ((new byte[0]).getClass().isAssignableFrom(klass)) { return Arrays.toString((byte[])val); } else if ((new char[0]).getClass().isAssignableFrom(klass)) { -- cgit v1.2.3-59-g8ed1b