erik/JSON-java
erik/JSON-java
1
0
Fork 0
mirror of https://github.com/ethauvin/JSON-java.git synced 2025-06-17 07:50:52 -07:00
Code Releases Activity

Merge pull request #74 from johnjaylward/AndroidSupport

Browse source 
Correct expected position information in error messages
This commit is contained in:
Sean Leary 2017-07-06 18:08:20 -05:00 • committed by GitHub
commit 974a5f7d5d
10 changed files with 381 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

26
README.md
View file

@ -101,24 +101,26 @@ A unit test has the following stages:
| CDL.java | 98.8% | Reasonable test cases. | | CDL.java | 98.8% | Reasonable test cases. |
| Cookie.java | 98.9% | Reasonable test cases. | | Cookie.java | 98.9% | Reasonable test cases. |
| CookieList.java |96.5% | Reasonable test cases. | | CookieList.java |96.5% | Reasonable test cases. |
| EnumTest.java | n/a | Just documenting how enums are handled. | | HTTP.java | 98.8%| Coverage > 90% |
| HTTP.java | 98.7%| Coverage > 90% |
| HTTPTokener.java |93.2% | No test | | HTTPTokener.java |93.2% | No test |
| JSONArray.java |95.9% | Reasonable test cases | | JSONArray.java |88.3% | Reasonable test cases. Need new tests for newer API functions |
| JSONException.java | 26.7% | No test | | JSONException.java | 100% | No test |
| JSONML.java | 86.8%| In progress | | JSONML.java | 84.4%| In progress |
| JSONObject | 94.0% | Reasonable test cases | | JSONObject | 96.7% | Reasonable test cases |
| JSONObject.Null | 87.5% | No test | | JSONObject.Null | 77.8% | No test |
| JSONPointer | 96.3% | Reasonable test cases |
| JSONPointerException | 100% | No test |
| JSONString.java | | No test | | JSONString.java | | No test |
| JSONStringer.java | 93.8%| Coverage > 90% | | JSONStringer.java | 93.8%| Coverage > 90% |
| JSONTokener.java | 72.1% | In progress | | JSONTokener.java | 87.5% | In progress |
| JSONWriter.java | 87.5% | No test | | JSONWriter.java | 89.15% | No test |
| Property.java | 94.8% | Coverage > 90% | | Property.java | 95.8% | Coverage > 90% |
| XML.java | 87.4% | In progress | | XML.java | 77.3% | In progress |
| XMLTokener.java| 82.7%| No test | | XMLTokener.java| 82.4%| No test |
| Files used in test | | Files used in test |
| ------------- | | ------------- |
| EnumTest.java |
| MyBean.java | | MyBean.java |
| MyBigNumberBean.java | | MyBigNumberBean.java |
| MyEnum.java | | MyEnum.java |

73
src/test/java/org/json/junit/CDLTest.java
View file

