geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r654748 - in /geronimo/server/trunk/testsuite: ./ console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ deployment-testsuite/ deployment-testsuite/deployment-tests/ deployment-testsuite/jca-cms-tests/jca-cms-ear/ e...
Date Fri, 09 May 2008 10:12:49 GMT
Author: jdillon
Date: Fri May  9 03:12:49 2008
New Revision: 654748

URL: http://svn.apache.org/viewvc?rev=654748&view=rev
Log:
Fix up some more testsuite configuration

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
    geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/pom.xml
    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-myfaces/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
Fri May  9 03:12:49 2008
@@ -24,8 +24,9 @@
 /**
  * @version $Rev$ $Date$
  */
-public class WebServerTest extends TestSupport {
-
+public class WebServerTest
+    extends TestSupport
+{
     public static final String TOMCAT = "Tomcat";
     public static final String JETTY = "Jetty";
 
@@ -38,7 +39,7 @@
     }
 
     @Test
-    public void testEditConnector() throws Exception{
+    public void testEditConnector() throws Exception {
         String name = "uniquename2";
         addConnector(name, 8082);
 
@@ -85,7 +86,7 @@
         selenium.click("link=Web Server");
         waitForPageLoad();
         String container = JETTY;
-        if(selenium.isTextPresent(TOMCAT)) {
+        if (selenium.isTextPresent(TOMCAT)) {
             container = TOMCAT;
         }
         

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml Fri May
 9 03:12:49 2008
@@ -38,6 +38,20 @@
     </description>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
Fri May  9 03:12:49 2008
@@ -54,6 +54,20 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Fri May  9 03:12:49 2008
@@ -39,26 +39,6 @@
     </description>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Fri May  9 03:12:49 2008
@@ -47,26 +47,6 @@
     </description>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri May  9 03:12:49 2008
@@ -231,6 +231,13 @@
                             <includes>
                                 <include>*/*/pom.xml</include>
                             </includes>
+                            
+                            <!--
+                            TODO: Need to find a better way to run container specific integration
tests.
+                            -->
+                            <excludes>
+                                <exclude>web-testsuite/test-tomcat/pom.xml</exclude>
+                            </excludes>
                         </fileset>
                     </projects>
                 </configuration>

Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Fri May  9 03:12:49 2008
@@ -48,12 +48,6 @@
                         <suiteXmlFiles>
                             <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                         </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
                     </configuration>
                 </plugin>
             </plugins>

Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Fri May  9 03:12:49 2008
@@ -44,65 +44,8 @@
          - JSTL
     </description>
 
-    <properties>
-        <excludeTest>test-tomcat</excludeTest>
-    </properties>
-
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>shitty-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <projects>
-                        <fileset>
-                            <directory>${project.basedir}</directory>
-                            <includes>
-                                <include>*/pom.xml</include>
-                            </includes>
-                            <!- -
-                            HACK: Skip tomcat (or jetty) tests for now till we figure out
how to switch it dynamically
-                            - ->
-                            <excludes>
-                                <exclude>${excludeTest}/pom.xml</exclude>
-                            </excludes>
-                        </fileset>
-                    </projects>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                            <goal>install</goal>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-            
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>

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=654748&r1=654747&r2=654748&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 Fri May  9 03:12:49
2008
@@ -49,6 +49,20 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

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=654748&r1=654747&r2=654748&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 Fri May  9 03:12:49
2008
@@ -43,6 +43,20 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

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=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Fri May  9 03:12:49 2008
@@ -43,7 +43,21 @@
     </dependencies>
     
     <build>
-      <plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
+        <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Fri May  9 03:12:49
2008
@@ -55,6 +55,20 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

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=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Fri May  9 03:12:49
2008
@@ -43,6 +43,20 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
Fri May  9 03:12:49 2008
@@ -59,6 +59,20 @@
     </dependencies>
     
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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=654748&r1=654747&r2=654748&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
Fri May  9 03:12:49 2008
@@ -59,6 +59,20 @@
     </dependencies>
     
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml?rev=654748&r1=654747&r2=654748&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml Fri May  9 03:12:49 2008
@@ -33,29 +33,12 @@
     <artifactId>webservices-testsuite</artifactId>
     <name>Geronimo TestSuite :: WebServices TestSuite</name>
     <packaging>pom</packaging>
-    <description>Tests JEE5 WebServices features.</description>
+    
+    <description>
+        Tests JEE5 WebServices features.
+    </description>
     
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>



Mime
View raw message