geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r577928 - in /geronimo/server/trunk/testsuite/web-testsuite: test-2.1-jsps/ test-2.5-servlets/ test-jetty/ test-security/ test-tomcat/ test-web-references/web-references-ear/ test-web-references/web-references-ear/src/main/resources/META-IN...
Date Thu, 20 Sep 2007 21:20:01 GMT
Author: gawor
Date: Thu Sep 20 14:20:00 2007
New Revision: 577928

URL: http://svn.apache.org/viewvc?rev=577928&view=rev
Log:
add selenium plug-in so that mvn -P child actaully works, and fix some tests

Modified:
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Thu Sep 20 14:20:00
2007
@@ -62,6 +62,11 @@
             <build>
                 <plugins>
                   <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>selenium-maven-plugin</artifactId>
+                   </plugin>
+
+                  <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>tools-maven-plugin</artifactId>
                     <extensions>true</extensions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml Thu Sep 20 14:20:00
2007
@@ -55,6 +55,12 @@
             <id>child</id>
             <build>
                 <plugins>
+
+                  <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>selenium-maven-plugin</artifactId>
+                   </plugin>
+
                   <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>tools-maven-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Thu Sep 20 14:20:00 2007
@@ -49,6 +49,11 @@
             <id>child</id>
             <build>
               <plugins>
+                   <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>selenium-maven-plugin</artifactId>
+                   </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-security/pom.xml Thu Sep 20 14:20:00
2007
@@ -56,6 +56,11 @@
             <id>child</id>
             <build>
                 <plugins>
+                   <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>selenium-maven-plugin</artifactId>
+                   </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Thu Sep 20 14:20:00
2007
@@ -56,6 +56,11 @@
             <id>child</id>
             <build>
                 <plugins>
+                   <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>selenium-maven-plugin</artifactId>
+                   </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
Thu Sep 20 14:20:00 2007
@@ -56,6 +56,11 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>selenium-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
                     <modules>
@@ -83,6 +88,30 @@
                 </configuration>
             </plugin>
                     
+            <!-- "ear" packaging doesn't compile test classes -->
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- "ear" packaging doesn't process test resources -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>testResources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
Thu Sep 20 14:20:00 2007
@@ -32,7 +32,7 @@
             </dep:dependency>
             <dep:dependency>
                 <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                <dep:artifactId>activemq</dep:artifactId>
+                <dep:artifactId>activemq-ra</dep:artifactId>
             </dep:dependency>
         </dep:dependencies>
     </dep:environment>
@@ -42,9 +42,12 @@
             <context-root>/webref</context-root>
             <ejb-ref>
                 <ref-name>ejb/TestBean</ref-name>
+                <ejb-link>TestBean</ejb-link>
+<!--
                 <pattern>
                     <name>TestBean</name>
                 </pattern>
+-->
             </ejb-ref>
             <resource-ref>
                 <ref-name>jdbc/MyDataSource</ref-name>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java?rev=577928&r1=577927&r2=577928&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
Thu Sep 20 14:20:00 2007
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.geronimo.testsuite.deployment;
+package org.apache.geronimo.testsuite.web.references;
 
 import org.apache.geronimo.testsupport.SeleniumTestSupport;
 import org.testng.annotations.Test;
@@ -36,7 +36,8 @@
         selenium.open("/webref/TomcatTestServlet");
         selenium.waitForPageToLoad("30000");
         assertEquals("Sample application to check references", selenium.getTitle());
-        assertEquals(" Check EJB Reference : Call to bean method returned ->bean Test",
selenium.getText("xpath=/html/body/font"));
+        System.out.println(selenium.getText("xpath=/html/body/font"));
+        assertEquals("Check EJB Reference : Call to bean method returned ->bean Test",
selenium.getText("xpath=/html/body/font"));
     }
 }
 



Mime
View raw message