summaryrefslogtreecommitdiffstats
path: root/json
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-05-13 12:36:25 -0700
committerElliott Hughes <enh@google.com>2010-05-13 12:49:12 -0700
commitf33eae7e84eb6d3b0f4e86b59605bb3de73009f3 (patch)
treef6cb62c04ce2669d2fa4715fbab86d38c8fca06d /json
parentd21d78fd49a2d798218e8c8aefbddb26a0e71bbb (diff)
downloadlibcore-f33eae7e84eb6d3b0f4e86b59605bb3de73009f3.zip
libcore-f33eae7e84eb6d3b0f4e86b59605bb3de73009f3.tar.gz
libcore-f33eae7e84eb6d3b0f4e86b59605bb3de73009f3.tar.bz2
Remove all trailing whitespace from the dalvik team-maintained parts of libcore.
Gentlemen, you may now set your editors to "strip trailing whitespace"... Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b
Diffstat (limited to 'json')
-rw-r--r--json/src/test/java/org/json/JSONArrayTest.java2
-rw-r--r--json/src/test/java/org/json/JSONObjectTest.java6
-rw-r--r--json/src/test/java/org/json/JSONStringerTest.java2
-rw-r--r--json/src/test/java/org/json/JSONTokenerTest.java2
-rw-r--r--json/src/test/java/org/json/ParsingTest.java2
5 files changed, 7 insertions, 7 deletions
diff --git a/json/src/test/java/org/json/JSONArrayTest.java b/json/src/test/java/org/json/JSONArrayTest.java
index 09990b9..b3f95bb 100644
--- a/json/src/test/java/org/json/JSONArrayTest.java
+++ b/json/src/test/java/org/json/JSONArrayTest.java
@@ -418,7 +418,7 @@ public class JSONArrayTest extends TestCase {
JSONArray array = new JSONArray(Arrays.asList(5.5, Double.NaN));
assertNull(array.toString());
}
-
+
public void testListConstructorCopiesContents() throws JSONException {
List<Object> contents = Arrays.<Object>asList(5);
JSONArray array = new JSONArray(contents);
diff --git a/json/src/test/java/org/json/JSONObjectTest.java b/json/src/test/java/org/json/JSONObjectTest.java
index b896a7f..c2ae575 100644
--- a/json/src/test/java/org/json/JSONObjectTest.java
+++ b/json/src/test/java/org/json/JSONObjectTest.java
@@ -95,7 +95,7 @@ public class JSONObjectTest extends TestCase {
assertEquals("bar", object.optString("foo", "bar"));
assertNull(object.remove("foo"));
}
-
+
public void testEqualsAndHashCode() throws JSONException {
JSONObject a = new JSONObject();
JSONObject b = new JSONObject();
@@ -468,7 +468,7 @@ public class JSONObjectTest extends TestCase {
} catch (JSONException e) {
}
}
-
+
public void testObjectCoercion() throws JSONException {
JSONObject object = new JSONObject();
object.put("foo", "{}");
@@ -810,7 +810,7 @@ public class JSONObjectTest extends TestCase {
assertFalse(object.has("bar"));
assertFalse(object.has(null));
}
-
+
public void testOptNull() throws JSONException {
JSONObject object = new JSONObject();
object.put("foo", "bar");
diff --git a/json/src/test/java/org/json/JSONStringerTest.java b/json/src/test/java/org/json/JSONStringerTest.java
index 64c3a74..1e4e0ec 100644
--- a/json/src/test/java/org/json/JSONStringerTest.java
+++ b/json/src/test/java/org/json/JSONStringerTest.java
@@ -192,7 +192,7 @@ public class JSONStringerTest extends TestCase {
stringer.object();
stringer.key("").value(false);
stringer.endObject();
- assertEquals("{\"\":false}", stringer.toString()); // legit behaviour!
+ assertEquals("{\"\":false}", stringer.toString()); // legit behaviour!
}
public void testEscaping() throws JSONException {
diff --git a/json/src/test/java/org/json/JSONTokenerTest.java b/json/src/test/java/org/json/JSONTokenerTest.java
index 0d4f9d3..2ab2fcc 100644
--- a/json/src/test/java/org/json/JSONTokenerTest.java
+++ b/json/src/test/java/org/json/JSONTokenerTest.java
@@ -341,7 +341,7 @@ public class JSONTokenerTest extends TestCase {
assertEquals("ABC", new JSONTokener("ABC'DEF").nextString('\''));
assertEquals("ABC", new JSONTokener("ABC'''DEF").nextString('\''));
- // nextString permits slash-escaping of arbitrary characters!
+ // nextString permits slash-escaping of arbitrary characters!
assertEquals("ABC", new JSONTokener("A\\B\\C'DEF").nextString('\''));
JSONTokener tokener = new JSONTokener(" 'abc' 'def' \"ghi\"");
diff --git a/json/src/test/java/org/json/ParsingTest.java b/json/src/test/java/org/json/ParsingTest.java
index 98d9069..e2cb2c1 100644
--- a/json/src/test/java/org/json/ParsingTest.java
+++ b/json/src/test/java/org/json/ParsingTest.java
@@ -125,7 +125,7 @@ public class ParsingTest extends TestCase {
}
public void test64BitHexValues() throws JSONException {
- assertParsed("Large hex longs shouldn't be yield ints or strings",
+ assertParsed("Large hex longs shouldn't be yield ints or strings",
-1L, "0xFFFFFFFFFFFFFFFF");
}