reorganize classes so test data is separate from test cases

Author: johnjaylward

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

@@ -10,6 +10,9 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.json.junit.data.MyEnum;
+import org.json.junit.data.MyEnumClass;
+import org.json.junit.data.MyEnumField;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -195,7 +198,7 @@ public void enumValueToString() {
          * However, an enum within another class will not be rendered
          * unless that class overrides default toString() 
          */
-        String expectedStr3 = "\"org.json.junit.MyEnumClass@";
+        String expectedStr3 = "\"org.json.junit.data.MyEnumClass@";
         myEnumClass.setMyEnum(MyEnum.VAL1);
         myEnumClass.setMyEnumField(MyEnumField.VAL1);
         String str3 = JSONObject.valueToString(myEnumClass);

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

@@ -5,6 +5,7 @@
 import java.util.*;
 
 import org.json.*;
+import org.json.junit.data.MyLocaleBean;
 import org.junit.*;
 
 /**

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

@@ -30,6 +30,16 @@
 import org.json.JSONObject;
 import org.json.JSONPointerException;
 import org.json.XML;
+import org.json.junit.data.BrokenToString;
+import org.json.junit.data.Fraction;
+import org.json.junit.data.MyBean;
+import org.json.junit.data.MyBigNumberBean;
+import org.json.junit.data.MyEnum;
+import org.json.junit.data.MyEnumField;
+import org.json.junit.data.MyJsonString;
+import org.json.junit.data.MyNumber;
+import org.json.junit.data.MyNumberContainer;
+import org.json.junit.data.MyPublicClass;
 import org.junit.Test;
 
 import com.jayway.jsonpath.Configuration;
@@ -484,7 +494,7 @@ public void jsonObjectByObjectAndNames() {
     @Test
     public void jsonObjectByResourceBundle() {
         JSONObject jsonObject = new
-                JSONObject("org.json.junit.StringsResourceBundle",
+                JSONObject("org.json.junit.data.StringsResourceBundle",
                         Locale.getDefault());
 
         // validate JSON
@@ -2572,18 +2582,5 @@ public void toMap() {
         // assert that the new map is mutable
         assertTrue("Removing a key should succeed", map.remove("key3") != null);
         assertTrue("Map should have 2 elements", map.size() == 2);
-
-    }
-    
-    /**
-     * test class for verifying write errors.
-     * @author John Aylward
-     *
-     */
-    private static class BrokenToString {
-        @Override
-        public String toString() {
-            throw new IllegalStateException("Something went horribly wrong!");
-        }
     }
 }

src/test/java/org/json/junit/data/BrokenToString.java

@@ -0,0 +1,13 @@
+package org.json.junit.data;
+
+/**
+ * test class for verifying write errors.
+ * @author John Aylward
+ *
+ */
+public class BrokenToString {
+    @Override
+    public String toString() {
+        throw new IllegalStateException("Something went horribly wrong!");
+    }
+}

…c/test/java/org/json/junit/Fraction.java …t/java/org/json/junit/data/Fraction.javasrc/test/java/org/json/junit/Fraction.java renamed to src/test/java/org/json/junit/data/Fraction.java src/test/java/org/json/junit/Fraction.java renamed to src/test/java/org/json/junit/data/Fraction.java

@@ -1,4 +1,4 @@
-package org.json.junit;
+package org.json.junit.data;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

src/test/java/org/json/junit/MyBean.java …est/java/org/json/junit/data/MyBean.javasrc/test/java/org/json/junit/MyBean.java renamed to src/test/java/org/json/junit/data/MyBean.java src/test/java/org/json/junit/MyBean.java renamed to src/test/java/org/json/junit/data/MyBean.java

@@ -1,11 +1,11 @@
-package org.json.junit;
+package org.json.junit.data;
 
 import java.io.*;
 
 /**
  * Used in testing when Bean behavior is needed
  */
-interface MyBean {
+public interface MyBean {
     public Integer getIntKey();
     public Double getDoubleKey();
     public String getStringKey();

…java/org/json/junit/MyBigNumberBean.java …org/json/junit/data/MyBigNumberBean.javasrc/test/java/org/json/junit/MyBigNumberBean.java renamed to src/test/java/org/json/junit/data/MyBigNumberBean.java src/test/java/org/json/junit/MyBigNumberBean.java renamed to src/test/java/org/json/junit/data/MyBigNumberBean.java

@@ -1,11 +1,11 @@
-package org.json.junit;
+package org.json.junit.data;
 
 import java.math.*;
 
 /**
  * Used in testing when a Bean containing big numbers is needed
  */
-interface MyBigNumberBean {
+public interface MyBigNumberBean {
     public BigInteger getBigInteger();
     public BigDecimal getBigDecimal();
 }

src/test/java/org/json/junit/MyEnum.java …est/java/org/json/junit/data/MyEnum.javasrc/test/java/org/json/junit/MyEnum.java renamed to src/test/java/org/json/junit/data/MyEnum.java src/test/java/org/json/junit/MyEnum.java renamed to src/test/java/org/json/junit/data/MyEnum.java

@@ -1,4 +1,4 @@
-package org.json.junit;
+package org.json.junit.data;
 
 /**
  * An enum with no methods or data

…est/java/org/json/junit/MyEnumClass.java …ava/org/json/junit/data/MyEnumClass.javasrc/test/java/org/json/junit/MyEnumClass.java renamed to src/test/java/org/json/junit/data/MyEnumClass.java src/test/java/org/json/junit/MyEnumClass.java renamed to src/test/java/org/json/junit/data/MyEnumClass.java

@@ -1,4 +1,4 @@
-package org.json.junit;
+package org.json.junit.data;
 
 /**
  * this is simply a class that contains some enum instances

…est/java/org/json/junit/MyEnumField.java …ava/org/json/junit/data/MyEnumField.javasrc/test/java/org/json/junit/MyEnumField.java renamed to src/test/java/org/json/junit/data/MyEnumField.java src/test/java/org/json/junit/MyEnumField.java renamed to src/test/java/org/json/junit/data/MyEnumField.java

@@ -1,4 +1,4 @@
-package org.json.junit;
+package org.json.junit.data;
 
 /**
  * An enum that contains getters and some internal fields