From 344be7167cdddf897f4ebe7ee985db5a956537ef Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 15:59:31 -0500 Subject: [PATCH 1/9] Remove double slashes before faces In some situations, the base will end without an ending slash, but in other cases it will end with a slash, so the replace should take care of issues with double slashes. --- .../cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java b/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java index e3171457e..46babbe42 100644 --- a/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java +++ b/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java @@ -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!")); } From 71ccc33266844f32fb26700033b59be484875543 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:01:20 -0500 Subject: [PATCH 2/9] Remove double slashes before faces In some situations, the base will end without an ending slash, but in other cases it will end with a slash, so the replace should take care of issues with double slashes. --- .../test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java b/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java index 6bf93f985..64135dd5d 100644 --- a/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java +++ b/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java @@ -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"); From 8705ff623d900327bf9756a7607c4f6adc600376 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:02:51 -0500 Subject: [PATCH 3/9] Remove double slashes before faces In some situations, the base will end without an ending slash, but in other cases it will end with a slash, so the replace should take care of issues with double slashes. --- .../src/test/java/org/javaee7/jsf/http/get/UserTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java b/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java index 2133d9dac..06998d8bf 100644 --- a/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java +++ b/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java @@ -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 From d20d81bcde53ea56a3023e0001f0dfdead4c8ee7 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:08:34 -0500 Subject: [PATCH 4/9] Switched selectBooleanCheckbox to selectManyCheckbox in appropriate areas In the selectManyListbox and selectManyMenu components, I updated selectBooleanCheckbox to selectManyCheckbox to account for the requirement that a list or array must be provided as the value. --- jsf/components/src/main/webapp/index.xhtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jsf/components/src/main/webapp/index.xhtml b/jsf/components/src/main/webapp/index.xhtml index 136d23959..3ec2fb550 100644 --- a/jsf/components/src/main/webapp/index.xhtml +++ b/jsf/components/src/main/webapp/index.xhtml @@ -111,20 +111,20 @@

selectManyListbox
- + - +

selectManyMenu
- + - + From f65b7e736c6e9d5c9141a09cfaa747d2a91ad510 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:13:15 -0500 Subject: [PATCH 5/9] Added close statements for jsonReader --- .../javaee7/json/object/reader/JsonReaderFromReaderTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java index 8ef7e0468..8374957d6 100644 --- a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java +++ b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java @@ -42,6 +42,7 @@ public void testEmptyObject() throws JSONException { assertNotNull(json); assertTrue(json.isEmpty()); + jsonReader.close(); } @Test @@ -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 @@ -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 @@ -103,5 +106,6 @@ public void testNestedStructure() throws JSONException { + " \"Laurence Fishburne\"," + " \"Carrie-Anne Moss\"" + " ]", jsonArr.toString(), JSONCompareMode.STRICT); + jsonReader.close(); } } From 0b1d51192ecf6521425a6902533cadb091a4ea4a Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:14:05 -0500 Subject: [PATCH 6/9] Added close statements for jsonReader --- .../javaee7/json/object/reader/JsonReaderFromStreamTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java index 47623b12b..e45f7ccfc 100644 --- a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java +++ b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java @@ -48,6 +48,7 @@ public void testEmptyObject() throws JSONException { assertNotNull(json); assertTrue(json.isEmpty()); + jsonReader.close(); } @Test @@ -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 @@ -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 @@ -104,5 +107,6 @@ public void testNestedStructure() throws JSONException { + " \"Laurence Fishburne\"," + " \"Carrie-Anne Moss\"" + " ]", jsonArr.toString(), JSONCompareMode.STRICT); + jsonReader.close(); } } From 6885adf3d71144b9e62946e10a3720ea63dbe964 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:15:40 -0500 Subject: [PATCH 7/9] Added close statements for parser --- .../json/streaming/parser/JsonParserFromReaderTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java index de41d8520..84bf74ddd 100644 --- a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java +++ b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java @@ -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 @@ -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 @@ -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 @@ -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(); } } From 66c17bf709fe4c0ef212e3fe16af889349367b53 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 16:16:35 -0500 Subject: [PATCH 8/9] Added close statements for parser --- .../json/streaming/parser/JsonParserFromStreamTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java index 0b885d0f5..fe02e27d9 100644 --- a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java +++ b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java @@ -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 @@ -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 @@ -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 @@ -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(); } } From c1e334fa4f89d35f28497671f45753249bc3d2d0 Mon Sep 17 00:00:00 2001 From: rbrinkster Date: Mon, 22 Jun 2015 17:05:46 -0500 Subject: [PATCH 9/9] Updated tests with corrections to assertions --- .../org/javaee7/jsf/bean/validation/MyBeanTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java b/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java index 64135dd5d..d50b3b688 100644 --- a/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java +++ b/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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