10:44 p.m.
Author: dan.j.allen
Date: 2009-06-18 23:44:43 -0400 (Thu, 18 Jun 2009)
New Revision: 2852
Added:
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java
Modified:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
add the DeploymentError exception category to the TCK harness
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
===================================================================
---
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-06-18
23:50:24 UTC (rev 2851)
+++
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-06-19
03:44:43 UTC (rev 2852)
@@ -9,6 +9,7 @@
import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.DefinitionException;
+import org.jboss.webbeans.DeploymentException;
import org.jboss.webbeans.WebBean;
public class ManagersImpl implements Managers
@@ -47,4 +48,19 @@
}
}
+ public boolean isDeploymentError(Throwable throwable)
+ {
+ if (throwable == null)
+ {
+ return false;
+ }
+ else if (DeploymentException.class.isAssignableFrom(throwable.getClass()))
+ {
+ return true;
+ }
+ else
+ {
+ return isDeploymentError(throwable.getCause());
+ }
+ }
}
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-18
23:50:24 UTC (rev 2851)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-19
03:44:43 UTC (rev 2852)
@@ -1,4 +1,11 @@
package org.jboss.jsr299.tck.api;
+/**
+ * A category exception which can be declared in the @ExpectedDeploymentException
+ * annotation of an @Artifact to detect a definition error as described in
+ * Section 12.4, "Problems detected automatically by the container".
+ *
+ * @see org.jboss.jsr299.tck.spi.Managers#isDefinitionError(Throwable)
+ */
public class DefinitionError extends RuntimeException {
}
Added: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java
(rev 0)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DeploymentError.java 2009-06-19
03:44:43 UTC (rev 2852)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.api;
+
+/**
+ * A category exception which can be declared in the @ExpectedDeploymentException
+ * annotation of an @Artifact to detect a deployment error as described in
+ * Section 12.4, "Problems detected automatically by the container".
+ *
+ * @see org.jboss.jsr299.tck.spi.Managers#isDeploymentError(Throwable)
+ */
+public class DeploymentError extends RuntimeException {
+}
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-18 23:50:24
UTC (rev 2851)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-19 03:44:43
UTC (rev 2852)
@@ -39,4 +39,12 @@
* @return true if the throwable reports a definition error
*/
public boolean isDefinitionError(Throwable throwable);
+
+ /**
+ * Checks whether the throwable is a deployment error, as described
+ * in Section 12.4, "Problems detected automatically by the container".
+ *
+ * @return true if the throwable reports a deployment error
+ */
+ public boolean isDeploymentError(Throwable throwable);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18
23:50:24 UTC (rev 2851)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-19
03:44:43 UTC (rev 2852)
@@ -17,6 +17,7 @@
import javax.enterprise.inject.spi.BeanManager;
import org.jboss.jsr299.tck.api.DefinitionError;
+import org.jboss.jsr299.tck.api.DeploymentError;
import org.jboss.jsr299.tck.api.JSR299Configuration;
import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl;
import org.jboss.jsr299.tck.impl.OldSPIBridge;
@@ -204,7 +205,11 @@
{
return true;
}
-
+ else if (throwableType.equals(DeploymentError.class) &&
getCurrentConfiguration().getManagers().isDeploymentError(throwable))
+ {
+ return true;
+ }
+
return super.isThrowablePresent(throwableType, throwable);
}
}