diff options
author | Jeff Hao <jeffhao@google.com> | 2014-01-15 13:49:50 -0800 |
---|---|---|
committer | Jeff Hao <jeffhao@google.com> | 2015-04-27 18:54:52 -0700 |
commit | 848f70a3d73833fc1bf3032a9ff6812e429661d9 (patch) | |
tree | b0349b3a40aab5a915af491b100659a5ca9fbbf6 /test/201-built-in-exception-detail-messages | |
parent | d14438f0c5071962be7fab572b54687d32d9d087 (diff) | |
download | art-848f70a3d73833fc1bf3032a9ff6812e429661d9.tar.gz art-848f70a3d73833fc1bf3032a9ff6812e429661d9.tar.bz2 art-848f70a3d73833fc1bf3032a9ff6812e429661d9.zip |
Replace String CharArray with internal uint16_t array.
Summary of high level changes:
- Adds compiler inliner support to identify string init methods
- Adds compiler support (quick & optimizing) with new invoke code path
that calls method off the thread pointer
- Adds thread entrypoints for all string init methods
- Adds map to verifier to log when receiver of string init has been
copied to other registers. used by compiler and interpreter
Change-Id: I797b992a8feb566f9ad73060011ab6f51eb7ce01
Diffstat (limited to 'test/201-built-in-exception-detail-messages')
-rw-r--r-- | test/201-built-in-exception-detail-messages/src/Main.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/test/201-built-in-exception-detail-messages/src/Main.java b/test/201-built-in-exception-detail-messages/src/Main.java index 24ee6e0eb3..52d4259330 100644 --- a/test/201-built-in-exception-detail-messages/src/Main.java +++ b/test/201-built-in-exception-detail-messages/src/Main.java @@ -358,7 +358,8 @@ public class Main { field.set(new A(), 5); fail(); } catch (IllegalArgumentException expected) { - assertEquals("field A.b has type java.lang.String, got java.lang.Integer", expected.getMessage()); + assertEquals("field A.b has type java.lang.String, got java.lang.Integer", + expected.getMessage()); } // Can't unbox null to a primitive. @@ -385,7 +386,8 @@ public class Main { m.invoke(new A(), 2, 2); fail(); } catch (IllegalArgumentException expected) { - assertEquals("method A.m argument 2 has type java.lang.String, got java.lang.Integer", expected.getMessage()); + assertEquals("method A.m argument 2 has type java.lang.String, got java.lang.Integer", + expected.getMessage()); } // Can't pass null as an int. @@ -409,21 +411,24 @@ public class Main { m.invoke("hello", "world"); // Wrong type. fail(); } catch (IllegalArgumentException iae) { - assertEquals("method java.lang.String.charAt argument 1 has type int, got java.lang.String", iae.getMessage()); + assertEquals("method java.lang.String.charAt! argument 1 has type int, got java.lang.String", + iae.getMessage()); } try { Method m = String.class.getMethod("charAt", int.class); m.invoke("hello", (Object) null); // Null for a primitive argument. fail(); } catch (IllegalArgumentException iae) { - assertEquals("method java.lang.String.charAt argument 1 has type int, got null", iae.getMessage()); + assertEquals("method java.lang.String.charAt! argument 1 has type int, got null", + iae.getMessage()); } try { Method m = String.class.getMethod("charAt", int.class); m.invoke(new Integer(5)); // Wrong type for 'this'. fail(); } catch (IllegalArgumentException iae) { - assertEquals("Expected receiver of type java.lang.String, but got java.lang.Integer", iae.getMessage()); + assertEquals("Expected receiver of type java.lang.String, but got java.lang.Integer", + iae.getMessage()); } try { Method m = String.class.getMethod("charAt", int.class); |