Skip to content

Commit

Permalink
Workaround for AS7-1197
Browse files Browse the repository at this point in the history
  • Loading branch information
@jharting
jharting committed Nov 10, 2011
1 parent 33ed039 commit 343296d
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions ...est/java/org/jboss/weld/tests/beanDeployment/circular/DependentCircularInjectionTest.java
View file
Expand Up @@ -6,14 +6,14 @@
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.exceptions.DeploymentException;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class DependentCircularInjectionTest {
@Deployment
@ShouldThrowException(DeploymentException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
public static JavaArchive createDeployment() {
return ShrinkWrap.create(BeanArchive.class)
.addClasses(Fish.class, Water.class);
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/jboss/weld/tests/beanDeployment/circular/DependentSelfInjectionProducerTest.java
View file
Expand Up @@ -6,14 +6,14 @@
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.exceptions.DeploymentException;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class DependentSelfInjectionProducerTest {
@Deployment
@ShouldThrowException(DeploymentException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
public static JavaArchive createDeployment() {
return ShrinkWrap.create(BeanArchive.class)
.addClasses(DependentLooping.class, DependentLoopingProducer.class);
Expand Down
4 changes: 2 additions & 2 deletions ...rc/test/java/org/jboss/weld/tests/beanDeployment/circular/DependentSelfInjectionTest.java
View file
Expand Up @@ -6,14 +6,14 @@
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.exceptions.DeploymentException;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(Arquillian.class)
public class DependentSelfInjectionTest {
@Deployment
@ShouldThrowException(DeploymentException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
public static JavaArchive createDeployment() {
return ShrinkWrap.create(BeanArchive.class)
.addClasses(Farm.class);
Expand Down
4 changes: 2 additions & 2 deletions .../weld/tests/event/observer/validation/ObserverMethodParameterInjectionValidationTest.java
View file
Expand Up @@ -28,7 +28,6 @@
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.weld.exceptions.DeploymentException;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -39,7 +38,8 @@
@RunWith(Arquillian.class)
public class ObserverMethodParameterInjectionValidationTest {
@Deployment
@ShouldThrowException(DeploymentException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
public static JavaArchive getDeployment() {
return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
Expand Down
4 changes: 2 additions & 2 deletions ...rg/jboss/weld/tests/interceptors/invalidContract/NoArgInterceptorInvalidContractTest.java
View file
Expand Up @@ -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.weld.exceptions.DefinitionException;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -41,7 +40,8 @@
@Ignore
public class NoArgInterceptorInvalidContractTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions ...ests/interceptors/invalidContract/NotThrowingExceptionInterceptorInvalidContractTest.java
View file
Expand Up @@ -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.weld.exceptions.DefinitionException;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -41,7 +40,8 @@
@Ignore
public class NotThrowingExceptionInterceptorInvalidContractTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions ...org/jboss/weld/tests/interceptors/invalidContract/VoidInterceptorInvalidContractTest.java
View file
Expand Up @@ -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.weld.exceptions.DefinitionException;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -41,7 +40,8 @@
@Ignore
public class VoidInterceptorInvalidContractTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions ...rceptorWithNonSerializableField/InterceptorWithNonSerializableFieldOnPassivatingBean.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.exceptions.DefinitionException;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -33,7 +32,8 @@
@RunWith(Arquillian.class)
public class InterceptorWithNonSerializableFieldOnPassivatingBean {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions ...ivation/broken/nonSerializableInterceptor/NonPassivatingInterceptorOnPassivatingBean.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.exceptions.DefinitionException;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -33,7 +32,8 @@
@RunWith(Arquillian.class)
public class NonPassivatingInterceptorOnPassivatingBean {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions ...a/org/jboss/weld/tests/interceptors/weld459/fccl/FinalClassClassLevelInterceptorTest.java
View file
Expand Up @@ -22,15 +22,15 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.exceptions.DefinitionException;
import org.junit.Test;
import org.junit.runner.RunWith;


@RunWith(Arquillian.class)
public class FinalClassClassLevelInterceptorTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions .../org/jboss/weld/tests/interceptors/weld459/fcml/FinalClassMethodLevelInterceptorTest.java
View file
Expand Up @@ -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.weld.exceptions.DefinitionException;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand All @@ -31,7 +30,8 @@
//@IntegrationTest(runLocally = true)
public class FinalClassMethodLevelInterceptorTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions .../org/jboss/weld/tests/interceptors/weld459/fmcl/FinalMethodClassLevelInterceptorTest.java
View file
Expand Up @@ -22,15 +22,15 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.exceptions.DefinitionException;
import org.junit.Test;
import org.junit.runner.RunWith;


@RunWith(Arquillian.class)
public class FinalMethodClassLevelInterceptorTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
4 changes: 2 additions & 2 deletions ...org/jboss/weld/tests/interceptors/weld459/fmml/FinalMethodMethodLevelInterceptorTest.java
View file
Expand Up @@ -22,15 +22,15 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.BeanArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.weld.exceptions.DefinitionException;
import org.junit.Test;
import org.junit.runner.RunWith;


@RunWith(Arquillian.class)
public class FinalMethodMethodLevelInterceptorTest {

@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
@Deployment
public static Archive<?> deploy() {
return ShrinkWrap.create(BeanArchive.class)
Expand Down
3 changes: 2 additions & 1 deletion ...ss/weld/tests/resources/producer/non/dependent/NonDependentResourceProducerFieldTest.java
View file
Expand Up @@ -17,7 +17,8 @@
public class NonDependentResourceProducerFieldTest {

@Deployment
@ShouldThrowException(DefinitionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
public static JavaArchive deploy() {
return ShrinkWrap.create(BeanArchive.class)
.addPackage(NonDependentResourceProducerFieldTest.class.getPackage());
Expand Down
5 changes: 2 additions & 3 deletions tests-arquillian/src/test/java/org/jboss/weld/tests/scope/unproxyable/UnproxyableTest.java
View file
Expand Up @@ -25,13 +25,12 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import javax.enterprise.inject.UnproxyableResolutionException;

@RunWith(Arquillian.class)
public class UnproxyableTest {

@Deployment
@ShouldThrowException(UnproxyableResolutionException.class)
// @ShouldThrowException(DefinitionException.class)
@ShouldThrowException(Exception.class) // AS7-1197
public static JavaArchive deploy() {
BeanArchive archive = ShrinkWrap.create(BeanArchive.class);
archive.addPackage(UnproxyableTest.class.getPackage());
Expand Down

0 comments on commit 343296d

Please sign in to comment.