[webbeans-commits] Webbeans SVN: r2856 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle: fail2 and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-06-19 00:37:45 -0400 (Fri, 19 Jun 2009)
New Revision: 2856
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/AddDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/BeanDiscoveryObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/AddDeploymentProblemTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/BeanDiscoveryObserver.java
Modified:
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/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java
Log:
add tests to verify definition and deployment errors added by observers are queued, then wrapped in appropriate error
Modified: 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/AfterBeanDiscoveryFailureTest.java 2009-06-19 04:36:43 UTC (rev 2855)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java 2009-06-19 04:37:45 UTC (rev 2856)
@@ -57,10 +57,8 @@
@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;
+ assert BeanDiscoveryObserver.isManagerInitialized();
}
}
Modified: 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/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-19 04:36:43 UTC (rev 2855)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-19 04:37:45 UTC (rev 2856)
@@ -25,8 +25,8 @@
import org.testng.annotations.Test;
/**
- * Tests that any failure in an observer observing the @AfterDependencyValidation
- * event results in a DeploymentException.
+ * Tests that any failure in an observer observing the AfterDeploymentValidation
+ * event results in a deployment error.
*
* Spec version: 20090519
*
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/AddDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/AddDefinitionErrorTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/AddDefinitionErrorTest.java 2009-06-19 04:37:45 UTC (rev 2856)
@@ -0,0 +1,38 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail5;
+
+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.AfterClass;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that any definition error added by an observer of the AfterBeanDiscovery
+ * event results in a definition error.
+ *
+ * Spec version: 20090519
+ *
+ * @author David Allen
+ * @author Dan Allen
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class AddDefinitionErrorTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "11.5.2", id = "c")
+ public void testObserverDefinitionErrorTreatedAsDefinitionError()
+ {
+ assert false;
+ }
+
+ @Override
+ @AfterClass(alwaysRun = true, groups = "scaffold")
+ public void afterClass() throws Exception
+ {
+ super.afterClass();
+ assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called";
+ }
+}
\ No newline at end of file
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/BeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/BeanDiscoveryObserver.java 2009-06-19 04:37:45 UTC (rev 2856)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail5;
+
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.event.Observes;
+
+class BeanDiscoveryObserver
+{
+ private static int invocationCount = 0;
+
+ public void afterBeanDiscovery(@Observes AfterBeanDiscovery event)
+ {
+ event.addDefinitionError(new AssertionError("This error should be treated as a definition error"));
+ invocationCount++;
+ }
+
+ public void alsoAfterBeanDiscovery(@Observes AfterBeanDiscovery event)
+ {
+ event.addDefinitionError(new AssertionError("This error should also be treated as a definition error"));
+ invocationCount++;
+ }
+
+ public static int getInvocationCount()
+ {
+ return invocationCount;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/AddDeploymentProblemTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/AddDeploymentProblemTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/AddDeploymentProblemTest.java 2009-06-19 04:37:45 UTC (rev 2856)
@@ -0,0 +1,57 @@
+/*
+ * 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.fail6;
+
+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.AfterClass;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that a deployment error registered by an observer of the AfterDeploymentValidation
+ * event results in a deployment error, but that all observers that observe this event
+ * are still called.
+ *
+ * Spec version: 20090519
+ *
+ * @author David Allen
+ * @author Dan Allen
+ */
+@Artifact
+(a)ExpectedDeploymentException(DeploymentError.class)
+public class AddDeploymentProblemTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "11.5.3", id = "b")
+ public void testObserverDeploymentProblemTreatedAsDeploymentError()
+ {
+ assert false;
+ }
+
+ @Override
+ @AfterClass(alwaysRun = true, groups = "scaffold")
+ public void afterClass() throws Exception
+ {
+ super.afterClass();
+ assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called";
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/BeanDiscoveryObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/BeanDiscoveryObserver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/BeanDiscoveryObserver.java 2009-06-19 04:37:45 UTC (rev 2856)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail6;
+
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.event.Observes;
+
+class BeanDiscoveryObserver
+{
+ private static int invocationCount = 0;
+
+ public void afterDeploymentValidation(@Observes AfterDeploymentValidation event)
+ {
+ event.addDeploymentProblem(new AssertionError("This error should be treated as a deployment error"));
+ invocationCount++;
+ }
+
+ public void alsoAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
+ {
+ event.addDeploymentProblem(new AssertionError("This error should also be treated as a deployment error"));
+ invocationCount++;
+ }
+
+ public static int getInvocationCount()
+ {
+ return invocationCount;
+ }
+}
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2855 - ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-06-19 00:36:43 -0400 (Fri, 19 Jun 2009)
New Revision: 2855
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
Log:
queue definition and deployment errors and throw after observers have been notified
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java 2009-06-19 03:46:23 UTC (rev 2854)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java 2009-06-19 04:36:43 UTC (rev 2855)
@@ -1,16 +1,22 @@
package org.jboss.webbeans.bootstrap;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import org.jboss.webbeans.DefinitionException;
-
public class AfterBeanDiscoveryImpl implements AfterBeanDiscovery
{
+ private List<Throwable> definitionErrors = new ArrayList<Throwable>();
+
public void addDefinitionError(Throwable t)
{
- //XXX spec says need to delay abort until all observers
- //have been notified
- throw new DefinitionException(t);
+ definitionErrors.add(t);
}
+
+ public List<Throwable> getDefinitionErrors()
+ {
+ return definitionErrors;
+ }
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java 2009-06-19 03:46:23 UTC (rev 2854)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java 2009-06-19 04:36:43 UTC (rev 2855)
@@ -1,16 +1,21 @@
package org.jboss.webbeans.bootstrap;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import org.jboss.webbeans.DeploymentException;
-
public class AfterDeploymentValidationImpl implements AfterDeploymentValidation
{
+ private List<Throwable> deploymentProblems = new ArrayList<Throwable>();
+
public void addDeploymentProblem(Throwable t)
{
- //XXX spec says need to delay abort until all observers
- //have been notified
- throw new DeploymentException(t);
+ deploymentProblems.add(t);
}
+ public List<Throwable> getDeploymentProblems()
+ {
+ return deploymentProblems;
+ }
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-19 03:46:23 UTC (rev 2854)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-19 04:36:43 UTC (rev 2855)
@@ -240,7 +240,11 @@
throw new DefinitionException(e);
}
- // TODO handle registered definition errors
+ if (event.getDefinitionErrors().size() > 0)
+ {
+ // FIXME communicate all the captured definition errors in this exception
+ throw new DefinitionException(event.getDefinitionErrors().get(0));
+ }
}
protected void fireAfterDeploymentValidationEvent()
@@ -256,7 +260,11 @@
throw new DeploymentException(e);
}
- // TODO handle registered deployment errors
+ if (event.getDeploymentProblems().size() > 0)
+ {
+ // FIXME communicate all the captured deployment problems in this exception
+ throw new DeploymentException(event.getDeploymentProblems().get(0));
+ }
}
/**
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2854 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bootstrap and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-06-18 23:46:23 -0400 (Thu, 18 Jun 2009)
New Revision: 2854
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/DeploymentException.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
Log:
catch and wrap exceptions thrown by observers during container initialization
Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/DeploymentException.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/DeploymentException.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/DeploymentException.java 2009-06-19 03:46:23 UTC (rev 2854)
@@ -0,0 +1,48 @@
+/*
+ * 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.webbeans;
+
+/**
+ * Thrown if an deployment exception occurs.
+ *
+ * @author Pete Muir
+ */
+public class DeploymentException extends RuntimeException
+{
+ private static final long serialVersionUID = 8014646336322875707L;
+
+ public DeploymentException()
+ {
+ super();
+ }
+
+ public DeploymentException(String message, Throwable throwable)
+ {
+ super(message, throwable);
+ }
+
+ public DeploymentException(String message)
+ {
+ super(message);
+ }
+
+ public DeploymentException(Throwable throwable)
+ {
+ super(throwable);
+ }
+
+}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java 2009-06-19 03:45:23 UTC (rev 2853)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterBeanDiscoveryImpl.java 2009-06-19 03:46:23 UTC (rev 2854)
@@ -1,16 +1,16 @@
package org.jboss.webbeans.bootstrap;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.inject.DeploymentException;
+import org.jboss.webbeans.DefinitionException;
+
public class AfterBeanDiscoveryImpl implements AfterBeanDiscovery
{
-
public void addDefinitionError(Throwable t)
{
- //XXX spec says need to delay abort until all observers
+ //XXX spec says need to delay abort until all observers
//have been notified
- throw new DeploymentException(t);
+ throw new DefinitionException(t);
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java 2009-06-19 03:45:23 UTC (rev 2853)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AfterDeploymentValidationImpl.java 2009-06-19 03:46:23 UTC (rev 2854)
@@ -2,13 +2,15 @@
import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import org.jboss.webbeans.DeploymentException;
+
public class AfterDeploymentValidationImpl implements AfterDeploymentValidation
{
public void addDeploymentProblem(Throwable t)
{
- //XXX spec says need to delay abort until all observers
+ //XXX spec says need to delay abort until all observers
//have been notified
- throw new RuntimeException(t);
+ throw new DeploymentException(t);
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-19 03:45:23 UTC (rev 2853)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-19 03:46:23 UTC (rev 2854)
@@ -9,7 +9,7 @@
* 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,
+ * 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.
@@ -19,6 +19,8 @@
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.BeanValidator;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.DefinitionException;
+import org.jboss.webbeans.DeploymentException;
import org.jboss.webbeans.bean.standard.EventBean;
import org.jboss.webbeans.bean.standard.InjectionPointBean;
import org.jboss.webbeans.bean.standard.InstanceBean;
@@ -201,18 +203,62 @@
manager.setEnabledInterceptorClasses(parser.getEnabledInterceptorClasses());
}
log.debug("Deployment types: " + manager.getEnabledDeploymentTypes());
- manager.fireEvent(new BeforeBeanDiscoveryImpl());
+ fireBeforeBeanDiscoveryEvent();
registerBeans(getServices().get(WebBeanDiscovery.class).discoverWebBeanClasses(), ejbDescriptors);
- manager.fireEvent(new AfterBeanDiscoveryImpl());
+ fireAfterBeanDiscoveryEvent();
log.debug("Web Beans initialized. Validating beans.");
manager.getResolver().resolveInjectionPoints();
new BeanValidator(manager).validate();
manager.getResolver().resolveInjectionPoints();
- manager.fireEvent(new AfterDeploymentValidationImpl());
+ fireAfterDeploymentValidationEvent();
endDeploy(requestBeanStore);
}
}
+ protected void fireBeforeBeanDiscoveryEvent()
+ {
+ BeforeBeanDiscoveryImpl event = new BeforeBeanDiscoveryImpl();
+ try
+ {
+ manager.fireEvent(event);
+ }
+ catch (Exception e)
+ {
+ throw new DefinitionException(e);
+ }
+ }
+
+ protected void fireAfterBeanDiscoveryEvent()
+ {
+ AfterBeanDiscoveryImpl event = new AfterBeanDiscoveryImpl();
+ try
+ {
+ manager.fireEvent(event);
+ }
+ catch (Exception e)
+ {
+ throw new DefinitionException(e);
+ }
+
+ // TODO handle registered definition errors
+ }
+
+ protected void fireAfterDeploymentValidationEvent()
+ {
+ AfterDeploymentValidationImpl event = new AfterDeploymentValidationImpl();
+
+ try
+ {
+ manager.fireEvent(event);
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException(e);
+ }
+
+ // TODO handle registered deployment errors
+ }
+
/**
* Gets version information
*
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2853 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle: fail and 3 other directories.
by webbeans-commits＠lists.jboss.org
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
+ */
+@Artifact
+(a)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
- *
- */
-@Artifact
-(a)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
+ */
+@Artifact
+(a)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
- *
- */
-@Artifact
-(a)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
+ */
+@Artifact
+(a)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
- *
- */
-@Artifact
-(a)ExpectedDeploymentException(DeploymentException.class)
-public class ObserverFailureInDeploymentPhaseTest extends AbstractJSR299Test
-{
- @Test(groups = { "ri-broken" })
- @SpecAssertion(section = "11.5", id = "ba")
- public void testDeploymentFailsAfterInitialization()
- {
- assert false;
- }
-}
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2852 - tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api and 2 other directories.
by webbeans-commits＠lists.jboss.org
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);
}
}
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2851 - in tck/trunk: xml/src/main/java/org/jboss/jsr299/tck/literals and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-06-18 19:50:24 -0400 (Thu, 18 Jun 2009)
New Revision: 2851
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
Log:
Put AbstractJSR299Test back to the way it was yesterday with new test harness changes
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 22:21:14 UTC (rev 2850)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18 23:50:24 UTC (rev 2851)
@@ -197,14 +197,14 @@
getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
}
- //@Override
- protected static boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
+ @Override
+ protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
{
- if (throwableType.equals(DefinitionError.class) && JSR299ConfigurationImpl.get().getManagers().isDefinitionError(throwable))
+ if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable))
{
return true;
}
-
- return org.jboss.testharness.AbstractTest.isThrowablePresent(throwableType, throwable);
+
+ return super.isThrowablePresent(throwableType, throwable);
}
}
Modified: tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java
===================================================================
--- tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-06-18 22:21:14 UTC (rev 2850)
+++ tck/trunk/xml/src/main/java/org/jboss/jsr299/tck/literals/CurrentLiteral.java 2009-06-18 23:50:24 UTC (rev 2851)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.literals;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
/**
* Annotation literal for @Current
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2850 - extensions/trunk/logger/src/main/java/org/jboss/webbeans/log.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-06-18 18:21:14 -0400 (Thu, 18 Jun 2009)
New Revision: 2850
Modified:
extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java
Log:
Updated to use new API.
Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java
===================================================================
--- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java 2009-06-18 09:44:13 UTC (rev 2849)
+++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java 2009-06-18 22:21:14 UTC (rev 2850)
@@ -37,7 +37,8 @@
{
Log log = null;
String category = null;
- category = injectionPoint.getAnnotation(Logger.class).value();
+
+ category = injectionPoint.getAnnotated().getAnnotation(Logger.class).value();
if (category.length() == 0)
{
log = Logging.getLog((Class<?>) injectionPoint.getMember().getDeclaringClass());
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2849 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-06-18 05:44:13 -0400 (Thu, 18 Jun 2009)
New Revision: 2849
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
Changed isThrowablePresent so it compiles with JSE 6
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 09:25:44 UTC (rev 2848)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18 09:44:13 UTC (rev 2849)
@@ -197,14 +197,14 @@
getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
}
-// @Override
-// protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
-// {
-// if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable))
-// {
-// return true;
-// }
-//
-// return super.isThrowablePresent(throwableType, throwable);
-// }
+ //@Override
+ protected static boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
+ {
+ if (throwableType.equals(DefinitionError.class) && JSR299ConfigurationImpl.get().getManagers().isDefinitionError(throwable))
+ {
+ return true;
+ }
+
+ return org.jboss.testharness.AbstractTest.isThrowablePresent(throwableType, throwable);
+ }
}
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2848 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/lookup/byname and 15 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-06-18 05:25:44 -0400 (Thu, 18 Jun 2009)
New Revision: 2848
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
tck/trunk/impl/src/main/resources/tck-tests.xml
Log:
The rest of the changes for all lookup tests to bring them up to date with rev 20090519 of the spec
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-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -197,14 +197,14 @@
getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
}
- @Override
- protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
- {
- if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable))
- {
- return true;
- }
-
- return super.isThrowablePresent(throwableType, throwable);
- }
+// @Override
+// protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
+// {
+// if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable))
+// {
+// return true;
+// }
+//
+// return super.isThrowablePresent(throwableType, throwable);
+// }
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -1,47 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.byname;
-
-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.testng.annotations.Test;
-
-/**
- *
- * Spec version: PRD2
- *
- */
-@Artifact
-public class InstantiationByNameTest extends AbstractJSR299Test
-{
-
- @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f")
- //TODO Need to find a way to intercept calls to the manager to verify this condition
- public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression()
- {
- assert false;
- }
-
-
- @Test(groups = { "resolution", "el" })
- @SpecAssertions({
- @SpecAssertion(section = "5.10", id = "d"),
- @SpecAssertion(section = "5.10", id = "c")
- })
- public void testGetInstanceByName() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert getCurrentManager().getBeans("nonexistant").size() == 0;
- assert getInstanceByName("nonexistant") == null;
- assert getInstanceByName("salmon") instanceof Salmon;
- }
-
- }.run();
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -8,7 +8,7 @@
/**
*
- * Spec version: Public Release Draft 2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -17,7 +17,7 @@
{
@Test(groups = { "resolution" })
- @SpecAssertion(section = "5.11", id = "c")
+ @SpecAssertion(section = "5.2", id = "c")
public void testOnlyHighestPrecedenceResolved() throws Exception
{
// Both Cod and Plaice are named "whitefish" - Plaice has the highest
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -26,7 +26,7 @@
/**
*
- * Spec version: Public Release Draft 2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -38,8 +38,9 @@
*
* @throws Exception
*/
- @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousResolutionException.class)
- @SpecAssertion(section = "5.10", id = "e")
+ @Test(groups = { "resolution", "el", "rewrite" })
+ // Needs to detect the problem
+ @SpecAssertion(section = "5.2.1", id = "a")
public void testDuplicateNamedBeans() throws Exception
{
new RunInDependentContext()
@@ -49,7 +50,6 @@
protected void execute() throws Exception
{
assert getCurrentManager().getBeans("whitefish").size() == 2;
- getInstanceByName("whitefish");
}
}.run();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/array/ArrayTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -1,19 +1,21 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.array;
-import javax.enterprise.inject.UnproxyableResolutionException;
-
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;
+/**
+ * Test for problem detection of array injection.
+ *
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(UnproxyableResolutionException.class)
public class ArrayTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section = "5.4.1", id = "d")
+ @Test(groups = "rewrite")
+ // Needs to detect problem
+ @SpecAssertion(section = "5.3.1", id = "da")
public void testInjectionPointWithArrayType()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/finalmethod/FinalMethodTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -1,19 +1,16 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.finalmethod;
-import javax.enterprise.inject.UnproxyableResolutionException;
-
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;
@Artifact
-(a)ExpectedDeploymentException(UnproxyableResolutionException.class)
public class FinalMethodTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section = "5.4.1", id = "bb")
+ @Test(groups = "rewrite")
+ // Needs to detect problem
+ @SpecAssertion(section = "5.3.1", id = "bba")
public void testClassWithFinalMethodCannotBeProxied()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/privateconstructor/PrivateConstructorTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -1,20 +1,22 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.privateconstructor;
-import javax.enterprise.inject.UnproxyableResolutionException;
-
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;
+/**
+ * Test for problem detection of unproxyable bean with private constructor.
+ *
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(UnproxyableResolutionException.class)
public class PrivateConstructorTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section = "5.4.1", id = "a")
+ @Test(groups = "rewrite")
+ // Needs to detect the problem
+ @SpecAssertion(section = "5.3.1", id = "aa")
public void testClassWithPrivateConstructor()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -1,19 +1,16 @@
package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable;
-import javax.enterprise.inject.UnproxyableResolutionException;
-
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;
@Artifact
-(a)ExpectedDeploymentException(UnproxyableResolutionException.class)
public class UnproxyableTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section = "5.4.1", id = "ba")
+ @Test(groups = "rewrite")
+ // Needs to detect problem
+ @SpecAssertion(section = "5.3.1", id = "baa")
public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/DependencyResolutionTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -8,21 +8,21 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.ForwardingBean;
-import org.jboss.jsr299.tck.impl.MockCreationalContext;
-import org.jboss.jsr299.tck.literals.CurrentLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
+/**
+ * Tests for dependency resolution problem detection
+ *
+ * Spec version: 20090519
+ */
@Artifact
public class DependencyResolutionTest extends AbstractJSR299Test
{
@@ -81,40 +81,23 @@
}
}
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "5.7.1", id = "c"),
- @SpecAssertion(section = "5.7.1", id = "d")
- })
- public void testGetInstanceToInjectReturnsContextualInstance() throws Exception
+ @Test(groups = "rewrite")
+ @SpecAssertion(section = "5.1.2", id = "aa")
+ public void testUnsatisfiedDependencyDetected() throws Exception
{
Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next();
Field injectedField = InjectedBean.class.getField("vanilla");
Set<Annotation> bindings = new HashSet<Annotation>();
- bindings.add(new CurrentLiteral());
- MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings);
-
- assert getCurrentManager().getInjectableReference(injectionPoint, new MockCreationalContext<Object>()) instanceof Vanilla;
- }
-
- @Test(expectedExceptions = UnsatisfiedResolutionException.class)
- @SpecAssertion(section = "5.7.1", id = "e")
- public void testGetInstanceToInjectThrowsUnsatisfiedDependencyException() throws Exception
- {
- Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next();
-
- Field injectedField = InjectedBean.class.getField("vanilla");
- Set<Annotation> bindings = new HashSet<Annotation>();
bindings.add(new OtherLiteral());
MockInjectionPoint injectionPoint = new MockInjectionPoint(vanillaBean, Vanilla.class, injectedField, bindings);
assert getCurrentManager().getInjectableReference(injectionPoint, null) instanceof Vanilla;
}
- @Test(expectedExceptions = UnsatisfiedResolutionException.class)
- @SpecAssertion(section = "5.7.1", id = "f")
- public void testGetInstanceToInjectThrowsAmbiguousDependencyException() throws Exception
+ @Test(groups = "rewrite")
+ @SpecAssertion(section = "5.1.2", id = "aa")
+ public void testAmbiguousDependencyDetected() throws Exception
{
Bean<Vanilla> vanillaBean = getBeans(Vanilla.class).iterator().next();
@@ -125,9 +108,9 @@
getCurrentManager().getInjectableReference(injectionPoint, null);
}
- @Test(expectedExceptions=UnproxyableResolutionException.class)
- @SpecAssertion(section = "5.7.1", id = "g")
- public void testGetInstanceToInjectThrowsUnproxyableDependencyException() throws Exception
+ @Test(groups = "rewrite")
+ @SpecAssertion(section = "5.3.1", id = "aa")
+ public void testUnproxyableDependencyDetected() throws Exception
{
final Bean<Mustard> bean = getBeans(Mustard.class).iterator().next();
final Set<Annotation> bindings = new HashSet<Annotation>();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -17,7 +17,7 @@
*
* @author Shane Bryzak
*
- * Spec version: 05192009
+ * Spec version: 20090519
*/
@Artifact
public class DynamicLookupTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -13,7 +13,7 @@
/**
*
- * Spec version: 05192009
+ * Spec version: 20090519
*
*/
@Artifact
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 05192009
+ * Spec version: 20090519
*
*/
@Artifact
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 05192009
+ * Spec version: 20090519
*/
@Artifact
@ExpectedDeploymentException(NullableDependencyException.class)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -40,7 +40,7 @@
*
* @author David Allen
*
- * Spec version: 05192009
+ * Spec version: 20090519
*/
@Artifact
public class InjectionPointTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -15,7 +15,7 @@
/**
*
- * Spec version: 05192009
+ * Spec version: 20090519
*
*/
@Artifact
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -11,7 +11,7 @@
/**
*
- * Spec version: 05192009
+ * Spec version: 20090519
*
*/
@Artifact
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-18 09:25:44 UTC (rev 2848)
@@ -19,7 +19,7 @@
/**
*
- * Spec version: 05192009
+ * Spec version: 20090519
*
*/
@Artifact
Modified: tck/trunk/impl/src/main/resources/tck-tests.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-06-17 23:20:46 UTC (rev 2847)
+++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-06-18 09:25:44 UTC (rev 2848)
@@ -15,7 +15,8 @@
<exclude name="stub" />
<exclude name="ri-broken" />
<exclude name="underInvestigation" />
- <exclude name="broken" />
+ <exclude name="broken" />
+ <exclude name="rewrite" />
</run>
</groups>
<packages>
14 years, 10 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2847 - ri/trunk/impl/src/main/java/org/jboss/webbeans and 95 other directories.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-06-17 19:20:46 -0400 (Wed, 17 Jun 2009)
New Revision: 2847
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/DefinitionException.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/beans.xml
Removed:
ri/trunk/api/src/main/java/javax/inject/DefinitionException.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypeNotImplemented/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/requiredTypesMerged/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/scopeNotSupported/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.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
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/ProducerFieldDeploymentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/Tarantula.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/ProducerMethodDeploymentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/Tarantula.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java
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/fail/DeploymentFailureTest.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/event/broken/event1/FiresOnNonEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
move DefinitionException to WebBeans core
accomodate a DefinitionError in AbstractJSR299TestCase and use TCK SPI to check for it
bring additional tests inline with 20090519 spec
update spec assertion list
Deleted: ri/trunk/api/src/main/java/javax/inject/DefinitionException.java
===================================================================
--- ri/trunk/api/src/main/java/javax/inject/DefinitionException.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/api/src/main/java/javax/inject/DefinitionException.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,52 +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 javax.inject;
-
-/**
- * Thrown if the definition of a bean is incorrect
- *
- * @author Pete Muir
- */
-public class DefinitionException extends RuntimeException
-{
-
- private static final long serialVersionUID = 8014646336322875707L;
-
- public DefinitionException()
- {
- super();
- }
-
- public DefinitionException(String message, Throwable throwable)
- {
- super(message, throwable);
- }
-
- public DefinitionException(String message)
- {
- super(message);
- }
-
- public DefinitionException(Throwable throwable)
- {
- super(throwable);
- }
-
-
-
-}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -36,7 +36,6 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.event.Event;
-import javax.inject.DefinitionException;
import javax.inject.InconsistentSpecializationException;
import javax.inject.NullableDependencyException;
import javax.inject.Obtains;
Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/DefinitionException.java (from rev 2838, ri/trunk/api/src/main/java/javax/inject/DefinitionException.java)
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/DefinitionException.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/DefinitionException.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,48 @@
+/*
+ * 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.webbeans;
+
+/**
+ * Thrown if the definition of a bean is incorrect
+ *
+ * @author Pete Muir
+ */
+public class DefinitionException extends RuntimeException
+{
+ private static final long serialVersionUID = 8014646336322875707L;
+
+ public DefinitionException()
+ {
+ super();
+ }
+
+ public DefinitionException(String message, Throwable throwable)
+ {
+ super(message, throwable);
+ }
+
+ public DefinitionException(String message)
+ {
+ super(message);
+ }
+
+ public DefinitionException(Throwable throwable)
+ {
+ super(throwable);
+ }
+
+}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -33,9 +33,9 @@
import javax.enterprise.inject.deployment.Standard;
import javax.enterprise.inject.spi.Bean;
import javax.event.Event;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.DependentInstancesStore;
import org.jboss.webbeans.conversation.ConversationImpl;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -30,9 +30,9 @@
import javax.enterprise.inject.deployment.DeploymentType;
import javax.enterprise.inject.deployment.Production;
import javax.event.Observes;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.injection.FieldInjectionPoint;
import org.jboss.webbeans.injection.MethodInjectionPoint;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -36,9 +36,9 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.deployment.DeploymentType;
import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.context.DependentContext;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -10,9 +10,9 @@
import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.spi.Decorator;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.injection.MethodInjectionPoint;
import org.jboss.webbeans.injection.WBInjectionPoint;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -31,9 +31,9 @@
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.deployment.DeploymentType;
import javax.event.Observes;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.injection.MethodInjectionPoint;
import org.jboss.webbeans.injection.ParameterInjectionPoint;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -32,10 +32,10 @@
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.CreationException;
import javax.event.Observes;
-import javax.inject.DefinitionException;
import javax.interceptor.Interceptor;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance;
import org.jboss.webbeans.bean.proxy.EnterpriseBeanProxyMethodHandler;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -24,9 +24,9 @@
import javax.enterprise.inject.CreationException;
import javax.enterprise.inject.Disposes;
import javax.event.Observes;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.context.DependentStorageRequest;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -24,9 +24,9 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Initializer;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.context.DependentStorageRequest;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -25,9 +25,9 @@
import javassist.util.proxy.ProxyFactory;
import javax.enterprise.inject.spi.Bean;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.util.Proxies;
import org.jboss.webbeans.util.collections.ConcurrentCache;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -32,9 +32,9 @@
import javax.event.Observer;
import javax.event.ObserverException;
import javax.event.Observes;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.context.DependentContext;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -24,10 +24,10 @@
import javax.event.AfterTransactionSuccess;
import javax.event.Asynchronously;
import javax.event.BeforeTransactionCompletion;
-import javax.inject.DefinitionException;
import javax.transaction.Synchronization;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.introspector.WBMethod;
import org.jboss.webbeans.transaction.spi.TransactionServices;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -18,8 +18,8 @@
import java.lang.annotation.Annotation;
-import javax.inject.DefinitionException;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.introspector.WBAnnotation;
import org.jboss.webbeans.resources.ClassTransformer;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -22,9 +22,9 @@
import javax.enterprise.inject.BindingType;
import javax.enterprise.inject.NonBinding;
-import javax.inject.DefinitionException;
import javax.inject.ExecutionException;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.introspector.WBMethod;
import org.jboss.webbeans.resources.ClassTransformer;
import org.jboss.webbeans.util.Reflections;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/StereotypeModel.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -26,9 +26,9 @@
import javax.enterprise.inject.Named;
import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.deployment.DeploymentType;
-import javax.inject.DefinitionException;
import javax.interceptor.InterceptorBindingType;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.resources.ClassTransformer;
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -24,9 +24,9 @@
import javax.enterprise.inject.BindingType;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
-import javax.inject.DefinitionException;
import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bean.EnterpriseBean;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.injection.FieldInjectionPoint;
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-17 23:17:36 UTC (rev 2846)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -8,6 +8,7 @@
import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.WebBean;
public class ManagersImpl implements Managers
@@ -29,5 +30,21 @@
deploymentTypes.remove(WebBean.class);
return deploymentTypes;
}
+
+ public boolean isDefinitionError(Throwable throwable)
+ {
+ if (throwable == null)
+ {
+ return false;
+ }
+ else if (DefinitionException.class.isAssignableFrom(throwable.getClass()))
+ {
+ return true;
+ }
+ else
+ {
+ return isDefinitionError(throwable.getCause());
+ }
+ }
}
Added: 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 (rev 0)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/DefinitionError.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,4 @@
+package org.jboss.jsr299.tck.api;
+
+public class DefinitionError extends RuntimeException {
+}
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/JSR299Configuration.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -11,11 +11,11 @@
/**
* The configuration of the TCK.
*
- * The TCK may be configured using system properties or placed in a properties
+ * The TCK may be configured using system properties or placed in a properties
* file called META-INF/web-beans-tck.properties.
*
- * Porting package property names are the FQCN of the SPI class. Other property
- * names (one for each non-porting package SPI configuration option) are
+ * Porting package property names are the FQCN of the SPI class. Other property
+ * names (one for each non-porting package SPI configuration option) are
* specified here. The defaults are also listed here.
*
* The TCK may also be configured programatically through this interface
@@ -25,9 +25,6 @@
*/
public interface JSR299Configuration extends Configuration
{
-
-
-
/**
* The implementation of {@link Beans} in use.
*/
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-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -8,20 +8,20 @@
/**
* This interface provides operations relating to a Manager.
*
- * The TCK porting package must provide an implementation of this interface which is
- * suitable for the target implementation.
+ * The TCK porting package must provide an implementation of this interface which is
+ * suitable for the target implementation.
*
* @author Shane Bryzak
*/
public interface Managers
-{
+{
public static final String PROPERTY_NAME = Managers.class.getName();
/**
* Get a new Manager instance
*
- * @return the Manager
+ * @return the Manager
*/
public BeanManager getManager();
@@ -32,4 +32,11 @@
*/
List<Class<? extends Annotation>> getEnabledDeploymentTypes();
+ /**
+ * Checks whether the throwable is a definition error, as described
+ * in Section 12.4, "Problems detected automatically by the container".
+ *
+ * @return true if the throwable reports a definition error
+ */
+ public boolean isDefinitionError(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-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -16,6 +16,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.jboss.jsr299.tck.api.JSR299Configuration;
import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl;
import org.jboss.jsr299.tck.impl.OldSPIBridge;
@@ -100,6 +101,7 @@
getCurrentConfiguration().getContexts().destroyContext(context);
}
+ @Override
protected JSR299Configuration getCurrentConfiguration()
{
return JSR299ConfigurationImpl.get();
@@ -151,15 +153,15 @@
public <T> Set<Bean<T>> getBeans(TypeLiteral<T> type, Annotation... bindings)
{
- return (Set<Bean<T>>)(Set)getCurrentManager().getBeans(type.getType(), bindings);
+ return (Set)getCurrentManager().getBeans(type.getType(), bindings);
}
- public <T> T getInstanceByType(Class<T> beanType, Annotation... bindings)
+ public <T> T getInstanceByType(Class<T> beanType, Annotation... bindings)
{
return OldSPIBridge.getInstanceByType(getCurrentManager(), beanType, bindings);
}
- public <T> T getInstanceByType(TypeLiteral<T> beanType, Annotation... bindings)
+ public <T> T getInstanceByType(TypeLiteral<T> beanType, Annotation... bindings)
{
return OldSPIBridge.getInstanceByType(getCurrentManager(), beanType, bindings);
}
@@ -194,4 +196,15 @@
{
getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance);
}
+
+ @Override
+ protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable)
+ {
+ if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable))
+ {
+ return true;
+ }
+
+ return super.isThrowablePresent(throwableType, throwable);
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -12,14 +12,13 @@
import javax.enterprise.context.spi.CreationalContext;
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.testng.annotations.Test;
/**
- *
* Spec version: 20090519
- *
*/
@Artifact
public class ContextTest extends AbstractJSR299Test
@@ -82,8 +81,13 @@
}
@Test(groups = { "contexts" })
- @SpecAssertion(section = "unknown", id = "unknown") // combination of 2.4.1 and 11.3.18
- //@SpecAssertion(section = "8.5", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.2", id = "aa"),
+ @SpecAssertion(section = "2.4.1", id = "a"),
+ @SpecAssertion(section = "2.4.1", id = "b"),
+ @SpecAssertion(section = "2.4.1", id = "c"),
+ @SpecAssertion(section = "11.3.18", id = "a")
+ })
public void testBuiltInContexts()
{
Context context = getCurrentManager().getContext(Dependent.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken2;
-import javax.inject.DefinitionException;
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;
/**
@@ -16,7 +16,7 @@
* Spec version: PRD2
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class NonSerializableTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.deployment.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@Inherited
-@interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany;
-
-import javax.enterprise.inject.deployment.Production;
-
-@Production
-@AnotherDeploymentType
-class BeanWithTooManyDeploymentTypes_Broken
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,44 +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.definition.deployment.broken.tooMany;
-
-import javax.inject.DefinitionException;
-
-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;
-
-/**
- * Single test for a bean with too many deployment types.
- */
-@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
-public class TooManyDeploymentTypesTest extends AbstractJSR299Test
-{
- @Test(groups = { "deploymentType", "rewrite"})
- // Definition exception has gone
- //@SpecAssertion(section = "2.5.3", id = "d")
- @SpecAssertion(section = "unknown", id = "unknown")
- public void testTooManyDeploymentTypes()
- {
- assert false;
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/typevariable/ParameterizedTypeInjectionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,24 +1,22 @@
package org.jboss.jsr299.tck.tests.definition.deployment.broken.typevariable;
-import javax.inject.DefinitionException;
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;
/**
- *
* @author Shane Bryzak
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterizedTypeInjectionTest extends AbstractJSR299Test
{
- @Test(groups = "rewrite")
+ @Test(groups = "rewrite") // use of type variables appears to be allowed now
//@SpecAssertion(section = "2.2", id = "c")
- // TODO no more DefinitionException
@SpecAssertion(section = "unknown", id = "unknown")
public void testInjectionPointIsNotParameterizedTypeWithTypeVariable()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/wildcard/WildcardTypeInjectionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.definition.deployment.broken.wildcard;
-import javax.inject.DefinitionException;
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;
/**
@@ -13,7 +13,7 @@
* @author Shane Bryzak
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class WildcardTypeInjectionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,20 +1,18 @@
package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard;
-import javax.inject.DefinitionException;
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;
/**
- *
* Spec version: 20090519
- *
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class NonBuiltInUsesStandardTest extends AbstractJSR299Test
{
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.deployment.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@Inherited
+@interface AnotherDeploymentType
+{
+}
\ No newline at end of file
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany;
+
+import javax.enterprise.inject.deployment.Production;
+
+@Production
+@AnotherDeploymentType
+class BeanWithTooManyDeploymentTypes_Broken
+{
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,43 @@
+/*
+ * 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.definition.deployment.tooMany;
+
+
+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;
+
+/**
+ * Single test for a bean with too many deployment types.
+ * Spec version: 20090519
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class TooManyDeploymentTypesTest extends AbstractJSR299Test
+{
+ @Test(groups = { "deploymentType" })
+ @SpecAssertion(section = "2.5.3", id = "da")
+ public void testTooManyDeploymentTypes()
+ {
+ assert false;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/AnotherDeploymentType.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField;
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/ProducerFieldDeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,20 +1,23 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField;
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField;
-import javax.inject.DefinitionException;
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;
+/**
+ * Validate that a producer field specifies at most one deployment type.
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ProducerFieldDeploymentTest extends AbstractJSR299Test
{
- @Test(groups = { "deploymentType", "rewrite"})
- // DefinitionException has gone
- @SpecAssertion(section = "2.5.3", id = "f")
+ @Test(groups = { "deploymentType" })
+ @SpecAssertion(section = "2.5.3", id = "fa")
public void testTooManyDeploymentTypes()
{
assert false;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
-
-@Production
-@AnotherDeploymentType
-class SpiderProducer
-{
- @Produces public Tarantula produceTarantula = new Tarantula();
-}
-
\ No newline at end of file
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer_Broken.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
+
+@Production
+@AnotherDeploymentType
+class SpiderProducer_Broken
+{
+ @Produces public Tarantula produceTarantula = new Tarantula();
+}
+
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/Tarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/Tarantula.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField;
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField;
-public class Tarantula
+class Tarantula
{
-
}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/AnotherDeploymentType.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod;
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
@@ -18,5 +18,4 @@
@Inherited
@interface AnotherDeploymentType
{
-
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/ProducerMethodDeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,21 +1,23 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod;
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod;
-import javax.inject.DefinitionException;
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;
+/**
+ * Validate that a producer method declares at most one deployment type.
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ProducerMethodDeploymentTest extends AbstractJSR299Test
{
- @Test(groups = { "deploymentType" , "rewrite"})
- // DefinitionException has gone
- //@SpecAssertion(section = "2.5.3", id = "e")
- @SpecAssertion(section= "unknown", id ="unknown")
+ @Test(groups = { "deploymentType" })
+ @SpecAssertion(section = "2.5.3", id = "ea")
public void testTooManyDeploymentTypes()
{
assert false;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.deployment.Production;
-
-@Production
-@AnotherDeploymentType
-class SpiderProducer
-{
- @Produces public Tarantula produceTarantula()
- {
- return new Tarantula();
- }
-}
-
\ No newline at end of file
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer_Broken.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.deployment.Production;
+
+@Production
+@AnotherDeploymentType
+class SpiderProducer_Broken
+{
+ @Produces public Tarantula produceTarantula()
+ {
+ return new Tarantula();
+ }
+}
+
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/Tarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java 2009-06-16 21:26:33 UTC (rev 2838)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/Tarantula.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
-package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod;
+package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod;
-public class Tarantula
+class Tarantula
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -10,9 +10,7 @@
import org.testng.annotations.Test;
/**
- *
* Spec version: 20090519
- *
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -29,5 +27,5 @@
public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
{
assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
- }
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes;
-import javax.inject.DefinitionException;
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.Classes;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
/**
@@ -14,7 +14,7 @@
*/
@Artifact(addCurrentPackage = false)
@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class })
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class IncompatibleStereotypesTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,18 +1,18 @@
package org.jboss.jsr299.tck.tests.definition.scope.tooMany;
-import javax.inject.DefinitionException;
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;
/**
* Spec version: 20090519
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class TooManyScopesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Goldfish.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -2,7 +2,6 @@
import javax.enterprise.context.RequestScoped;
-@RequestScopedAnimalStereotype
@RequestScoped
class Goldfish implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -3,7 +3,6 @@
import javax.enterprise.context.RequestScoped;
@HornedMammalStereotype
-@RequestScopedAnimalStereotype
@RequestScoped
@Tame
class HighlandCow implements Animal
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/RequestScopedAnimalStereotype.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.stereotype;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Stereotype;
-
-(a)Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class)
-@Target( { TYPE })
-@Retention(RUNTIME)
-@interface RequestScopedAnimalStereotype
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -3,7 +3,6 @@
import javax.enterprise.context.ApplicationScoped;
@ApplicationScopedHornedMammalStereotype
-@RequestScopedAnimalStereotype
@ApplicationScoped
class Springbok implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -18,14 +18,12 @@
import org.testng.annotations.Test;
/**
- *
- * Spec version: PRD2
- *
+ * Spec version: 20090519
*/
@Artifact
@BeansXml("beans.xml")
public class StereotypeDefinitionTest extends AbstractJSR299Test
-{
+{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
@Test(groups = { "annotationDefinition" })
@@ -37,44 +35,34 @@
}
@Test
- @SpecAssertions({
- @SpecAssertion(section = "2.7.1.1", id = "a"),
- @SpecAssertion(section = "2.4.3", id = "c")
- })
+ @SpecAssertions( { @SpecAssertion(section = "2.7.1.1", id = "aa"), @SpecAssertion(section = "2.4.3", id = "c") })
public void testStereotypeWithScopeType()
{
- assert getBeans(Moose.class).size() == 1;
+ assert getBeans(Moose.class).size() == 1;
assert getBeans(Moose.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
@Test
- @SpecAssertions({
- @SpecAssertion(section = "2.7.1.1", id = "a"),
- @SpecAssertion(section="2.4.5", id = "b")
- })
+ @SpecAssertions( { @SpecAssertion(section = "2.7.1.1", id = "aa"), @SpecAssertion(section = "2.4.4", id = "b") })
public void testStereotypeWithoutScopeType()
{
- assert getBeans(Reindeer.class).size() == 1;
+ assert getBeans(Reindeer.class).size() == 1;
assert getBeans(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class);
}
@Test
@SpecAssertion(section = "2.7", id = "c")
- public void testOneStereotype()
+ public void testOneStereotypeAllowed()
{
Bean<LongHairedDog> bean = getBeans(LongHairedDog.class).iterator().next();
assert bean.getScopeType().equals(RequestScoped.class);
}
@Test
- @SpecAssertions({
- @SpecAssertion(section = "2.7.2", id = "e"),
- @SpecAssertion(section = "2.7.4", id = "c"),
- @SpecAssertion(section = "2.7", id = "d")
- })
- public void testMultipleStereotypes()
+ @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.7", id = "d") })
+ public void testMultipleStereotypesAllowed()
{
- assert getBeans(HighlandCow.class, TAME_LITERAL).size() == 1;
+ assert getBeans(HighlandCow.class, TAME_LITERAL).size() == 1;
Bean<HighlandCow> highlandCow = getBeans(HighlandCow.class, TAME_LITERAL).iterator().next();
assert highlandCow.getName() == null;
assert highlandCow.getBindings().contains(TAME_LITERAL);
@@ -83,33 +71,14 @@
}
@Test
- @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"),
- @SpecAssertion(section = "2.7.4", id = "c") })
- public void testMultipleStereotypesMergesScopes()
+ @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "e") })
+ public void testExplicitScopeOverridesMergedScopesFromMultipleStereotype()
{
- assert getBeans(Springbok.class).size() == 1;
+ assert getBeans(Springbok.class).size() == 1;
assert getBeans(Springbok.class).iterator().next().getScopeType().equals(ApplicationScoped.class);
}
@Test
- @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "b"),
- @SpecAssertion(section = "2.7.4", id = "a") })
- public void testRequiredTypeIsImplemented()
- {
- assert getBeans(HighlandCow.class, TAME_LITERAL).size() == 1;
- assert getBeans(HighlandCow.class, TAME_LITERAL).iterator().next().getTypes().contains(Animal.class);
- }
-
- @Test
- @SpecAssertions( { @SpecAssertion(section = "2.7.1.4", id = "a"),
- @SpecAssertion(section = "2.7.4", id = "b") })
- public void testScopeIsSupported()
- {
- assert getBeans(Goldfish.class).size() == 1;
- assert getBeans(Goldfish.class).iterator().next().getScopeType().equals(RequestScoped.class);
- }
-
- @Test
@SpecAssertion(section = "4.1", id = "ab")
public void testStereotypeDeclaredInheritedIsInherited() throws Exception
{
@@ -120,7 +89,7 @@
@SpecAssertion(section = "4.1", id = "ab")
public void testStereotypeNotDeclaredInheritedIsNotInherited()
{
- assert getBeans(ShetlandPony.class).size() == 1;
+ assert getBeans(ShetlandPony.class).size() == 1;
assert getBeans(ShetlandPony.class).iterator().next().getDeploymentType().equals(Production.class);
}
@@ -128,21 +97,21 @@
@SpecAssertion(section = "4.1", id = "ah")
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
{
- assert getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ assert getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "daa")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
- assert getBeans(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);
+ assert getBeans(Chihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);
}
@Test
@SpecAssertion(section = "4.1", id = "dca")
public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope()
{
- assert getBeans(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);
- }
+ assert getBeans(MexicanChihuahua.class).iterator().next().getScopeType().equals(SessionScoped.class);
+ }
}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
+
+@HornedMammalStereotype
+@AnotherStereotype
+class Goat
+{
+
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
-
-
-@HornedMammalStereotype
-@AnotherStereotype
-class Goat_Broken
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,26 +1,25 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes;
-import javax.inject.DefinitionException;
-
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.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
-
+/**
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+@BeansXml("beans.xml")
public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractJSR299Test
{
- // TODO remove me - I don't think this is needed any more since satisfying restrictions of a stereotype is no longer mentioned in the spec
- // or if the case isn't cover, this test should ensure that the highest precendence deployment type specified by the stereotypes is choosen
- @Test(groups="stub")
- @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.5.4", id = "da") })
+ @Test
+ @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.5.4", id = "b") })
public void testMultipleStereotypesWithMultipleDeploymentTypes()
{
- assert false;
+ assert getBeans(Goat.class).size() == 1;
+ assert getBeans(Goat.class).iterator().next().getDeploymentType().equals(HornedAnimalDeploymentType.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -8,7 +7,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
/**
@@ -16,8 +15,7 @@
*/
@Artifact(addCurrentPackage = false)
@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer_Broken.class })
-@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class MultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -5,7 +5,6 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -13,7 +12,6 @@
*/
@Artifact(addCurrentPackage = false)
@Classes( { ApplicationScopedHornedMammalStereotype.class, SessionScopedHornedMammalStereotype.class, Deer.class })
-@BeansXml("beans.xml")
public class ResolvedMultipleStereotypesWithMultipleScopeTypesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,19 +1,19 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed;
-import javax.inject.DefinitionException;
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.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
/**
* Spec version: 20090519
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class NonEmptyNamedTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -3,24 +3,32 @@
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.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.WAR)
@Resources({
- @Resource(destination="META-INF/beans.xml", source="default-beans.xml"),
+ @Resource(destination="WEB-INF/classes/META-INF/beans.xml", source="default-beans.xml"),
@Resource(destination="WEB-INF/beans.xml", source="default-beans.xml")
})
@ExpectedDeploymentException(DeploymentException.class)
-@IntegrationTest
-public class TooManyDeployElementsTest
+public class TooManyDeployElementsTest extends AbstractJSR299Test
{
- @Test(groups="underInvestigation") @SpecAssertion(section = "2.5.6", id = "e")
+ @Test
+ @SpecAssertion(section = "2.5.5", id = "ea")
public void testTooManyDeployElements()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -16,5 +16,4 @@
@DeploymentType
@interface AnotherDeploymentType
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes;
-
@StereotypeWithTooManyDeploymentTypes_Broken
class Gazelle_Broken
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -16,5 +16,4 @@
@AnotherDeploymentType
@interface StereotypeWithTooManyDeploymentTypes_Broken
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,21 +1,23 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes;
-import javax.inject.DefinitionException;
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;
+/**
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class TooManyDeploymentTypesTest extends AbstractJSR299Test
{
-
@Test
- @SpecAssertion(section = "2.7.1.1", id = "b")
+ @SpecAssertion(section = "2.7.1.1", id = "bb")
public void testStereotypeWithTooManyDeploymentTypes()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes;
-
@StereotypeWithTooManyScopeTypes_Broken
class Elk_Broken
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,5 +17,4 @@
@RequestScoped
@interface StereotypeWithTooManyScopeTypes_Broken
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,21 +1,23 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes;
-import javax.inject.DefinitionException;
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;
+/**
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class TooManyScopeTypesTest extends AbstractJSR299Test
{
-
@Test
- @SpecAssertion(section = "2.7.1.1", id = "a")
+ @SpecAssertion(section = "2.7.1.1", id = "aa")
public void testStereotypeWithTooManyScopeTypes()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,5 +17,4 @@
@BindingType
@interface Asynchronous
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes;
-
@StereotypeWithBindingTypes_Broken
class RoeDeer_Broken
{
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,21 +1,23 @@
package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes;
-import javax.inject.DefinitionException;
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;
+/**
+ * Spec version: 20090519
+ */
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test
{
-
@Test
- @SpecAssertion(section = "2.7.1", id = "d")
+ @SpecAssertion(section = "2.7.1", id = "da")
public void testStereotypeWithBindingTypes()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -8,12 +8,10 @@
import javax.enterprise.inject.Stereotype;
-
@Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
@Asynchronous
@interface StereotypeWithBindingTypes_Broken
{
-
}
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-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -9,7 +9,7 @@
* 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,
+ * 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.
@@ -27,13 +27,12 @@
* Tests related to the final deployment phase of the lifecycle.
*
* @author David Allen
- *
*/
@Artifact
public class DeploymentTest extends AbstractJSR299Test
{
@Test
- @SpecAssertions({
+ @SpecAssertions({
@SpecAssertion(section = "11.1", id = "d"),
@SpecAssertion(section = "11.1", id = "e"),
@SpecAssertion(section = "11.5", id = "b")
@@ -46,7 +45,7 @@
}
@Test
- @SpecAssertions({
+ @SpecAssertions({
@SpecAssertion(section = "11.5", id = "d")
})
public void testScopesActive()
@@ -56,7 +55,7 @@
}
@Test(groups = { "ri-broken" })
- @SpecAssertions({
+ @SpecAssertions({
@SpecAssertion(section = "11.2", id = "ac")
})
public void testOnlyEnabledBeansDeployed()
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-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/DeploymentFailureTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,11 +7,12 @@
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;
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class DeploymentFailureTest extends AbstractJSR299Test
{
@Test
Modified: 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-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ObserverFailureInDefinitionPhaseTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3;
-import javax.inject.DefinitionException;
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;
/**
@@ -16,7 +16,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverFailureInDefinitionPhaseTest extends AbstractJSR299Test
{
@Test(groups = { "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.event1;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class FiresOnNonEventTest extends AbstractJSR299Test
{
@Test(groups = { "events", "broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.event2;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class FiresOnEventWithoutTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events", "broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.event3;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class FiresOnEventWithWildcardTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.event4;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class FiresOnEventWithTypeVariableTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/jms1/MappedEventObserversAsynchronousTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,11 +17,11 @@
package org.jboss.jsr299.tck.tests.event.broken.jms1;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
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;
/**
@@ -32,7 +32,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class MappedEventObserversAsynchronousTest
{
@Test(groups = { "events", "stub" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,7 +17,6 @@
package org.jboss.jsr299.tck.tests.event.broken.observer1;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -26,6 +25,7 @@
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;
/**
@@ -36,7 +36,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,16 +1,16 @@
package org.jboss.jsr299.tck.tests.event.broken.observer2;
-import javax.inject.DefinitionException;
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.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer3;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodAndWildcardedEventTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer3a/ObserverMethodAndTypeVariableEventTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer3a;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodAndTypeVariableEventTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer4;
-import javax.inject.DefinitionException;
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;
/**
@@ -32,7 +32,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer5;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer6;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer7;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class TransactionalObserverMethodOnlyOnePhaseTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer8;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class AsynchronousBeforeCompletionObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -17,12 +17,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer9;
-import javax.inject.DefinitionException;
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;
/**
@@ -33,7 +33,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class AsynchronousConditionalObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -8,6 +7,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
/**
@@ -16,7 +16,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2;
-import javax.inject.DefinitionException;
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;
/**
@@ -14,7 +14,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3;
-import javax.inject.DefinitionException;
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.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
/**
@@ -15,7 +15,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4;
-import javax.inject.DefinitionException;
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.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
/**
@@ -15,7 +15,7 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -10,10 +9,11 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@IntegrationTest
@Packaging(PackagingType.EAR)
public class DisposalMethodOnSessionBean extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newAndOtherBinding;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class NewAndOtherBindingTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithConversationScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,9 +7,10 @@
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;
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
public class SingletonWithConversationScopeTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithRequestScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class SingletonWithRequestScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.singletonWithSessionScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class SingletonWithSessionScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithApplicationScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithConversationScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithConversationScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithRequestScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithRequestScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.statelessWithSessionScope;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class StatelessWithSessionScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,16 +1,16 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.methodAnnotatedProduces;
-import javax.inject.DefinitionException;
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.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class MethodAnnotatedProducesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedDisposes;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.parameterAnnotatedObserves;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.initializer.staticInitializer;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class StaticInitializerTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.parameterizedReturnTypeWithWildcard;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.enterprise.nonbusiness;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -9,11 +8,12 @@
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;
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedDisposes;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.parameterAnnotatedObserves;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter/ParameterizedTypeWithTypeParameterTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithWildcard/PamaterizedTypeWithWildcardTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithWildcard;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class PamaterizedTypeWithWildcardTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/stereotypeEnforcesRequiredTypes/StereotypeEnforcesRequiredTypesTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,16 +1,16 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.stereotypeEnforcesRequiredTypes;
-import javax.inject.DefinitionException;
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.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class StereotypeEnforcesRequiredTypesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasDisposesParameter;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.constructorHasObservesParameter;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class ConstructorHasObservesParameterTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.dependentWithPublicField;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class DependentWithPublicFieldTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.simple.definition.tooManyInitializerAnnotatedConstructors;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/newAndOtherBindingType/NewAndOtherBindingTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.newAndOtherBindingType;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class NewAndOtherBindingTypeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -5,7 +5,6 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -17,7 +16,6 @@
import org.testng.annotations.Test;
/**
- *
* Spec version: PRD2
*/
@Artifact
@@ -28,7 +26,7 @@
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
- @Test
+ @Test
@SpecAssertions({
@SpecAssertion(section = "4.3.1", id = "c"),
@SpecAssertion(section = "3.3.7", id = "a")
@@ -53,19 +51,5 @@
assert getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
assert getBeans(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
}
-
- @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.3.7", id = "a")
- public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
- {
- assert false;
- }
-
- @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.3.7", id = "a")
- public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
- {
- assert false;
- }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,35 @@
+package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise;
+
+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.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Spec version: PRD2
+ */
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@BeansXml("beans.xml")
+(a)ExpectedDeploymentException(DefinitionError.class)
+public class InvalidEnterpriseBeanSpecializationTest extends AbstractJSR299Test
+{
+ @Test(groups={"stub", "specialization"})
+ @SpecAssertion(section="3.3.7", id = "a")
+ public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
+ {
+ assert false;
+ }
+
+ @Test(groups={"stub", "specialization"})
+ @SpecAssertion(section="3.3.7", id = "a")
+ public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
+ {
+ assert false;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsNothing;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,10 +7,11 @@
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
public class DirectlyExtendsNothingTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,11 +7,12 @@
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;
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,9 +7,10 @@
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;
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
public class ImplementsInterfaceAndExtendsNothingTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.sameName;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -9,10 +8,11 @@
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.jsr299.tck.api.DefinitionError;
import org.testng.annotations.Test;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
public class SameNameTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.indirectOverride;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class IndirectOverrideTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializesStaticMethod;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializesStaticMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.specializingAndSpecializedBeanHaveName;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.extendejb;
-import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -8,11 +7,12 @@
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;
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.names;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend1;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend2;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -1,15 +1,15 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.noextend3;
-import javax.inject.DefinitionException;
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;
@Artifact
-(a)ExpectedDeploymentException(DefinitionException.class)
+(a)ExpectedDeploymentException(DefinitionError.class)
public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization", "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-17 23:20:46 UTC (rev 2847)
@@ -7,7 +7,6 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
-import javax.inject.DefinitionException;
import javax.inject.DuplicateBindingTypeException;
import org.hibernate.tck.annotations.SpecAssertion;
@@ -28,7 +27,7 @@
public class ResolutionByTypeTest extends AbstractJSR299Test
{
- @Test(groups="resolution")
+ @Test(groups="resolution")
@SpecAssertions({
@SpecAssertion(section="5.1", id = "gaa")
})
@@ -39,28 +38,28 @@
assert possibleTargets.iterator().next().getTypes().contains(Tuna.class);
}
- @Test(groups = { "resolution", "rewrite" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = { "resolution", "rewrite" }, expectedExceptions = IllegalArgumentException.class)
// This assertion comes back later
public <T> void testParameterizedTypeWithTypeParameter()
{
getBeans(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
}
- @Test(groups = { "resolution", "rewrite" }, expectedExceptions=DuplicateBindingTypeException.class)
+ @Test(groups = { "resolution", "rewrite" }, expectedExceptions=DuplicateBindingTypeException.class)
@SpecAssertion(section="5.1", id = "d")
public void testDuplicateBindingTypesUsed()
{
getBeans(Tuna.class, new CurrentLiteral(), new CurrentLiteral());
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
@SpecAssertion(section="5.1", id = "e")
public void testNonBindingTypeUsed()
{
getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
}
- @Test(groups="resolution")
+ @Test(groups="resolution")
@SpecAssertions({
@SpecAssertion(section = "5.1", id ="faa")
})
@@ -94,7 +93,7 @@
assert classes.contains(Haddock.class);
}
- @Test(groups="injection")
+ @Test(groups="injection")
@SpecAssertions({
@SpecAssertion(section = "2.3.4", id = "b" ),
@SpecAssertion(section = "5.1", id = "gba"),
@@ -135,7 +134,7 @@
assert getBeans(new TypeLiteral<Farmer<ScottishFish>>(){}).iterator().next().getTypes().contains(ScottishFishFarmer.class);
}
- @Test(groups={"resolution", "producerMethod"})
+ @Test(groups={"resolution", "producerMethod"})
@SpecAssertion(section="5.1", id = "fc")
public void testResolveByTypeWithArray() throws Exception
{
@@ -150,21 +149,21 @@
}
- @Test(groups="resolution")
+ @Test(groups="resolution")
@SpecAssertion(section="5.1", id = "hb")
public void testNoWebBeansFound() throws Exception
{
assert getBeans(Tuna.class, new AnnotationLiteral<FakeFish>() {}).size() == 0;
}
- @Test(groups="resolution")
+ @Test(groups="resolution")
@SpecAssertions({
@SpecAssertion(section="5.1", id = "gca")
})
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
- Set<Bean<Animal>> beans = getBeans(Animal.class, new ExpensiveLiteral()
+ Set<Bean<Animal>> beans = getBeans(Animal.class, new ExpensiveLiteral()
{
public int cost()
@@ -196,44 +195,64 @@
assert classes.contains(RoundWhitefish.class);
}
- @Test(groups="resolution", expectedExceptions=DefinitionException.class)
+ @Test(groups="resolution")
@SpecAssertion(section="5.1.4", id = "ca")
public void testArrayValuedAnnotationMemberWithoutNonBinding()
{
- getBeans(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() {
-
- public boolean[] bool()
+ Throwable t = null;
+ try
+ {
+ getBeans(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken()
{
- return new boolean[0];
- }
-
- });
+
+ public boolean[] bool()
+ {
+ return new boolean[0];
+ }
+
+ });
+ }
+ catch (Throwable throwable)
+ {
+ t = throwable;
+ }
+
+ assert getCurrentConfiguration().getManagers().isDefinitionError(t);
}
- @Test(groups="resolution", expectedExceptions=DefinitionException.class)
+ @Test(groups="resolution")//, expectedExceptions=DefinitionException.class)
@SpecAssertion(section="5.1.4", id = "cb")
public void testAnnotationValuedAnnotationMemberWithoutNonBinding()
{
- getBeans(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken()
+ Throwable t = null;
+ try
{
-
- public Expensive expensive()
+ getBeans(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken()
{
- return new ExpensiveLiteral()
+ public Expensive expensive()
{
- public int cost()
+ return new ExpensiveLiteral()
{
- return 0;
- }
-
- public boolean veryExpensive()
- {
- return false;
- }
- };
- }
+ public int cost()
+ {
+ return 0;
+ }
+
+ public boolean veryExpensive()
+ {
+ return false;
+ }
+ };
+ }
+
+ });
+ }
+ catch (Throwable throwable)
+ {
+ t = throwable;
+ }
- });
+ assert getCurrentConfiguration().getManagers().isDefinitionError(t);
}
}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/beans.xml 2009-06-17 23:20:46 UTC (rev 2847)
@@ -0,0 +1,8 @@
+<beans>
+ <deploy>
+ <type>javax.enterprise.inject.deployment.Standard</type>
+ <type>javax.enterprise.inject.deployment.Production</type>
+ <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes.AnotherDeploymentType</type>
+ <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes.HornedAnimalDeploymentType</type>
+ </deploy>
+</beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-17 23:17:36 UTC (rev 2846)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-17 23:20:46 UTC (rev 2847)
@@ -2526,6 +2526,10 @@
</section>
<section id="6.2" title="The Context interface">
+ <assertion id="aa">
+ <text>The |javax.enterprise.context.spi.Context| interface provides an operation for obtaining contextual instances with a particular scope of any contextual type.</text>
+ </assertion>
+
<assertion id="ha">
<text>When a context object is active the |isActive()| method returns |true|. Otherwise, we say that the context object is inactive and the |isActive()| method returns false.</text>
</assertion>
@@ -4557,6 +4561,12 @@
<text>The interface |Annotated| exposes the overriding annotations and type declarations.</text>
</assertion>
</section>
+
+ <section id="11.3.18" title="Obtaining the active Context for a scope">
+ <assertion id="a">
+ <text>The method |BeanManager.getContext()| retrieves an active context object associated with the a given scope, as defined in Section 6.5.1, "The active context object for a scope".</text>
+ </assertion>
+ </section>
<section id="11.4" title="Helper objects for Bean implementations">
<assertion id="a">
14 years, 10 months
- 1
- 0