X Tutup
Skip to content

Added clear() methods to JSONObject and JSONArray #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stleary merged 4 commits into from
Dec 7, 2020
Merged

Added clear() methods to JSONObject and JSONArray #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57ad94e
Added clear() methods to JSONObject and JSONArray
stranck Dec 3, 2020
d85eea5
Update JSONArray.java
stranck Dec 4, 2020
c7130d5
Oops
stranck Dec 4, 2020
efad1d7
Added UnitTests
stranck Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/org/json/JSONArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,14 @@ public int length() {
return this.myArrayList.size();
}

/**
* Removes all of the elements from this JSONArray.
* The JSONArray will be empty after this call returns.
*/
public void clear() {
this.myArrayList.clear();
}

/**
* Get the optional object value associated with an index.
*
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/json/JSONObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,14 @@ public int length() {
return this.map.size();
}

/**
* Removes all of the elements from this JSONObject.
* The JSONObject will be empty after this call returns.
*/
public void clear() {
this.map.clear();
}

/**
* Check if JSONObject is empty.
*
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/org/json/junit/JSONArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,4 +1254,19 @@ public void testJSONArrayPutAll() {
assertEquals("index " + i + " are equal", a1.get(i), a2.get(i));
}
}

/**
* Tests if calling JSONArray clear() method actually makes the JSONArray empty
*/
@Test(expected = JSONException.class)
public void jsonArrayClearMethodTest() {
//Adds random stuff to the JSONArray
JSONArray jsonArray = new JSONArray();
jsonArray.put(123);
jsonArray.put("456");
jsonArray.put(new JSONArray());
jsonArray.clear(); //Clears the JSONArray
assertTrue("expected jsonArray.length() == 0", jsonArray.length() == 0); //Check if its length is 0
jsonArray.getInt(0); //Should throws org.json.JSONException: JSONArray[0] not found
}
}
15 changes: 15 additions & 0 deletions src/test/java/org/json/junit/JSONObjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3215,4 +3215,19 @@ public void testIssue548ObjectWithEmptyJsonArray() {
assertNotNull("'empty_json_array' should be an array", jsonObject.getJSONArray("empty_json_array"));
assertEquals("'empty_json_array' should have a length of 0", 0, jsonObject.getJSONArray("empty_json_array").length());
}

/**
* Tests if calling JSONObject clear() method actually makes the JSONObject empty
*/
@Test(expected = JSONException.class)
public void jsonObjectClearMethodTest() {
//Adds random stuff to the JSONObject
JSONObject jsonObject = new JSONObject();
jsonObject.put("key1", 123);
jsonObject.put("key2", "456");
jsonObject.put("key3", new JSONObject());
jsonObject.clear(); //Clears the JSONObject
assertTrue("expected jsonObject.length() == 0", jsonObject.length() == 0); //Check if its length is 0
jsonObject.getInt("key1"); //Should throws org.json.JSONException: JSONObject["asd"] not found
}
}
X Tutup