12:06 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-07-22 13:06:33 -0400 (Wed, 22 Jul 2009)
New Revision: 3140
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
More improvements to audit for passivating contexts
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-07-22
16:51:41 UTC (rev 3139)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-07-22
17:06:33 UTC (rev 3140)
@@ -39,13 +39,13 @@
assert !beans.isEmpty();
}
- @Test @SpecAssertion(section="unknown", id = "unknown")
+ @Test @SpecAssertion(section="review", id = "review")
public void testInjectionOfDependentPrimitiveProductIntoNormalBean()
{
getInstanceByType(NumberConsumer.class).ping();
}
- @Test @SpecAssertion(section="unknown", id = "unknown")
+ @Test @SpecAssertion(section="6.6.2", id = "6.6.2")
public void testInjectionOfDependentSerializableProductIntoNormalBean()
{
getInstanceByType(SerializableCityConsumer.class).ping();
@@ -53,10 +53,9 @@
@Test(groups = { "contexts", "passivation" })
@SpecAssertions({
- @SpecAssertion(section = "unknown", id = "unknown"),
- @SpecAssertion(section = "unknown", id = "unknown")
+ @SpecAssertion(section = "6.6", id = "a")
})
- public void
testSimpleWebBeanDeclaringPassivatingScopeIsSerializedWhenContextIsPassivated() throws
IOException, ClassNotFoundException
+ public void testPassivationOccurs() throws IOException, ClassNotFoundException
{
Kajaani instance = getInstanceByType(Kajaani.class);
instance.setTheNumber(100);
@@ -78,49 +77,13 @@
return resurrected.toString().equals(instance.toString());
}
- /**
- * @throws ClassNotFoundException
- * @throws IOException
- */
- @Test(groups = { "contexts", "passivation", "ri-broken"
})
- @SpecAssertion(section = "unknown", id = "unknown")
- public void testDependentEJBsAreSerializable() throws IOException,
ClassNotFoundException
- {
- Set<Bean<Vaasa>> vaasaBeans = getBeans(Vaasa.class);
- assert vaasaBeans.size() == 1;
- assert testSerialize(vaasaBeans.iterator().next());
- }
-
@Test(groups = { "contexts", "passivation" })
- @SpecAssertion(section = "6.6.4", id = "aab")
- public void
testSimpleWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK()
+ @SpecAssertion(section = "6.6.4", id = "aaba")
+ public void testBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK()
{
Set<Bean<Joensuu>> beans = getBeans(Joensuu.class);
assert !beans.isEmpty();
}
-
- @Test(groups = { "contexts", "passivation" })
- @SpecAssertion(section = "unknown", id = "unknown")
- public void
testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK()
- {
- Set<Bean<Hyvinkaa>> beans = getBeans(Hyvinkaa.class);
- assert !beans.isEmpty();
- }
-
- @Test(groups = { "contexts", "passivation" })
- @SpecAssertion(section = "unknown", id = "unknown")
- public void
testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK()
- {
- getInstanceByType(Salo_Broken.class).ping();
- }
-
- @Test(groups = { "contexts", "passivation",
"enterpriseBean", "integration" })
- //@SpecAssertion(section = "8.4", id = "a")
- @SpecAssertion(section = "unknown", id = "unknown")
- public void testEJBWebBeanCanDeclarePassivatingScope()
- {
- assert getBeans(TurkuLocal.class).size() == 1;
- }
@Test(expectedExceptions = IllegalProductException.class)
@SpecAssertion(section = "6.6.4", id = "d")
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-07-22
16:51:41 UTC (rev 3139)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken6/NonSerializableTest.java 2009-07-22
17:06:33 UTC (rev 3140)
@@ -16,7 +16,7 @@
public class NonSerializableTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
- @SpecAssertion(section = "6.6.4", id = "aab")
+ @SpecAssertion(section = "6.6.4", id = "aaba")
public void
testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-07-22
16:51:41 UTC (rev 3139)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken7/NonSerializableTest.java 2009-07-22
17:06:33 UTC (rev 3140)
@@ -16,7 +16,7 @@
public class NonSerializableTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
- @SpecAssertion(section = "6.6.4", id = "aab")
+ @SpecAssertion(section = "6.6.4", id = "aabb")
public void
testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoConstructorParameterOfWebBeanWithPassivatingScopeFails()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-07-22
16:51:41 UTC (rev 3139)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken8/NonSerializableTest.java 2009-07-22
17:06:33 UTC (rev 3140)
@@ -16,7 +16,7 @@
public class NonSerializableTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
- @SpecAssertion(section = "6.6.4", id = "aab")
+ @SpecAssertion(section = "6.6.4", id = "aabc")
public void
testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-22 16:51:41 UTC (rev 3139)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-22 17:06:33 UTC (rev 3140)
@@ -2548,7 +2548,9 @@
</section>
<section id="6.6" title="Passivation and passivating
scopes">
-
+ <assertion id="a" implied="true">
+ <text>Test passivation occurs</text>
+ </assertion>
</section>
<section id="6.6.1" title="Passivation capable beans">
@@ -2645,10 +2647,18 @@
<note>Here we check the class, as interceptors and decorators are tested
below</note>
</assertion>
- <assertion id="aab">
- <text>If a managed bean which declares a passivating scope has a
non-transient injected field, bean constructor parameter or initializer method parameter
that does not resolve to a passivation capable dependency, then the container
automatically detects the problem and treats it as a deployment problem, as defined in
Section 12.4, "Problems detected automatically by the container".</text>
+ <assertion id="aaba">
+ <text>If a managed bean which declares a passivating scope has a
non-transient injected field~, bean constructor parameter or initializer method parameter~
that does not resolve to a passivation capable dependency, then the container
automatically detects the problem and treats it as a deployment problem, as defined in
Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
+ <assertion id="aabb">
+ <text>If a managed bean which declares a passivating scope has a
non-transient ~injected field,~ bean constructor parameter ~or initializer method
parameter~ that does not resolve to a passivation capable dependency, then the container
automatically detects the problem and treats it as a deployment problem, as defined in
Section 12.4, "Problems detected automatically by the container".</text>
+ </assertion>
+
+ <assertion id="aabc">
+ <text>If a managed bean which declares a passivating scope has a
non-transient ~injected field, bean constructor parameter or~ initializer method parameter
that does not resolve to a passivation capable dependency, then the container
automatically detects the problem and treats it as a deployment problem, as defined in
Section 12.4, "Problems detected automatically by the container".</text>
+ </assertion>
+
<assertion id="aac">
<text>If a managed bean which declares a passivating scope has an interceptor
~or decorator~ with a non-transient injected field~, bean constructor parameter or
initializer method parameter~ that does not resolve to a passivation capable dependency,
then the container automatically detects the problem and treats it as a deployment
problem, as defined in Section 12.4, "Problems detected automatically by the
container".</text>
</assertion>