Pass by ref tests added

samarjit · samarjit · commit db197da2d584 · 2012-12-03T12:22:36.000+08:00
diff --git a/src/main/java/MyTest.java b/src/main/java/MyTest.java
@@ -22,7 +22,7 @@ public static void main(String[] args) {
 		//"stoogearray":[["Curly","Larry","Moe"]],"array":[null,null]}
 //{"stooge":"Shemp","stooges":["Curly","Larry","Moe"],"stoogearray":["Curly","Larry","Moe"],"array":[]}
 		
-        Collection<Object> collection = new ArrayList<Object>();
+       /* Collection<Object> collection = new ArrayList<Object>();
         Map<String, Object> map =  new HashMap<String, Object>();
 
         JSONObject jsonobject = new JSONObject(map);
@@ -49,7 +49,13 @@ public static void main(String[] args) {
 		System.out.println( JSONML.toString(jsonobject));
 		
 		jsonarray = JSONML.toJSONArray(string);
-		System.out.println(jsonarray);
+		System.out.println(jsonarray);*/
+		JSONObject jsonobject = new JSONObject();
+    	JSONObject localobj = new JSONObject();
+    	localobj.put("a","old");
+    	jsonobject.put("passre",localobj);
+		localobj.put("b","new");
+		System.out.println(jsonobject.toString());
 	}
 
 }
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
@@ -589,7 +589,7 @@ public JSONArray put(Collection value) {
     /**
      * Put a value in the JSONArray, where the value will be a
      * JSONArray which is produced from a Collection.
-     * Do not wrap JSONArray, pass by value
+     * Do not wrap JSONArray, pass by ref
      * @param value A Collection value.
      * @return      this.
      */
@@ -668,7 +668,7 @@ public JSONArray put(JSONObject value) {
     /**
      * Append an object value. This increases the array's length by one.
      * @param value An object value.  The value should be a
-     *  Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     *  Boolean, Double, Integer, JSONArray,<strike> JSONObject,</strike> Long, or String, or the
      *  JSONObject.NULL object.
      * @return this.
      */
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -1125,7 +1125,7 @@ public JSONObject put(String key, Map value) throws JSONException {
      * then the key will be removed from the JSONObject if it is present.
      * @param key   A key string.
      * @param value An object which is the value. It should be of one of these
-     *  types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String,
+     *  types: Boolean, Double, Integer, JSONArray, <strike>JSONObject,</strike> Long, String,
      *  or the JSONObject.NULL object.
      * @return this.
      * @throws JSONException If the value is non-finite number
diff --git a/src/test/java/org/json/tests/TestJSONArray.java b/src/test/java/org/json/tests/TestJSONArray.java
@@ -1439,4 +1439,29 @@ public void testRemove()
         }
     }
     
+    /**
+     * This should call JSONArray.put(JSONArray value) hence pass by ref
+     */
+    public void testPassByRefJSONArray(){
+    	JSONArray localar = new JSONArray();
+		jsonarray = new JSONArray();
+		localar.put("old");
+		jsonarray.put(localar);
+		localar.put("new");
+		assertEquals("[[\"old\",\"new\"]]",jsonarray.toString());
+    }
+    
+    /**
+     * This should call JSONArray.put(JSONObject value) instead of JSONObject.put(Map value) 
+     * to simulate pass by ref
+     */
+    public void testPassByRefJSONObject(){
+    	JSONObject jsonobject = new JSONObject();
+		jsonarray = new JSONArray();
+		jsonobject.put("a","old");
+		jsonarray.put(jsonobject);
+		jsonobject.put("b","new");
+		assertEquals("[{\"b\":\"new\",\"a\":\"old\"}]",jsonarray.toString());
+    }
+    
 }
diff --git a/src/test/java/org/json/tests/TestJSONObject.java b/src/test/java/org/json/tests/TestJSONObject.java
@@ -2507,4 +2507,29 @@ public static void testDoubleToString()
         assertEquals("1.0E89", JSONObject.doubleToString(10e88));
         assertEquals("1.0E89", JSONObject.doubleToString(10E88));
     }
+    
+    /**
+     * This should call JSONObject.put(Object value) hence pass by ref
+     */
+    public void testPassByRefJSONArray(){
+    	jsonobject = new JSONObject();
+		jsonarray = new JSONArray();
+		jsonarray.put("old");
+		jsonobject.put("ar",jsonarray);
+		jsonarray.put("new");
+		assertEquals("{\"ar\":[\"old\",\"new\"]}",jsonobject.toString());
+    }
+    
+    /**
+     * This should call JSONObject.put(JSONObject value) instead of JSONObject.put(Map value) 
+     * to simulate pass by ref
+     */
+    public void testPassByRefJSONObject(){
+    	jsonobject = new JSONObject();
+    	JSONObject localobj = new JSONObject();
+    	localobj.put("a","old");
+    	jsonobject.put("passrefmap",localobj);
+		localobj.put("b","new");
+		assertEquals("{\"passrefmap\":{\"b\":\"new\",\"a\":\"old\"}}",jsonobject.toString());
+    }
 }
