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

update expected exception text in tests to match unified number getters

Browse source
This commit is contained in:
John J. Aylward 2018-10-04 16:02:50 -04:00
parent 3b8b0a681c
commit 3e6c0a51bd
2 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -331,57 +331,57 @@ public class JSONArrayTest {
jsonArray.getBoolean(4);
assertTrue("expected getBoolean to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[4] is not a boolean.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[4] is not a boolean.",e.getMessage());
}
try {
jsonArray.get(-1);
assertTrue("expected get to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[-1] not found.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[-1] not found.",e.getMessage());
}
try {
jsonArray.getDouble(4);
assertTrue("expected getDouble to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[4] is not a number.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[4] is not a number.",e.getMessage());
}
try {
jsonArray.getInt(4);
assertTrue("expected getInt to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[4] is not a number.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[4] is not a number.",e.getMessage());
}
try {
jsonArray.getJSONArray(4);
assertTrue("expected getJSONArray to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[4] is not a JSONArray.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[4] is not a JSONArray.",e.getMessage());
}
try {
jsonArray.getJSONObject(4);
assertTrue("expected getJSONObject to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[4] is not a JSONObject.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[4] is not a JSONObject.",e.getMessage());
}
try {
jsonArray.getLong(4);
assertTrue("expected getLong to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[4] is not a number.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[4] is not a number.",e.getMessage());
}
try {
jsonArray.getString(5);
assertTrue("expected getString to fail", false);
} catch (JSONException e) {
assertTrue("Expected an exception message",
"JSONArray[5] not a string.".equals(e.getMessage()));
assertEquals("Expected an exception message",
"JSONArray[5] not a string.",e.getMessage());
}
}

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

@ -1013,128 +1013,128 @@ public class JSONObjectTest {
jsonObject.getBoolean("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("expecting an exception message",
"JSONObject[\"nonKey\"] not found.".equals(e.getMessage()));
assertEquals("expecting an exception message",
"JSONObject[\"nonKey\"] not found.", e.getMessage());
}
try {
jsonObject.getBoolean("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a Boolean.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a Boolean.",
e.getMessage());
}
try {
jsonObject.getString("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getString("trueKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"trueKey\"] not a string.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"trueKey\"] not a string.",
e.getMessage());
}
try {
jsonObject.getDouble("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getDouble("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a number.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a number.",
e.getMessage());
}
try {
jsonObject.getFloat("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getFloat("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a number.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a number.",
e.getMessage());
}
try {
jsonObject.getInt("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getInt("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not an int.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a number.",
e.getMessage());
}
try {
jsonObject.getLong("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getLong("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a long.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a number.",
e.getMessage());
}
try {
jsonObject.getJSONArray("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getJSONArray("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a JSONArray.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a JSONArray.",
e.getMessage());
}
try {
jsonObject.getJSONObject("nonKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"nonKey\"] not found.",
e.getMessage());
}
try {
jsonObject.getJSONObject("stringKey");
fail("Expected an exception");
} catch (JSONException e) {
assertTrue("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a JSONObject.".
equals(e.getMessage()));
assertEquals("Expecting an exception message",
"JSONObject[\"stringKey\"] is not a JSONObject.",
e.getMessage());
}
}