diff options
author | Jeff Hao <jeffhao@google.com> | 2015-05-11 18:39:28 -0700 |
---|---|---|
committer | Jeff Hao <jeffhao@google.com> | 2015-05-12 11:15:47 -0700 |
commit | f450cf6b06255ead0a43a9e94dc2f2175e6f9849 (patch) | |
tree | 7a969f139cd1ae1b0f9595f4f19f119ecb4c1dd4 /test/127-secondarydex | |
parent | 3d8ac11e412aeb186e2e14270d09585bc34e229e (diff) | |
download | art-f450cf6b06255ead0a43a9e94dc2f2175e6f9849.tar.gz art-f450cf6b06255ead0a43a9e94dc2f2175e6f9849.tar.bz2 art-f450cf6b06255ead0a43a9e94dc2f2175e6f9849.zip |
Add test for String init called from unresolvable class.
Bug: 20971268
Change-Id: I0cb027f5e29667e9d522eb01a6b966cd69abb104
Diffstat (limited to 'test/127-secondarydex')
-rw-r--r-- | test/127-secondarydex/expected.txt | 1 | ||||
-rw-r--r-- | test/127-secondarydex/src/Main.java | 8 | ||||
-rw-r--r-- | test/127-secondarydex/src/Test.java | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/test/127-secondarydex/expected.txt b/test/127-secondarydex/expected.txt index 29a1411ad3..1c8defb6ec 100644 --- a/test/127-secondarydex/expected.txt +++ b/test/127-secondarydex/expected.txt @@ -1,3 +1,4 @@ testSlowPathDirectInvoke Test Got null pointer exception +Test diff --git a/test/127-secondarydex/src/Main.java b/test/127-secondarydex/src/Main.java index c921c5b0c8..0ede8ed2b2 100644 --- a/test/127-secondarydex/src/Main.java +++ b/test/127-secondarydex/src/Main.java @@ -24,6 +24,7 @@ import java.lang.reflect.Method; public class Main { public static void main(String[] args) { testSlowPathDirectInvoke(); + testString(); } public static void testSlowPathDirectInvoke() { @@ -40,4 +41,11 @@ public class Main { System.out.println("Got unexpected exception " + e); } } + + // For string change, test that String.<init> is compiled properly in + // secondary dex. See http://b/20870917 + public static void testString() { + Test t = new Test(); + System.out.println(t.toString()); + } } diff --git a/test/127-secondarydex/src/Test.java b/test/127-secondarydex/src/Test.java index 82cb901374..8547e791c2 100644 --- a/test/127-secondarydex/src/Test.java +++ b/test/127-secondarydex/src/Test.java @@ -22,4 +22,8 @@ public class Test extends Super { private void print() { System.out.println("Test"); } + + public String toString() { + return new String("Test"); + } } |