[weld-commits] Weld SVN: r6819 - in core/trunk/tests-arquillian/src: main/java/org/jboss/weld/mock/cluster and 21 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Wed Jul 28 05:27:29 EDT 2010
Author: aslak
Date: 2010-07-28 05:27:27 -0400 (Wed, 28 Jul 2010)
New Revision: 6819
Modified:
core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeanArchiveImpl.java
core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java
core/trunk/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java
core/trunk/tests-arquillian/src/main/resources/META-INF/services/org.jboss.shrinkwrap.api.BeanArchive
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/AllTestRunner.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/CategoryArchiveAppender.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/NormalSuite.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java
core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java
Log:
WELD-493 Updated tests to use new ShrinkWrap Alpha11 api
Modified: core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeanArchiveImpl.java
===================================================================
--- core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeanArchiveImpl.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeanArchiveImpl.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -47,10 +47,10 @@
//-------------------------------------------------------------------------------------||
/* (non-Javadoc)
- * @see org.jboss.declarchive.impl.base.ContainerBase#getManinfestPath()
+ * @see org.jboss.declarchive.impl.base.ContainerBase#getManifestPath()
*/
@Override
- protected ArchivePath getManinfestPath()
+ protected ArchivePath getManifestPath()
{
return PATH_MANIFEST;
}
Modified: core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java
===================================================================
--- core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -6,7 +6,7 @@
import java.util.Arrays;
import java.util.List;
-import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.asset.Asset;
class BeansXml implements Asset
{
Modified: core/trunk/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java
===================================================================
--- core/trunk/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/AbstractClusterTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -17,6 +17,7 @@
package org.jboss.weld.mock.cluster;
import java.io.ByteArrayInputStream;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -41,11 +42,11 @@
public class AbstractClusterTest
{
- private Singleton<Container> singleton;
+ private static Singleton<Container> singleton;
@SuppressWarnings("unchecked")
@BeforeClass
- public void beforeClass() throws Exception
+ public static void beforeClass() throws Exception
{
singleton = (Singleton) getInstanceField().get(null);
getInstanceField().set(null, new SwitchableSingletonProvider().create(Container.class));
@@ -59,7 +60,7 @@
}
@AfterClass
- public void afterClass() throws Exception
+ public static void afterClass() throws Exception
{
getInstanceField().set(null, singleton);
}
Modified: core/trunk/tests-arquillian/src/main/resources/META-INF/services/org.jboss.shrinkwrap.api.BeanArchive
===================================================================
--- core/trunk/tests-arquillian/src/main/resources/META-INF/services/org.jboss.shrinkwrap.api.BeanArchive 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/main/resources/META-INF/services/org.jboss.shrinkwrap.api.BeanArchive 2010-07-28 09:27:27 UTC (rev 6819)
@@ -1 +1,2 @@
-org.jboss.shrinkwrap.impl.BeanArchiveImpl
\ No newline at end of file
+implementingClassName=org.jboss.shrinkwrap.impl.BeanArchiveImpl
+extension=.jar
\ No newline at end of file
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/AllTestRunner.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/AllTestRunner.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/AllTestRunner.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -6,6 +6,7 @@
import java.util.List;
import org.jboss.shrinkwrap.impl.base.URLPackageScanner;
+import org.jboss.weld.tests.annotatedType.ExampleTest;
import org.junit.runners.Suite;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
@@ -22,8 +23,7 @@
final List<Class<?>> classes = new ArrayList<Class<?>>();
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
URLPackageScanner.newInstance(
- AllTestRunner.class.getPackage(),
- true,
+ true,
classLoader,
new URLPackageScanner.Callback()
{
@@ -46,7 +46,9 @@
throw new RuntimeException(e);
}
}
- }).scanPackage();
+ },
+ AllTestRunner.class.getPackage()).scanPackage();
+ //ExampleTest.class.getPackage()).scanPackage();
Collections.sort(classes, new Comparator<Class<?>>()
{
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/CategoryArchiveAppender.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/CategoryArchiveAppender.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/CategoryArchiveAppender.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -36,7 +36,7 @@
*/
public Archive<?> createAuxiliaryArchive()
{
- return ShrinkWrap.create("weld-core-test-categories.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "weld-core-test-categories.jar")
.addPackage(Integration.class.getPackage());
}
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/NormalSuite.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/NormalSuite.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/NormalSuite.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -33,5 +33,4 @@
@SuiteClasses(AllTests.class)
public class NormalSuite
{
-
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -22,7 +22,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,9 +32,8 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addPackage(Alternatives2Test.class.getPackage())
- .as(JavaArchive.class);
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(Alternatives2Test.class.getPackage());
}
@Test
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -31,7 +31,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.stereotype(TestAlternative.class)
.addPackage(Alternatives2Test.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -38,12 +38,11 @@
@RunWith(Arquillian.class)
public class DeclaringTypeTest
{
-
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addPackage(DeclaringTypeTest.class.getPackage());
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(DeclaringTypeTest.class.getPackage());
}
@Inject
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/ExampleTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -45,7 +45,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.addPackage(ExampleTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/decoration/AnnotatedTypeDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -44,7 +44,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.addPackage(AnnotatedTypeDecoratorTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -16,13 +16,12 @@
*/
package org.jboss.weld.tests.decorators;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +36,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(SimpleDecorator1.class, SimpleDecorator2.class)
.addPackage(SimpleDecoratorTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -37,7 +37,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(FrameWithFieldInjectedDelegate.class)
.addPackage(SimpleAbstractDecoratorTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodAndInitializerMethodTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -37,7 +37,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(
FrameWithInitializerMethodInjectedDelegateAndAbstractMethod.class,
FrameWithFieldInjectedDelegate.class)
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithAbstractMethodTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -18,13 +18,13 @@
package org.jboss.weld.tests.decorators.abstractDecorator;
import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-import junit.framework.Assert;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(
FrameWithFieldInjectedDelegateAndAbstractMethod.class,
FrameWithFieldInjectedDelegate.class)
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithCallToItselfTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -18,13 +18,13 @@
package org.jboss.weld.tests.decorators.abstractDecorator;
import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-import junit.framework.Assert;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(
FrameWithFieldInjectedDelegateAndSelfInvokedAbstractMethod.class,
FrameWithFieldInjectedDelegate.class)
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithConstructorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -18,13 +18,13 @@
package org.jboss.weld.tests.decorators.abstractDecorator;
import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-import junit.framework.Assert;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(
FrameWithConstructorInjectedDelegateAndAbstractMethod.class,
FrameWithConstructorInjectedDelegate.class)
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/SimpleAbstractDecoratorWithInitializerMethodTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -18,13 +18,13 @@
package org.jboss.weld.tests.decorators.abstractDecorator;
import static org.jboss.weld.tests.decorators.abstractDecorator.AbstractDecoratorTestHelper.resetAll;
-import junit.framework.Assert;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(FrameWithInitializerMethodInjectedDelegate.class)
.addPackage(SimpleAbstractDecoratorWithInitializerMethodTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/abstractDecorator/broken/SimpleAbstractDecoratorWithInvalidAbstractMethodTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -38,7 +38,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(Frame.class)
.addPackage(SimpleAbstractDecoratorWithInvalidAbstractMethodTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/custom/CustomDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -23,8 +23,6 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Extension;
-import junit.framework.Assert;
-
import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.mock.MockBeanDeploymentArchive;
import org.jboss.weld.mock.MockDeployment;
@@ -32,6 +30,7 @@
import org.jboss.weld.mock.TestContainer;
import org.jboss.weld.util.serviceProvider.PackageServiceLoaderFactory;
import org.jboss.weld.util.serviceProvider.ServiceLoaderFactory;
+import org.junit.Assert;
import org.junit.Test;
/**
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jboss.weld.tests.decorators.decoratedTypes;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,7 +34,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(PartialDecorator.class)
.addPackage(PartialDecoratorTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -17,13 +17,13 @@
package org.jboss.weld.tests.decorators.generic;
-import junit.framework.Assert;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,7 +36,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(PartialDecorator.class, StringPartialDecorator.class)
.addPackage(PartialDecoratorTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/generic/extend/ExtendDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -35,7 +35,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(ExtendsDecoratedDecorator.class)
.addPackage(ExtendDecoratorTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/interceptor/InterceptorAndDecoratorTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -17,13 +17,12 @@
package org.jboss.weld.tests.decorators.interceptor;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,7 +32,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(ServiceDecorator.class)
.intercept(ServiceInterceptor.class)
.addPackage(InterceptorAndDecoratorTest.class.getPackage());
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/multidelegate/TestMultiDelegate.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -30,7 +30,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(AccountDecorator.class)
.addPackage(TestMultiDelegate.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/resolution/BasicDecoratorResolutionTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -17,13 +17,12 @@
package org.jboss.weld.tests.decorators.resolution;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,7 +35,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(SimpleDecorator.class, ComplexDecorator.class)
.addPackage(BasicDecoratorResolutionTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/decorators/stackoverflow/StackOverFlowTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -32,7 +32,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.decorate(SecurePaymentService.class)
.addPackage(StackOverFlowTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/ExampleTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -16,14 +16,12 @@
*/
package org.jboss.weld.tests.examples;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,9 +31,8 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addPackage(ExampleTest.class.getPackage())
- .as(JavaArchive.class);
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(ExampleTest.class.getPackage());
}
@Test
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/examples/MockExampleTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -16,13 +16,12 @@
*/
package org.jboss.weld.tests.examples;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,7 +31,7 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
+ return ShrinkWrap.create(BeanArchive.class)
.alternate(MockSentenceTranslator.class)
.addPackage(ExampleTest.class.getPackage());
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/generic/GenericBeanTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -16,14 +16,12 @@
*/
package org.jboss.weld.tests.generic;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,9 +34,8 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addPackage(GenericBeanTest.class.getPackage())
- .as(JavaArchive.class);
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(GenericBeanTest.class.getPackage());
}
@Test
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -27,7 +27,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.bean.ManagedBean;
import org.jboss.weld.bean.NewManagedBean;
import org.jboss.weld.introspector.WeldAnnotated;
@@ -43,9 +42,8 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addPackage(NewSimpleBeanTest.class.getPackage())
- .as(JavaArchive.class);
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(NewSimpleBeanTest.class.getPackage());
}
private ManagedBean<WrappedSimpleBean> wrappedSimpleBean;
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ExampleTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -29,7 +29,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,9 +39,8 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addClasses(External.class, WebBean.class)
- .as(JavaArchive.class);
+ return ShrinkWrap.create(BeanArchive.class)
+ .addClasses(External.class, WebBean.class);
}
@Inject
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -21,8 +21,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.jboss.weld.tests.category.Integration;
import org.junit.Assert;
import org.junit.Test;
@@ -36,12 +36,12 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(ServletContextListenerImpl.class, LogManager.class)
.addWebResource(
ServletListenerTest.class.getPackage(), "web.xml", ArchivePaths.create("web.xml"))
.addWebResource(
- new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
+ EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
}
Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java 2010-07-28 09:02:02 UTC (rev 6818)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/specialization/SpecializationTest.java 2010-07-28 09:27:27 UTC (rev 6819)
@@ -19,14 +19,12 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
-import junit.framework.Assert;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,9 +34,8 @@
@Deployment
public static Archive<?> deploy()
{
- return ShrinkWrap.create("test.jar", BeanArchive.class)
- .addPackage(SpecializationTest.class.getPackage())
- .as(JavaArchive.class);
+ return ShrinkWrap.create(BeanArchive.class)
+ .addPackage(SpecializationTest.class.getPackage());
}
@Inject
More information about the weld-commits
mailing list