Skip to content

Commit 3e6c0a5

Browse files
author
John J. Aylward
committed
update expected exception text in tests to match unified number getters
1 parent 3b8b0a6 commit 3e6c0a5

2 files changed

Lines changed: 63 additions & 63 deletions

File tree

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -331,57 +331,57 @@ public void failedGetArrayValues() {
331331
jsonArray.getBoolean(4);
332332
assertTrue("expected getBoolean to fail", false);
333333
} catch (JSONException e) {
334-
assertTrue("Expected an exception message",
335-
"JSONArray[4] is not a boolean.".equals(e.getMessage()));
334+
assertEquals("Expected an exception message",
335+
"JSONArray[4] is not a boolean.",e.getMessage());
336336
}
337337
try {
338338
jsonArray.get(-1);
339339
assertTrue("expected get to fail", false);
340340
} catch (JSONException e) {
341-
assertTrue("Expected an exception message",
342-
"JSONArray[-1] not found.".equals(e.getMessage()));
341+
assertEquals("Expected an exception message",
342+
"JSONArray[-1] not found.",e.getMessage());
343343
}
344344
try {
345345
jsonArray.getDouble(4);
346346
assertTrue("expected getDouble to fail", false);
347347
} catch (JSONException e) {
348-
assertTrue("Expected an exception message",
349-
"JSONArray[4] is not a number.".equals(e.getMessage()));
348+
assertEquals("Expected an exception message",
349+
"JSONArray[4] is not a number.",e.getMessage());
350350
}
351351
try {
352352
jsonArray.getInt(4);
353353
assertTrue("expected getInt to fail", false);
354354
} catch (JSONException e) {
355-
assertTrue("Expected an exception message",
356-
"JSONArray[4] is not a number.".equals(e.getMessage()));
355+
assertEquals("Expected an exception message",
356+
"JSONArray[4] is not a number.",e.getMessage());
357357
}
358358
try {
359359
jsonArray.getJSONArray(4);
360360
assertTrue("expected getJSONArray to fail", false);
361361
} catch (JSONException e) {
362-
assertTrue("Expected an exception message",
363-
"JSONArray[4] is not a JSONArray.".equals(e.getMessage()));
362+
assertEquals("Expected an exception message",
363+
"JSONArray[4] is not a JSONArray.",e.getMessage());
364364
}
365365
try {
366366
jsonArray.getJSONObject(4);
367367
assertTrue("expected getJSONObject to fail", false);
368368
} catch (JSONException e) {
369-
assertTrue("Expected an exception message",
370-
"JSONArray[4] is not a JSONObject.".equals(e.getMessage()));
369+
assertEquals("Expected an exception message",
370+
"JSONArray[4] is not a JSONObject.",e.getMessage());
371371
}
372372
try {
373373
jsonArray.getLong(4);
374374
assertTrue("expected getLong to fail", false);
375375
} catch (JSONException e) {
376-
assertTrue("Expected an exception message",
377-
"JSONArray[4] is not a number.".equals(e.getMessage()));
376+
assertEquals("Expected an exception message",
377+
"JSONArray[4] is not a number.",e.getMessage());
378378
}
379379
try {
380380
jsonArray.getString(5);
381381
assertTrue("expected getString to fail", false);
382382
} catch (JSONException e) {
383-
assertTrue("Expected an exception message",
384-
"JSONArray[5] not a string.".equals(e.getMessage()));
383+
assertEquals("Expected an exception message",
384+
"JSONArray[5] not a string.",e.getMessage());
385385
}
386386
}
387387

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

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,128 +1013,128 @@ public void jsonObjectNonAndWrongValues() {
10131013
jsonObject.getBoolean("nonKey");
10141014
fail("Expected an exception");
10151015
} catch (JSONException e) {
1016-
assertTrue("expecting an exception message",
1017-
"JSONObject[\"nonKey\"] not found.".equals(e.getMessage()));
1016+
assertEquals("expecting an exception message",
1017+
"JSONObject[\"nonKey\"] not found.", e.getMessage());
10181018
}
10191019
try {
10201020
jsonObject.getBoolean("stringKey");
10211021
fail("Expected an exception");
10221022
} catch (JSONException e) {
1023-
assertTrue("Expecting an exception message",
1024-
"JSONObject[\"stringKey\"] is not a Boolean.".
1025-
equals(e.getMessage()));
1023+
assertEquals("Expecting an exception message",
1024+
"JSONObject[\"stringKey\"] is not a Boolean.",
1025+
e.getMessage());
10261026
}
10271027
try {
10281028
jsonObject.getString("nonKey");
10291029
fail("Expected an exception");
10301030
} catch (JSONException e) {
1031-
assertTrue("Expecting an exception message",
1032-
"JSONObject[\"nonKey\"] not found.".
1033-
equals(e.getMessage()));
1031+
assertEquals("Expecting an exception message",
1032+
"JSONObject[\"nonKey\"] not found.",
1033+
e.getMessage());
10341034
}
10351035
try {
10361036
jsonObject.getString("trueKey");
10371037
fail("Expected an exception");
10381038
} catch (JSONException e) {
1039-
assertTrue("Expecting an exception message",
1040-
"JSONObject[\"trueKey\"] not a string.".
1041-
equals(e.getMessage()));
1039+
assertEquals("Expecting an exception message",
1040+
"JSONObject[\"trueKey\"] not a string.",
1041+
e.getMessage());
10421042
}
10431043
try {
10441044
jsonObject.getDouble("nonKey");
10451045
fail("Expected an exception");
10461046
} catch (JSONException e) {
1047-
assertTrue("Expecting an exception message",
1048-
"JSONObject[\"nonKey\"] not found.".
1049-
equals(e.getMessage()));
1047+
assertEquals("Expecting an exception message",
1048+
"JSONObject[\"nonKey\"] not found.",
1049+
e.getMessage());
10501050
}
10511051
try {
10521052
jsonObject.getDouble("stringKey");
10531053
fail("Expected an exception");
10541054
} catch (JSONException e) {
1055-
assertTrue("Expecting an exception message",
1056-
"JSONObject[\"stringKey\"] is not a number.".
1057-
equals(e.getMessage()));
1055+
assertEquals("Expecting an exception message",
1056+
"JSONObject[\"stringKey\"] is not a number.",
1057+
e.getMessage());
10581058
}
10591059
try {
10601060
jsonObject.getFloat("nonKey");
10611061
fail("Expected an exception");
10621062
} catch (JSONException e) {
1063-
assertTrue("Expecting an exception message",
1064-
"JSONObject[\"nonKey\"] not found.".
1065-
equals(e.getMessage()));
1063+
assertEquals("Expecting an exception message",
1064+
"JSONObject[\"nonKey\"] not found.",
1065+
e.getMessage());
10661066
}
10671067
try {
10681068
jsonObject.getFloat("stringKey");
10691069
fail("Expected an exception");
10701070
} catch (JSONException e) {
1071-
assertTrue("Expecting an exception message",
1072-
"JSONObject[\"stringKey\"] is not a number.".
1073-
equals(e.getMessage()));
1071+
assertEquals("Expecting an exception message",
1072+
"JSONObject[\"stringKey\"] is not a number.",
1073+
e.getMessage());
10741074
}
10751075
try {
10761076
jsonObject.getInt("nonKey");
10771077
fail("Expected an exception");
10781078
} catch (JSONException e) {
1079-
assertTrue("Expecting an exception message",
1080-
"JSONObject[\"nonKey\"] not found.".
1081-
equals(e.getMessage()));
1079+
assertEquals("Expecting an exception message",
1080+
"JSONObject[\"nonKey\"] not found.",
1081+
e.getMessage());
10821082
}
10831083
try {
10841084
jsonObject.getInt("stringKey");
10851085
fail("Expected an exception");
10861086
} catch (JSONException e) {
1087-
assertTrue("Expecting an exception message",
1088-
"JSONObject[\"stringKey\"] is not an int.".
1089-
equals(e.getMessage()));
1087+
assertEquals("Expecting an exception message",
1088+
"JSONObject[\"stringKey\"] is not a number.",
1089+
e.getMessage());
10901090
}
10911091
try {
10921092
jsonObject.getLong("nonKey");
10931093
fail("Expected an exception");
10941094
} catch (JSONException e) {
1095-
assertTrue("Expecting an exception message",
1096-
"JSONObject[\"nonKey\"] not found.".
1097-
equals(e.getMessage()));
1095+
assertEquals("Expecting an exception message",
1096+
"JSONObject[\"nonKey\"] not found.",
1097+
e.getMessage());
10981098
}
10991099
try {
11001100
jsonObject.getLong("stringKey");
11011101
fail("Expected an exception");
11021102
} catch (JSONException e) {
1103-
assertTrue("Expecting an exception message",
1104-
"JSONObject[\"stringKey\"] is not a long.".
1105-
equals(e.getMessage()));
1103+
assertEquals("Expecting an exception message",
1104+
"JSONObject[\"stringKey\"] is not a number.",
1105+
e.getMessage());
11061106
}
11071107
try {
11081108
jsonObject.getJSONArray("nonKey");
11091109
fail("Expected an exception");
11101110
} catch (JSONException e) {
1111-
assertTrue("Expecting an exception message",
1112-
"JSONObject[\"nonKey\"] not found.".
1113-
equals(e.getMessage()));
1111+
assertEquals("Expecting an exception message",
1112+
"JSONObject[\"nonKey\"] not found.",
1113+
e.getMessage());
11141114
}
11151115
try {
11161116
jsonObject.getJSONArray("stringKey");
11171117
fail("Expected an exception");
11181118
} catch (JSONException e) {
1119-
assertTrue("Expecting an exception message",
1120-
"JSONObject[\"stringKey\"] is not a JSONArray.".
1121-
equals(e.getMessage()));
1119+
assertEquals("Expecting an exception message",
1120+
"JSONObject[\"stringKey\"] is not a JSONArray.",
1121+
e.getMessage());
11221122
}
11231123
try {
11241124
jsonObject.getJSONObject("nonKey");
11251125
fail("Expected an exception");
11261126
} catch (JSONException e) {
1127-
assertTrue("Expecting an exception message",
1128-
"JSONObject[\"nonKey\"] not found.".
1129-
equals(e.getMessage()));
1127+
assertEquals("Expecting an exception message",
1128+
"JSONObject[\"nonKey\"] not found.",
1129+
e.getMessage());
11301130
}
11311131
try {
11321132
jsonObject.getJSONObject("stringKey");
11331133
fail("Expected an exception");
11341134
} catch (JSONException e) {
1135-
assertTrue("Expecting an exception message",
1136-
"JSONObject[\"stringKey\"] is not a JSONObject.".
1137-
equals(e.getMessage()));
1135+
assertEquals("Expecting an exception message",
1136+
"JSONObject[\"stringKey\"] is not a JSONObject.",
1137+
e.getMessage());
11381138
}
11391139
}
11401140

0 commit comments

Comments
 (0)