[webbeans-commits] Webbeans SVN: r2812 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/request/ejb and 4 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Jun 10 11:22:00 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-10 11:22:00 -0400 (Wed, 10 Jun 2009)
New Revision: 2812
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/RequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.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/request/RequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-06-10 13:14:48 UTC (rev 2811)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-06-10 15:22:00 UTC (rev 2812)
@@ -14,7 +14,7 @@
/**
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@IntegrationTest(runLocally=true)
@@ -30,7 +30,7 @@
* the web application.
*/
@Test(groups = { "contexts", "servlet", "integration" })
- @SpecAssertion(section = "8.5.1", id = "a")
+ @SpecAssertion(section = "6.7.1", id = "aa")
public void testRequestScopeActiveDuringServiceMethod() throws Exception
{
WebClient webClient = new WebClient();
@@ -43,7 +43,7 @@
* the web application.
*/
@Test(groups = { "contexts", "servlet", "integration" })
- @SpecAssertion(section = "8.5.1", id = "b")
+ @SpecAssertion(section = "6.7.1", id = "ab")
public void testRequestScopeActiveDuringServletFilter() throws Exception
{
WebClient webClient = new WebClient();
@@ -56,7 +56,9 @@
* the Servlet service() method returns.
*/
@Test(groups = { "contexts", "servlet", "integration" })
- @SpecAssertion(section = "8.5.1", id = "c")
+ //@SpecAssertion(section = "6.7.1", id = "ba")
+ @SpecAssertion(section="unknown", id="unknown")
+ // TODO Need to tidy this one up, make it actually check that the context is active til after the service method ends
public void testRequestScopeIsDestroyedAfterServletRequest() throws Exception
{
WebClient webClient = new WebClient();
@@ -75,70 +77,4 @@
// assert Boolean.parseBoolean(beanDestructionResult.getContent());
}
- /**
- * The request scope is active during any Java EE web service invocation.
- */
- @Test(groups = { "stub", "contexts", "webservice", "integration" })
- @SpecAssertion(section = "8.5.1", id = "d")
- public void testRequestScopeActiveDuringWebSericeInvocation()
- {
- assert false;
- }
-
- /**
- * The request context is destroyed after the web service invocation
- * completes
- */
- @Test(groups = { "stub", "contexts", "webservice", "integration" })
- @SpecAssertion(section = "8.5.1", id = "e")
- public void testRequestScopeIsDestroyedAfterWebServiceInvocation()
- {
- assert false;
- }
-
- /**
- * The request scope is active during any remote method invocation of any EJB
- * bean, during any call to an EJB timeout method and during message delivery
- * to any EJB message driven bean.
- */
- @Test(groups = { "stub", "contexts", "ejb3", "integration" })
- @SpecAssertion(section = "8.5.1", id = "h")
- public void testRequestScopeActiveDuringRemoteMethodInvocationOfEjb()
- {
- assert false;
- }
-
- /**
- * The request scope is active during any remote method invocation of any EJB
- * bean, during any call to an EJB timeout method and during message delivery
- * to any EJB message driven bean.
- */
- @Test(groups = { "stub", "contexts", "ejb3", "integration" })
- @SpecAssertion(section = "8.5.1", id = "j")
- public void testRequestScopeActiveDuringEjbMessageDelivery()
- {
- assert false;
- }
-
- /**
- * The request context is destroyed after the remote method invocation,
- * timeout or message delivery completes.
- */
- @Test(groups = { "stub", "contexts", "ejb3", "integration" })
- @SpecAssertion(section = "8.5.1", id = "k")
- public void testRequestScopeDestroyedAfterRemoteMethodInvocationOfEjb()
- {
- assert false;
- }
-
- /**
- * The request context is destroyed after the remote method invocation,
- * timeout or message delivery completes.
- */
- @Test(groups = { "stub", "contexts", "ejb3", "integration" })
- @SpecAssertion(section = "8.5.1", id = "m")
- public void testRequestScopeDestroyedAfterEjbMessageDelivery()
- {
- assert false;
- }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-06-10 13:14:48 UTC (rev 2811)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-06-10 15:22:00 UTC (rev 2812)
@@ -13,7 +13,7 @@
*
* @author David Allen
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@IntegrationTest
@@ -26,7 +26,7 @@
* to any EJB message driven bean.
*/
@Test(groups = { "ri-broken", "contexts", "ejb3.1", "integration" })
- @SpecAssertion(section = "8.5.1", id = "i")
+ @SpecAssertion(section = "6.7.1", id = "gc")
public void testRequestScopeActiveDuringCallToEjbTimeoutMethod() throws Exception
{
FMS flightManagementSystem = getInstanceByType(FMS.class);
@@ -40,7 +40,7 @@
* timeout or message delivery completes.
*/
@Test(groups = { "ri-broken", "contexts", "ejb3.1", "integration" })
- @SpecAssertion(section = "8.5.1", id = "l")
+ @SpecAssertion(section = "6.7.1", id = "hc")
public void testRequestScopeDestroyedAfterCallToEjbTimeoutMethod() throws Exception
{
FMS flightManagementSystem = getInstanceByType(FMS.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/RequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/RequestContextTest.java 2009-06-10 13:14:48 UTC (rev 2811)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/RequestContextTest.java 2009-06-10 15:22:00 UTC (rev 2812)
@@ -25,7 +25,7 @@
/**
* @author David Allen
*
- * Spec version: PRD2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -35,7 +35,7 @@
* The request scope is active during any asynchronous observer method notification
*/
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "8.5.1", id = "f")
+ @SpecAssertion(section = "6.7.1", id = "gb")
public void testRequestScopeIsActiveDuringAsynchronousObserverMethodInvocation() throws Exception
{
getCurrentManager().fireEvent(new TargetEvent());
@@ -48,7 +48,7 @@
* completes
*/
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "8.5.1", id = "g")
+ @SpecAssertion(section = "6.7.1", id = "hb")
public void testRequestScopeIsDestroyedAfterAsynchronousObserverMethodInvocation() throws Exception
{
NearMiss event = new NearMiss();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-06-10 13:14:48 UTC (rev 2811)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-06-10 15:22:00 UTC (rev 2812)
@@ -14,7 +14,7 @@
/**
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@IntegrationTest(runLocally=true)
@@ -25,7 +25,7 @@
public class SessionContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "servlet", "integration" })
- @SpecAssertion(section = "8.5.2", id = "a")
+ @SpecAssertion(section = "6.7.2", id = "aa")
public void testSessionScopeActiveDuringServiceMethod() throws Exception
{
WebClient webClient = new WebClient();
@@ -34,7 +34,7 @@
}
@Test(groups = { "contexts", "servlet", "integration" })
- @SpecAssertion(section = "8.5.2", id = "b")
+ @SpecAssertion(section = "6.7.2", id = "ab")
public void testSessionScopeActiveDuringDoFilterMethod() throws Exception
{
WebClient webClient = new WebClient();
@@ -43,7 +43,7 @@
}
@Test(groups = { "contexts", "servlet", "integration" })
- @SpecAssertion(section = "8.5.2", id = "c")
+ @SpecAssertion(section = "6.7.2", id = "b")
public void testSessionContextSharedBetweenServletRequestsInSameHttpSession() throws Exception
{
WebClient webClient = new WebClient();
@@ -58,7 +58,7 @@
}
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "8.5.2", id = "d")
+ @SpecAssertion(section = "6.7.2", id = "c")
public void testSessionContextDestroyedWhenHttpSessionInvalidated() throws Exception
{
WebClient webClient = new WebClient();
@@ -79,7 +79,7 @@
}
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "8.5.2", id = "e")
+ @SpecAssertion(section = "6.7.2", id = "d")
public void testSessionContextDestroyedWhenHttpSessionTimesOut() throws Exception
{
WebClient webClient = new WebClient();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-06-10 13:14:48 UTC (rev 2811)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-06-10 15:22:00 UTC (rev 2812)
@@ -6,7 +6,6 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.deployment.Production;
import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -19,7 +18,7 @@
*
* @author Pete Muir
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
public class BeanDefinitionTest extends AbstractJSR299Test
@@ -71,7 +70,7 @@
}
@Test(groups = "producerMethod")
- @SpecAssertion(section = "5.2", id = "b")
+ @SpecAssertion(section = "5.1.3", id = "ba")
public void testIsNullable() throws Exception
{
assert getBeans(int.class).size() == 1;
@@ -86,10 +85,9 @@
@SpecAssertions({
@SpecAssertion(section = "3.2.2", id = "a"),
@SpecAssertion(section = "2.2", id = "a"),
- @SpecAssertion(section = "2.2", id = "e"),
- @SpecAssertion(section = "2.2", id = "h"),
- @SpecAssertion(section = "2.2", id = "i"),
- @SpecAssertion(section = "2.2", id = "k"),
+ @SpecAssertion(section = "2.2.1", id = "a"),
+ @SpecAssertion(section = "2.2.1", id = "d"),
+ @SpecAssertion(section = "2.2.1", id = "e"),
@SpecAssertion(section = "2.2", id = "l")
})
public void testBeanTypes()
@@ -106,7 +104,7 @@
}
@Test
- @SpecAssertion(section = "2.2", id = "m")
+ @SpecAssertion(section = "2.2.2", id = "a")
@SuppressWarnings("unused")
public void testBeanClientCanCastBeanInstanceToAnyBeanType()
{
@@ -122,7 +120,7 @@
}
@Test
- @SpecAssertion(section = "2.2", id = "g")
+ @SpecAssertion(section = "2.2.1", id = "d")
public void testFinalApiType()
{
assert !getBeans(DependentFinalTuna.class).isEmpty();
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 13:14:48 UTC (rev 2811)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 15:22:00 UTC (rev 2812)
@@ -2894,14 +2894,34 @@
</section>
<section id="6.6.4" title="Validation of passivation capable beans and dependencies">
- <assertion id="a">
- <text>If a managed bean which declares a passivating scope is not passivation capable, or 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="aa">
+ <text>If a managed bean which declares a passivating scope is not passivation capable~, or 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="b">
- <text>If a stateful session bean 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="ab">
+ <text>If a managed bean which ~declares a passivating scope is not passivation capable, or~ 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="ac">
+ <text>If a managed bean which ~declares a passivating scope is not passivation capable, or~ 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="ad">
+ <text>If a managed bean which ~declares a passivating scope is not passivation capable, or~ 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="ba">
+ <text>If a stateful session bean 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="bb">
+ <text>If a stateful session bean 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="bc">
+ <text>If a stateful session bean 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="c">
<text>If a producer method declares a passivating scope and the container is able to determine that it is not passivation capable by inspecting its return type, or has a 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>
@@ -2937,14 +2957,22 @@
</section>
<section id="6.7.1" title="Request context lifecycle">
- <assertion id="a">
- <text>The request scope is active during the |service()| method of any servlet in the web application and during the |doFilter()| method of any servlet filter.</text>
+ <assertion id="aa">
+ <text>The request scope is active during the |service()| method of any servlet in the web application~ and during the |doFilter()| method of any servlet filter.~</text>
</assertion>
- <assertion id="b">
- <text>The request context is destroyed at the end of the servlet request, after the |service()| method and all |doFilter()| methods return.</text>
+ <assertion id="ab">
+ <text>The request scope is active ~during the |service()| method of any servlet in the web application and~ during the |doFilter()| method of any servlet filter.</text>
</assertion>
+ <assertion id="ba">
+ <text>The request context is destroyed at the end of the servlet request, after the |service()| method ~and all |doFilter()| methods~ return.</text>
+ </assertion>
+
+ <assertion id="bb">
+ <text>The request context is destroyed at the end of the servlet request, after ~the |service()| method and~ all |doFilter()| methods return.</text>
+ </assertion>
+
<assertion id="c">
<text>The request scope is active during any Java EE web service invocation.</text>
</assertion>
@@ -2961,24 +2989,62 @@
<text>The request context is destroyed after the notification completes</text>
</assertion>
- <assertion id="g">
- <text>The request scope is active during any remote method invocation of any EJB, during any asynchronous method invocation
-of any EJB, during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.</text>
+ <assertion id="ga">
+ <text>The request scope is active during any remote method invocation of any EJB,~ during any asynchronous method invocation of any EJB, during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.~</text>
</assertion>
- <assertion id="h">
- <text>The request context is destroyed after the remote method invocation, asynchronous method invocation, timeout or message delivery completes.</text>
+ <assertion id="gb">
+ <text>The request scope is active ~during any remote method invocation of any EJB~, during any asynchronous method invocation of any EJB, ~during any call to an EJB timeout method and during message delivery to any EJB message-driven bean.~</text>
</assertion>
+
+ <assertion id="gc">
+ <text>The request scope is active ~during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB,~ during any call to an EJB timeout method ~and during message delivery to any EJB message-driven bean~.</text>
+ </assertion>
+
+ <assertion id="gd">
+ <text>The request scope is active ~during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB, during any call to an EJB timeout method and~ during message delivery to any EJB message-driven bean.</text>
+ </assertion>
+
+ <assertion id="ha">
+ <text>The request context is destroyed after the remote method invocation,~ asynchronous method invocation, timeout or message delivery completes~.</text>
+ </assertion>
+
+ <assertion id="hb">
+ <text>The request context is destroyed after the ~remote method invocation,~ asynchronous method invocation~, timeout or message delivery completes~.</text>
+ </assertion>
+
+ <assertion id="hc">
+ <text>The request context is destroyed after the ~remote method invocation, asynchronous method invocation,~ timeout~ or message delivery completes~.</text>
+ </assertion>
+
+ <assertion id="hd">
+ <text>The request context is destroyed after the ~remote method invocation, asynchronous method invocation, timeout or~ message delivery completes.</text>
+ </assertion>
+
+
</section>
<section id="6.7.2" title="Session context lifecycle">
- <assertion id="a">
- <text>The session scope is active during the |service()| method of any servlet in the web application and during the |doFilter()| method of any servlet filter.</text>
+ <assertion id="aa">
+ <text>The session scope is active during the |service()| method of any servlet in the web application ~and during the |doFilter()| method of any servlet filter~.</text>
</assertion>
+ <assertion id="ab">
+ <text>The session scope is active ~during the |service()| method of any servlet in the web application and~ during the |doFilter()| method of any servlet filter.</text>
+ </assertion>
+
<assertion id="b">
- <text>The session context is shared between all servlet requests that occur in the same HTTP servlet session. The session context is destroyed when the |HTTPSession| is invalidated or times out.</text>
+ <text>The session context is shared between all servlet requests that occur in the same HTTP servlet session.</text>
</assertion>
+
+ <assertion id="c">
+ <text>The session context is destroyed when the |HTTPSession| is invalidated ~or times out~.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The session context is destroyed when the |HTTPSession| ~is invalidated or~ times out.</text>
+ </assertion>
+
</section>
<section id="6.7.3" title="Application context lifecycle">
More information about the weld-commits
mailing list