Merge pull request #968 from marilynel/master

Update keepStrings behavior to reflect changes in keepBooleanAsString, keepNumberAsString

Author: stleary

src/main/java/org/json/XMLParserConfiguration.java

@@ -224,6 +224,7 @@ protected XMLParserConfiguration clone() {
     @Override
     public XMLParserConfiguration withKeepStrings(final boolean newVal) {
         XMLParserConfiguration newConfig = this.clone();
+        newConfig.keepStrings = newVal;
         newConfig.keepNumberAsString = newVal;
         newConfig.keepBooleanAsString = newVal;
         return newConfig;
@@ -241,6 +242,7 @@ public XMLParserConfiguration withKeepStrings(final boolean newVal) {
     public XMLParserConfiguration withKeepNumberAsString(final boolean newVal) {
         XMLParserConfiguration newConfig = this.clone();
         newConfig.keepNumberAsString = newVal;
+        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
         return newConfig;
     }
 
@@ -256,6 +258,7 @@ public XMLParserConfiguration withKeepNumberAsString(final boolean newVal) {
     public XMLParserConfiguration withKeepBooleanAsString(final boolean newVal) {
         XMLParserConfiguration newConfig = this.clone();
         newConfig.keepBooleanAsString = newVal;
+        newConfig.keepStrings = newConfig.keepBooleanAsString && newConfig.keepNumberAsString;
         return newConfig;
     }
 

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

@@ -794,6 +794,31 @@ public void testToJSONArray_jsonOutput_withKeepBooleanAsString() {
         Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
     }
 
+    /**
+     * Test keepStrings behavior when setting keepBooleanAsString, keepNumberAsString
+     */
+    @Test
+    public void test_keepStringBehavior() {
+        XMLParserConfiguration xpc = new XMLParserConfiguration().withKeepStrings(true);
+        assertEquals(xpc.isKeepStrings(), true);
+
+        xpc = xpc.withKeepBooleanAsString(true);
+        xpc = xpc.withKeepNumberAsString(false);
+        assertEquals(xpc.isKeepStrings(), false);
+
+        xpc = xpc.withKeepBooleanAsString(false);
+        xpc = xpc.withKeepNumberAsString(true);
+        assertEquals(xpc.isKeepStrings(), false);
+
+        xpc = xpc.withKeepBooleanAsString(true);
+        xpc = xpc.withKeepNumberAsString(true);
+        assertEquals(xpc.isKeepStrings(), true);
+
+        xpc = xpc.withKeepBooleanAsString(false);
+        xpc = xpc.withKeepNumberAsString(false);
+        assertEquals(xpc.isKeepStrings(), false);
+    }
+
     /**
      * JSON string cannot be reverted to original xml.
      */