[webbeans-commits] Webbeans SVN: r2853 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle: fail and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Jun 18 23:45:23 EDT 2009
Author: dan.j.allen
Date: 2009-06-18 23:45:23 -0400 (Thu, 18 Jun 2009)
New Revision: 2853
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/InitializerBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/AfterBeanDiscoveryObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/BeanDiscoveryObserver.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterInitFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ObserverFailureInDefinitionPhaseTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ObserverFailureInDeploymentPhaseTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/DeploymentFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java
Log:
sync deployment lifecycle tests with 20090519 spec
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -26,6 +26,8 @@
/**
* Tests related to the final deployment phase of the lifecycle.
*
+ * Spec version: 20090519 (sort of)
+ *
* @author David Allen
*/
@Artifact
@@ -33,20 +35,21 @@
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "11.1", id = "d"),
- @SpecAssertion(section = "11.1", id = "e"),
- @SpecAssertion(section = "11.5", id = "b")
+ @SpecAssertion(section = "11.5.2", id = "a"),
+ @SpecAssertion(section = "11.5.3", id = "a"),
+ @SpecAssertion(section = "11.5.3", id = "d")
})
public void testDeployedManagerEvent()
{
assert ManagerObserver.isManagerDeployed();
getCurrentManager().fireEvent("event");
+ // QUESTION what is this testing?
assert !getCurrentManager().resolveObservers(new InitializedBinding()).isEmpty();
}
@Test
@SpecAssertions({
- @SpecAssertion(section = "11.5", id = "d")
+ @SpecAssertion(section = "12.2", id = "h")
})
public void testScopesActive()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/InitializedBinding.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,13 +1,10 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
class InitializedBinding implements AfterBeanDiscovery
{
-
- public void addDefinitionError(Throwable t)
+ public void addDefinitionError(Throwable t)
{
throw new RuntimeException(t);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -6,7 +6,6 @@
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.event.Observes;
class ManagerObserver
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BeanDiscoveryObserver.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BeanDiscoveryObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
+
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.event.Observes;
+
+class BeanDiscoveryObserver
+{
+ public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
+ {
+ assert false : "Deployment should have already failed because of the presence of an invalid @Initializer method";
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
-
-import javax.enterprise.inject.Initializer;
-import javax.event.Observes;
-
-class BrokenInitializerBean
-{
- @Initializer
- public void initialize(@Observes String string)
- {
-
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/DeploymentFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/DeploymentFailureTest.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/DeploymentFailureTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,23 +1,29 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
-
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
public class DeploymentFailureTest extends AbstractJSR299Test
-{
+{
@Test
- @SpecAssertion(section = "11.1", id = "a")
- public void testDeploymentFailsBeforeInitialization()
+ @SpecAssertions({
+ @SpecAssertion(section = "10.5.2", id = "e"),
+ @SpecAssertion(section = "11.5.2", id = "a")
+ })
+ public void testDeploymentFailsBeforeNotifyingObserversAfterBeanDiscovery()
{
assert false;
}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/InitializerBean_Broken.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BrokenInitializerBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/InitializerBean_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/InitializerBean_Broken.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
+
+import javax.enterprise.inject.Initializer;
+import javax.event.Observes;
+
+class InitializerBean_Broken
+{
+ @Initializer
+ public void initialize(@Observes String string)
+ {
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ManagerObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
-
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.event.Observes;
-
-class ManagerObserver
-{
- public void managerInitialized(@Observes BeforeBeanDiscovery event)
- {
- assert false : "Deployment should already have failed";
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterInitFailureTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2;
+
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+/**
+ * Tests a failure that occurs during validation of beans, which occurs after
+ * the AfterBeanDiscovery event but before the AfterDeploymentValidation event
+ * is raised.
+ *
+ * Spec version: 20090519
+ *
+ * @author David Allen
+ * @author Dan Allen
+ */
+ at Artifact
+ at ExpectedDeploymentException(UnsatisfiedResolutionException.class)
+public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "11.5.2", id = "a"),
+ @SpecAssertion(section = "12.2", id = "e"),
+ @SpecAssertion(section = "11.5.3", id = "a"),
+ @SpecAssertion(section = "12.2", id = "f"),
+ })
+ public void testDeploymentFailsDuringValidation()
+ {
+ assert false;
+ }
+
+ @Override
+ @AfterClass(alwaysRun = true, groups = "scaffold")
+ public void afterClass() throws Exception
+ {
+ boolean initialized = BeanDiscoveryObserver.isManagerInitialized();
+ // make sure that the artifact gets undeployed
+ super.afterClass();
+ assert initialized;
+ }
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterInitFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterInitFailureTest.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterInitFailureTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2;
-
-import javax.inject.DeploymentException;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-/**
- * Tests a failure that occurs during deployment (not definition) after
- * initialization and before completion of the deployment phase.
- *
- * @author David Allen
- *
- */
- at Artifact
- at ExpectedDeploymentException(DeploymentException.class)
-public class AfterInitFailureTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "11.1", id = "b"),
- @SpecAssertion(section = "11.1", id = "c"),
- @SpecAssertion(section = "11.5", id = "a")
- })
- public void testDeploymentFailsAfterInitialization()
- {
- ManagerObserver.setManagerInitialized(false);
- //TODO Need a way to check the flag value after the exception occurs
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanDiscoveryObserver.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanDiscoveryObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2;
+
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.event.Observes;
+
+class BeanDiscoveryObserver
+{
+ private static boolean managerInitialized;
+
+ public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
+ {
+ managerInitialized = true;
+ }
+
+ public void afterDeploymentValidation(@Observes AfterDeploymentValidation event)
+ {
+ assert false : "Deployment should have already failed because of the presence of an unsatisfied dependency";
+ }
+
+ public static boolean isManagerInitialized()
+ {
+ return managerInitialized;
+ }
+
+ public static void setManagerInitialized(boolean managerInitialized)
+ {
+ BeanDiscoveryObserver.managerInitialized = managerInitialized;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -2,8 +2,8 @@
import javax.enterprise.inject.Current;
+
class BeanWithInjection
{
- @Current
- protected NotABean pretendBean;
+ @Current protected NotABean pretendBean;
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ManagerObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,30 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2;
-
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.event.Observes;
-
-class ManagerObserver
-{
- private static boolean managerInitialized;
-
- public void managerInitialized(@Observes BeforeBeanDiscovery event)
- {
- managerInitialized = true;
- }
-
- public void managerDeployed(@Observes AfterDeploymentValidation event)
- {
- assert false : "Manager should not be deployed due to deployment errors";
- }
-
- public static boolean isManagerInitialized()
- {
- return managerInitialized;
- }
-
- public static void setManagerInitialized(boolean managerInitialized)
- {
- ManagerObserver.managerInitialized = managerInitialized;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/AfterBeanDiscoveryObserverExecutionFailureTest.java (from rev 2847, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ObserverFailureInDefinitionPhaseTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/AfterBeanDiscoveryObserverExecutionFailureTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,29 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.api.DefinitionError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that any exception raised in a method observing the AfterBeanDiscovery
+ * event results in a definition error.
+ *
+ * Spec version: 20090519
+ *
+ * @author David Allen
+ * @author Dan Allen
+ */
+ at Artifact
+ at ExpectedDeploymentException(DefinitionError.class)
+public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "11.5.2", id = "d")
+ public void testObserverFailureTreatedAsDefinitionError()
+ {
+ assert false;
+ }
+}
\ No newline at end of file
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/BeanDiscoveryObserver.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/BeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/BeanDiscoveryObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3;
+
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.event.Observes;
+
+class BeanDiscoveryObserver
+{
+ public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
+ {
+ throw new AssertionError("This error should be treated as a definition error");
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ManagerObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3;
-
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.event.Observes;
-
-class ManagerObserver
-{
- public void managerInitialized(@Observes BeforeBeanDiscovery event)
- {
- assert false : "This error should be turned into a DefinitionException";
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ObserverFailureInDefinitionPhaseTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ObserverFailureInDefinitionPhaseTest.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ObserverFailureInDefinitionPhaseTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,29 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.jsr299.tck.api.DefinitionError;
-import org.testng.annotations.Test;
-
-/**
- * Tests that any failure in an observer observing the @AfterBeanDiscovery
- * event results in a DefinitionException.
-
- * @author David Allen
- *
- */
- at Artifact
- at ExpectedDeploymentException(DefinitionError.class)
-public class ObserverFailureInDefinitionPhaseTest extends AbstractJSR299Test
-{
- @Test(groups = { "ri-broken" })
- @SpecAssertion(section = "11.5", id = "aa")
- public void testObserverFailureRaisesDefinitionException()
- {
- assert false;
- }
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ObserverFailureInDeploymentPhaseTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.api.DeploymentError;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that any failure in an observer observing the @AfterDependencyValidation
+ * event results in a DeploymentException.
+ *
+ * Spec version: 20090519
+ *
+ * @author David Allen
+ * @author Dan Allen
+ */
+ at Artifact
+ at ExpectedDeploymentException(DeploymentError.class)
+public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "11.5.3", id = "c")
+ public void testObserverFailureTreatedAsDeploymentError()
+ {
+ assert false;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/BeanDiscoveryObserver.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/BeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/BeanDiscoveryObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4;
+
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.event.Observes;
+
+class BeanDiscoveryObserver
+{
+ public void afterDeploymentValidation(@Observes AfterDeploymentValidation event)
+ {
+ throw new AssertionError("This error should be treated as a deployment error");
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ManagerObserver.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4;
-
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.event.Observes;
-
-class ManagerObserver
-{
- public void managerDeployed(@Observes AfterDeploymentValidation event)
- {
- assert false : "This error should result in a DeploymentException";
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ObserverFailureInDeploymentPhaseTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ObserverFailureInDeploymentPhaseTest.java 2009-06-19 03:44:43 UTC (rev 2852)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ObserverFailureInDeploymentPhaseTest.java 2009-06-19 03:45:23 UTC (rev 2853)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4;
-
-import javax.inject.DeploymentException;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-/**
- * Tests that any failure in an observer observing the @AfterDependencyValidation
- * event results in a DeploymentException.
- *
- * @author David Allen
- *
- */
- at Artifact
- at ExpectedDeploymentException(DeploymentException.class)
-public class ObserverFailureInDeploymentPhaseTest extends AbstractJSR299Test
-{
- @Test(groups = { "ri-broken" })
- @SpecAssertion(section = "11.5", id = "ba")
- public void testDeploymentFailsAfterInitialization()
- {
- assert false;
- }
-}
More information about the weld-commits
mailing list