Factor out Writer from Appendable tests.

Author: run2000

src/test/java/org/json/junit/JSONArrayTest.java

@@ -802,24 +802,36 @@ public void optQueryWithSyntaxError() {
     @Test
     public void write() {
         String str = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":2,\"key3\":3}]";
-        String expectedStr = str;
         JSONArray jsonArray = new JSONArray(str);
+        String expectedStr = str;
         StringWriter stringWriter = new StringWriter();
         Writer writer = jsonArray.write(stringWriter);
         String actualStr = writer.toString();
         assertTrue("write() expected " + expectedStr +
-                        "but found " + actualStr,
+                        " but found " + actualStr,
                 expectedStr.equals(actualStr));
+    }
+
+    /**
+     * Exercise the JSONArray write() method using Appendable.
+     */
+/*
+    @Test
+    public void writeAppendable() {
+        String str = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":2,\"key3\":3}]";
+        JSONArray jsonArray = new JSONArray(str);
+        String expectedStr = str;
         StringBuilder stringBuilder = new StringBuilder();
         Appendable appendable = jsonArray.write(stringBuilder);
-        actualStr = appendable.toString();
+        String actualStr = appendable.toString();
         assertTrue("write() expected " + expectedStr +
-                        "but found " + actualStr,
+                        " but found " + actualStr,
                 expectedStr.equals(actualStr));
     }
+*/
 
     /**
-     * Exercise the JSONArray write(Appendable, int, int) method
+     * Exercise the JSONArray write(Writer, int, int) method
      */
     @Test
     public void write3Param() {
@@ -834,23 +846,51 @@ public void write3Param() {
                 "     \"key3\": 3.14\n" +
                 "   }\n" +
                 " ]";
-        String expectedStr = str0;
         JSONArray jsonArray = new JSONArray(str0);
+        String expectedStr = str0;
         StringWriter stringWriter = new StringWriter();
         Writer writer = jsonArray.write(stringWriter, 0, 0);
         String actualStr = writer.toString();
         assertEquals(expectedStr, actualStr);
-        expectedStr = str0;
+
+        expectedStr = str2;
+        stringWriter = new StringWriter();
+        writer = jsonArray.write(stringWriter, 2, 1);
+        actualStr = writer.toString();
+        assertEquals(expectedStr, actualStr);
+    }
+
+    /**
+     * Exercise the JSONArray write(Appendable, int, int) method
+     */
+/*
+    @Test
+    public void write3ParamAppendable() {
+        String str0 = "[\"value1\",\"value2\",{\"key1\":1,\"key2\":false,\"key3\":3.14}]";
+        String str2 =
+                "[\n" +
+                        "   \"value1\",\n" +
+                        "   \"value2\",\n" +
+                        "   {\n" +
+                        "     \"key1\": 1,\n" +
+                        "     \"key2\": false,\n" +
+                        "     \"key3\": 3.14\n" +
+                        "   }\n" +
+                        " ]";
+        JSONArray jsonArray = new JSONArray(str0);
+        String expectedStr = str0;
         StringBuilder stringBuilder = new StringBuilder();
         Appendable appendable = jsonArray.write(stringBuilder, 0, 0);
-        actualStr = appendable.toString();
+        String actualStr = appendable.toString();
         assertEquals(expectedStr, actualStr);
+
         expectedStr = str2;
         stringBuilder = new StringBuilder();
         appendable = jsonArray.write(stringBuilder, 2, 1);
         actualStr = appendable.toString();
         assertEquals(expectedStr, actualStr);
     }
+*/
 
     /**
      * Exercise JSONArray toString() method with various indent levels.

src/test/java/org/json/junit/JSONObjectTest.java

@@ -1916,18 +1916,30 @@ public void write() {
         Writer writer = jsonObject.write(stringWriter);
         String actualStr = writer.toString();
         assertTrue("write() expected " +expectedStr+
-                "but found " +actualStr,
+                " but found " +actualStr,
                 expectedStr.equals(actualStr));
+    }
+
+    /**
+     * Exercise the JSONObject write() method
+     */
+/*
+    @Test
+    public void writeAppendable() {
+        String str = "{\"key1\":\"value1\",\"key2\":[1,2,3]}";
+        String expectedStr = str;
+        JSONObject jsonObject = new JSONObject(str);
         StringBuilder stringBuilder = new StringBuilder();
         Appendable appendable = jsonObject.write(stringBuilder);
-        actualStr = appendable.toString();
+        String actualStr = appendable.toString();
         assertTrue("write() expected " +expectedStr+
-                        "but found " +actualStr,
+                        " but found " +actualStr,
                 expectedStr.equals(actualStr));
     }
+*/
 
     /**
-     * Exercise the JSONObject write(Appendable, int, int) method
+     * Exercise the JSONObject write(Writer, int, int) method
      */
     @Test
     public void write3Param() {
@@ -1941,23 +1953,50 @@ public void write3Param() {
                 "     3.14\n" +
                 "   ]\n" +
                 " }";
-        String expectedStr = str0;
         JSONObject jsonObject = new JSONObject(str0);
+        String expectedStr = str0;
         StringWriter stringWriter = new StringWriter();
         Writer writer = jsonObject.write(stringWriter,0,0);
         String actualStr = writer.toString();
         assertEquals(expectedStr, actualStr);
-        expectedStr = str0;
+
+        expectedStr = str2;
+        stringWriter = new StringWriter();
+        writer = jsonObject.write(stringWriter,2,1);
+        actualStr = writer.toString();
+        assertEquals(expectedStr, actualStr);
+    }
+
+    /**
+     * Exercise the JSONObject write(Appendable, int, int) method
+     */
+/*
+    @Test
+    public void write3ParamAppendable() {
+        String str0 = "{\"key1\":\"value1\",\"key2\":[1,false,3.14]}";
+        String str2 =
+                "{\n" +
+                        "   \"key1\": \"value1\",\n" +
+                        "   \"key2\": [\n" +
+                        "     1,\n" +
+                        "     false,\n" +
+                        "     3.14\n" +
+                        "   ]\n" +
+                        " }";
+        JSONObject jsonObject = new JSONObject(str0);
+        String expectedStr = str0;
         StringBuilder stringBuilder = new StringBuilder();
         Appendable appendable = jsonObject.write(stringBuilder,0,0);
-        actualStr = appendable.toString();
+        String actualStr = appendable.toString();
         assertEquals(expectedStr, actualStr);
+
         expectedStr = str2;
         stringBuilder = new StringBuilder();
         appendable = jsonObject.write(stringBuilder,2,1);
         actualStr = appendable.toString();
         assertEquals(expectedStr, actualStr);
     }
+*/
 
     /**
      * Exercise the JSONObject equals() method