geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r477800 - in /geronimo/server/trunk/testsuite: ./ console-testsuite/basic/ console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ console-testsuite/basic/src/test/resources/ deployment-testsuite/test-deployments/ deplo...
Date Tue, 21 Nov 2006 18:21:44 GMT
Author: prasad
Date: Tue Nov 21 10:21:43 2006
New Revision: 477800

URL: http://svn.apache.org/viewvc?view=rev&rev=477800
Log:
* moved maven-compiler-plugin to use jdk15 for source and target.
* moved tests in console and deployment suites to use TestNG annotations.
* introduced testng.xml for basic and test-deployments testsets.
* all tests now run and pass successfully.

Added:
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
  (with props)
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
  (with props)
Modified:
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
    geronimo/server/trunk/testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Tue Nov 21 10:21:43 2006
@@ -19,28 +19,37 @@
 -->
 <!-- $Rev$ $Date$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
     <artifactId>basic</artifactId>
     <name>Geronimo TestSuite, Console :: Basic</name>
     <packaging>jar</packaging>
-
     <description>Basic test for the Geronimo console.
-
         Note the parent artifactId and the relativePath.
-
         Since no other build executions are done here, the profile is not explicitly
         defined. It inherits the 'child' profile from parent. maven-maven-plugin:invoke
         executes the 'child' profile.i
     </description>
-
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
-

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
Tue Nov 21 10:21:43 2006
@@ -19,6 +19,8 @@
 
 package org.apache.geronimo.testsuite.console;
 
+import org.testng.annotations.Test;
+
 /**
  * ???
  *
@@ -30,6 +32,7 @@
     /**
      * @testng.test
      */