@ -61,11 +61,11 @@ public class CDLTest {
String badLine = "Col1, \"Col2\nVal1, Val2"; String badLine = "Col1, \"Col2\nVal1, Val2";
try { try {
CDL.toJSONArray(badLine); CDL.toJSONArray(badLine);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Missing close quote '\"'. at 12 [character 0 line 2]". "Missing close quote '\"'. at 12 [character 0 line 2]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -78,11 +78,11 @@ public class CDLTest {
String badLine = "Col1, Col2\n\"Val1, Val2"; String badLine = "Col1, Col2\n\"Val1, Val2";
try { try {
CDL.toJSONArray(badLine); CDL.toJSONArray(badLine);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Missing close quote '\"'. at 23 [character 12 line 3]". "Missing close quote '\"'. at 22 [character 11 line 2]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -96,11 +96,11 @@ public class CDLTest {
String badLine = "C\0ol1, Col2\nVal1, Val2"; String badLine = "C\0ol1, Col2\nVal1, Val2";
try { try {
CDL.toJSONArray(badLine); CDL.toJSONArray(badLine);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Bad character 'o' (111). at 3 [character 4 line 1]". "Bad character 'o' (111). at 2 [character 3 line 1]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -114,11 +114,11 @@ public class CDLTest {
String badLine = "Col1, Col2\n\"Val1, \"\"Val2\"\""; String badLine = "Col1, Col2\n\"Val1, \"\"Val2\"\"";
try { try {
CDL.toJSONArray(badLine); CDL.toJSONArray(badLine);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Missing close quote '\"'. at 27 [character 16 line 3]". "Missing close quote '\"'. at 26 [character 15 line 2]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -128,7 +128,7 @@ public class CDLTest {
*/ */
@Test @Test
public void singleEscapedQuote(){ public void singleEscapedQuote(){
String singleEscape = "Col1, Col2\nVal1, \"\"\"Val2\""; String singleEscape = "Col1, Col2\nVal1, \"\"\"Val2\"";
JSONArray jsonArray = CDL.toJSONArray(singleEscape); JSONArray jsonArray = CDL.toJSONArray(singleEscape);
String cdlStr = CDL.toString(jsonArray); String cdlStr = CDL.toString(jsonArray);
@ -136,7 +136,22 @@ public class CDLTest {
assertTrue(cdlStr.contains("Col2")); assertTrue(cdlStr.contains("Col2"));
assertTrue(cdlStr.contains("Val1")); assertTrue(cdlStr.contains("Val1"));
assertTrue(cdlStr.contains("\"Val2")); assertTrue(cdlStr.contains("\"Val2"));
}
/**
* Assert that there is no error for a single escaped quote within a properly
* embedded quote when not the last value.
*/
@Test
public void singleEscapedQuoteMiddleString(){
String singleEscape = "Col1, Col2\nVal1, \"\"\"Val2\"\nVal 3,Val 4";
JSONArray jsonArray = CDL.toJSONArray(singleEscape);
String cdlStr = CDL.toString(jsonArray);
assertTrue(cdlStr.contains("Col1"));
assertTrue(cdlStr.contains("Col2"));
assertTrue(cdlStr.contains("Val1"));
assertTrue(cdlStr.contains("\"Val2"));
} }
/** /**
@ -149,12 +164,12 @@ public class CDLTest {
try { try {
CDL.toJSONArray(badLine); CDL.toJSONArray(badLine);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
System.out.println("Message" + e.getMessage()); System.out.println("Message" + e.getMessage());
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Bad character 'V' (86). at 20 [character 9 line 3]". "Bad character 'V' (86). at 20 [character 9 line 2]",
equals(e.getMessage())); e.getMessage());
} }
@ -186,8 +201,8 @@ public class CDLTest {
public void onlyColumnNames() { public void onlyColumnNames() {
String columnNameStr = "col1, col2, col3"; String columnNameStr = "col1, col2, col3";
JSONArray jsonArray = CDL.toJSONArray(columnNameStr); JSONArray jsonArray = CDL.toJSONArray(columnNameStr);
assertTrue("CDL should return null when only 1 row is given", assertNull("CDL should return null when only 1 row is given",
jsonArray == null); jsonArray);
} }
/** /**
@ -197,8 +212,8 @@ public class CDLTest {
public void emptyLinesToJSONArray() { public void emptyLinesToJSONArray() {
String str = " , , , \n , , , "; String str = " , , , \n , , , ";
JSONArray jsonArray = CDL.toJSONArray(str); JSONArray jsonArray = CDL.toJSONArray(str);
assertTrue("JSONArray should be null for no content", assertNull("JSONArray should be null for no content",
jsonArray == null); jsonArray);
} }
/** /**
@ -208,8 +223,8 @@ public class CDLTest {
public void emptyJSONArrayToString() { public void emptyJSONArrayToString() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
String str = CDL.toString(jsonArray); String str = CDL.toString(jsonArray);
assertTrue("CDL should return null for toString(null)", assertNull("CDL should return null for toString(null)",
str == null); str);
} }
/** /**
@ -218,8 +233,8 @@ public class CDLTest {
@Test @Test
public void nullJSONArraysToString() { public void nullJSONArraysToString() {
String str = CDL.toString(null, null); String str = CDL.toString(null, null);
assertTrue("CDL should return null for toString(null)", assertNull("CDL should return null for toString(null)",
str == null); str);
} }
/** /**

8
src/test/java/org/json/junit/CookieListTest.java
View file

@ -47,14 +47,14 @@ public class CookieListTest {
String cookieStr = "thisCookieHasNoEqualsChar"; String cookieStr = "thisCookieHasNoEqualsChar";
try { try {
CookieList.toJSONObject(cookieStr); CookieList.toJSONObject(cookieStr);
assertTrue("should throw an exception", false); fail("should throw an exception");
} catch (JSONException e) { } catch (JSONException e) {
/** /**
* Not sure of the missing char, but full string compare fails * Not sure of the missing char, but full string compare fails
*/ */
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
e.getMessage().startsWith("Expected '=' and instead saw '") && "Expected '=' and instead saw '' at 25 [character 26 line 1]",
e.getMessage().endsWith("' at 27 [character 28 line 1]")); e.getMessage());
} }
} }

24
src/test/java/org/json/junit/CookieTest.java
View file

@ -43,11 +43,11 @@ public class CookieTest {
String cookieStr = "thisCookieHasNoEqualsChar"; String cookieStr = "thisCookieHasNoEqualsChar";
try { try {
Cookie.toJSONObject(cookieStr); Cookie.toJSONObject(cookieStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
e.getMessage().startsWith("Expected '=' and instead saw '") "Expected '=' and instead saw '' at 25 [character 26 line 1]",
&& e.getMessage().endsWith("' at 27 [character 28 line 1]")); e.getMessage());
} }
} }
@ -61,11 +61,11 @@ public class CookieTest {
String cookieStr = "this=Cookie;myAttribute"; String cookieStr = "this=Cookie;myAttribute";
try { try {
Cookie.toJSONObject(cookieStr); Cookie.toJSONObject(cookieStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Missing '=' in cookie parameter. at 25 [character 26 line 1]". "Missing '=' in cookie parameter. at 23 [character 24 line 1]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -79,11 +79,11 @@ public class CookieTest {
String cookieStr = ""; String cookieStr = "";
try { try {
Cookie.toJSONObject(cookieStr); Cookie.toJSONObject(cookieStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
e.getMessage().startsWith("Expected '=' and instead saw '") && "Expected '=' and instead saw '' at 0 [character 1 line 1]",
e.getMessage().endsWith("' at 2 [character 3 line 1]")); e.getMessage());
} }
} }

6
src/test/java/org/json/junit/JSONArrayTest.java
View file

@ -74,9 +74,9 @@ public class JSONArrayTest {
try { try {
assertNull("Should throw an exception", new JSONArray(str)); assertNull("Should throw an exception", new JSONArray(str));
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expected an exception message", assertEquals("Expected an exception message",
"A JSONArray text must start with '[' at 1 [character 2 line 1]". "A JSONArray text must start with '[' at 0 [character 1 line 1]",
equals(e.getMessage())); e.getMessage());
} }
} }

64
src/test/java/org/json/junit/JSONMLTest.java
View file

@ -42,11 +42,11 @@ public class JSONMLTest {
String xmlStr = ""; String xmlStr = "";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Bad XML at 1 [character 2 line 1]". "Bad XML at 0 [character 1 line 1]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -95,11 +95,11 @@ public class JSONMLTest {
String xmlStr = "{ \"this is\": \"not xml\"}"; String xmlStr = "{ \"this is\": \"not xml\"}";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Bad XML at 25 [character 26 line 1]". "Bad XML at 23 [character 24 line 1]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -198,11 +198,11 @@ public class JSONMLTest {
"</addresses>"; "</addresses>";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misshaped tag at 176 [character 14 line 7]". "Misshaped tag at 176 [character 14 line 4]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -223,11 +223,11 @@ public class JSONMLTest {
"</addresses>"; "</addresses>";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misshaped meta tag at 216 [character 13 line 11]". "Misshaped meta tag at 215 [character 12 line 7]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -253,11 +253,11 @@ public class JSONMLTest {
"</addresses>"; "</addresses>";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misshaped meta tag at 215 [character 13 line 11]". "Misshaped meta tag at 214 [character 12 line 7]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -283,11 +283,11 @@ public class JSONMLTest {
"</addresses>"; "</addresses>";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misplaced '<' at 194 [character 5 line 10]". "Misplaced '<' at 194 [character 5 line 6]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -343,11 +343,11 @@ public class JSONMLTest {
"</addresses>"; "</addresses>";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misplaced '<' at 206 [character 1 line 12]". "Misplaced '<' at 206 [character 1 line 7]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -373,11 +373,11 @@ public class JSONMLTest {
"</addresses>"; "</addresses>";
try { try {
JSONML.toJSONArray(xmlStr); JSONML.toJSONArray(xmlStr);
assertTrue("Expecting an exception", false); fail("Expecting an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Expected 'CDATA[' at 204 [character 11 line 9]". "Expected 'CDATA[' at 204 [character 11 line 5]",
equals(e.getMessage())); e.getMessage());
} }
} }

48
src/test/java/org/json/junit/JSONObjectTest.java
View file

@ -1853,36 +1853,36 @@ public class JSONObjectTest {
String str = "abc"; String str = "abc";
assertNull("Expected an exception",new JSONObject(str)); assertNull("Expected an exception",new JSONObject(str));
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"A JSONObject text must begin with '{' at 1 [character 2 line 1]". "A JSONObject text must begin with '{' at 1 [character 2 line 1]",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// does not end with '}' // does not end with '}'
String str = "{"; String str = "{";
assertNull("Expected an exception",new JSONObject(str)); assertNull("Expected an exception",new JSONObject(str));
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"A JSONObject text must end with '}' at 2 [character 3 line 1]". "A JSONObject text must end with '}' at 1 [character 2 line 1]",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// key with no ':' // key with no ':'
String str = "{\"myKey\" = true}"; String str = "{\"myKey\" = true}";
assertNull("Expected an exception",new JSONObject(str)); assertNull("Expected an exception",new JSONObject(str));
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Expected a ':' after a key at 10 [character 11 line 1]". "Expected a ':' after a key at 10 [character 11 line 1]",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// entries with no ',' separator // entries with no ',' separator
String str = "{\"myKey\":true \"myOtherKey\":false}"; String str = "{\"myKey\":true \"myOtherKey\":false}";
assertNull("Expected an exception",new JSONObject(str)); assertNull("Expected an exception",new JSONObject(str));
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Expected a ',' or '}' at 15 [character 16 line 1]". "Expected a ',' or '}' at 15 [character 16 line 1]",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// append to wrong key // append to wrong key
@ -1891,9 +1891,9 @@ public class JSONObjectTest {
jsonObject.append("myKey", "hello"); jsonObject.append("myKey", "hello");
fail("Expected an exception"); fail("Expected an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"JSONObject[myKey] is not a JSONArray.". "JSONObject[myKey] is not a JSONArray.",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// increment wrong key // increment wrong key
@ -1902,9 +1902,9 @@ public class JSONObjectTest {
jsonObject.increment("myKey"); jsonObject.increment("myKey");
fail("Expected an exception"); fail("Expected an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Unable to increment [\"myKey\"].". "Unable to increment [\"myKey\"].",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// invalid key // invalid key
@ -1913,18 +1913,18 @@ public class JSONObjectTest {
jsonObject.get(null); jsonObject.get(null);
fail("Expected an exception"); fail("Expected an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Null key.". "Null key.",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// invalid numberToString() // invalid numberToString()
JSONObject.numberToString((Number)null); JSONObject.numberToString((Number)null);
fail("Expected an exception"); fail("Expected an exception");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Null pointer". "Null pointer",
equals(e.getMessage())); e.getMessage());
} }
try { try {
// null put key // null put key

22
src/test/java/org/json/junit/JSONPointerTest.java
View file

@ -1,8 +1,18 @@
package org.json.junit; package org.json.junit;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.json.*; import java.io.IOException;
import java.io.InputStream;
import org.json.JSONArray;
import org.json.JSONObject;
import org.json.JSONPointer;
import org.json.JSONPointerException;
import org.json.JSONTokener;
import org.junit.Test; import org.junit.Test;
public class JSONPointerTest { public class JSONPointerTest {
@ -10,8 +20,12 @@ public class JSONPointerTest {
private static final JSONObject document; private static final JSONObject document;
static { static {
document = new JSONObject(new JSONTokener( @SuppressWarnings("resource")
JSONPointerTest.class.getClassLoader().getResourceAsStream("jsonpointer-testdoc.json"))); InputStream resourceAsStream = JSONPointerTest.class.getClassLoader().getResourceAsStream("jsonpointer-testdoc.json");
if(resourceAsStream == null) {
throw new ExceptionInInitializerError("Unable to locate test file. Please check your development environment configuration");
}
document = new JSONObject(new JSONTokener(resourceAsStream));
} }
private Object query(String pointer) { private Object query(String pointer) {

201
src/test/java/org/json/junit/JSONTokenerTest.java Normal file
View file

@ -0,0 +1,201 @@
package org.json.junit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import org.json.JSONException;
import org.json.JSONTokener;
import org.junit.Test;
/**
* Test specific to the {@link org.json.JSONTokener} class.
* @author John Aylward
*
*/
public class JSONTokenerTest {
/**
* verify that back() fails as expected.
* @throws IOException thrown if something unexpected happens.
*/
@Test
public void verifyBackFailureZeroIndex() throws IOException {
try(Reader reader = new StringReader("some test string")) {
final JSONTokener tokener = new JSONTokener(reader);
try {
// this should fail since the index is 0;
tokener.back();
fail("Expected an exception");
} catch (JSONException e) {
assertEquals("Stepping back two steps is not supported", e.getMessage());
} catch (Exception e) {
fail("Unknown Exception type " + e.getClass().getCanonicalName()+" with message "+e.getMessage());
}
}
}
/**
* verify that back() fails as expected.
* @throws IOException thrown if something unexpected happens.
*/
@Test
public void verifyBackFailureDoubleBack() throws IOException {
try(Reader reader = new StringReader("some test string")) {
final JSONTokener tokener = new JSONTokener(reader);
tokener.next();
tokener.back();
try {
// this should fail since the index is 0;
tokener.back();
fail("Expected an exception");
} catch (JSONException e) {
assertEquals("Stepping back two steps is not supported", e.getMessage());
} catch (Exception e) {
fail("Unknown Exception type " + e.getClass().getCanonicalName()+" with message "+e.getMessage());
}
}
}
/**
* Tests the failure of the skipTo method with a buffered reader. Preferably
* we'd like this not to fail but at this time we don't have a good recovery.
*
* @throws IOException thrown if something unexpected happens.
*/
@Test
public void testSkipToFailureWithBufferedReader() throws IOException {
final byte[] superLongBuffer = new byte[1000001];
// fill our buffer
for(int i=0;i<superLongBuffer.length;i++) {
superLongBuffer[i] = 'A';
}
try(Reader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(superLongBuffer)))) {
final JSONTokener tokener = new JSONTokener(reader);
try {
// this should fail since the internal markAhead buffer is only 1,000,000
// but 'B' doesn't exist in our buffer that is 1,000,001 in size
tokener.skipTo('B');
fail("Expected exception");
} catch (JSONException e) {
assertEquals("Mark invalid", e.getMessage());
} catch (Exception e) {
fail("Unknown Exception type " + e.getClass().getCanonicalName()+" with message "+e.getMessage());
}
}
}
/**
* Tests the success of the skipTo method with a String reader.
*
* @throws IOException thrown if something unexpected happens.
*/
@Test
public void testSkipToSuccessWithStringReader() throws IOException {
final StringBuilder superLongBuffer = new StringBuilder(1000001);
// fill our buffer
for(int i=0;i<superLongBuffer.length();i++) {
superLongBuffer.append('A');
}
try(Reader reader = new StringReader(superLongBuffer.toString())) {
final JSONTokener tokener = new JSONTokener(reader);
try {
// this should not fail since the internal markAhead is ignored for StringReaders
tokener.skipTo('B');
} catch (Exception e) {
fail("Unknown Exception type " + e.getClass().getCanonicalName()+" with message "+e.getMessage());
}
}
}
/**
* Verify that next and back are working properly and tracking the correct positions
* with different new line combinations.
*/
@Test
public void testNextBackComboWithNewLines() {
final String testString = "this is\nA test\r\nWith some different\rNew Lines";
// ^ ^ ^ ^
// index positions 0 8 16 36
final JSONTokener tokener = new JSONTokener(testString);
assertEquals(" at 0 [character 1 line 1]", tokener.toString());
assertEquals('t',tokener.next());
assertEquals(" at 1 [character 2 line 1]", tokener.toString());
tokener.skipTo('\n');
assertEquals("skipTo() improperly modifying indexes"," at 7 [character 8 line 1]", tokener.toString());
assertEquals('\n',tokener.next());
assertEquals(" at 8 [character 0 line 2]", tokener.toString());
assertEquals('A',tokener.next());
assertEquals(" at 9 [character 1 line 2]", tokener.toString());
tokener.back();
assertEquals(" at 8 [character 0 line 2]", tokener.toString());
tokener.skipTo('\r');
assertEquals("skipTo() improperly modifying indexes"," at 14 [character 6 line 2]", tokener.toString());
// verify \r\n combo doesn't increment the line twice
assertEquals('\r', tokener.next());
assertEquals(" at 15 [character 0 line 3]", tokener.toString());
assertEquals('\n', tokener.next());
assertEquals(" at 16 [character 0 line 3]", tokener.toString());
// verify stepping back after reading the \n of an \r\n combo doesn't increment the line incorrectly
tokener.back();
assertEquals(" at 15 [character 6 line 2]", tokener.toString());
assertEquals('\n', tokener.next());
assertEquals(" at 16 [character 0 line 3]", tokener.toString());
assertEquals('W', tokener.next());
assertEquals(" at 17 [character 1 line 3]", tokener.toString());
assertEquals('i', tokener.next());
assertEquals(" at 18 [character 2 line 3]", tokener.toString());
tokener.skipTo('\r');
assertEquals("skipTo() improperly modifying indexes"," at 35 [character 19 line 3]", tokener.toString());
assertEquals('\r', tokener.next());
assertEquals(" at 36 [character 0 line 4]", tokener.toString());
tokener.back();
assertEquals(" at 35 [character 19 line 3]", tokener.toString());
assertEquals('\r', tokener.next());
assertEquals(" at 36 [character 0 line 4]", tokener.toString());
assertEquals('N', tokener.next());
assertEquals(" at 37 [character 1 line 4]", tokener.toString());
// verify we get the same data just walking though, no calls to back
final JSONTokener t2 = new JSONTokener(testString);
for(int i=0; i<7; i++) {
assertTrue(t2.toString().startsWith(" at " + i + " "));
assertEquals(testString.charAt(i), t2.next());
}
assertEquals(" at 7 [character 8 line 1]", t2.toString());
assertEquals(testString.charAt(7), t2.next());
assertEquals(" at 8 [character 0 line 2]", t2.toString());
for(int i=8; i<14; i++) {
assertTrue(t2.toString().startsWith(" at " + i + " "));
assertEquals(testString.charAt(i), t2.next());
}
assertEquals(" at 14 [character 6 line 2]", t2.toString());
assertEquals('\r', t2.next());
assertEquals(" at 15 [character 0 line 3]", t2.toString());
assertEquals('\n', t2.next());
assertEquals(" at 16 [character 0 line 3]", t2.toString());
assertEquals('W', t2.next());
assertEquals(" at 17 [character 1 line 3]", t2.toString());
for(int i=17; i<37; i++) {
assertTrue(t2.toString().startsWith(" at " + i + " "));
assertEquals(testString.charAt(i), t2.next());
}
assertEquals(" at 37 [character 1 line 4]", t2.toString());
for(int i=37; i<testString.length(); i++) {
assertTrue(t2.toString().startsWith(" at " + i + " "));
assertEquals(testString.charAt(i), t2.next());
}
assertEquals(" at "+ testString.length() +" [character 9 line 4]", t2.toString());
// end of the input
assertEquals(0, t2.next());
assertFalse(t2.more());
}
}

57
src/test/java/org/json/junit/XMLTest.java
View file

@ -3,6 +3,7 @@ package org.json.junit;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
@ -74,11 +75,11 @@ public class XMLTest {
"</addresses>"; "</addresses>";
try { try {
XML.toJSONObject(xmlStr); XML.toJSONObject(xmlStr);
assertTrue("Expecting a JSONException", false); fail("Expecting a JSONException");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misshaped tag at 176 [character 14 line 5]". "Misshaped tag at 176 [character 14 line 4]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -99,11 +100,11 @@ public class XMLTest {
"</addresses>"; "</addresses>";
try { try {
XML.toJSONObject(xmlStr); XML.toJSONObject(xmlStr);
assertTrue("Expecting a JSONException", false); fail("Expecting a JSONException");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misshaped meta tag at 215 [character 13 line 8]". "Misshaped meta tag at 214 [character 12 line 7]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -124,11 +125,11 @@ public class XMLTest {
"</addresses>"; "</addresses>";
try { try {
XML.toJSONObject(xmlStr); XML.toJSONObject(xmlStr);
assertTrue("Expecting a JSONException", false); fail("Expecting a JSONException");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misshaped meta tag at 214 [character 13 line 8]". "Misshaped meta tag at 213 [character 12 line 7]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -149,11 +150,11 @@ public class XMLTest {
"</addresses>"; "</addresses>";
try { try {
XML.toJSONObject(xmlStr); XML.toJSONObject(xmlStr);
assertTrue("Expecting a JSONException", false); fail("Expecting a JSONException");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Misplaced '<' at 193 [character 4 line 7]". "Misplaced '<' at 193 [character 4 line 6]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -174,11 +175,11 @@ public class XMLTest {
"</addresses>"; "</addresses>";
try { try {
XML.toJSONObject(xmlStr); XML.toJSONObject(xmlStr);
assertTrue("Expecting a JSONException", false); fail("Expecting a JSONException");
} catch (JSONException e) { } catch (JSONException e) {
assertTrue("Expecting an exception message", assertEquals("Expecting an exception message",
"Expected 'CDATA[' at 204 [character 11 line 6]". "Expected 'CDATA[' at 204 [character 11 line 5]",
equals(e.getMessage())); e.getMessage());
} }
} }
@ -397,9 +398,9 @@ public class XMLTest {
final String expected = "<jo></jo>"; final String expected = "<jo></jo>";
String output1 = XML.toString(jo1,"jo"); String output1 = XML.toString(jo1,"jo");
assertTrue("Expected an empty root tag", expected.equals(output1)); assertEquals("Expected an empty root tag", expected, output1);
String output2 = XML.toString(jo2,"jo"); String output2 = XML.toString(jo2,"jo");
assertTrue("Expected an empty root tag", expected.equals(output2)); assertEquals("Expected an empty root tag", expected, output2);
} }
/** /**
@ -414,9 +415,9 @@ public class XMLTest {
final String expected = "<jo><arr>One</arr><arr></arr><arr>Four</arr></jo>"; final String expected = "<jo><arr>One</arr><arr></arr><arr>Four</arr></jo>";
String output1 = XML.toString(jo1,"jo"); String output1 = XML.toString(jo1,"jo");
assertTrue("Expected a matching array", expected.equals(output1)); assertEquals("Expected a matching array", expected, output1);
String output2 = XML.toString(jo2,"jo"); String output2 = XML.toString(jo2,"jo");
assertTrue("Expected a matching array", expected.equals(output2)); assertEquals("Expected a matching array", expected, output2);
} }
/** /**
@ -431,9 +432,9 @@ public class XMLTest {
final String expected = "<jo><arr>One</arr><arr>Two</arr><arr>Three</arr></jo>"; final String expected = "<jo><arr>One</arr><arr>Two</arr><arr>Three</arr></jo>";
String output1 = XML.toString(jo1,"jo"); String output1 = XML.toString(jo1,"jo");
assertTrue("Expected a non empty root tag", expected.equals(output1)); assertEquals("Expected a non empty root tag", expected, output1);
String output2 = XML.toString(jo2,"jo"); String output2 = XML.toString(jo2,"jo");
assertTrue("Expected a non empty root tag", expected.equals(output2)); assertEquals("Expected a non empty root tag", expected, output2);
} }
/** /**
@ -448,9 +449,9 @@ public class XMLTest {
final String expected = "<jo><arr>One</arr><arr><array>Two</array><array>Three</array></arr><arr>Four</arr></jo>"; final String expected = "<jo><arr>One</arr><arr><array>Two</array><array>Three</array></arr><arr>Four</arr></jo>";
String output1 = XML.toString(jo1,"jo"); String output1 = XML.toString(jo1,"jo");
assertTrue("Expected a matching array", expected.equals(output1)); assertEquals("Expected a matching array", expected, output1);
String output2 = XML.toString(jo2,"jo"); String output2 = XML.toString(jo2,"jo");
assertTrue("Expected a matching array", expected.equals(output2)); assertEquals("Expected a matching array", expected, output2);
} }
/** /**