From 68d84d684db69f8acb13e2f21e6643a62a97733e Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Sat, 2 Aug 2008 02:34:11 +0000
Subject: [PATCH] Add some integration tests

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@681928 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/pom.xml                         | 83 ++++++++++++++++---
 .../src/main/resources/struts-tags-ui.xml     | 24 +++---
 .../webapp/tags/ui/actionTagExampleCalled.jsp |  2 +
 .../tags/ui/actionTagExampleCalling.jsp       | 14 ++++
 .../src/main/webapp/tags/ui/example.jsp       | 34 ++++----
 .../src/main/webapp/tags/ui/index.jsp         |  3 +-
 .../showcase/ActionTagExampleTest.java        | 29 +++++++
 .../showcase/ComponentTagExampleTest.java     | 31 +++++++
 .../apache/struts2/showcase/ITBaseTest.java   | 30 +++++++
 .../struts2/showcase/ParameterUtils.java      | 32 +++++++
 .../struts2/showcase/UITagExampleTest.java    | 55 ++++++++++++
 11 files changed, 297 insertions(+), 40 deletions(-)
 create mode 100644 apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp
 create mode 100644 apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
 create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java
 create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java
 create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/ITBaseTest.java
 create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/ParameterUtils.java
 create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 3e416401a..e5072276a 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -181,6 +181,32 @@
          <version>1.1.1</version>
      </dependency>
 
+     <dependency>
+         <groupId>net.sourceforge.jwebunit</groupId>
+         <artifactId>jwebunit-core</artifactId>
+         <version>1.4.1</version>
+         <scope>test</scope>
+     </dependency>
+
+     <dependency>
+         <groupId>commons-httpclient</groupId>
+         <artifactId>commons-httpclient</artifactId>
+         <version>3.1</version>
+         <scope>test</scope>
+     </dependency>
+
+     <dependency>
+         <groupId>net.sourceforge.jwebunit</groupId>
+         <artifactId>jwebunit-htmlunit-plugin</artifactId>
+         <version>1.4.1</version>
+         <scope>test</scope>
+         <exclusions>
+             <exclusion>
+                 <groupId>xom</groupId>
+                 <artifactId>xom</artifactId>
+             </exclusion>
+         </exclusions>
+     </dependency>
 
     </dependencies>
 
@@ -211,19 +237,52 @@
                    </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.twdata.maven</groupId>