+    @Test
     public void testServerInfoLink() throws Exception {
         login();
         

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
Tue Nov 21 10:21:43 2006
@@ -25,6 +25,9 @@
 
 import org.openqa.selenium.server.SeleniumServer;
 
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.AfterSuite;
+
 /**
  * ???
  *
@@ -53,6 +56,7 @@
     /**
      * @testng.before-suite
      */
+    @BeforeSuite
     protected void startSeleniumClient() throws Exception {
         log.info("Starting Selenium client");
         
@@ -63,6 +67,7 @@
     /**
      * @testng.after-suite
      */
+    @AfterSuite
     protected void stopSeleniumClient() throws Exception {
         log.info("Stopping Selenium client");
         

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
Tue Nov 21 10:21:43 2006
@@ -19,6 +19,8 @@
 
 package org.apache.geronimo.testsuite.console;
 
+import org.testng.annotations.Test;
+
 /**
  * ???
  *
@@ -30,6 +32,7 @@
     /**
      * @testng.test
      */
+    @Test
     public void testLogin() throws Exception {
         login();
         
@@ -39,6 +42,7 @@
     /**
      * @testng.test
      */
+    @Test
     public void testLoginAndLogout() throws Exception {
         login();
         logout();
@@ -47,6 +51,7 @@
     /**
      * @testng.test
      */
+    @Test
     public void testClickSomeLinks() throws Exception {
         login();
         

Added: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml?view=auto&rev=477800
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
(added)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
Tue Nov 21 10:21:43 2006
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Suite1" verbose="1" >
+    <test name="basic-console"   >
+        <packages>
+            <package name="org.apache.geronimo.testsuite.console" />
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Tue Nov
21 10:21:43 2006
@@ -17,15 +17,11 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <!-- $Rev$ $Date$ -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
-
     <modelVersion>4.0.0</modelVersion>
     
-
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>deployment-testsuite</artifactId>
@@ -33,23 +29,18 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-
     <artifactId>test-deployments</artifactId>
     <name>Geronimo TestSuite, Deployment :: Test Deployments</name>
     <packaging>jar</packaging>
     
-
     <description>
         Tests for the test-deployables.
-
         Note the parent artifactId and the relativePath.
-
         maven-maven-plugin:invoke executes the 'child' profile.
         Since build executions are done here, a 'child' profile is explicitly defined here
to prevent inheriting other configurations and executions from parent.
     </description>
     
     
-
     <profiles>
         <profile>
             <id>child</id>
@@ -59,16 +50,15 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <testFailureIgnore>true</testFailureIgnore>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
                     </plugin>
             
-
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
-                
-
                         <executions>
                             <execution>
                                 <id>deploy-ears</id>
@@ -85,7 +75,6 @@
                                             <type>ear</type>
                                         </module>
                                 
-
                                         <module>
                                             <groupId>org.apache.geronimo.testsupport</groupId>
                                             <artifactId>test-ear-j2ee_1.4</artifactId>
@@ -96,7 +85,6 @@
                                 </configuration>
                             </execution>
                     
-
                             <execution>
                                 <id>undeploy-ear-as-module</id>
                                 <phase>post-integration-test</phase>
@@ -114,7 +102,6 @@
                                     </modules>
                                 </configuration>
                             </execution>
-
                             <execution>
                                 <id>undeploy-ear-as-moduleId</id>
                                 <phase>post-integration-test</phase>
@@ -132,5 +119,4 @@
         </profile>
     </profiles>
    
-
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
Tue Nov 21 10:21:43 2006
@@ -18,6 +18,7 @@
  */
 
 package org.apache.geronimo.testsuite.deployment;
+import org.testng.annotations.Test;
 
 /**
  * ???
@@ -30,6 +31,7 @@
     /**
      * @testng.test
      */
+    @Test
     public void testIndexContent() throws Exception {
         selenium.open("/test-1_3/");
         selenium.waitForPageToLoad("30000");

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
Tue Nov 21 10:21:43 2006
@@ -19,6 +19,8 @@
 
 package org.apache.geronimo.testsuite.deployment;
 
+import org.testng.annotations.Test;
+
 /**
  * ???
  *
@@ -30,6 +32,7 @@
     /**
      * @testng.test
      */
+    @Test
     public void testIndexContent() throws Exception {
         selenium.open("/test-1_4/");
         selenium.waitForPageToLoad("30000");

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
Tue Nov 21 10:21:43 2006
@@ -25,6 +25,9 @@
 
 import org.openqa.selenium.server.SeleniumServer;
 
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.AfterSuite;
+
 /**
  * ???
  *
@@ -53,6 +56,7 @@
     /**
      * @testng.before-suite
      */
+    @BeforeSuite
     protected void startSeleniumClient() throws Exception {
         log.info("Starting Selenium client");
         
@@ -63,6 +67,7 @@
     /**
      * @testng.after-suite
      */
+    @AfterSuite
     protected void stopSeleniumClient() throws Exception {
         log.info("Stopping Selenium client");
         
@@ -71,21 +76,23 @@
 
     /**
      * junit's per class setup.
-     */
+     * 
     protected void setUp() throws Exception {
         log.info("Starting Selenium client");
         
         selenium = createSeleniumClient("http://localhost:8080/");
         selenium.start();
     }
+     */
     
     /**
      * junit's per class teardown.
-     */
+     * 
     protected void tearDown() throws Exception {
         log.info("Stopping Selenium client");
         
         selenium.stop();
     }
+     */
 }
 

Added: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml?view=auto&rev=477800
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
(added)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
Tue Nov 21 10:21:43 2006
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Suite1" verbose="1" >
+    <test name="deployment"   >
+        <packages>
+            <package name="org.apache.geronimo.testsuite.deployment" />
+        </packages>
+    </test>
+</suite>

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=477800&r1=477799&r2=477800
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Tue Nov 21 10:21:43 2006
@@ -60,7 +60,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <classifier>jdk14</classifier>
+                <classifier>jdk15</classifier>
                 <version>5.1</version>
             </dependency>
             <dependency>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <classifier>jdk14</classifier>
+            <classifier>jdk15</classifier>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -91,6 +91,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <modules>
         <module>console-testsuite</module>
         <module>deployment-testsuite</module>
@@ -104,7 +105,6 @@
                     <artifactId>selenium-maven-plugin</artifactId>
                     <version>${version}</version>
                 </plugin>
-                
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-invoker-plugin</artifactId>
@@ -209,19 +209,33 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
+
     <distributionManagement>
         <site>
             <id>website</id>
             <url>file://${deployDirectory}/website</url>
         </site>
     </distributionManagement>
+
     <profiles>
         <profile>
             <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+
             <build>
                 <pluginManagement>
                     <plugins>
@@ -295,6 +309,7 @@
                         </plugin>
                     </plugins>
                 </pluginManagement>
+
                 <plugins>
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
@@ -304,6 +319,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>child</id>
         </profile>
@@ -326,9 +342,7 @@
         </repository>
     </repositories>
     
-    <!--
     NOTE: This is the repository where maven-surefire-plugin:2.8-SNAPSHOT comes from.
-    -->
     <pluginRepositories>
         <pluginRepository>
             <id>tapestry.javaforge</id>



Mime
View raw message