diff options
author | Andreas Gampe <agampe@google.com> | 2015-05-07 16:44:58 -0700 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2015-05-07 16:46:53 -0700 |
commit | 678e6959d5af8e7b07bf51f1648516c146bdf8d2 (patch) | |
tree | ddca45af39d2a4bb5a285dcf47a8833ab7761eb1 /test/082-inline-execute | |
parent | 7b4de07fffc6dbbbd986bb21b212fa0c4a2aec58 (diff) | |
download | art-678e6959d5af8e7b07bf51f1648516c146bdf8d2.zip art-678e6959d5af8e7b07bf51f1648516c146bdf8d2.tar.gz art-678e6959d5af8e7b07bf51f1648516c146bdf8d2.tar.bz2 |
ART: Refactor 082-inline-execute
Refactor the indexOf intrinsics tests so that the optimizing
compiler would actually compile them.
Bug: 20889065
Change-Id: I69bfda7fa3eb4ce42c593203731e3ddd61f7e1ed
Diffstat (limited to 'test/082-inline-execute')
-rw-r--r-- | test/082-inline-execute/src/Main.java | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/test/082-inline-execute/src/Main.java b/test/082-inline-execute/src/Main.java index 0e90c4d..abd6cb8 100644 --- a/test/082-inline-execute/src/Main.java +++ b/test/082-inline-execute/src/Main.java @@ -236,15 +236,6 @@ public class Main { String str10 = "abcdefghij"; String str40 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabc"; - int supplementaryChar = 0x20b9f; - String surrogatePair = "\ud842\udf9f"; - String stringWithSurrogates = "hello " + surrogatePair + " world"; - - Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar), "hello ".length()); - Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar, 2), "hello ".length()); - Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar, 6), 6); - Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar, 7), -1); - Assert.assertEquals(str0.indexOf('a'), -1); Assert.assertEquals(str3.indexOf('a'), 0); Assert.assertEquals(str3.indexOf('b'), 1); @@ -269,24 +260,49 @@ public class Main { Assert.assertEquals(str40.indexOf('a',10), 10); Assert.assertEquals(str40.indexOf('b',40), -1); + testIndexOfNull(); + + testSurrogateIndexOf(); + } + + private static void testSurrogateIndexOf() { + int supplementaryChar = 0x20b9f; + String surrogatePair = "\ud842\udf9f"; + String stringWithSurrogates = "hello " + surrogatePair + " world"; + + Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar), "hello ".length()); + Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar, 2), "hello ".length()); + Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar, 6), 6); + Assert.assertEquals(stringWithSurrogates.indexOf(supplementaryChar, 7), -1); + } + + private static void testIndexOfNull() { String strNull = null; try { - strNull.indexOf('a'); + testNullIndex(strNull, 'a'); Assert.fail(); } catch (NullPointerException expected) { } try { - strNull.indexOf('a', 0); + testNullIndex(strNull, 'a', 0); Assert.fail(); } catch (NullPointerException expected) { } try { - strNull.indexOf('a', -1); + testNullIndex(strNull, 'a', -1); Assert.fail(); } catch (NullPointerException expected) { } } + private static int testNullIndex(String strNull, int c) { + return strNull.indexOf(c); + } + + private static int testNullIndex(String strNull, int c, int startIndex) { + return strNull.indexOf(c, startIndex); + } + public static void test_String_compareTo() { String test = "0123456789"; String test1 = new String("0123456789"); // different object |