diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c2136fe7a..a1933bc5f 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -144,7 +144,7 @@ net.sourceforge.htmlunit htmlunit - 2.39.0 + 2.61.0 test @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M4 + 3.0.0-M6 it.org.apache.struts2.showcase.*Test @@ -193,7 +193,7 @@ log4j.configuration - file:${basedir}/src/main/resources/log4j.properties + file:${basedir}/src/main/resources/log4j2.xml slf4j @@ -214,11 +214,8 @@ stop - run-forked + start - - false - stop-jetty diff --git a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml index f5c15414c..ef700ef48 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml @@ -45,66 +45,46 @@ - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + @@ -129,9 +109,7 @@ - - - + diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java index 4889193cc..dd519c53d 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java @@ -32,7 +32,7 @@ public class ActionChainingTest { try (final WebClient webClient = new WebClient()) { final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/actionchaining/actionChain1!input"); - final String pageAsText = page.asText(); + final String pageAsText = page.asNormalizedText(); Assert.assertTrue(pageAsText.contains("Action Chain 1 Property 1: Property Set In Action Chain 1")); Assert.assertTrue(pageAsText.contains("Action Chain 2 Property 1: Property Set in Action Chain 2")); Assert.assertTrue(pageAsText.contains("Action Chain 3 Property 1: Property set in Action Chain 3")); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java index c2d260136..1229e7ed4 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java @@ -32,7 +32,7 @@ public class ActionTagExampleTest { try (final WebClient webClient = new WebClient()) { final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/tags/ui/actionTagExample!input.action"); - final String pageAsText = page.asText(); + final String pageAsText = page.asNormalizedText(); Assert.assertTrue(pageAsText.contains("This text is from the called class")); } } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java index d23064ed5..4da639a71 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java @@ -46,7 +46,7 @@ public class AsyncTest { final DomElement msgs = page2.getElementById("msgs"); - Assert.assertEquals("hello", msgs.asText()); + Assert.assertEquals("hello", msgs.asNormalizedText()); } } } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java index 37f185eca..72a7a5e2c 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java @@ -44,7 +44,7 @@ public class CRUDTest { final HtmlSubmitInput button = form.getInputByValue("Save"); final HtmlPage page2 = button.click(); - final String page2Text = page2.asText(); + final String page2Text = page2.asNormalizedText(); Assert.assertTrue(page2Text.contains("somename1")); Assert.assertTrue(page2Text.contains("somedescription1")); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java index d31882423..4519ac6ac 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java @@ -33,7 +33,7 @@ public class ComponentTagExampleTest { final HtmlPage page = webClient .getPage(ParameterUtils.getBaseUrl() + "/tags/ui/componentTagExample.action"); - final String pageAsText = page.asText(); + final String pageAsText = page.asNormalizedText(); Assert.assertTrue(pageAsText.contains("Freemarker Custom Template - parameter 'paramName' - paramValue1")); Assert.assertTrue(pageAsText.contains("Freemarker Custom Template - parameter 'paramName' - paramValue4")); Assert.assertTrue(pageAsText.contains("JSP Custom Template - parameter 'paramName' - paramValue2")); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java index ff6b0bdcc..b7805048e 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java @@ -46,7 +46,7 @@ public class ConversionTest { final HtmlSubmitInput button = form.getInputByValue("Submit"); final HtmlPage page2 = button.click(); - final String page2Text = page2.asText(); + final String page2Text = page2.asNormalizedText(); Assert.assertTrue(page2Text.contains("SET 0 Name: name0")); Assert.assertTrue(page2Text.contains("SET 0 Age: 0")); @@ -71,7 +71,7 @@ public class ConversionTest { final HtmlSubmitInput button = form.getInputByValue("Submit"); final HtmlPage page2 = button.click(); - final String page2Text = page2.asText(); + final String page2Text = page2.asNormalizedText(); Assert.assertTrue(page2Text.contains("id0 -> address0")); Assert.assertTrue(page2Text.contains("id1 -> address1")); @@ -92,7 +92,7 @@ public class ConversionTest { final HtmlSubmitInput button = form.getInputByValue("Submit"); final HtmlPage page2 = button.click(); - final String page2Text = page2.asText(); + final String page2Text = page2.asNormalizedText(); Assert.assertTrue(page2Text.contains("ADD")); Assert.assertTrue(page2Text.contains("MINUS")); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java index 445b34027..16628a9df 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java @@ -43,12 +43,12 @@ public class ExecAndWaitTest { final HtmlSubmitInput button = form.getInputByValue("submit"); final HtmlPage page2 = button.click(); - Assert.assertTrue(page2.asText().contains("We are processing your request. Please wait.")); + Assert.assertTrue(page2.asNormalizedText().contains("We are processing your request. Please wait.")); // hit it again final HtmlPage page3 = webClient .getPage(ParameterUtils.getBaseUrl() + "/wait/longProcess1.action?time=1000"); - Assert.assertTrue(page3.asText().contains("We are processing your request. Please wait.")); + Assert.assertTrue(page3.asNormalizedText().contains("We are processing your request. Please wait.")); } } } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java index 333bf4218..b4956e35d 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java @@ -43,6 +43,7 @@ public class FileDownloadTest { } } + @Test public void testZip() throws Exception { try (final WebClient webClient = new WebClient()) { final Page page = webClient.getPage(ParameterUtils.getBaseUrl() + "/filedownload/download2.action"); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java index 61c0dddce..fb2a23a0e 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java @@ -36,11 +36,11 @@ public class FreeMarkerManagerTest { final DomElement date = page.getElementById("todaysDate"); Assert.assertNotNull(date); - Assert.assertTrue(date.asText().length() > 0); + Assert.assertTrue(date.asNormalizedText().length() > 0); final DomElement time = page.getElementById("timeNow"); Assert.assertNotNull(time); - Assert.assertTrue(time.asText().length() > 0); + Assert.assertTrue(time.asNormalizedText().length() > 0); } } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java index 06057f9f1..db87bf7b0 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java @@ -33,26 +33,23 @@ public class StaticContentTest { webClient.getPage(ParameterUtils.getBaseUrl() + "/struts.."); Assert.fail("Previous request should have failed"); } catch (FailingHttpStatusCodeException e) { + Assert.assertEquals("Not Found", e.getStatusMessage()); + Assert.assertEquals(404, e.getStatusCode()); } } } + @Test public void testInvalidRersources2() throws Exception { try (final WebClient webClient = new WebClient()) { try { webClient.getPage(ParameterUtils.getBaseUrl() + "/static/..%252f"); Assert.fail("Previous request should have failed"); } catch (FailingHttpStatusCodeException e) { + Assert.assertEquals("Not Found", e.getStatusMessage()); + Assert.assertEquals(404, e.getStatusCode()); } } } - /*public void testInvalidRersources3() throws IOException { - try { - beginAt("/static/..%252f..%252f..%252fWEB-INF/classes/org/apache/struts2/showcase/action/EmployeeAction.class/"); - fail("Previous request should have failed"); - } catch (TestingEngineResponseException ex) { - // ok - } - }*/ } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java index 03bf74e80..9468f85e5 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java @@ -65,11 +65,11 @@ public class UITagExampleTest { final HtmlSubmitInput button = form.getInputByValue("Submit"); final HtmlPage page2 = button.click(); - Assert.assertEquals("name", page2.getElementById("name").asText()); - Assert.assertEquals("bio", page2.getElementById("bio").asText()); - Assert.assertEquals("Red", page2.getElementById("favouriteColor").asText()); - Assert.assertEquals("[Patrick, Jason]", page2.getElementById("friends").asText()); - Assert.assertEquals("true", page2.getElementById("legalAge").asText()); + Assert.assertEquals("name", page2.getElementById("name").asNormalizedText()); + Assert.assertEquals("bio", page2.getElementById("bio").asNormalizedText()); + Assert.assertEquals("Red", page2.getElementById("favouriteColor").asNormalizedText()); + Assert.assertEquals("[Patrick, Jason]", page2.getElementById("friends").asNormalizedText()); + Assert.assertEquals("true", page2.getElementById("legalAge").asNormalizedText()); } } } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java index 3e7940a11..0bc83837a 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java @@ -47,7 +47,7 @@ public class ValidationTest { final HtmlSubmitInput button = form.getInputByValue("Submit"); final HtmlPage page2 = button.click(); - final String page2Text = page2.asText(); + final String page2Text = page2.asNormalizedText(); Assert.assertTrue(page2Text.contains("Invalid field value for field \"dateValidatorField\"")); Assert.assertTrue(page2Text.contains("Invalid field value for field \"integerValidatorField\""));