[webbeans-commits] Webbeans SVN: r2810 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/dependent and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Jun 10 09:00:49 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-10 09:00:49 -0400 (Wed, 10 Jun 2009)
New Revision: 2810
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
update tck to 20090519
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-06-10 12:36:21 UTC (rev 2809)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-06-10 13:00:49 UTC (rev 2810)
@@ -14,7 +14,7 @@
*
* @author Nicklas Karlsson
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact(addCurrentPackage=false)
@Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-06-10 12:36:21 UTC (rev 2809)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-06-10 13:00:49 UTC (rev 2810)
@@ -18,7 +18,7 @@
*
* @author Nicklas Karlsson
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact(addCurrentPackage=false)
@Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-06-10 12:36:21 UTC (rev 2809)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-06-10 13:00:49 UTC (rev 2810)
@@ -14,7 +14,7 @@
*
* @author Nicklas Karlsson
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact(addCurrentPackage=false)
@Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-06-10 12:36:21 UTC (rev 2809)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-06-10 13:00:49 UTC (rev 2810)
@@ -18,7 +18,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: Public Release Draft 2
+ * Spec version: 20090519
*/
@Artifact
@BeansXml("beans.xml")
@@ -28,7 +28,7 @@
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame> () {};
@Test(groups = { "contexts", "injection" })
- @SpecAssertion(section = "8.3", id = "a")
+ @SpecAssertion(section = "6.4", id = "a")
public void testInstanceNotSharedBetweenInjectionPoints()
{
Set<Bean<Fox>> foxBeans = getBeans(Fox.class);
@@ -41,7 +41,7 @@
}
@Test(groups = { "contexts", "el" })
- @SpecAssertion(section = "8.3", id = "c")
+ @SpecAssertion(section = "6.4", id = "c")
public void testInstanceUsedForElEvaluationNotShared() throws Exception
{
new RunInDependentContext()
@@ -60,7 +60,7 @@
}
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3", id = "d")
+ @SpecAssertion(section = "6.4", id = "da")
public void testInstanceUsedForProducerMethodNotShared() throws Exception
{
Bean<Tarantula> tarantulaBean = getBeans(Tarantula.class).iterator().next();
@@ -72,7 +72,7 @@
}
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3", id = "d")
+ @SpecAssertion(section = "6.4", id = "db")
public void testInstanceUsedForProducerFieldNotShared() throws Exception
{
Bean<Tarantula> tarantulaBean = getBeans(Tarantula.class, TAME_LITERAL).iterator().next();
@@ -84,7 +84,7 @@
}
@Test(groups = { "contexts", "disposalMethod" })
- @SpecAssertion(section = "8.3", id = "d")
+ @SpecAssertion(section = "6.4", id = "dc")
public void testInstanceUsedForDisposalMethodNotShared() throws Exception
{
new RunInDependentContext()
@@ -106,7 +106,7 @@
}
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "d")
+ @SpecAssertion(section = "6.4", id = "dd")
public void testInstanceUsedForObserverMethodNotShared() throws Exception
{
new RunInDependentContext()
@@ -125,8 +125,8 @@
}
@Test(groups = "contexts")
- @SpecAssertion(section = "8.3", id = "e")
- public void testContextGetWithCreateTrueReturnsNewInstance() throws Exception
+ @SpecAssertion(section = "6.4", id = "e")
+ public void testContextGetWithCreationalContextReturnsNewInstance() throws Exception
{
new RunInDependentContext()
{
@@ -146,7 +146,7 @@
}
@Test(groups = "contexts")
- @SpecAssertion(section = "8.3", id = "f")
+ @SpecAssertion(section = "6.4", id = "f")
public void testContextGetWithCreateFalseReturnsNull() throws Exception
{
new RunInDependentContext()
@@ -166,7 +166,7 @@
}
@Test(groups = { "contexts", "ri-broken" }, expectedExceptions = ContextNotActiveException.class)
- @SpecAssertion(section = "8.3", id = "g")
+ @SpecAssertion(section = "6.4.1", id = "ga")
public void testContextIsInactive()
{
// The RI test harness is broken here, it just enables the dependent context blindly
@@ -174,7 +174,7 @@
}
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3", id = "g")
+ @SpecAssertion(section = "6.4.1", id = "gb")
public void testContextIsActiveWhenInvokingProducerMethod()
{
Bean<Tarantula> tarantulaBean = getBeans(Tarantula.class).iterator().next();
@@ -184,7 +184,7 @@
}
@Test(groups = { "contexts", "producerField"})
- @SpecAssertion(section = "8.3", id = "g")
+ @SpecAssertion(section = "6.4.1", id = "gc")
public void testContextIsActiveWhenInvokingProducerField()
{
// Reset test class
@@ -195,8 +195,7 @@
@Test(groups = { "contexts", "disposalMethod" })
@SpecAssertions({
- @SpecAssertion(section = "8.3", id = "g"),
- @SpecAssertion(section = "8.3", id = "j")
+ @SpecAssertion(section = "6.4.1", id = "gd")
})
public void testContextIsActiveWhenInvokingDisposalMethod()
{
@@ -209,7 +208,10 @@
}
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "g")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.4.1", id = "ge"),
+ @SpecAssertion(section = "6.4.1", id = "i")
+ })
public void testContextIsActiveWhenCreatingObserverMethodInstance()
{
getCurrentManager().fireEvent(new HorseInStableEvent());
@@ -217,7 +219,7 @@
}
@Test(groups = { "contexts", "el" })
- @SpecAssertion(section = "8.3", id = "h")
+ @SpecAssertion(section = "6.4.1", id = "h")
public void testContextIsActiveWhenEvaluatingElExpression() throws Exception
{
SensitiveFox.setManager(getCurrentManager());
@@ -233,16 +235,8 @@
}.run();
}
- @Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3", id = "i")
- public void testContextIsActiveWhenInvokingObserverMethod()
- {
- getCurrentManager().fireEvent(new HorseInStableEvent());
- assert ApplicationHorseStable.isDependentContextActive();
- }
-
@Test(groups = { "contexts", "beanLifecycle" })
- @SpecAssertion(section = "8.3", id = "j")
+ @SpecAssertion(section = "6.4.1", id = "ja")
public void testContextIsActiveDuringBeanCreation() throws Exception
{
SensitiveFox.setManager(getCurrentManager());
@@ -261,7 +255,7 @@
}
@Test(groups = { "contexts", "injection" })
- @SpecAssertion(section = "8.3", id = "j")
+ @SpecAssertion(section = "6.4.1", id = "jc")
public void testContextIsActiveDuringInjection()
{
Bean<FoxRun> foxRunBean = getBeans(FoxRun.class).iterator().next();
@@ -271,8 +265,8 @@
@Test(groups = { "contexts", "beanDestruction"})
@SpecAssertions({
- @SpecAssertion(section = "8.3.2", id = "a"),
- @SpecAssertion(section = "8.3", id = "b")
+ @SpecAssertion(section = "6.4.3", id = "a"),
+ @SpecAssertion(section = "6.4", id = "b")
})
public void testDestroyingSimpleParentDestroysDependents() throws Exception
{
@@ -298,8 +292,8 @@
@Test(groups = { "contexts", "beanDestruction"})
@SpecAssertions({
- @SpecAssertion(section = "8.3.2", id = "a"),
- @SpecAssertion(section = "8.3", id = "b")
+ @SpecAssertion(section = "6.4.3", id = "a"),
+ @SpecAssertion(section = "6.4", id = "b")
})
public void testDestroyingSimpleParentDestroysDependentsOfSameBean() throws Exception
{
@@ -326,7 +320,7 @@
}
@Test(groups = { "contexts", "el"})
- @SpecAssertion(section = "8.3.2", id = "c")
+ @SpecAssertion(section = "6.4.3", id = "c")
public void testDependentsDestroyedWhenElEvaluationCompletes() throws Exception
{
new RunInDependentContext()
@@ -346,7 +340,7 @@
}
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "8.3.2", id = "da")
+ @SpecAssertion(section = "6.4.3", id = "da")
public void testDependentsDestroyedWhenProducerMethodCompletes() throws Exception
{
new RunInDependentContext()
@@ -366,7 +360,7 @@
}
@Test(groups = { "contexts", "producerField" })
- @SpecAssertion(section = "8.3.2", id = "db")
+ @SpecAssertion(section = "6.4.3", id = "db")
public void testDependentsDestroyedWhenProducerFieldCompletes() throws Exception
{
new RunInDependentContext()
@@ -388,7 +382,7 @@
}
@Test(groups = { "contexts", "disposalMethod", "ri-broken" })
- @SpecAssertion(section = "8.3.2", id = "dc")
+ @SpecAssertion(section = "6.4.3", id = "dc")
public void testDependentsDestroyedWhenDisposalMethodCompletes() throws Exception
{
new RunInDependentContext()
@@ -413,7 +407,7 @@
}
@Test(groups = { "contexts", "observerMethod" })
- @SpecAssertion(section = "8.3.2", id = "dd")
+ @SpecAssertion(section = "6.4.3", id = "dd")
public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes() throws Exception
{
new RunInDependentContext()
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 12:36:21 UTC (rev 2809)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 13:00:49 UTC (rev 2810)
@@ -2615,10 +2615,22 @@
<text>When a bean is declared to have |@Dependent| scope, any instance of the bean that is used to evaluate a Unified EL expression exists to service that evaluation only</text>
</assertion>
- <assertion id="d">
- <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a producer method, producer field, disposal method or observer method invocation exists to service that invocation only</text>
+ <assertion id="da">
+ <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a producer method~, producer field, disposal method or observer method~ invocation exists to service that invocation only</text>
</assertion>
+ <assertion id="db">
+ <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method,~ producer field~, disposal method or observer method~ invocation exists to service that invocation only</text>
+ </assertion>
+
+ <assertion id="dc">
+ <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method, producer field,~ disposal method ~or observer method~ invocation exists to service that invocation only</text>
+ </assertion>
+
+ <assertion id="dd">
+ <text>When a bean is declared to have |@Dependent| scope, any instance of the bean that receives a ~producer method, producer field, disposal method or~ observer method invocation exists to service that invocation only</text>
+ </assertion>
+
<assertion id="e">
<text>Every invocation of the |get()| operation of the |Context| object for the |@Dependent| scope with a |CreationalContext| returns a new instance of the given bean</text>
</assertion>
@@ -2629,11 +2641,32 @@
</section>
<section id="6.4.1" title="Dependent scope lifecycle">
- <assertion id="g">
- <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a producer method, producer field, disposal method or observer method invocation</text>
+
+ <assertion id="ga">
+ <text>The |@Dependent| scope is inactive ~except when an instance of a bean with scope |@Dependent| is created by the container to receive a producer method, producer field, disposal method or observer method ~invocation</text>
<note>Assertions g through k are all related and should be treated as "or" conditions</note>
</assertion>
+
+ <assertion id="gb">
+ <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a producer method~, producer field, disposal method or observer method ~invocation</text>
+ <note>Assertions g through k are all related and should be treated as "or" conditions</note>
+ </assertion>
+ <assertion id="gc">
+ <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a ~producer method,~ producer field~, disposal method or observer method ~invocation</text>
+ <note>Assertions g through k are all related and should be treated as "or" conditions</note>
+ </assertion>
+
+ <assertion id="gd">
+ <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a ~producer method, producer field,~ disposal method ~or observer method ~invocation</text>
+ <note>Assertions g through k are all related and should be treated as "or" conditions</note>
+ </assertion>
+
+ <assertion id="ge">
+ <text>The |@Dependent| scope is inactive except when an instance of a bean with scope |@Dependent| is created by the container to receive a ~producer method, producer field, disposal method or~ observer method ~invocation</text>
+ <note>Assertions g through k are all related and should be treated as "or" conditions</note>
+ </assertion>
+
<assertion id="h">
<text>The |@Dependent| scope is inactive except while a Unified EL expression is evaluated</text>
</assertion>
@@ -2643,9 +2676,29 @@
</assertion>
<assertion id="ja">
- <text>The |@Dependent| scope is inactive except when the container is creating or destroying a contextual instance of a bean, injecting its dependencies, invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.</text>
+ <text>The |@Dependent| scope is inactive except when the container is creating ~or destroying~ a contextual instance of a bean~, injecting its dependencies, invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
</assertion>
+ <assertion id="jb">
+ <text>The |@Dependent| scope is inactive except when the container is ~creating or~ destroying a contextual instance of a bean, ~injecting its dependencies, invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
+ </assertion>
+
+ <assertion id="jc">
+ <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean,~ injecting its dependencies, ~invoking its observer methods, or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
+ </assertion>
+
+ <assertion id="jd">
+ <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean, injecting its dependencies,~ invoking its observer methods, ~or invoke its |@PostConstruct| or |@PreDestroy| callback.~</text>
+ </assertion>
+
+ <assertion id="je">
+ <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean, injecting its dependencies, invoking its observer methods, or~ invoke its |@PostConstruct|~ or |@PreDestroy|~ callback.</text>
+ </assertion>
+
+ <assertion id="jf">
+ <text>The |@Dependent| scope is inactive except when the container is ~creating or destroying a contextual instance of a bean, injecting its dependencies, invoking its observer methods, or~ invoke ~its |@PostConstruct| or~ |@PreDestroy| callback.</text>
+ </assertion>
+
<assertion id="ka">
<text>The |@Dependent| scope is inactive except when the container is injecting dependencies or invoking the |@PostConstruct| or |@PreDestroy| callback of a Java EE component class supporting injection.</text>
</assertion>
More information about the weld-commits
mailing list