Skip to content

Commit 0fcf352

Browse files
Simulant87Simulant87
committed
Revert "explain position information numbers in syntax exception"
This reverts commit d69d5e2.
1 parent 78cdb3d commit 0fcf352

10 files changed

+84
-84
lines changed

‎src/main/java/org/json/JSONTokener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,11 +520,11 @@ public JSONException syntaxError(String message, Throwable causedBy) {
520520
/**
521521
* Make a printable string of this JSONTokener.
522522
*
523-
* @return " at index {index} [character number {character} in line {line}]"
523+
* @return " at {index} [character {character} line {line}]"
524524
*/
525525
@Override
526526
public String toString() {
527-
return " at index " + this.index + " [character number " + this.character + " in line " +
527+
return " at " + this.index + " [character " + this.character + " line " +
528528
this.line + "]";
529529
}
530530

‎src/test/java/org/json/junit/CDLTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void unbalancedQuoteInName() {
6666
fail("Expecting an exception");
6767
} catch (JSONException e) {
6868
assertEquals("Expecting an exception message",
69-
"Missing close quote '\"'. at index 12 [character number 0 in line 2]",
69+
"Missing close quote '\"'. at 12 [character 0 line 2]",
7070
e.getMessage());
7171
}
7272
}
@@ -83,7 +83,7 @@ public void unbalancedQuoteInValue() {
8383
fail("Expecting an exception");
8484
} catch (JSONException e) {
8585
assertEquals("Expecting an exception message",
86-
"Missing close quote '\"'. at index 22 [character number 11 in line 2]",
86+
"Missing close quote '\"'. at 22 [character 11 line 2]",
8787
e.getMessage());
8888

8989
}
@@ -101,7 +101,7 @@ public void nullInName() {
101101
fail("Expecting an exception");
102102
} catch (JSONException e) {
103103
assertEquals("Expecting an exception message",
104-
"Bad character 'o' (111). at index 2 [character number 3 in line 1]",
104+
"Bad character 'o' (111). at 2 [character 3 line 1]",
105105
e.getMessage());
106106

107107
}
@@ -119,7 +119,7 @@ public void unbalancedEscapedQuote(){
119119
fail("Expecting an exception");
120120
} catch (JSONException e) {
121121
assertEquals("Expecting an exception message",
122-
"Missing close quote '\"'. at index 26 [character number 15 in line 2]",
122+
"Missing close quote '\"'. at 26 [character 15 line 2]",
123123
e.getMessage());
124124

125125
}
@@ -170,7 +170,7 @@ public void badEscapedQuote(){
170170
} catch (JSONException e) {
171171
//System.out.println("Message" + e.getMessage());
172172
assertEquals("Expecting an exception message",
173-
"Bad character 'V' (86). at index 20 [character number 9 in line 2]",
173+
"Bad character 'V' (86). at 20 [character 9 line 2]",
174174
e.getMessage());
175175

176176
}

‎src/test/java/org/json/junit/CookieListTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void malFormedCookieListException() {
5757
* Not sure of the missing char, but full string compare fails
5858
*/
5959
assertEquals("Expecting an exception message",
60-
"Expected '=' and instead saw '' at index 25 [character number 26 in line 1]",
60+
"Expected '=' and instead saw '' at 25 [character 26 line 1]",
6161
e.getMessage());
6262
}
6363
}

