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
rbrinkster 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

Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion ...ped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public static WebArchive deploy() {
@Test
public void checkRenderedPage() throws Exception {
WebClient webClient = new WebClient();
HtmlPage page = webClient.getPage(base + "/faces/myflow/index.xhtml");
HtmlPage page = webClient.getPage((base + "/faces/myflow/index.xhtml").replace("//faces", "/faces"));
assertNotNull(page);
assert (page.asText().contains("Hello there!"));
}
Expand Down
14 changes: 7 additions & 7 deletions jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public static WebArchive createDeployment() {
@Before
public void setup() throws IOException {
webClient = new WebClient();
page = webClient.getPage(base + "/faces/index.xhtml");
page = webClient.getPage((base + "/faces/index.xhtml").replace("//faces", "/faces"));
nameInputText = (HtmlTextInput) page.getElementById("nameInputText");
ageInputText = (HtmlTextInput) page.getElementById("ageInputText");
zipInputText = (HtmlTextInput) page.getElementById("zipInputText");
Expand All@@ -68,7 +68,7 @@ public void testNameLessCharacters() throws IOException {
zipInputText.setText("12345");
HtmlPage result = button.click();
HtmlSpan span = (HtmlSpan) result.getElementById("nameMessage");
assertEquals("At least 3 characters", span.asText());
assertEquals("nameInputText: At least 3 characters", span.asText());
}

@Test
Expand All@@ -88,7 +88,7 @@ public void testAgeLessThan() throws IOException {
zipInputText.setText("12345");
HtmlPage result = button.click();
HtmlSpan span = (HtmlSpan) result.getElementById("ageMessage");
assertEquals("must be greater than or equal to 18", span.asText());
assertEquals("ageInputText: must be greater than or equal to 18", span.asText());
}

@Test
Expand DownExpand Up@@ -118,7 +118,7 @@ public void testAgeGreaterThan() throws IOException {
zipInputText.setText("12345");
HtmlPage result = button.click();
HtmlSpan span = (HtmlSpan) result.getElementById("ageMessage");
assertEquals("must be less than or equal to 25", span.asText());
assertEquals("ageInputText: must be less than or equal to 25", span.asText());
}

@Test
Expand All@@ -128,7 +128,7 @@ public void testZipAlphabets() throws IOException {
zipInputText.setText("abcde");
HtmlPage result = button.click();
HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage");
assertEquals("must match \"[0-9]{5}\"", span.asText());
assertEquals("zipInputText: must match the following regular expression: [0-9]{5}", span.asText());
}

@Test
Expand All@@ -138,7 +138,7 @@ public void testZipLessNumbers() throws IOException {
zipInputText.setText("1234");
HtmlPage result = button.click();
HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage");
assertEquals("must match \"[0-9]{5}\"", span.asText());
assertEquals("zipInputText: must match the following regular expression: [0-9]{5}", span.asText());
}

@Test
Expand All@@ -148,7 +148,7 @@ public void testZipMoreNumbers() throws IOException {
zipInputText.setText("123456");
HtmlPage result = button.click();
HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage");
assertEquals("must match \"[0-9]{5}\"", span.asText());
assertEquals("zipInputText: must match the following regular expression: [0-9]{5}", span.asText());
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions jsf/components/src/main/webapp/index.xhtml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,20 +111,20 @@
</h:selectManyCheckbox>

<p/><b>selectManyListbox</b><br/>
<h:selectManyListbox value="#{myBean.selectBooleanCheckbox}" size="2">
<h:selectManyListbox value="#{myBean.selectManyCheckbox}" size="2">
<f:selectItem itemValue="red" itemLabel="Red"/>
<f:selectItem itemValue="green" itemLabel="Green"/>
<f:selectItem itemValue="blue" itemLabel="Blue"/>
<f:selectItem itemValue="yellow" itemLabel="yellow"/>
<f:selectItem itemValue="yellow" itemLabel="Yellow"/>
<f:selectItem itemValue="orange" itemLabel="Orange"/>
</h:selectManyListbox>

<p/><b>selectManyMenu</b><br/>
<h:selectManyMenu value="#{myBean.selectBooleanCheckbox}">
<h:selectManyMenu value="#{myBean.selectManyCheckbox}">
<f:selectItem itemValue="red" itemLabel="Red"/>
<f:selectItem itemValue="green" itemLabel="Green"/>
<f:selectItem itemValue="blue" itemLabel="Blue"/>
<f:selectItem itemValue="yellow" itemLabel="yellow"/>
<f:selectItem itemValue="yellow" itemLabel="Yellow"/>
<f:selectItem itemValue="orange" itemLabel="Orange"/>
</h:selectManyMenu>
</h:form>
Expand Down
2 changes: 1 addition & 1 deletion jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ public static WebArchive createDeployment() {
@Before
public void setup() throws IOException {
webClient = new WebClient();
page = webClient.getPage(base + "/faces/index.xhtml");
page = webClient.getPage((base + "/faces/index.xhtml").replace("//faces", "/faces"));
}

@Test
Expand Down
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 numberDiff line numberDiff 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 DownExpand Up@@ -103,5 +106,6 @@ public void testNestedStructure() throws JSONException {
+ " \"Laurence Fishburne\","
+ " \"Carrie-Anne Moss\""
+ " ]", jsonArr.toString(), JSONCompareMode.STRICT);
jsonReader.close();
}
}
4 changes: 4 additions & 0 deletions .../object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ public void testEmptyObject() throws JSONException {

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

@Test
Expand All@@ -64,6 +65,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@@ -78,6 +80,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 All@@ -104,5 +107,6 @@ public void testNestedStructure() throws JSONException {
+ " \"Laurence Fishburne\","
+ " \"Carrie-Anne Moss\""
+ " ]", jsonArr.toString(), JSONCompareMode.STRICT);
jsonReader.close();
}
}
4 changes: 4 additions & 0 deletions ...ming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ public void testEmptyObject() throws JSONException {
JsonParser parser = Json.createParser(new StringReader(json));
assertEquals(JsonParser.Event.START_OBJECT, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
parser.close();
}

@Test
Expand All@@ -52,6 +53,7 @@ public void testSimpleObject() throws JSONException {
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
parser.close();
}

@Test
Expand All@@ -68,6 +70,7 @@ public void testArray() throws JSONException {
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
assertEquals(JsonParser.Event.END_ARRAY, parser.next());
parser.close();
}

@Test
Expand All@@ -86,5 +89,6 @@ public void testNestedStructure() throws JSONException {
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
assertEquals(JsonParser.Event.END_ARRAY, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
parser.close();
}
}
4 changes: 4 additions & 0 deletions ...ming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ public void testEmptyObject() throws JSONException {

assertEquals(JsonParser.Event.START_OBJECT, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
parser.close();
}

@Test
Expand All@@ -60,6 +61,7 @@ public void testSimpleObject() throws JSONException {
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
parser.close();
}

@Test
Expand All@@ -79,6 +81,7 @@ public void testArray() throws JSONException {
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
assertEquals(JsonParser.Event.END_ARRAY, parser.next());
parser.close();
}

@Test
Expand All@@ -100,6 +103,7 @@ public void testNestedStructure() throws JSONException {
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
assertEquals(JsonParser.Event.END_ARRAY, parser.next());
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
parser.close();
}

}