svn commit: r399512 - in /struts/action/trunk: apps/pom.xml integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java

[ws...@apache.org]

Author: wsmoak
Date: Wed May  3 19:25:29 2006
New Revision: 399512

URL: http://svn.apache.org/viewcvs?rev=399512&view=rev
Log:
Corrected the location of the source code in the example apps.
Issue:  STR-2855
Reported By: Michael Jouravlev

Modified:
    struts/action/trunk/apps/pom.xml
    struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java

Modified: struts/action/trunk/apps/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=399512&r1=399511&r2=399512&view=diff
==============================================================================
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Wed May  3 19:25:29 2006
@@ -81,7 +81,7 @@
                </configuration>
             </configuration>
          </plugin>
-         <!-- Include source code under WEB-INF/src -->
+         <!-- Include source code under WEB-INF/src/java -->
          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
@@ -89,7 +89,7 @@
                   <phase>process-sources</phase>
                   <configuration>
                      <tasks>
-                        <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src"
+                        <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
                               failonerror="false">
                            <fileset dir="${basedir}/src/main/java"/>
                         </copy>

Modified: struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java?rev=399512&r1=399511&r2=399512&view=diff
==============================================================================
--- struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java (original)
+++ struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java Wed May  3 19:25:29 2006
@@ -27,8 +27,8 @@
 import junit.framework.TestSuite;
 
 /**
- * Verify that each of the example apps starts and displays its
- * default page.
+ * Verify that each of the example apps starts and (at least)
+ * displays its default page.
  */
 public class AppsTest extends TestCase {
 
@@ -81,7 +81,21 @@
 
         assertEquals("Struts Cookbook", page.getTitleText());
     }
+    
+    /**
+     * Verify that the view source function is working
+     * in the Struts Cookbook app.
+     */
+    public void testStrutsCookbookViewSource() throws Exception {
+        WebClient webClient = new WebClient();
+        URL url = new URL("http://localhost:"
+                + port + "/struts-cookbook-" + version + "/source.jsp"
+                + "?src=/WEB-INF/src/java/examples/SuccessAction.java");
+        HtmlPage page = (HtmlPage) webClient.getPage(url);
 
+        assertEquals("View Source", page.getTitleText());
+    }
+    
     /**
      * Verify that the Struts Examples app has started
      */