Merge pull request #30 from stleary/confirmValueToStringFix

Fix tabs, add valueToString() test to JSONObjectTest

Author: stleary

JSONArrayTest.java

@@ -93,62 +93,62 @@ public void badObject() {
      */
     @Test
     public void verifyConstructor() {
-	
-	final JSONArray expected = new JSONArray("[10]");
-	
-	@SuppressWarnings("rawtypes")
-	Collection myRawC = Collections.singleton(Integer.valueOf(10));
-	JSONArray jaRaw = new JSONArray(myRawC);
-
-	Collection<Integer> myCInt = Collections.singleton(Integer.valueOf(10));
-	JSONArray jaInt = new JSONArray(myCInt);
-
-	Collection<Object> myCObj = Collections.singleton((Object) Integer
-		.valueOf(10));
-	JSONArray jaObj = new JSONArray(myCObj);
-
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaRaw));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaInt));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaObj));
+        
+        final JSONArray expected = new JSONArray("[10]");
+        
+        @SuppressWarnings("rawtypes")
+        Collection myRawC = Collections.singleton(Integer.valueOf(10));
+        JSONArray jaRaw = new JSONArray(myRawC);
+
+        Collection<Integer> myCInt = Collections.singleton(Integer.valueOf(10));
+        JSONArray jaInt = new JSONArray(myCInt);
+
+        Collection<Object> myCObj = Collections.singleton((Object) Integer
+                .valueOf(10));
+        JSONArray jaObj = new JSONArray(myCObj);
+
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaRaw));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaInt));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaObj));
     }
 
     /**
      * Verifies that the put Collection has backwards compatability with RAW types pre-java5.
      */
     @Test
     public void verifyPutCollection() {
-	
-	final JSONArray expected = new JSONArray("[[10]]");
-
-	@SuppressWarnings("rawtypes")
-	Collection myRawC = Collections.singleton(Integer.valueOf(10));
-	JSONArray jaRaw = new JSONArray();
-	jaRaw.put(myRawC);
-
-	Collection<Object> myCObj = Collections.singleton((Object) Integer
-		.valueOf(10));
-	JSONArray jaObj = new JSONArray();
-	jaObj.put(myCObj);
-
-	Collection<Integer> myCInt = Collections.singleton(Integer.valueOf(10));
-	JSONArray jaInt = new JSONArray();
-	jaInt.put(myCInt);
-
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaRaw));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaObj));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaInt));
+        
+        final JSONArray expected = new JSONArray("[[10]]");
+
+        @SuppressWarnings("rawtypes")
+        Collection myRawC = Collections.singleton(Integer.valueOf(10));
+        JSONArray jaRaw = new JSONArray();
+        jaRaw.put(myRawC);
+
+        Collection<Object> myCObj = Collections.singleton((Object) Integer
+                .valueOf(10));
+        JSONArray jaObj = new JSONArray();
+        jaObj.put(myCObj);
+
+        Collection<Integer> myCInt = Collections.singleton(Integer.valueOf(10));
+        JSONArray jaInt = new JSONArray();
+        jaInt.put(myCInt);
+
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaRaw));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaObj));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaInt));
     }
 
 
@@ -157,41 +157,41 @@ public void verifyPutCollection() {
      */
     @Test
     public void verifyPutMap() {
-	
-	final JSONArray expected = new JSONArray("[{\"myKey\":10}]");
-
-	@SuppressWarnings("rawtypes")
-	Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
-	JSONArray jaRaw = new JSONArray();
-	jaRaw.put(myRawC);
-
-	Map<String, Object> myCStrObj = Collections.singletonMap("myKey",
-		(Object) Integer.valueOf(10));
-	JSONArray jaStrObj = new JSONArray();
-	jaStrObj.put(myCStrObj);
-
-	Map<String, Integer> myCStrInt = Collections.singletonMap("myKey",
-		Integer.valueOf(10));
-	JSONArray jaStrInt = new JSONArray();
-	jaStrInt.put(myCStrInt);
-
-	Map<?, ?> myCObjObj = Collections.singletonMap((Object) "myKey",
-		(Object) Integer.valueOf(10));
-	JSONArray jaObjObj = new JSONArray();
-	jaObjObj.put(myCObjObj);
-
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaRaw));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaStrObj));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaStrInt));
-	assertTrue(
-		"The RAW Collection should give me the same as the Typed Collection",
-		expected.similar(jaObjObj));
+        
+        final JSONArray expected = new JSONArray("[{\"myKey\":10}]");
+
+        @SuppressWarnings("rawtypes")
+        Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
+        JSONArray jaRaw = new JSONArray();
+        jaRaw.put(myRawC);
+
+        Map<String, Object> myCStrObj = Collections.singletonMap("myKey",
+                (Object) Integer.valueOf(10));
+        JSONArray jaStrObj = new JSONArray();
+        jaStrObj.put(myCStrObj);
+
+        Map<String, Integer> myCStrInt = Collections.singletonMap("myKey",
+                Integer.valueOf(10));
+        JSONArray jaStrInt = new JSONArray();
+        jaStrInt.put(myCStrInt);
+
+        Map<?, ?> myCObjObj = Collections.singletonMap((Object) "myKey",
+                (Object) Integer.valueOf(10));
+        JSONArray jaObjObj = new JSONArray();
+        jaObjObj.put(myCObjObj);
+
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaRaw));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaStrObj));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaStrInt));
+        assertTrue(
+                "The RAW Collection should give me the same as the Typed Collection",
+                expected.similar(jaObjObj));
     }
 
     /**