‎src/test/java/org/json/junit/CookieTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void malFormedNameValueException() {
4848
fail("Expecting an exception");
4949
} catch (JSONException e) {
5050
assertEquals("Expecting an exception message",
51-
"Expected '=' and instead saw '' at index 25 [character number 26 in line 1]",
51+
"Expected '=' and instead saw '' at 25 [character 26 line 1]",
5252
e.getMessage());
5353
}
5454
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void emptyStr() {
127127
assertNull("Should throw an exception", new JSONArray(str));
128128
} catch (JSONException e) {
129129
assertEquals("Expected an exception message",
130-
"A JSONArray text must start with '[' at index 0 [character number 1 in line 1]",
130+
"A JSONArray text must start with '[' at 0 [character 1 line 1]",
131131
e.getMessage());
132132
}
133133
}
@@ -142,7 +142,7 @@ public void unclosedArray() {
142142
assertNull("Should throw an exception", new JSONArray("["));
143143
} catch (JSONException e) {
144144
assertEquals("Expected an exception message",
145-
"Expected a ',' or ']' at index 1 [character number 2 in line 1]",
145+
"Expected a ',' or ']' at 1 [character 2 line 1]",
146146
e.getMessage());
147147
}
148148
}
@@ -157,7 +157,7 @@ public void unclosedArray2() {
157157
assertNull("Should throw an exception", new JSONArray("[\"test\""));
158158
} catch (JSONException e) {
159159
assertEquals("Expected an exception message",
160-
"Expected a ',' or ']' at index 7 [character number 8 in line 1]",
160+
"Expected a ',' or ']' at 7 [character 8 line 1]",
161161
e.getMessage());
162162
}
163163
}
@@ -172,7 +172,7 @@ public void unclosedArray3() {
172172
assertNull("Should throw an exception", new JSONArray("[\"test\","));
173173
} catch (JSONException e) {
174174
assertEquals("Expected an exception message",
175-
"Expected a ',' or ']' at index 8 [character number 9 in line 1]",
175+
"Expected a ',' or ']' at 8 [character 9 line 1]",
176176
e.getMessage());
177177
}
178178
}

‎src/test/java/org/json/junit/JSONMLTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void emptyXMLException() {
4949
fail("Expecting an exception");
5050
} catch (JSONException e) {
5151
assertEquals("Expecting an exception message",
52-
"Bad XML at index 0 [character number 1 in line 1]",
52+
"Bad XML at 0 [character 1 line 1]",
5353
e.getMessage());
5454
}
5555
}
@@ -102,7 +102,7 @@ public void nonXMLException() {
102102
fail("Expecting an exception");
103103
} catch (JSONException e) {
104104
assertEquals("Expecting an exception message",
105-
"Bad XML at index 23 [character number 24 in line 1]",
105+
"Bad XML at 23 [character 24 line 1]",
106106
e.getMessage());
107107
}
108108
}
@@ -205,7 +205,7 @@ public void invalidSlashInTagException() {
205205
fail("Expecting an exception");
206206
} catch (JSONException e) {
207207
assertEquals("Expecting an exception message",
208-
"Misshaped tag at index 176 [character number 14 in line 4]",
208+
"Misshaped tag at 176 [character 14 line 4]",
209209
e.getMessage());
210210
}
211211
}
@@ -230,7 +230,7 @@ public void invalidBangInTagException() {
230230
fail("Expecting an exception");
231231
} catch (JSONException e) {
232232
assertEquals("Expecting an exception message",
233-
"Misshaped meta tag at index 215 [character number 12 in line 7]",
233+
"Misshaped meta tag at 215 [character 12 line 7]",
234234
e.getMessage());
235235
}
236236
}
@@ -260,7 +260,7 @@ public void invalidBangNoCloseInTagException() {
260260
fail("Expecting an exception");
261261
} catch (JSONException e) {
262262
assertEquals("Expecting an exception message",
263-
"Misshaped meta tag at index 214 [character number 12 in line 7]",
263+
"Misshaped meta tag at 214 [character 12 line 7]",
264264
e.getMessage());
265265
}
266266
}
@@ -290,7 +290,7 @@ public void noCloseStartTagException() {
290290
fail("Expecting an exception");
291291
} catch (JSONException e) {
292292
assertEquals("Expecting an exception message",
293-
"Misplaced '<' at index 194 [character number 5 in line 6]",
293+
"Misplaced '<' at 194 [character 5 line 6]",
294294
e.getMessage());
295295
}
296296
}
@@ -350,7 +350,7 @@ public void noCloseEndBraceException() {
350350
fail("Expecting an exception");
351351
} catch (JSONException e) {
352352
assertEquals("Expecting an exception message",
353-
"Misplaced '<' at index 206 [character number 1 in line 7]",
353+
"Misplaced '<' at 206 [character 1 line 7]",
354354
e.getMessage());
355355
}
356356
}
@@ -380,7 +380,7 @@ public void invalidCDATABangInTagException() {
380380
fail("Expecting an exception");
381381
} catch (JSONException e) {
382382
assertEquals("Expecting an exception message",
383-
"Expected 'CDATA[' at index 204 [character number 11 in line 5]",
383+
"Expected 'CDATA[' at 204 [character 11 line 5]",
384384
e.getMessage());
385385
}
386386
}
@@ -815,7 +815,7 @@ public void testIssue484InfinteLoop1() {
815815
fail("Exception expected for invalid JSON.");
816816
} catch (JSONException ex) {
817817
assertEquals("Exception string did not match: ",
818-
"Unterminated string at index 271 [character number 272 in line 1]",
818+
"Unterminated string at 271 [character 272 line 1]",
819819
ex.getMessage());
820820
}
821821
}
@@ -829,7 +829,7 @@ public void testIssue484InfinteLoop2() {
829829
fail("Exception expected for invalid JSON.");
830830
} catch (JSONException ex) {
831831
assertEquals("Exception string did not match: ",
832-
"Unterminated string at index 242 [character number 238 in line 2]",
832+
"Unterminated string at 242 [character 238 line 2]",
833833
ex.getMessage());
834834
}
835835
}

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,7 +2202,7 @@ public void jsonObjectParseControlCharacterEOFAssertExceptionMessage(){
22022202
fail("JSONException should be thrown");
22032203
} catch (JSONException ex) {
22042204
assertEquals("Unterminated string. " + "Character with int code 0" +
2205-
" is not allowed within a quoted string. at index 8 [character number 9 in line 1]", ex.getMessage());
2205+
" is not allowed within a quoted string. at 8 [character 9 line 1]", ex.getMessage());
22062206
}
22072207
}
22082208

