Author: rmannibucau
Date: Tue Aug 7 16:19:03 2012
New Revision: 1370339
URL: http://svn.apache.org/viewvc?rev=1370339&view=rev
Log:
no need of any interceptor finally for deployment exception catching,
arquillian gives it to us through an event
Modified:
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/deployment/exception/DeploymentExceptionErrorTest.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java?rev=1370339&r1=1370338&r2=1370339&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
Tue Aug 7 16:19:03 2012
@@ -1,8 +1,7 @@
package org.apache.openejb.arquillian.common.deployment;
-import org.jboss.arquillian.container.spi.event.DeployDeployment;
+import org.jboss.arquillian.container.spi.client.container.DeploymentException;
import org.jboss.arquillian.core.api.annotation.Observes;
-import org.jboss.arquillian.core.spi.EventContext;
import org.jboss.arquillian.test.spi.event.suite.AfterClass;
import java.util.HashMap;
@@ -14,24 +13,20 @@ public class DeploymentExceptionObserver
private static final Map<Class<?>, Exception> EXCEPTIONS = new
HashMap<Class<?>, Exception>();
private static final Map<Class<?>, Exception> PARENT_EXCEPTIONS = new
HashMap<Class<?>, Exception>();
- public void observes(@Observes final EventContext<DeployDeployment> dd)
throws Exception {
- try {
- dd.proceed();
- } catch (Exception t) {
- EXCEPTIONS.put(t.getClass(), t);
-
- Throwable current = t.getCause();
- while (current != null) {
- if (current instanceof Exception) {
- PARENT_EXCEPTIONS.put(current.getClass(), (Exception)
current);
- }
- if (current.getCause() != current) {
- current = current.getCause();
- }
- }
+ public void observes(@Observes final DeploymentException t) throws
Exception {
+ EXCEPTIONS.put(t.getClass(), t);
- throw t;
+ Throwable current = t.getCause();
+ while (current != null) {
+ if (current instanceof Exception) {
+ PARENT_EXCEPTIONS.put(current.getClass(), (Exception) current);
+ }
+ if (current.getCause() != current) {
+ current = current.getCause();
+ }
}
+
+ throw t; // don't forget it even if it is an observer and not an
interceptor
}
public static Exception getExceptions(final Class<?> clazz) {
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java?rev=1370339&r1=1370338&r2=1370339&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
Tue Aug 7 16:19:03 2012
@@ -30,7 +30,7 @@ public class ExceptionInjectionTest {
private OpenEJBException oejbException;
@Deployment(testable = false)
- @ShouldThrowException(DeploymentException.class)
+ @ShouldThrowException(OpenEJBException.class)
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class)
.addAsWebInfResource(new
StringAsset(Descriptors.create(BeansDescriptor.class)
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/deployment/exception/DeploymentExceptionErrorTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/deployment/exception/DeploymentExceptionErrorTest.java?rev=1370339&r1=1370338&r2=1370339&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/deployment/exception/DeploymentExceptionErrorTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/deployment/exception/DeploymentExceptionErrorTest.java
Tue Aug 7 16:19:03 2012
@@ -30,7 +30,7 @@ public class DeploymentExceptionErrorTes
private OpenEJBException oejbException;
@Deployment(testable = false)
- @ShouldThrowException(DeploymentException.class)
+ @ShouldThrowException(OpenEJBException.class)
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class)
.addAsWebInfResource(new
StringAsset(Descriptors.create(BeansDescriptor.class)
