You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2006/11/13 16:28:11 UTC
svn commit: r474368 - in /geronimo/server/trunk/testsuite:
console-testsuite/basic/pom.xml console-testsuite/pom.xml
deployment-testsuite/pom.xml deployment-testsuite/test-deployments/pom.xml
pom.xml
Author: prasad
Date: Mon Nov 13 07:28:11 2006
New Revision: 474368
URL: http://svn.apache.org/viewvc?view=rev&rev=474368
Log:
* execute testsuite-maven-plugin to generate surefire reports for suite poms
Modified:
geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
geronimo/server/trunk/testsuite/console-testsuite/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
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=474368&r1=474367&r2=474368
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Mon Nov 13 07:28:11 2006
@@ -26,9 +26,9 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>testsuite</artifactId>
+ <artifactId>console-testsuite</artifactId>
<version>1.2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>basic</artifactId>
@@ -45,18 +45,4 @@
</description>
- <dependencies>
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openqa.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- </dependency>
- </dependencies>
-
-
-
-</project>
+ </project>
Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?view=diff&rev=474368&r1=474367&r2=474368
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Mon Nov 13 07:28:11 2006
@@ -33,7 +33,7 @@
<artifactId>console-testsuite</artifactId>
<name>Geronimo TestSuite, Console</name>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<description>
Geronimo console testsuite.
@@ -52,6 +52,31 @@
</dependencies>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
<plugins>
<plugin>
@@ -96,6 +121,13 @@
</plugins>
</build>
+ </profile>
+
+ <profile>
+ <id>child</id>
+ </profile>
+
+ </profiles>
</project>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?view=diff&rev=474368&r1=474367&r2=474368
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Mon Nov 13 07:28:11 2006
@@ -33,7 +33,7 @@
<artifactId>deployment-testsuite</artifactId>
<name>Geronimo TestSuite, Deployment</name>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<description>
Geronimo deployment testsuite.
@@ -52,7 +52,33 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <!-- This plugin is needed for all suite poms. -->
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<!--
TODO: Hook up m-m-p to allow child modules to be built early during this modules
compile (or something) phase.
@@ -75,6 +101,13 @@
</plugin>
</plugins>
</build>
+ </profile>
+
+ <profile>
+ <id>child</id>
+ </profile>
+
+ </profiles>
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=474368&r1=474367&r2=474368
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Mon Nov 13 07:28:11 2006
@@ -26,9 +26,9 @@
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>testsuite</artifactId>
+ <artifactId>deployment-testsuite</artifactId>
<version>1.2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>test-deployments</artifactId>
@@ -44,19 +44,6 @@
Since build executions are done here, a 'child' profile is explicitly defined here to prevent inheriting other configurations and executions from parent.
</description>
- <dependencies>
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.openqa.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
<profiles>
<profile>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=474368&r1=474367&r2=474368
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Mon Nov 13 07:28:11 2006
@@ -50,8 +50,6 @@
</description>
-
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -116,6 +114,7 @@
<build>
<pluginManagement>
<plugins>
+
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>selenium-maven-plugin</artifactId>
@@ -189,7 +188,6 @@
</goals>
</execution>
- <!--
<execution>
<id>site</id>
<phase>site</phase>
@@ -202,20 +200,6 @@
</goals>
</configuration>
</execution>
- -->
-
- <execution>
- <id>site-deploy</id>
- <phase>site-deploy</phase>
- <goals>
- <goal>invoke</goal>
- </goals>
- <configuration>
- <goals>
- <goal>site-deploy</goal>
- </goals>
- </configuration>
- </execution>
<execution>
<id>clean</id>
@@ -287,7 +271,7 @@
<configuration>
<logOutput>true</logOutput>
<background>true</background>
- <!-- Example: -->
+ <!-- EXAMPLE: Use the following option to re-use a single installation of the server for all tests -->
<!--
<installDirectory>c:\apache</installDirectory>
-->
@@ -301,11 +285,34 @@
<goal>stop-server</goal>
</goals>
</execution>
+
</executions>
</plugin>
</plugins>
</pluginManagement>
+
+
+ <plugins>
+ <plugin>
+ <!--
+ FIXME: This plugin executes twice in each of the child.
+ -->
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
+ <executions>
+ <execution>
+ <id>generate-surefire-report</id>
+ <phase>site</phase>
+ <goals>
+ <goal>generate-surefire-report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
</build>
</profile>