@@ -2216,7 +2216,7 @@ public void jsonObjectParseControlCharacterNewLineAssertExceptionMessage(){
22162216
fail("JSONException should be thrown");
22172217
} catch (JSONException ex) {
22182218
assertEquals("Unterminated string. " + "Character with int code " + (int) c +
2219-
" is not allowed within a quoted string. at index 9 [character number 0 in line 2]", ex.getMessage());
2219+
" is not allowed within a quoted string. at 9 [character 0 line 2]", ex.getMessage());
22202220
}
22212221
}
22222222
}
@@ -2230,7 +2230,7 @@ public void jsonObjectParseUTF8EncodingAssertExceptionMessage(){
22302230
fail("JSONException should be thrown");
22312231
} catch (JSONException ex) {
22322232
assertEquals("Illegal escape. \\u must be followed by a 4 digit hexadecimal number. " +
2233-
"\\123x is not valid. at index 14 [character number 15 in line 1]", ex.getMessage());
2233+
"\\123x is not valid. at 14 [character 15 line 1]", ex.getMessage());
22342234
}
22352235
}
22362236

@@ -2243,7 +2243,7 @@ public void jsonObjectParseIllegalEscapeAssertExceptionMessage(){
22432243
fail("JSONException should be thrown");
22442244
} catch (JSONException ex) {
22452245
assertEquals("Illegal escape. Escape sequence " + c + " is not valid." +
2246-
" at index 10 [character number 11 in line 1]", ex.getMessage());
2246+
" at 10 [character 11 line 1]", ex.getMessage());
22472247
}
22482248
}
22492249

