6:12 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-07-27 19:12:35 -0400 (Mon, 27 Jul 2009)
New Revision: 3295
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Make a start on Scopes and contexts
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-07-27
23:00:58 UTC (rev 3294)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-07-27
23:12:35 UTC (rev 3295)
@@ -5,11 +5,11 @@
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.impl.MockCreationalContext;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.impl.MockCreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -19,8 +19,7 @@
{
@Test(groups = { "contexts" })
@SpecAssertions({
- @SpecAssertion(section = "6.2", id = "o"),
- @SpecAssertion(section = "6.2", id = "na")
+ @SpecAssertion(section = "6.2", id = "o")
})
public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27
23:00:58 UTC (rev 3294)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-27
23:12:35 UTC (rev 3295)
@@ -84,9 +84,8 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "6.1.1", id = "ca"),
@SpecAssertion(section = "6.1.1", id = "d"),
- @SpecAssertion(section = "6.1.1", id = "e")
+ @SpecAssertion(section = "6.1.1", id = "g")
})
public void testCreateReturnsSameBeanPushed()
{
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 23:00:58 UTC (rev 3294)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 23:12:35 UTC (rev 3295)
@@ -2396,14 +2396,16 @@
<note>A statement about container specific behavior which is not spec
defined</note>
</assertion>
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>The container and portable extensions may define implementations of the
|Contextual| interface that do not extend |Bean|, but it is not recommended that
applications directly implement |Contextual|.</text>
+ <note>Advice only</note>
</assertion>
</section>
<section id="6.1.1" title="The CreationalContext interface">
- <assertion id="ca">
+ <assertion id="ca" testable="false">
<text>The interface |javax.enterprise.context.spi.CreationalContext| provides
operations that are used by the |Contextual| implementation during instance creation and
destruction.</text>
+ <note>introductory text</note>
</assertion>
<assertion id="d">
@@ -2422,18 +2424,21 @@
<text>If |Contextual.create()| calls |push()|, it must also return the
instance passed to |push()|.</text>
</assertion>
- <assertion id="h">
+ <assertion id="h" testable="false">
<text>|Contextual.create()| should use the given |CreationalContext| when
obtaining contextual references to inject, as defined in Section 6.5.3, "Contextual
reference for a bean", in order to ensure that any dependent objects are associated
with the contextual instance that is being created.</text>
+ <note>Advice</note>
</assertion>
- <assertion id="i">
+ <assertion id="i" testable="false">
<text>|Contextual.destroy()| should call |release()| to allow the container
to destroy dependent objects of the contextual instance.</text>
+ <note>Advice</note>
</assertion>
</section>
<section id="6.2" title="The Context interface">
- <assertion id="aa">
+ <assertion id="aa" testable="false">
<text>The |javax.enterprise.context.spi.Context| interface provides an
operation for obtaining contextual instances with a particular scope of any contextual
type.</text>
+ <note>Introductory text</note>
</assertion>
<assertion id="ab">