[jboss-svn-commits] JBoss Common SVN: r3896 - in arquillian/trunk: demo-testng and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2009-12-29 17:39:29 -0500 (Tue, 29 Dec 2009)
New Revision: 3896

Modified:
   arquillian/trunk/build/pom.xml
   arquillian/trunk/demo-testng/
   arquillian/trunk/demo-testng/pom.xml
   arquillian/trunk/testng/pom.xml
   arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
Log:
ARQ-51 Updated to TestNG 5.10


Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml	2009-12-29 15:08:44 UTC (rev 3895)
+++ arquillian/trunk/build/pom.xml	2009-12-29 22:39:29 UTC (rev 3896)
@@ -27,9 +27,9 @@
 	<properties>
 
 		<!-- Versioning -->
-	  <version.junit_junit>4.6</version.junit_junit>	
-    <version.testng_testng>5.9</version.testng_testng>
-    <version.shrinkwrap_shrinkwrap>1.0.0-SNAPSHOT</version.shrinkwrap_shrinkwrap>
+		<version.junit_junit>4.6</version.junit_junit>	
+		<version.testng_testng>5.10</version.testng_testng>
+		<version.shrinkwrap_shrinkwrap>1.0.0-SNAPSHOT</version.shrinkwrap_shrinkwrap>
 		<version.jboss_embedded>1.0.0-alpha-1</version.jboss_embedded>
 		<version.servlet_api>2.5</version.servlet_api>
 		<version.jetty_jetty>6.1.9</version.jetty_jetty>
@@ -205,6 +205,7 @@
       <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
+		<classifier>jdk15</classifier>
         <version>${version.testng_testng}</version>
       </dependency>
 			<dependency>


Property changes on: arquillian/trunk/demo-testng
___________________________________________________________________
Name: svn:ignore
   - .classpath
.project
.settings
target


   + .classpath
.project
.settings
target
temp-testng-customsuite.xml
test-output


Modified: arquillian/trunk/demo-testng/pom.xml
===================================================================
--- arquillian/trunk/demo-testng/pom.xml	2009-12-29 15:08:44 UTC (rev 3895)
+++ arquillian/trunk/demo-testng/pom.xml	2009-12-29 22:39:29 UTC (rev 3896)
@@ -95,6 +95,7 @@
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
+         <classifier>jdk15</classifier>
          <scope>test</scope>
       </dependency>
 

Modified: arquillian/trunk/testng/pom.xml
===================================================================
--- arquillian/trunk/testng/pom.xml	2009-12-29 15:08:44 UTC (rev 3895)
+++ arquillian/trunk/testng/pom.xml	2009-12-29 22:39:29 UTC (rev 3896)
@@ -40,19 +40,12 @@
       </dependency>
 
       <!-- 
-    org.jboss.shrinkwrap    
-     -->
-      <dependency>
-         <groupId>org.jboss.shrinkwrap</groupId>
-         <artifactId>shrinkwrap-impl-base</artifactId>
-      </dependency>
-
-      <!-- 
     External Projects
      -->
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
+         <classifier>jdk15</classifier>
          <scope>provided</scope>
       </dependency>
 

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	2009-12-29 15:08:44 UTC (rev 3895)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java	2009-12-29 22:39:29 UTC (rev 3896)
@@ -17,14 +17,18 @@
 package org.jboss.arquillian.testng;
 
 import org.jboss.arquillian.spi.DeploymentAppender;
+import org.jboss.arquillian.spi.TestRunner;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.Archives;
 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;
@@ -56,10 +60,14 @@
                      TestPlan.class.getPackage(),
                      XmlSuite.class.getPackage(),
                      Searcher.class.getPackage(),
+                     Maps.class.getPackage(),
+                     //IJUnitTestRunner.class.getPackage(),
+                     RemoteTestNG.class.getPackage(),
+                     XMLUtils.class.getPackage(),
                      Package.getPackage("org.jboss.arquillian.testng"))
                .addPackage(TestNG.class.getPackage())
-               .addManifestResource(
-                     "META-INF/services/org.jboss.arquillian.spi.TestRunner",
-                     "services/org.jboss.arquillian.spi.TestRunner");
+               .addServiceProvider(
+                     TestRunner.class, 
+                     TestNGTestRunner.class);
    }
 }