Skip to content

Minor fixes to close json resources, prevent malformed URLs, and correct index.xhtml values #313

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Minor fixes to close json resources, prevent malformed URLs, and correct index.xhtml values #313

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
344be71
Remove double slashes before faces
rbrinkster Jun 22, 2015
71ccc33
Remove double slashes before faces
rbrinkster Jun 22, 2015
8705ff6
Remove double slashes before faces
rbrinkster Jun 22, 2015
d20d81b
Switched selectBooleanCheckbox to selectManyCheckbox in appropriate a…
rbrinkster Jun 22, 2015
f65b7e7
Added close statements for jsonReader
rbrinkster Jun 22, 2015
0b1d511
Added close statements for jsonReader
rbrinkster Jun 22, 2015
6885adf
Added close statements for parser
rbrinkster Jun 22, 2015
66c17bf
Added close statements for parser
rbrinkster Jun 22, 2015
c1e334f
Updated tests with corrections to assertions
rbrinkster Jun 22, 2015
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
Prev Previous commit
Next Next commit
Added close statements for jsonReader
  • Loading branch information
@rbrinkster
rbrinkster committed Jun 22, 2015
commit f65b7e736c6e9d5c9141a09cfaa747d2a91ad510
4 changes: 4 additions & 0 deletions .../object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public void testEmptyObject() throws JSONException {

assertNotNull(json);
assertTrue(json.isEmpty());
jsonReader.close();
}

@Test
Expand All @@ -58,6 +59,7 @@ public void testSimpleObjectWithTwoElements() throws JSONException {
assertEquals("red", json.getString("apple"));
assertTrue(json.containsKey("banana"));
assertEquals("yellow", json.getString("banana"));
jsonReader.close();
}

@Test
Expand All @@ -72,6 +74,7 @@ public void testArray() throws JSONException {

JSONAssert.assertEquals("{\"apple\":\"red\"}", jsonArr.get(0).toString(), JSONCompareMode.STRICT);
JSONAssert.assertEquals("{\"banana\":\"yellow\"}", jsonArr.get(1).toString(), JSONCompareMode.STRICT);
jsonReader.close();
}

@Test
Expand Down Expand Up @@ -103,5 +106,6 @@ public void testNestedStructure() throws JSONException {
+ " \"Laurence Fishburne\","
+ " \"Carrie-Anne Moss\""
+ " ]", jsonArr.toString(), JSONCompareMode.STRICT);
jsonReader.close();
}
}