summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-29 20:22:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-29 20:22:18 +0000
commit1a11432d5e0bbe320f69603efb01730fb748305d (patch)
tree77386a5ce16f250830716eb4f92129d6a7a759bf
parentba4ab9fc1009fc0c453fc29a8ab93812904a52a6 (diff)
parentc75cd0a51c12a49893977532f6fac03f2beca21b (diff)
downloadlibcore-1a11432d5e0bbe320f69603efb01730fb748305d.zip
libcore-1a11432d5e0bbe320f69603efb01730fb748305d.tar.gz
libcore-1a11432d5e0bbe320f69603efb01730fb748305d.tar.bz2
Merge "Fix org.json.JSONTokenerTest#testNextStringUnicodeEscaped."
-rw-r--r--json/src/test/java/org/json/JSONTokenerTest.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/json/src/test/java/org/json/JSONTokenerTest.java b/json/src/test/java/org/json/JSONTokenerTest.java
index de3a59a..1152e46 100644
--- a/json/src/test/java/org/json/JSONTokenerTest.java
+++ b/json/src/test/java/org/json/JSONTokenerTest.java
@@ -402,7 +402,6 @@ public class JSONTokenerTest extends TestCase {
try {
new JSONTokener("abc\\u002\"").nextString('"');
fail();
- } catch (NumberFormatException e) {
} catch (JSONException e) {
}
try {
@@ -413,13 +412,13 @@ public class JSONTokenerTest extends TestCase {
try {
new JSONTokener("abc\\u \"").nextString('"');
fail();
- } catch (NumberFormatException e) {
+ } catch (JSONException e) {
}
assertEquals("abc\"def", new JSONTokener("abc\\u0022def\"ghi").nextString('"'));
try {
new JSONTokener("abc\\u000G\"").nextString('"');
fail();
- } catch (NumberFormatException e) {
+ } catch (JSONException e) {
}
}