Skip to content

Commit 4c64ad3

Browse files
authored
Merge pull request #88 from johnjaylward/FixForBigDecimal
Updated testcases for PR440
2 parents dedb044 + 3e6c0a5 commit 4c64ad3

2 files changed

Lines changed: 149 additions & 72 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

0 commit comments

Comments
 (0)