+                <artifactId>maven-itblast-plugin</artifactId>
+                <version>0.3</version>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <containers>tomcat5x,jetty6x,jboss42x,resin3x</containers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>it/**</exclude>
+                        <exclude>**/*$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
-                <resources>
-                    <!-- Include resources under src/main/java in WEB-INF/classes -->
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/java</directory>
-                            <includes>
-                                <include>**/*.java</include>
-                             </includes>
-                     </resource>
-                </resources>
+
+        <resources>
+            <!-- Include resources under src/main/java in WEB-INF/classes -->
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.java</include>
+                </includes>
+            </resource>
+        </resources>
 
     </build>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>twdata-m2-repository</id>
+            <name>twdata.org Maven Repository</name>
+            <url>http://twdata-m2-repository.googlecode.com/svn/</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml
index 3c3cd7cd6..0fcb2a3dc 100644
--- a/apps/showcase/src/main/resources/struts-tags-ui.xml
+++ b/apps/showcase/src/main/resources/struts-tags-ui.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE struts PUBLIC
     "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
     "http://struts.apache.org/dtds/struts-2.0.dtd">
-	
+
 <struts>
     <package name="ui-tags" extends="struts-default" namespace="/tags/ui">
         <action name="example" class="org.apache.struts2.showcase.UITagExample">
@@ -40,26 +40,30 @@
         </action>
 
         <!--  START SNIPPET: treeExampleDynamicXWorkXml -->
-        
+
         <action name="showDynamicTreeAction" class="org.apache.struts2.showcase.ShowDynamicTreeAction">
         	<result>/tags/ui/treeExampleDynamic.jsp</result>
         </action>
-        
+
         <!--  END SNIPPET: treeExampleDynamicXWorkXml -->
-        
+
         <action name="showDynamicAjaxTreeAction">
             <result>/tags/ui/treeExampleAjaxDynamic.jsp</result>
         </action>
-        
+
         <action name="showComponentTagExampleCode">
         	<result type="plainText">/tags/ui/componentTagExample.jsp</result>
         </action>
-        
+
+        <action name="actionTagExample">
+            <result>/tags/ui/actionTagExampleCalled.jsp</result>
+            <result name="input">/tags/ui/actionTagExampleCalling.jsp</result>
+        </action>
 	</package>
-	
+
 	<!--  START SNIPPET: treeExampleXWorkXml -->
-	
-	<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">        
+
+	<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">
         <!-- Actions dealing with Tree Example  -->
         <action name="staticTreeSelectAction">
         	<result>/tags/ui/staticTreeSelect.jsp</result>
@@ -68,6 +72,6 @@
         	<result>/tags/ui/dynamicTreeSelect.jsp</result>
         </action>
     </package>
-    
+
     <!--  END SNIPPET: treeExampleXWorkXml -->
 </struts>
diff --git a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp
new file mode 100644
index 000000000..0c496a901
--- /dev/null
+++ b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp
@@ -0,0 +1,2 @@
+<%@taglib prefix="s" uri="/struts-tags" %>
+This text is from the called class
\ No newline at end of file
diff --git a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
new file mode 100644
index 000000000..42b02c2a1
--- /dev/null
+++ b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
@@ -0,0 +1,14 @@
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+<head>
+<title>Showcase - Tags - UI Tags - Action Tag</title>
+</head>
+<body>
+  <b>Example 1:</b>
+  This example calls an action and includes the output on the page
+  <p id="example1" style="background-color:yellow;">
+    <s:action name="/tags/ui" name="actionTagExample" executeResult="true"/>
+  </p>
+</body>
+</html>
\ No newline at end of file
diff --git a/apps/showcase/src/main/webapp/tags/ui/example.jsp b/apps/showcase/src/main/webapp/tags/ui/example.jsp
index 53cc8e01e..c8435789e 100644
--- a/apps/showcase/src/main/webapp/tags/ui/example.jsp
+++ b/apps/showcase/src/main/webapp/tags/ui/example.jsp
@@ -16,8 +16,8 @@
 
 
 <s:form action="exampleSubmit" enctype="multipart/form-data" javascriptTooltip="true">
-    <s:textfield 
-            label="Name" 
+    <s:textfield
+            label="Name"
             name="name"
             tooltip="Enter your Name here"/>
 
@@ -25,13 +25,13 @@
             tooltip="Select Your Birthday"
             label="Birthday"
             name="birthday" />
-            
+
     <sx:datetimepicker
             tooltip="Enter the time you wake up"
             label="Wake up time"
-            name="wakeup" 
+            name="wakeup"
             type="time"/>
-            
+
     <s:textarea
             tooltip="Enter your Biography"
             label="Biography"
@@ -76,7 +76,7 @@
             name="region" list="{'North', 'South'}"
             value="'South'"
             doubleValue="'Florida'"
-            doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}" 
+            doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
             doubleName="state"
             headerKey="-1"
             headerValue="---------- Please Select ----------"
@@ -100,35 +100,35 @@
 
     <s:file
             tooltip="Upload Your Picture"
-            label="Picture" 
+            label="Picture"
             name="picture" />
-            
+
     <s:optiontransferselect
             tooltip="Select Your Favourite Cartoon Characters"
             label="Favourite Cartoons Characters"
-            name="leftSideCartoonCharacters" 
+            name="leftSideCartoonCharacters"
             leftTitle="Left Title"
             rightTitle="Right Title"
-            list="{'Popeye', 'He-Man', 'Spiderman'}" 
+            list="{'Popeye', 'He-Man', 'Spiderman'}"
             multiple="true"
             headerKey="headerKey"
             headerValue="--- Please Select ---"
             emptyOption="true"
-            doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}" 
+            doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
             doubleName="rightSideCartoonCharacters"
             doubleHeaderKey="doubleHeaderKey"
-            doubleHeaderValue="--- Please Select ---" 
+            doubleHeaderValue="--- Please Select ---"
             doubleEmptyOption="true"
             doubleMultiple="true" />
-    
+
     <s:textarea
             label="Your Thougths"
-            name="thoughts" 
+            name="thoughts"
             tooltip="Enter your thoughts here" />
-            
-    <s:submit onclick="alert('Custom onclick event triggered before submitting form... Press OK to continue!');" />
+
+    <s:submit />
     <s:reset onclick="alert('Resetting form now... Press OK to continue!');" />
 </s:form>
-    
+
 </body>
 </html>
diff --git a/apps/showcase/src/main/webapp/tags/ui/index.jsp b/apps/showcase/src/main/webapp/tags/ui/index.jsp
index 5005be75f..cd14b48d4 100644
--- a/apps/showcase/src/main/webapp/tags/ui/index.jsp
+++ b/apps/showcase/src/main/webapp/tags/ui/index.jsp
@@ -6,7 +6,7 @@
 </head>
 <body>
     <h1>UI Tags</h1>
-    
+
     <ul>
         <li><s:url var="url" namespace="/tags/ui" action="example" method="input" /><s:a href="%{url}">UI Example</s:a></li>
         <li><s:url var="url" namespace="/tags/ui" action="exampleVelocity" method="input" /><s:a href="%{url}">UI Example (Velocity)</s:a></li>
@@ -16,6 +16,7 @@
         <li><s:url var="url" namespace="/tags/ui" action="showDynamicTreeAction"/><s:a href="%{url}">Tree Example (dynamic)</s:a>
         <li><s:url var="url" namespace="/tags/ui" action="showDynamicAjaxTreeAction"/><s:a href="%{url}">Tree Example (dynamic ajax loading)</s:a>
         <li><s:url var="url" value="componentTagExample.jsp"/><s:a href="%{#url}">Component Tag Example</s:a>
+        <li><s:url var="url" namespace="/tags/ui" action="actionTagExample" method="input" /><s:a href="%{url}">Action Tag Example</s:a></li>
         <li><a href="datepicker/index.jsp">DateTime picker tag - Pick a date</a></li>
         <li><a href="timepicker/index.jsp">DateTime picker tag - Pick a time</a></li>
         <%--li><s:url var="url" namespace="/tags/ui" action="populateUsingIterator" method="input" /><s:a href="%{url}">UI population using iterator tag</s:a></li--%>
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
new file mode 100644
index 000000000..70211f38f
--- /dev/null
+++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java
@@ -0,0 +1,29 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ActionTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/actionTagExample!input.action");
+        assertTextPresent("This text is from the called class");
+    }
+
+}
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
new file mode 100644
index 000000000..afcce647d
--- /dev/null
+++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java
@@ -0,0 +1,31 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ComponentTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/componentTagExample.jsp");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue1");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue4");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue2");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue3");
+    }
+}
diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ITBaseTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ITBaseTest.java
new file mode 100644
index 000000000..61e6514e3
--- /dev/null
+++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ITBaseTest.java
@@ -0,0 +1,30 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+
+public abstract class ITBaseTest extends WebTestCase {
+
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
+}
diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ParameterUtils.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ParameterUtils.java
new file mode 100644
index 000000000..ddfdf4361
--- /dev/null
+++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ParameterUtils.java
@@ -0,0 +1,32 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ParameterUtils {
+
+    public static String getBaseUrl() {
+        String port = System.getProperty("http.port");
+        if (port == null) {
+            port = "8080";
+        }
+        return "http://localhost:"+port+"/struts2-showcase";
+    }
+}
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
new file mode 100644
index 000000000..1051e6b94
--- /dev/null
+++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java
@@ -0,0 +1,55 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class UITagExampleTest extends ITBaseTest {
+    public void testInputForm() {
+        setScriptingEnabled(false);
+        beginAt("/tags/ui/example!input.action");
+        assertFormPresent("exampleSubmit");
+        // text box
+        assertFormElementPresent("name");
+        // textarea
+        assertFormElementPresent("bio");
+        // select
+        assertFormElementPresent("favouriteColor");
+        // checkbox list
+        assertFormElementPresent("friends");
+        // checkbox
+        assertFormElementPresent("legalAge");
+
+        // set fields
+        setTextField("name", "name");
+        setTextField("bio", "bio");
+        selectOption("favouriteColor", "Red");
+        checkCheckbox("friends", "Patrick");
+        checkCheckbox("friends", "Jason");
+        checkCheckbox("legalAge");
+
+        submit();
+
+        assertTextInElement("name", "name");
+        assertTextInElement("bio", "bio");
+        assertTextInElement("favouriteColor", "Red");
+        assertTextInElement("friends", "[Patrick, Jason]");
+        assertTextInElement("legalAge", "true");
+    }
+}