@@ -2259,7 +2259,7 @@ public void jsonObjectParsingErrors() {
22592259
assertNull("Expected an exception",new JSONObject(str));
22602260
} catch (JSONException e) {
22612261
assertEquals("Expecting an exception message",
2262-
"A JSONObject text must begin with '{' at index 1 [character number 2 in line 1]",
2262+
"A JSONObject text must begin with '{' at 1 [character 2 line 1]",
22632263
e.getMessage());
22642264
}
22652265
try {
@@ -2268,7 +2268,7 @@ public void jsonObjectParsingErrors() {
22682268
assertNull("Expected an exception",new JSONObject(str));
22692269
} catch (JSONException e) {
22702270
assertEquals("Expecting an exception message",
2271-
"A JSONObject text must end with '}' at index 1 [character number 2 in line 1]",
2271+
"A JSONObject text must end with '}' at 1 [character 2 line 1]",
22722272
e.getMessage());
22732273
}
22742274
try {
@@ -2277,7 +2277,7 @@ public void jsonObjectParsingErrors() {
22772277
assertNull("Expected an exception",new JSONObject(str));
22782278
} catch (JSONException e) {
22792279
assertEquals("Expecting an exception message",
2280-
"Expected a ':' after a key at index 10 [character number 11 in line 1]",
2280+
"Expected a ':' after a key at 10 [character 11 line 1]",
22812281
e.getMessage());
22822282
}
22832283
try {
@@ -2286,7 +2286,7 @@ public void jsonObjectParsingErrors() {
22862286
assertNull("Expected an exception",new JSONObject(str));
22872287
} catch (JSONException e) {
22882288
assertEquals("Expecting an exception message",
2289-
"Expected a ',' or '}' at index 15 [character number 16 in line 1]",
2289+
"Expected a ',' or '}' at 15 [character 16 line 1]",
22902290
e.getMessage());
22912291
}
22922292
try {
@@ -2295,7 +2295,7 @@ public void jsonObjectParsingErrors() {
22952295
assertNull("Expected an exception",new JSONObject(str));
22962296
} catch (JSONException e) {
22972297
assertEquals("Expecting an exception message",
2298-
"Missing value at index 1 [character number 2 in line 1]",
2298+
"Missing value at 1 [character 2 line 1]",
22992299
e.getMessage());
23002300
}
23012301
try {
@@ -2304,7 +2304,7 @@ public void jsonObjectParsingErrors() {
23042304
assertNull("Expected an exception",new JSONObject(str));
23052305
} catch (JSONException e) {
23062306
assertEquals("Expecting an exception message",
2307-
"Missing value at index 9 [character number 10 in line 1]",
2307+
"Missing value at 9 [character 10 line 1]",
23082308
e.getMessage());
23092309
}
23102310
try {
@@ -2313,7 +2313,7 @@ public void jsonObjectParsingErrors() {
23132313
assertNull("Expected an exception",new JSONObject(str));
23142314
} catch (JSONException e) {
23152315
assertEquals("Expecting an exception message",
2316-
"Expected a ':' after a key at index 5 [character number 6 in line 1]",
2316+
"Expected a ':' after a key at 5 [character 6 line 1]",
23172317
e.getMessage());
23182318
}
23192319
try {
@@ -2322,7 +2322,7 @@ public void jsonObjectParsingErrors() {
23222322
assertNull("Expected an exception",new JSONObject(str));
23232323
} catch (JSONException e) {
23242324
assertEquals("Expecting an exception message",
2325-
"Expected a ':' after a key at index 5 [character number 6 in line 1]",
2325+
"Expected a ':' after a key at 5 [character 6 line 1]",
23262326
e.getMessage());
23272327
}
23282328
try {
@@ -2331,7 +2331,7 @@ public void jsonObjectParsingErrors() {
23312331
assertNull("Expected an exception",new JSONObject(str));
23322332
} catch (JSONException e) {
23332333
assertEquals("Expecting an exception message",
2334-
"A JSONObject text must end with '}' at index 15 [character number 16 in line 1]",
2334+
"A JSONObject text must end with '}' at 15 [character 16 line 1]",
23352335
e.getMessage());
23362336
}
23372337
try {
@@ -2412,7 +2412,7 @@ public void jsonObjectParsingErrors() {
24122412
fail("Expected an exception");
24132413
} catch (JSONException e) {
24142414
assertEquals("Expecting an expection message",
2415-
"Duplicate key \"attr03\" at index 90 [character number 13 in line 5]",
2415+
"Duplicate key \"attr03\" at 90 [character 13 line 5]",
24162416
e.getMessage());
24172417
}
24182418
try {
@@ -2431,7 +2431,7 @@ public void jsonObjectParsingErrors() {
24312431
fail("Expected an exception");
24322432
} catch (JSONException e) {
24332433
assertEquals("Expecting an expection message",
2434-
"Duplicate key \"attr03\" at index 90 [character number 13 in line 5]",
2434+
"Duplicate key \"attr03\" at 90 [character 13 line 5]",
24352435
e.getMessage());
24362436
}
24372437
try {
@@ -2452,7 +2452,7 @@ public void jsonObjectParsingErrors() {
24522452
fail("Expected an exception");
24532453
} catch (JSONException e) {
24542454
assertEquals("Expecting an expection message",
2455-
"Duplicate key \"attr03\" at index 90 [character number 13 in line 5]",
2455+
"Duplicate key \"attr03\" at 90 [character 13 line 5]",
24562456
e.getMessage());
24572457
}
24582458
try {
@@ -2472,7 +2472,7 @@ public void jsonObjectParsingErrors() {
24722472
fail("Expected an exception");
24732473
} catch (JSONException e) {
24742474
assertEquals("Expecting an expection message",
2475-
"Duplicate key \"attr04-03\" at index 215 [character number 20 in line 9]",
2475+
"Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
24762476
e.getMessage());
24772477
}
24782478
try {
@@ -2496,7 +2496,7 @@ public void jsonObjectParsingErrors() {
24962496
fail("Expected an exception");
24972497
} catch (JSONException e) {
24982498
assertEquals("Expecting an expection message",
2499-
"Duplicate key \"attr04-03\" at index 215 [character number 20 in line 9]",
2499+
"Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
25002500
e.getMessage());
25012501
}
25022502
try {
@@ -2522,7 +2522,7 @@ public void jsonObjectParsingErrors() {
25222522
fail("Expected an exception");
25232523
} catch (JSONException e) {
25242524
assertEquals("Expecting an expection message",
2525-
"Duplicate key \"attr04-03\" at index 215 [character number 20 in line 9]",
2525+
"Duplicate key \"attr04-03\" at 215 [character 20 line 9]",
25262526
e.getMessage());
25272527
}
25282528
try {
@@ -2541,7 +2541,7 @@ public void jsonObjectParsingErrors() {
25412541
fail("Expected an exception");
25422542
} catch (JSONException e) {
25432543
assertEquals("Expecting an expection message",
2544-
"Duplicate key \"attr01\" at index 124 [character number 17 in line 8]",
2544+
"Duplicate key \"attr01\" at 124 [character 17 line 8]",
25452545
e.getMessage());
25462546
}
25472547
try {
@@ -2566,7 +2566,7 @@ public void jsonObjectParsingErrors() {
25662566
fail("Expected an exception");
25672567
} catch (JSONException e) {
25682568
assertEquals("Expecting an expection message",
2569-
"Duplicate key \"attr02-01\" at index 269 [character number 24 in line 13]",
2569+
"Duplicate key \"attr02-01\" at 269 [character 24 line 13]",
25702570
e.getMessage());
25712571
}
25722572
}

0 commit comments

Comments
 (0)