[jboss-svn-commits] JBoss Common SVN: r4008 - in arquillian/trunk: demo/src/test/java/com/acme/cdi and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 9 02:48:51 EST 2010
Author: aslak
Date: 2010-02-09 02:48:50 -0500 (Tue, 09 Feb 2010)
New Revision: 4008
Modified:
arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/InjectionTestCase.java
arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java
arquillian/trunk/demo-testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java
arquillian/trunk/demo/src/test/java/com/acme/cdi/InjectionTestCase.java
arquillian/trunk/demo/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
arquillian/trunk/demo/src/test/java/com/acme/cdi/random/RandomTestCase.java
arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java
arquillian/trunk/protocol-servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
arquillian/trunk/protocol-servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java
arquillian/trunk/testenricher-jboss/src/test/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppenderTestCase.java
arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
Log:
ARQ-61 Upgraded to ShrinkWrap alpha-5
Modified: arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -29,9 +29,9 @@
import java.util.Map;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.Path;
import org.jboss.shrinkwrap.impl.base.AssignableBase;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
@@ -69,8 +69,8 @@
public Collection<URL> getBeansXml()
{
List<URL> beanClasses = new ArrayList<URL>();
- Map<Path, Asset> archives = archive.getContent(Filters.include(".*\\.jar"));
- for(Map.Entry<Path, Asset> archiveEntry : archives.entrySet())
+ Map<ArchivePath, Asset> archives = archive.getContent(Filters.include(".*\\.jar"));
+ for(Map.Entry<ArchivePath, Asset> archiveEntry : archives.entrySet())
{
if(archiveEntry.getValue() instanceof ArchiveAsset)
{
@@ -78,8 +78,8 @@
if(beansArchive.getName().matches("arquillian.*")) {
continue;
}
- Map<Path, Asset> classes = beansArchive.getContent(Filters.include(".*/beans.xml"));
- for(final Map.Entry<Path, Asset> entry : classes.entrySet())
+ Map<ArchivePath, Asset> classes = beansArchive.getContent(Filters.include(".*/beans.xml"));
+ for(final Map.Entry<ArchivePath, Asset> entry : classes.entrySet())
{
try
{
@@ -116,8 +116,8 @@
public Collection<Class<?>> getBeanClasses()
{
List<Class<?>> beanClasses = new ArrayList<Class<?>>();
- Map<Path, Asset> archives = archive.getContent(Filters.include(".*\\.jar"));
- for(Map.Entry<Path, Asset> archiveEntry : archives.entrySet())
+ Map<ArchivePath, Asset> archives = archive.getContent(Filters.include(".*\\.jar"));
+ for(Map.Entry<ArchivePath, Asset> archiveEntry : archives.entrySet())
{
if(archiveEntry.getValue() instanceof ArchiveAsset)
{
@@ -125,8 +125,8 @@
if(beansArchive.getName().matches("arquillian.*")) {
continue;
}
- Map<Path, Asset> classes = beansArchive.getContent(Filters.include(".*\\.class"));
- for(Map.Entry<Path, Asset> classEntry : classes.entrySet())
+ Map<ArchivePath, Asset> classes = beansArchive.getContent(Filters.include(".*\\.class"));
+ for(Map.Entry<ArchivePath, Asset> classEntry : classes.entrySet())
{
if (classEntry.getValue() instanceof ClassAsset)
{
Modified: arquillian/trunk/demo/src/test/java/com/acme/cdi/InjectionTestCase.java
===================================================================
--- arquillian/trunk/demo/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/demo/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -21,8 +21,8 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Paths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
@@ -49,7 +49,7 @@
GreetingManagerBean.class)
.addManifestResource(
new ByteArrayAsset("<beans/>".getBytes()),
- Paths.create("beans.xml"));
+ ArchivePaths.create("beans.xml"));
}
@Inject GreetingManager greetingManager;
Modified: arquillian/trunk/demo/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
===================================================================
--- arquillian/trunk/demo/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/demo/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -20,15 +20,15 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Paths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * InjectionTestCase
+ *
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
@@ -44,7 +44,7 @@
)
.addManifestResource(
"com/acme/cdi/payment/beans.xml",
- Paths.create("beans.xml"));
+ ArchivePaths.create("beans.xml"));
}
@Inject @Synchronous PaymentProcessor processor;
Modified: arquillian/trunk/demo/src/test/java/com/acme/cdi/random/RandomTestCase.java
===================================================================
--- arquillian/trunk/demo/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/demo/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -22,17 +22,15 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Paths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
-import com.acme.cdi.random.Random;
-
/**
- * InjectionTestCase
+ *
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
@@ -48,7 +46,7 @@
)
.addManifestResource(
new ByteArrayAsset("<beans/>".getBytes()),
- Paths.create("beans.xml"));
+ ArchivePaths.create("beans.xml"));
}
@Inject @Random
Modified: arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/InjectionTestCase.java
===================================================================
--- arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -17,13 +17,12 @@
package com.acme.cdi;
import javax.enterprise.inject.spi.BeanManager;
-
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Paths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
@@ -48,7 +47,7 @@
GreetingManagerBean.class)
.addManifestResource(
new ByteArrayAsset("<beans/>".getBytes()),
- Paths.create("beans.xml"));
+ ArchivePaths.create("beans.xml"));
}
@Inject GreetingManager greetingManager;
Modified: arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java
===================================================================
--- arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/demo-testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -20,8 +20,8 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Paths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
@@ -36,7 +36,7 @@
TranslateController.class.getPackage())
.addManifestResource(
new ByteArrayAsset("<beans/>".getBytes()),
- Paths.create("beans.xml"));
+ ArchivePaths.create("beans.xml"));
}
@Inject TranslateController controller;
@@ -44,7 +44,7 @@
@Test
public void shouldSetInputText() throws Exception
{
- controller.setInputText("hi");
+ controller.setInputText("hi");
}
@Test(dependsOnMethods = "shouldSetInputText")
Modified: arquillian/trunk/demo-testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java
===================================================================
--- arquillian/trunk/demo-testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/demo-testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -22,15 +22,12 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Paths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.acme.jpa.User;
-import com.acme.jpa.UserRepository;
-
/**
* UserRepositoryTest
*
@@ -47,7 +44,7 @@
User.class.getPackage())
.addManifestResource(
"com/acme/jpa/user-test-persistence.xml",
- Paths.create("persistence.xml"));
+ ArchivePaths.create("persistence.xml"));
}
private static final String FIRST_NAME = "first-name";
Modified: arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitDeploymentAppenderTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.junit.Test;
/**
@@ -38,11 +38,11 @@
Assert.assertTrue(
"Should have added TestRunner SPI",
- archive.contains(Paths.create("/META-INF/services/org.jboss.arquillian.spi.TestRunner")));
+ archive.contains(ArchivePaths.create("/META-INF/services/org.jboss.arquillian.spi.TestRunner")));
Assert.assertTrue(
"Should have added TestRunner Impl",
- archive.contains(Paths.create("/org/jboss/arquillian/junit/JUnitTestRunner.class")));
+ archive.contains(ArchivePaths.create("/org/jboss/arquillian/junit/JUnitTestRunner.class")));
System.out.println(archive.toString(true));
}
Modified: arquillian/trunk/protocol-servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
===================================================================
--- arquillian/trunk/protocol-servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/protocol-servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -39,11 +39,12 @@
@Override
public Archive<?> createArchive()
{
- WebArchive archive = Archives.create("protocol.war", WebArchive.class)
+ WebArchive archive = Archives.create("arquillian-protocol.war", WebArchive.class)
.setWebXML("org/jboss/arquillian/protocol/servlet/web.xml")
- .addPackages(
- true,
- Package.getPackage("org.jboss.arquillian.protocol.servlet"));
+ .addClasses(
+ SecurityActions.class,
+ ServletTestRunner.class
+ );
return archive;
}
Modified: arquillian/trunk/protocol-servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/protocol-servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/protocol-servlet/src/test/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppenderTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.junit.Test;
/**
@@ -38,7 +38,7 @@
Assert.assertTrue(
"Should have added web.xml",
- archive.contains(Paths.create("WEB-INF/web.xml"))
+ archive.contains(ArchivePaths.create("WEB-INF/web.xml"))
);
System.out.println(archive.toString(true));
Modified: arquillian/trunk/testenricher-jboss/src/test/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/testenricher-jboss/src/test/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppenderTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/testenricher-jboss/src/test/java/org/jboss/arquillian/testenricher/jboss/JbossDeploymentAppenderTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.junit.Test;
/**
@@ -39,22 +39,22 @@
Assert.assertTrue(
"Should have added TestEnricher SPI",
- archive.contains(Paths.create("/META-INF/services/org.jboss.arquillian.spi.TestEnricher")));
+ archive.contains(ArchivePaths.create("/META-INF/services/org.jboss.arquillian.spi.TestEnricher")));
Assert.assertTrue(
"Should have added TestEnricher EJB impl",
- archive.contains(Paths.create("/org/jboss/arquillian/testenricher/jboss/EJBInjectionEnricher.class")));
+ archive.contains(ArchivePaths.create("/org/jboss/arquillian/testenricher/jboss/EJBInjectionEnricher.class")));
Assert.assertTrue(
"Should have added TestEnricher Resource impl",
- archive.contains(Paths.create("/org/jboss/arquillian/testenricher/jboss/ResourceInjectionEnricher.class")));
+ archive.contains(ArchivePaths.create("/org/jboss/arquillian/testenricher/jboss/ResourceInjectionEnricher.class")));
Assert.assertTrue(
"Should have added TestEnricher CDI impl",
- archive.contains(Paths.create("/org/jboss/arquillian/testenricher/jboss/CDIInjectionEnricher.class")));
+ archive.contains(ArchivePaths.create("/org/jboss/arquillian/testenricher/jboss/CDIInjectionEnricher.class")));
Assert.assertTrue(
"Should have added TestEnricher Impl dep",
- archive.contains(Paths.create("/org/jboss/arquillian/testenricher/jboss/SecurityActions.class")));
+ archive.contains(ArchivePaths.create("/org/jboss/arquillian/testenricher/jboss/SecurityActions.class")));
}
}
Modified: arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java
===================================================================
--- arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2010-02-09 06:39:02 UTC (rev 4007)
+++ arquillian/trunk/testng/src/test/java/org/jboss/arquillian/testng/TestNGDeploymentAppenderTestCase.java 2010-02-09 07:48:50 UTC (rev 4008)
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.junit.Test;
/**
@@ -38,11 +38,11 @@
Assert.assertTrue(
"Should have added TestRunner SPI",
- archive.contains(Paths.create("/META-INF/services/org.jboss.arquillian.spi.TestRunner")));
+ archive.contains(ArchivePaths.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")));
+ archive.contains(ArchivePaths.create("/org/jboss/arquillian/testng/TestNGTestRunner.class")));
System.out.println(archive.toString(true));
More information about the jboss-svn-commits
mailing list