Skip to content

Commit

Permalink
Make tests work in AS6
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmuir
pmuir committed Aug 12, 2010
1 parent af3baf6 commit e8e7e00
Show file tree
Hide file tree
Showing 20 changed files with 92 additions and 93 deletions.
6 changes: 6 additions & 0 deletions impl/pom.xml
View file
Expand Up @@ -143,6 +143,12 @@
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</dependency>

<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
Expand Down
7 changes: 3 additions & 4 deletions impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/GenericBeanTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.field;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
Expand All @@ -26,18 +27,16 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class GenericBeanTest
{
@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(GenericBeanTest.class.getPackage());
return baseDeployment().addPackage(GenericBeanTest.class.getPackage());
}

@Inject
Expand Down
7 changes: 3 additions & 4 deletions impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/GenericProductTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.field;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand All @@ -25,18 +26,16 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class GenericProductTest
{
@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(GenericProductTest.class.getPackage());
return baseDeployment().addPackage(GenericProductTest.class.getPackage());
}

@Inject
Expand Down
8 changes: 4 additions & 4 deletions ...st/java/org/jboss/weld/extensions/test/bean/generic/field/ObserversOnGenericBeanTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.field;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

Expand All @@ -25,18 +26,17 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class ObserversOnGenericBeanTest
{

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(ObserversOnGenericBeanTest.class.getPackage());
return baseDeployment().addPackage(ObserversOnGenericBeanTest.class.getPackage());
}

@Inject
Expand Down
10 changes: 5 additions & 5 deletions ...st/java/org/jboss/weld/extensions/test/bean/generic/field/ProducersOnGenericBeanTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.field;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

Expand All @@ -24,20 +25,19 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class ProducersOnGenericBeanTest
{

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(ProducersOnGenericBeanTest.class.getPackage());
return baseDeployment().addPackage(ProducersOnGenericBeanTest.class.getPackage());
}

@Inject
@Qux
@Foo(1)
Expand Down
8 changes: 4 additions & 4 deletions impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/GenericBeanTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.method;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand All @@ -25,18 +26,17 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class GenericBeanTest
{

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(GenericBeanTest.class.getPackage());
return baseDeployment().addPackage(GenericBeanTest.class.getPackage());
}

@Inject
Expand Down
8 changes: 4 additions & 4 deletions .../src/test/java/org/jboss/weld/extensions/test/bean/generic/method/GenericProductTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.method;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand All @@ -25,18 +26,17 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class GenericProductTest
{

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(GenericProductTest.class.getPackage());
return baseDeployment().addPackage(GenericProductTest.class.getPackage());
}

@Inject
Expand Down
8 changes: 4 additions & 4 deletions ...t/java/org/jboss/weld/extensions/test/bean/generic/method/ProducersOnGenericBeanTest.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.jboss.weld.extensions.test.bean.generic.method;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

Expand All @@ -24,18 +25,17 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class ProducersOnGenericBeanTest
{

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(ProducersOnGenericBeanTest.class.getPackage());
return baseDeployment().addPackage(ProducersOnGenericBeanTest.class.getPackage());
}

@Inject
Expand Down
16 changes: 8 additions & 8 deletions impl/src/test/java/org/jboss/weld/extensions/test/core/CoreTest.java
View file
Expand Up @@ -16,13 +16,13 @@
*/
package org.jboss.weld.extensions.test.core;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;

import javax.inject.Inject;

import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -33,16 +33,16 @@
@RunWith(Arquillian.class)
public class CoreTest
{

@Inject
RaceTrack raceTrack;


@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(CoreTest.class.getPackage());
return baseDeployment().addPackage(CoreTest.class.getPackage());
}

@Inject
RaceTrack raceTrack;

@Test
public void testExact()
{
Expand Down
10 changes: 5 additions & 5 deletions impl/src/test/java/org/jboss/weld/extensions/test/defaultbean/DefaultBeanTest.java
View file
Expand Up @@ -16,13 +16,13 @@
*/
package org.jboss.weld.extensions.test.defaultbean;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;

import javax.inject.Inject;

import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -37,9 +37,9 @@ public class DefaultBeanTest
MagneticDrive magneticDrive;

@Deployment
public static Archive<?> deploy()
public static WebArchive deployment()
{
return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(DefaultBeanTest.class.getPackage());
return baseDeployment().addPackage(DefaultBeanTest.class.getPackage());
}

@Test
Expand Down
10 changes: 4 additions & 6 deletions impl/src/test/java/org/jboss/weld/extensions/test/el/ElTest.java
View file
Expand Up @@ -16,13 +16,13 @@
*/
package org.jboss.weld.extensions.test.el;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;

import javax.inject.Inject;

import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.extensions.el.Expressions;
import org.junit.Assert;
import org.junit.Test;
Expand All @@ -35,11 +35,9 @@ public class ElTest
Expressions extressions;

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
JavaArchive a = ShrinkWrap.create(JavaArchive.class, "test.jar");
a.addPackage(ElTest.class.getPackage());
return a;
return baseDeployment().addPackage(ElTest.class.getPackage());
}

@Test
Expand Down
12 changes: 4 additions & 8 deletions impl/src/test/java/org/jboss/weld/extensions/test/log/LoggerInjectionTest.java
View file
Expand Up @@ -17,14 +17,13 @@

package org.jboss.weld.extensions.test.log;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;

import javax.inject.Inject;

import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.impl.LastMessageLoggerFactory;
Expand All @@ -44,12 +43,9 @@ public class LoggerInjectionTest
Finch finch;

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
JavaArchive a = ShrinkWrap.create(JavaArchive.class, "test.jar");
a.addPackage(LoggerInjectionTest.class.getPackage());
a.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
return a;
return baseDeployment().addPackage(LoggerInjectionTest.class.getPackage()).addPackage(LastMessageLoggerFactory.class.getPackage());
}

@Test
Expand Down
14 changes: 4 additions & 10 deletions impl/src/test/java/org/jboss/weld/extensions/test/managedproducer/ManagedProducerTest.java
View file
Expand Up @@ -16,16 +16,14 @@
*/
package org.jboss.weld.extensions.test.managedproducer;

import static org.jboss.weld.extensions.test.util.Deployments.baseDeployment;

import javax.inject.Inject;
import javax.inject.Named;

import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.extensions.managedproducer.ManagedProducerExtension;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -34,13 +32,9 @@ public class ManagedProducerTest
{

@Deployment
public static Archive<?> deploy()
public static Archive<?> deployment()
{
JavaArchive a = ShrinkWrap.create(JavaArchive.class, "test.jar");
a.addPackage(ManagedProducerTest.class.getPackage());
a.addPackage(ManagedProducerExtension.class.getPackage());
a.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
return a;
return baseDeployment().addPackage(ManagedProducerTest.class.getPackage());
}

@Inject
Expand Down

0 comments on commit e8e7e00

Please sign in to comment.