[jboss-svn-commits] JBoss Common SVN: r4489 - in arquillian/trunk: doc/reference/src/main/docbook/en-US and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 10 13:34:35 EDT 2010
Author: aslak
Date: 2010-06-10 13:34:34 -0400 (Thu, 10 Jun 2010)
New Revision: 4489
Modified:
arquillian/trunk/build/pom.xml
arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
arquillian/trunk/examples/testng/pom.xml
arquillian/trunk/testng/pom.xml
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestEnricherDataProvider.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java
Log:
ARQ-86 Updated to use TestNG 5.12.1. Google Guice is now a new dependency the user needs to add.
Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/build/pom.xml 2010-06-10 17:34:34 UTC (rev 4489)
@@ -1,298 +1,303 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
+ <!--
vi:ts=2:sw=2:expandtab:
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Parent -->
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5</version>
- <relativePath />
- </parent>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5</version>
+ <relativePath />
+ </parent>
- <!-- Model Version -->
- <modelVersion>4.0.0</modelVersion>
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
- <!-- Artifact Configuration -->
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Arquillian Build</name>
- <description>Arquillian Build Configuration</description>
- <packaging>pom</packaging>
+ <!-- Artifact Configuration -->
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Arquillian Build</name>
+ <description>Arquillian Build Configuration</description>
+ <packaging>pom</packaging>
- <!-- Properties -->
- <properties>
+ <!-- Properties -->
+ <properties>
- <!-- Versioning -->
- <version.junit_junit>4.6</version.junit_junit>
- <version.testng_testng>5.10</version.testng_testng>
- <version.shrinkwrap_shrinkwrap>1.0.0-alpha-9</version.shrinkwrap_shrinkwrap>
- <version.jboss_embedded>1.0.0-alpha-1</version.jboss_embedded>
- <version.javaee_api>6.0</version.javaee_api>
- <version.jetty_jetty>6.1.9</version.jetty_jetty>
- <version.mockito_all>1.8.3</version.mockito_all>
+ <!-- Versioning -->
+ <version.junit_junit>4.6</version.junit_junit>
+ <version.testng_testng>5.12.1</version.testng_testng>
+ <version.shrinkwrap_shrinkwrap>1.0.0-alpha-9</version.shrinkwrap_shrinkwrap>
+ <version.jboss_embedded>1.0.0-alpha-1</version.jboss_embedded>
+ <version.javaee_api>6.0</version.javaee_api>
+ <version.jetty_jetty>6.1.9</version.jetty_jetty>
+ <version.mockito_all>1.8.3</version.mockito_all>
- </properties>
+ </properties>
- <!-- Maven 2 Repositories -->
-<repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-deprecated</id>
- <name>JBoss Deprecated</name>
- <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+ <!-- Maven 2 Repositories -->
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-deprecated</id>
+ <name>JBoss Deprecated</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- <!-- SCM -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/common/arquillian/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/common/arquillian/trunk</developerConnection>
- <url>http://anonsvn.jboss.org/repos/common/arquillian/trunk</url>
- </scm>
+ <!-- SCM -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/common/arquillian/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/common/arquillian/trunk</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/common/arquillian/trunk</url>
+ </scm>
- <!-- Issues -->
- <issueManagement>
- <system>jira</system>
- <url>http://jira.jboss.com/jira/browse/ARQ</url>
- </issueManagement>
+ <!-- Issues -->
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.jboss.com/jira/browse/ARQ</url>
+ </issueManagement>
- <!-- Licenses -->
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
+ <!-- Licenses -->
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
- <!-- Build -->
- <build>
- <plugins>
+ <!-- Build -->
+ <build>
+ <plugins>
- <!-- JBoss-specific Packaging -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <extensions>true</extensions>
- </plugin>
+ <!-- JBoss-specific Packaging -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <extensions>true</extensions>
+ </plugin>
- <!-- Compiler -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- <compilerVersion>1.6</compilerVersion>
- <fork>true</fork>
- <argLine>-Xmx512M</argLine>
- <executable>${JAVA_HOME}/bin/javac</executable>
- </configuration>
- </plugin>
+ <!-- Compiler -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ <compilerVersion>1.6</compilerVersion>
+ <fork>true</fork>
+ <argLine>-Xmx512M</argLine>
+ <executable>${JAVA_HOME}/bin/javac</executable>
+ </configuration>
+ </plugin>
- <!-- Surefire -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <trimStackTrace>false</trimStackTrace>
- <printSummary>true</printSummary>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*TestSuite.java</include>
- </includes>
- <useFile>true</useFile>
- </configuration>
- </plugin>
+ <!-- Surefire -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*TestSuite.java</include>
+ </includes>
+ <useFile>true</useFile>
+ </configuration>
+ </plugin>
- <!-- Maven Release Plugin Configuration -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/common/arquillian/tags</tagBase>
- </configuration>
- </plugin>
+ <!-- Maven Release Plugin Configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/common/arquillian/tags</tagBase>
+ </configuration>
+ </plugin>
- <!-- Enforce Maven Environment -->
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven-environment</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version> <!-- Must be Maven 2.0.9 >= x > 2.1 -->
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.6.0</version> <!-- Must be JDK6 -->
- </requireJavaVersion>
- </rules>
- </configuration>
- </plugin>
+ <!-- Enforce Maven Environment -->
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven-environment</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.0.9,)</version> <!-- Must be Maven 2.0.9 >= x > 2.1 -->
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.6.0</version> <!-- Must be JDK6 -->
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
- <!-- Dependency Management -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-spi</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-extension-glassfish</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-extension-vfs3</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- </dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>${version.javaee_api}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit_junit}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>${version.testng_testng}</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-embedded</artifactId>
- <version>${version.jetty_jetty}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${version.mockito_all}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
+ <!-- Dependency Management -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-spi</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-glassfish</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vfs3</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>${version.javaee_api}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit_junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${version.testng_testng}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId> <!-- Needed by TestNG -->
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ </dependency>
- <!-- Reporting -->
- <reporting>
- <plugins>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-embedded</artifactId>
+ <version>${version.jetty_jetty}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${version.mockito_all}</version>
+ </dependency>
- <!-- Cobertura (Code Coverage) -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
+ </dependencies>
+ </dependencyManagement>
- <!-- FindBugs -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
- </configuration>
- </plugin>
+ <!-- Reporting -->
+ <reporting>
+ <plugins>
- <!-- JavaDoc / APIViz -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.3.0.GA</version>
- </docletArtifact>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- <charset>UTF-8</charset>
- <encoding>UTF-8</encoding>
- <docencoding>UTF-8</docencoding>
- <breakiterator>true</breakiterator>
- <version>true</version>
- <author>true</author>
- <keywords>true</keywords>
- <additionalparam>-sourceclasspath
- ${project.build.outputDirectory}</additionalparam>
- </configuration>
- </plugin>
+ <!-- Cobertura (Code Coverage) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ </configuration>
+ </plugin>
- </plugins>
- </reporting>
+ <!-- FindBugs -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
+ </configuration>
+ </plugin>
+
+ <!-- JavaDoc / APIViz -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.3.0.GA</version>
+ </docletArtifact>
+ <useStandardDocletOptions>true</useStandardDocletOptions>
+ <charset>UTF-8</charset>
+ <encoding>UTF-8</encoding>
+ <docencoding>UTF-8</docencoding>
+ <breakiterator>true</breakiterator>
+ <version>true</version>
+ <author>true</author>
+ <keywords>true</keywords>
+ <additionalparam>-sourceclasspath
+ ${project.build.outputDirectory}</additionalparam>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </reporting>
</project>
Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml 2010-06-10 17:34:34 UTC (rev 4489)
@@ -74,17 +74,23 @@
<programlisting role="XML"><![CDATA[<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
+ <version>5.12.1</version>
<scope>test</scope>
</dependency>
+<dependency> <!-- Needed by TestNG -->
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-testng</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
-</dependency>]]></programlisting>
+</dependency>
+]]></programlisting>
<para>
That covers the libraries you need to write your first Arquillian test case. We'll revisit the pom.xml file in a
Modified: arquillian/trunk/examples/testng/pom.xml
===================================================================
--- arquillian/trunk/examples/testng/pom.xml 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/examples/testng/pom.xml 2010-06-10 17:34:34 UTC (rev 4489)
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../../build/pom.xml</relativePath>
- </parent>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../build/pom.xml</relativePath>
+ </parent>
- <!-- Model Version -->
- <modelVersion>4.0.0</modelVersion>
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
- <!-- Artifact Configuration -->
- <groupId>org.jboss.arquillian.example</groupId>
- <artifactId>arquillian-example-testng</artifactId>
- <name>Arquillian Example TestNG</name>
- <description>TestNG example of Arquillian Usage</description>
+ <!-- Artifact Configuration -->
+ <groupId>org.jboss.arquillian.example</groupId>
+ <artifactId>arquillian-example-testng</artifactId>
+ <name>Arquillian Example TestNG</name>
+ <description>TestNG example of Arquillian Usage</description>
- <!-- Properties -->
- <properties>
+ <!-- Properties -->
+ <properties>
- <!-- Versioning -->
+ <!-- Versioning -->
<version.weld_core>1.0.1-SP1</version.weld_core>
<version.org.apache.openejb_openejb.core>3.1.2</version.org.apache.openejb_openejb.core>
<version.openwebbeans>1.0.0-M4</version.openwebbeans>
@@ -31,7 +31,7 @@
<version.glassfish_30>3.0.1-b02</version.glassfish_30>
- </properties>
+ </properties>
<profiles>
<profile>
@@ -118,8 +118,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
- <include>com/acme/cdi/*</include>
- <include>com/acme/cdi/payment/*</include>
+ <include>com/acme/cdi/*</include>
+ <include>com/acme/cdi/payment/*</include>
</includes>
</configuration>
</plugin>
@@ -198,7 +198,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
- <include>com/acme/cdi/*</include>
+ <include>com/acme/cdi/*</include>
</includes>
</configuration>
</plugin>
@@ -264,7 +264,12 @@
classes, methods, etc. EMB-41. Endorsed required for things like
WS support (EMB-61)
-->
- <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${project.build.directory}/jboss-${version.jboss_60}/lib/endorsed -Djboss.home=${project.build.directory}/jboss-${version.jboss_60} -Djboss.boot.server.log.dir=${project.build.directory}/jboss-${version.jboss_60}</argLine>
+ <argLine>-Xmx512m -XX:MaxPermSize=256m
+ -Djava.net.preferIPv4Stack=true
+ -Djava.util.logging.manager=org.jboss.logmanager.LogManager
+ -Djava.endorsed.dirs=${project.build.directory}/jboss-${version.jboss_60}/lib/endorsed
+ -Djboss.home=${project.build.directory}/jboss-${version.jboss_60}
+ -Djboss.boot.server.log.dir=${project.build.directory}/jboss-${version.jboss_60}</argLine>
<excludes>
<exclude>com/acme/cdi/*</exclude> <!-- Weld Deployer issue in M3 -->
<exclude>com/acme/cdi/translate/*</exclude>
@@ -461,60 +466,65 @@
</profiles>
- <!-- Dependencies -->
- <dependencies>
+ <!-- Dependencies -->
+ <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-testng</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-testng</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.example</groupId>
- <artifactId>arquillian-example-domain</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.example</groupId>
+ <artifactId>arquillian-example-domain</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.0-SP1</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0-SP1</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId> <!-- Needed by TestNG -->
+ <artifactId>guice</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
</project>
Modified: arquillian/trunk/testng/pom.xml
===================================================================
--- arquillian/trunk/testng/pom.xml 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/testng/pom.xml 2010-06-10 17:34:34 UTC (rev 4489)
@@ -1,81 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
+ <!--
vi:ts=2:sw=2:expandtab:
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
- </parent>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
- <!-- Model Version -->
- <modelVersion>4.0.0</modelVersion>
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
- <!-- Artifact Configuration -->
- <artifactId>arquillian-testng</artifactId>
- <name>Arquillian TestRunner TestNG</name>
- <description>TestNG Implementations for the Arquillian Project</description>
+ <!-- Artifact Configuration -->
+ <artifactId>arquillian-testng</artifactId>
+ <name>Arquillian TestRunner TestNG</name>
+ <description>TestNG Implementations for the Arquillian Project</description>
- <!-- Properties -->
- <properties>
+ <!-- Properties -->
+ <properties>
- </properties>
+ </properties>
- <!-- Dependencies -->
- <dependencies>
+ <!-- Dependencies -->
+ <dependencies>
- <!--
+ <!--
org.jboss.arquillian
-->
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-impl-base</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-impl-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!--
+ <!--
External Projects
-->
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId> <!-- Needed by TestNG -->
+ <artifactId>guice</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestEnricherDataProvider.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestEnricherDataProvider.java 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestEnricherDataProvider.java 2010-06-10 17:34:34 UTC (rev 4489)
@@ -18,7 +18,6 @@
import java.lang.reflect.Method;
-import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.spi.util.TestEnrichers;
import org.testng.annotations.DataProvider;
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java 2010-06-10 17:34:34 UTC (rev 4489)
@@ -19,21 +19,12 @@
import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
import org.jboss.arquillian.spi.TestRunner;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.Filters;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.TestNG;
-import org.testng.annotations.Test;
-import org.testng.collections.Maps;
-import org.testng.internal.AnnotationTypeEnum;
-import org.testng.log.TextFormatter;
-import org.testng.log4testng.Logger;
-import org.testng.remote.RemoteTestNG;
-import org.testng.reporters.XMLUtils;
-import org.testng.util.RetryAnalyzerCount;
-import org.testng.v6.TestPlan;
-import org.testng.xml.XmlSuite;
-import com.thoughtworks.qdox.Searcher;
+import com.google.inject.Inject;
/**
* TestNGDeploymentAppender
@@ -49,18 +40,9 @@
return ShrinkWrap.create("arquillian-testng.jar", JavaArchive.class)
.addPackages(
true,
- Test.class.getPackage(),
- AnnotationTypeEnum.class.getPackage(),
- RetryAnalyzerCount.class.getPackage(),
- TextFormatter.class.getPackage(),
- Logger.class.getPackage(),
- TestPlan.class.getPackage(),
- XmlSuite.class.getPackage(),
- Searcher.class.getPackage(),
- Maps.class.getPackage(),
- //IJUnitTestRunner.class.getPackage(),
- RemoteTestNG.class.getPackage(),
- XMLUtils.class.getPackage(),
+ Filters.exclude("/org/testng/junit/.*"),
+ TestNG.class.getPackage(),
+ Inject.class.getPackage(),
Package.getPackage("org.jboss.arquillian.testng"))
.addPackage(TestNG.class.getPackage())
.addServiceProvider(
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java 2010-06-10 14:40:02 UTC (rev 4488)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java 2010-06-10 17:34:34 UTC (rev 4489)
@@ -27,6 +27,7 @@
import org.testng.TestNG;
import org.testng.internal.AnnotationTypeEnum;
import org.testng.xml.XmlClass;
+import org.testng.xml.XmlInclude;
import org.testng.xml.XmlSuite;
import org.testng.xml.XmlTest;
@@ -65,7 +66,7 @@
test.setName("Arquillian - " + className);
List<XmlClass> testClasses = new ArrayList<XmlClass>();
XmlClass testClass = new XmlClass(className);
- testClass.getIncludedMethods().add(methodName);
+ testClass.getIncludedMethods().add(new XmlInclude(methodName));
testClasses.add(testClass);
test.setXmlClasses(testClasses);
return suite;
More information about the jboss-svn-commits
mailing list