9:38 a.m.
Author: shane.bryzak(a)jboss.com
Date: 2009-07-20 03:38:29 -0400 (Mon, 20 Jul 2009)
New Revision: 3094
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
match lifecycle and producer method tests, minor fix in tck-audit
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java 2009-07-20
04:25:41 UTC (rev 3093)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesOnBeanTest.java 2009-07-20
07:38:29 UTC (rev 3094)
@@ -28,15 +28,15 @@
/**
* Single test for a bean with multiple active deployment types.
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class TooManyDeploymentTypesOnBeanTest extends AbstractJSR299Test
{
@Test(groups = { "deploymentType" })
- @SpecAssertion(section = "2.5.3", id = "da")
- public void testMultipleActiveDeploymentTypesOnBean()
+ @SpecAssertion(section = "2.5.3", id = "review")
+ public void testMultipleActiveDeploymentTypesOnBean() // deployment types removed from
spec
{
assert false;
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-20
04:25:41 UTC (rev 3093)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-20
07:38:29 UTC (rev 3094)
@@ -31,7 +31,7 @@
* @author Nicklas Karlsson
* @author David Allen
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -42,9 +42,9 @@
@Test(groups = {"enterpriseBeans", "clientProxy",
"lifecycle", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.3.5", id = "a"),
- @SpecAssertion(section = "7.3", id = "aa"),
- @SpecAssertion(section = "7.3", id = "bb")
+ @SpecAssertion(section = "3.2.5", id = "a"),
+ @SpecAssertion(section = "7.3.2", id = "aa"),
+ @SpecAssertion(section = "7.3.2", id = "bb")
})
public void testCreateSFSB() throws Exception
{
@@ -86,7 +86,7 @@
@Test(groups = { "enterpriseBeans", "clientProxy",
"lifecycle", "integration" })
@SpecAssertions({
- @SpecAssertion(section = "7.3", id = "bc")
+ @SpecAssertion(section = "7.3.2", id = "bc")
})
public void testDestroyRemovesSFSB() throws Exception
{
@@ -107,8 +107,8 @@
@Test(groups = { "enterpriseBeans", "lifecycle",
"integration" })
@SpecAssertions({
- @SpecAssertion(section = "7.3", id = "bc"),
- @SpecAssertion(section = "3.3.1", id = "dba")
+ @SpecAssertion(section = "7.3.2", id = "bc"),
+ @SpecAssertion(section = "3.2.1", id = "dba")
})
public void testRemovedEjbIgnored()
{
@@ -124,7 +124,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle",
"integration" })
- @SpecAssertion(section = "7.4", id = "a")
+ @SpecAssertion(section = "7.3.3", id = "a")
public void testCreateSLSB()
{
Bean<NeueStadt> stadtBean = getBeans(NeueStadt.class).iterator().next();
@@ -140,7 +140,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle",
"integration" })
- @SpecAssertion(section = "3.9.2", id = "b")
+ @SpecAssertion(section = "3.8.2", id = "b")
public void testInitializerMethodsCalledWithCurrentParameterValues()
{
AlteStadt alteStadt =
this.getCurrentConfiguration().getBeans().getEnterpriseBean(Mainz.class,
AlteStadt.class);
@@ -149,7 +149,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle",
"ri-broken" })
- @SpecAssertion(section = "6.11", id = "f")
+ @SpecAssertion(section = "5.6.5", id = "a")
public void testDependentObjectsDestroyed()
{
UniStadt marburg = getInstanceByType(UniStadt.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-20
04:25:41 UTC (rev 3093)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/MethodAnnotatedProducesTest.java 2009-07-20
07:38:29 UTC (rev 3094)
@@ -11,7 +11,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -19,7 +19,8 @@
{
@Test(groups = "initializerMethod")
- @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "ba"),
@SpecAssertion(section = "3.4.2", id = "c") })
+ @SpecAssertions( { @SpecAssertion(section = "3.8.1", id = "ba"),
+ @SpecAssertion(section = "3.3.2", id = "ca") })
public void testInitializerMethodAnnotatedProduces()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-20
04:25:41 UTC (rev 3093)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-07-20
07:38:29 UTC (rev 3094)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -19,7 +19,7 @@
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.9.1", id = "ca")
+ @SpecAssertion(section = "3.8.1", id = "ca")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-20
04:25:41 UTC (rev 3093)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-07-20
07:38:29 UTC (rev 3094)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -19,7 +19,7 @@
{
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4.2", id = "ea")
+ @SpecAssertion(section = "3.3.2", id = "ea")
public void testProducerMethodWithParameterAnnotatedObserves() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 04:25:41 UTC (rev 3093)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-20 07:38:29 UTC (rev 3094)
@@ -848,7 +848,6 @@
</section>
<section id="3.3.2" title="Declaring a producer method">
-
<assertion id="a">
<text>A producer method may be declared by annotating a method with the
|(a)javax.enterprise.inject.Produces| annotation</text>
</assertion>
@@ -1979,8 +1978,8 @@
</section>
<section id="5.6.5" title="Destruction of dependent
objects">
- <assertion>
- <text>When the container destroys an instance of a bean or of any Java EE
component class supporting injection, the container destroys all dependent objects, as
defined in Section 6.4.3, "Dependent object destruction", after the
|@PreDestroy| callback completes and after the servlet |destroy()| method is
called.</text>
+ <assertion id="a">
+ <text>When the container destroys an instance of a bean or of any Java EE
component class supporting injection, the container destroys all dependent objects, as
defined in Section 6.4.2, "Dependent object destruction", after the
|@PreDestroy| callback completes and after the servlet |destroy()| method is
called.</text>
</assertion>
</section>