Merge pull request stleary#45 from guywithnose/master

Testing

Author: douglascrockford

JSONML.java

@@ -163,7 +163,7 @@ private static Object parse(
 // attribute = value
 
                         attribute = (String)token;
-                        if (!arrayForm && (attribute == "tagName" || attribute == "childNode")) {
+                        if (!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute))) {
                             throw x.syntaxError("Reserved attribute.");
                         }
                         token = x.nextToken();
@@ -462,4 +462,4 @@ public static String toString(JSONObject jo) throws JSONException {
         }
         return sb.toString();
     }
-}
+}

JSONTokener.java

@@ -403,7 +403,7 @@ public char skipTo(char to) throws JSONException {
             int startIndex = this.index;
             int startCharacter = this.character;
             int startLine = this.line;
-            this.reader.mark(Integer.MAX_VALUE);
+            this.reader.mark(1000000);
             do {
                 c = this.next();
                 if (c == 0) {
@@ -443,4 +443,4 @@ public String toString() {
         return " at " + this.index + " [character " + this.character + " line " +
             this.line + "]";
     }
-}
+}

Test.java

@@ -0,0 +1,29 @@
+/*
+ * File:         SampleResourceBundle_en_US.java
+ * Author:       JSON.org
+ */
+package org.json.tests;
+
+import java.util.*;
+
+/**
+ * The Class SampleResourceBundle_en_US.
+ */
+public class SampleResourceBundle_en_US extends ListResourceBundle {
+    
+    /* (non-Javadoc)
+     * @see java.util.ListResourceBundle#getContents()
+     */
+    @Override
+    public Object[][] getContents() {
+        return contents;
+    }
+    
+    /** The contents. */
+    private Object[][] contents = {
+        { "ASCII", "American Standard Code for Information Interchange" },
+        { "JAVA.desc", "Just Another Vague Acronym" },
+        { "JAVA.data", "Sweet language" },
+        { "JSON", "JavaScript Object Notation" },
+    };
+}

tests/SampleResourceBundle_en_US.java

@@ -0,0 +1,28 @@
+/*
+ * File:         SampleResourceBundle_fr.java
+ * Author:       JSON.org
+ */
+package org.json.tests;
+
+import java.util.*;
+
+/**
+ * The Class SampleResourceBundle_fr.
+ */
+public class SampleResourceBundle_fr extends ListResourceBundle {
+    
+    /* (non-Javadoc)
+     * @see java.util.ListResourceBundle#getContents()
+     */
+    @Override
+    public Object[][] getContents() {
+        return contents;
+    }
+    
+    /** The contents. */
+    private Object[][] contents = {
+            { "ASCII", "Number that represent chraracters" },
+            { "JAVA", "The language you are running to see this" },
+            { "JSON", "What are we testing?" },
+        };
+}