commit 28d332c720cb7c9c0163c4844bb0c1a2a067470e
author Jeff Hao <jeffhao@google.com> Tue May 12 21:46:16 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 12 21:46:17 2015 +0000
tree d06a72736529db0a16988588022ea084b362472c
parent 85c63973b00b6c091f9b380e99733dbfad6b5874
parent da3749ef05977911cdc059b7daa53d5799c7acaf

Merge "Add test for String init called from unresolvable class."

test/127-secondarydex/expected.txt

diff --git a/test/127-secondarydex/expected.txt b/test/127-secondarydex/expected.txt
index 29a1411..1c8defb 100644
--- a/test/127-secondarydex/expected.txt
+++ b/test/127-secondarydex/expected.txt
@@ -1,3 +1,4 @@
 testSlowPathDirectInvoke
 Test
 Got null pointer exception
+Test

test/127-secondarydex/src/Main.java

diff --git a/test/127-secondarydex/src/Main.java b/test/127-secondarydex/src/Main.java
index c921c5b..0ede8ed 100644
--- a/test/127-secondarydex/src/Main.java
+++ b/test/127-secondarydex/src/Main.java
@@ -24,6 +24,7 @@
 public class Main {
     public static void main(String[] args) {
         testSlowPathDirectInvoke();
+        testString();
     }
 
     public static void testSlowPathDirectInvoke() {
@@ -40,4 +41,11 @@
             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());
+    }
 }

test/127-secondarydex/src/Test.java

diff --git a/test/127-secondarydex/src/Test.java b/test/127-secondarydex/src/Test.java
index 82cb901..8547e79 100644
--- a/test/127-secondarydex/src/Test.java
+++ b/test/127-secondarydex/src/Test.java
@@ -22,4 +22,8 @@
     private void print() {
         System.out.println("Test");
     }
+
+    public String toString() {
+        return new String("Test");
+    }
 }