[jboss-svn-commits] JBoss Common SVN: r3897 - in arquillian/trunk: junit/src/main/java/org/jboss/arquillian/junit and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 29 18:11:51 EST 2009
Author: aslak
Date: 2009-12-29 18:11:51 -0500 (Tue, 29 Dec 2009)
New Revision: 3897
Added:
arquillian/trunk/testng/src/test/java/org/
arquillian/trunk/testng/src/test/java/org/jboss/
arquillian/trunk/testng/src/test/java/org/jboss/arquillian/
arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/
arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
Removed:
arquillian/trunk/junit/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner
arquillian/trunk/testenricher-jboss/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
arquillian/trunk/testng/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner
Modified:
arquillian/trunk/build/pom.xml
arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java
arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppender.java
Log:
ARQ-52 Updated to ShrinkWrap-alpha-3, taken advantage of new features
Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/build/pom.xml 2009-12-29 23:11:51 UTC (rev 3897)
@@ -29,7 +29,7 @@
<!-- Versioning -->
<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.shrinkwrap_shrinkwrap>1.0.0-alpha-3</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>
Modified: arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java
===================================================================
--- arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java 2009-12-29 23:11:51 UTC (rev 3897)
@@ -17,6 +17,7 @@
package org.jboss.arquillian.junit;
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;
@@ -44,9 +45,9 @@
Package.getPackage("org.junit"),
Package.getPackage("org.hamcrest"),
Package.getPackage("org.jboss.arquillian.junit"))
- .addManifestResource(
- "META-INF/services/org.jboss.arquillian.spi.TestRunner",
- "services/org.jboss.arquillian.spi.TestRunner");
+ .addServiceProvider(
+ TestRunner.class,
+ JUnitTestRunner.class);
try
{
archive.addPackages(
Deleted: arquillian/trunk/junit/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner
===================================================================
--- arquillian/trunk/junit/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/junit/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner 2009-12-29 23:11:51 UTC (rev 3897)
@@ -1 +0,0 @@
-org.jboss.arquillian.junit.JUnitTestRunner
\ No newline at end of file
Modified: arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppender.java
===================================================================
--- arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppender.java 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/testenricher-jboss/src/main/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppender.java 2009-12-29 23:11:51 UTC (rev 3897)
@@ -17,6 +17,7 @@
package org.jboss.arquillian.testenricher.jboss;
import org.jboss.arquillian.spi.DeploymentAppender;
+import org.jboss.arquillian.spi.TestEnricher;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -43,9 +44,11 @@
.addPackages(
true,
Package.getPackage("org.jboss.arquillian.testenricher.jboss"))
- .addManifestResource(
- "META-INF/services/org.jboss.arquillian.spi.TestEnricher",
- "services/org.jboss.arquillian.spi.TestEnricher");
+ .addServiceProvider(
+ TestEnricher.class,
+ EJBInjectionEnricher.class,
+ ResourceInjectionEnricher.class,
+ CDIInjectionEnricher.class);
return archive;
}
Deleted: arquillian/trunk/testenricher-jboss/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
===================================================================
--- arquillian/trunk/testenricher-jboss/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/testenricher-jboss/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2009-12-29 23:11:51 UTC (rev 3897)
@@ -1,3 +0,0 @@
-org.jboss.arquillian.testenricher.jboss.EJBInjectionEnricher
-org.jboss.arquillian.testenricher.jboss.ResourceInjectionEnricher
-org.jboss.arquillian.testenricher.jboss.CDIInjectionEnricher
\ No newline at end of file
Deleted: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2009-12-29 23:11:51 UTC (rev 3897)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.arquillian.testng;
-
-import junit.framework.Assert;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Paths;
-import org.junit.Test;
-
-/**
- * TestNGDeploymentAppenderTestCase
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public class TestNGDeploymentAppenderTestCase
-{
-
- @Test
- public void shouldGenerateDependencies() throws Exception
- {
- Archive<?> archive = new TestNGDeploymentAppender().createArchive();
-
- Assert.assertTrue(
- "Should have added TestRunner SPI",
- archive.contains(Paths.create("/META-INF/services/org.jboss.arquillian.spi.TestRunner")));
-
- Assert.assertTrue(
- "Should have added TestRunner Impl",
- archive.contains(Paths.create("/org/jboss/arquillian/testng/TestNGTestRunner.class")));
-
- System.out.println(archive.toString(true));
-
- }
-}
Deleted: arquillian/trunk/testng/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner
===================================================================
--- arquillian/trunk/testng/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner 2009-12-29 22:39:29 UTC (rev 3896)
+++ arquillian/trunk/testng/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestRunner 2009-12-29 23:11:51 UTC (rev 3897)
@@ -1 +0,0 @@
-org.jboss.arquillian.testng.TestNGTestRunner
\ No newline at end of file
Copied: arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java (from rev 3883, arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java)
===================================================================
--- arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java (rev 0)
+++ arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2009-12-29 23:11:51 UTC (rev 3897)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.testng;
+
+import junit.framework.Assert;
+
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.Paths;
+import org.junit.Test;
+
+/**
+ * TestNGDeploymentAppenderTestCase
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class TestNGDeploymentAppenderTestCase
+{
+
+ @Test
+ public void shouldGenerateDependencies() throws Exception
+ {
+ Archive<?> archive = new TestNGDeploymentAppender().createArchive();
+
+ Assert.assertTrue(
+ "Should have added TestRunner SPI",
+ archive.contains(Paths.create("/META-INF/services/org.jboss.arquillian.spi.TestRunner")));
+
+ Assert.assertTrue(
+ "Should have added TestRunner Impl",
+ archive.contains(Paths.create("/org/jboss/arquillian/testng/TestNGTestRunner.class")));
+
+ System.out.println(archive.toString(true));
+
+ }
+}
More information about the jboss-svn-commits
mailing list