Author: pete.muir(a)jboss.org
Date: 2009-06-10 07:50:17 -0400 (Wed, 10 Jun 2009)
New Revision: 2807
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.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/application/ApplicationContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-06-10
11:42:30 UTC (rev 2806)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-06-10
11:50:17 UTC (rev 2807)
@@ -16,7 +16,7 @@
*
* @author David Allen
*
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@IntegrationTest(runLocally=true)
@@ -28,7 +28,7 @@
{
@Test(groups = { "contexts", "servlet", "integration"
})
- @SpecAssertion(section = "8.5.3", id = "a")
+ @SpecAssertion(section = "6.7.3", id = "aa")
public void testApplicationScopeActiveDuringServiceMethod() throws Exception
{
WebClient webClient = new WebClient();
@@ -37,7 +37,7 @@
}
@Test(groups = { "contexts", "servlet", "integration"
})
- @SpecAssertion(section = "8.5.3", id = "b")
+ @SpecAssertion(section = "6.7.3", id = "ab")
public void testApplicationScopeActiveDuringDoFilterMethod() throws Exception
{
WebClient webClient = new WebClient();
@@ -45,23 +45,8 @@
webClient.getPage(getContextPath() + "SimplePage.html");
}
- @Test(groups = { "stub", "contexts", "ejb3",
"integration" })
- @SpecAssertion(section = "8.5.3", id = "e")
- public void testApplicationScopeActiveDuringRemoteMethodInvocationOfEjb()
- {
- //TODO Easy to implement once global naming w/EJB3.1 is available
- assert false;
- }
-
- @Test(groups = { "stub", "contexts", "ejb3",
"jms", "integration" })
- @SpecAssertion(section = "8.5.3", id = "g")
- public void testApplicationScopeActiveDuringMdbMessageDelivery()
- {
- assert false;
- }
-
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "8.5.3", id = "h")
+ @SpecAssertion(section = "6.7.3", id = "ea")
public void testApplicationContextSharedBetweenServletRequests() throws Exception
{
WebClient webClient = new WebClient();
@@ -75,34 +60,4 @@
assert Double.parseDouble(secondRequestResult.getContent()) ==
Double.parseDouble(firstRequestResult.getContent());
}
- @Test(groups = { "stub", "contexts", "webservice",
"integration" })
- @SpecAssertion(section = "8.5.3", id = "j")
- public void testApplicationContextSharedBetweenWebServices()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "contexts", "ejb3",
"integration" })
- @SpecAssertion(section = "8.5.3", id = "k")
- public void testApplicationContextSharedBetweenRemoteMethodInvokations()
- {
- //TODO Easy to implement once global naming w/EJB3.1 is available
- assert false;
- }
-
- @Test(groups = { "stub", "contexts", "jms",
"integration" })
- @SpecAssertion(section = "8.5.3", id = "m")
- public void testApplicationContextSharedBetweenMDBMessageDeliveries()
- {
- assert false;
- }
-
- @Test(groups = { "underInvestigation", "contexts",
"integration" })
- @SpecAssertion(section = "8.5.3", id = "n")
- public void testApplicationScopeDestroyedWhenApplicationIsUndeployed()
- {
- //TODO How can the WB container be tested after the app is undeployed?
- assert false;
- }
-
}
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 11:42:30 UTC (rev 2806)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 11:50:17 UTC (rev 2807)
@@ -2921,10 +2921,14 @@
</section>
<section id="6.7.3" title="Application context lifecycle">
- <assertion id="a">
- <text>The application 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 application 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 application 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 application scope is active during any Java EE web service
invocation.</text>
</assertion>
@@ -2937,10 +2941,34 @@
<text>The application scope is also 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="e">
- <text>The application context is shared between all servlet requests,
asynchronous observer method notifications, web service invocations, EJB remote method
invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to
message driven beans that execute within the same application.</text>
+ <assertion id="ea">
+ <text>The application context is shared between all servlet requests~,
asynchronous observer method notifications, web service invocations, EJB remote method
invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to
message driven beans ~that execute within the same application.</text>
</assertion>
+ <assertion id="eb">
+ <text>The application context is shared between all ~servlet requests,~
asynchronous observer method notifications~, web service invocations, EJB remote method
invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to
message driven beans ~that execute within the same application.</text>
+ </assertion>
+
+ <assertion id="ec">
+ <text>The application context is shared between all ~servlet requests,
asynchronous observer method notifications,~ web service invocations~, EJB remote method
invocations, EJB asynchronous method invocations, EJB timeouts and message deliveries to
message driven beans ~that execute within the same application~.</text>
+ </assertion>
+
+ <assertion id="ed">
+ <text>The application context is shared between all ~servlet requests,
asynchronous observer method notifications, web service invocations,~ EJB remote method
invocations~, EJB asynchronous method invocations, EJB timeouts and message deliveries to
message driven beans ~that execute within the same application~.</text>
+ </assertion>
+
+ <assertion id="ee">
+ <text>The application context is shared between all ~servlet requests,
asynchronous observer method notifications, web service invocations, EJB remote method
invocations,~ EJB asynchronous method invocations~, EJB timeouts and message deliveries to
message driven beans ~that execute within the same application.</text>
+ </assertion>
+
+ <assertion id="ef">
+ <text>The application context is shared between all ~servlet requests,
asynchronous observer method notifications, web service invocations, EJB remote method
invocations, EJB asynchronous method invocations,~ EJB timeouts ~and message deliveries to
message driven beans ~that execute within the same application.</text>
+ </assertion>
+
+ <assertion id="eg">
+ <text>The application context is shared between all ~servlet requests,
asynchronous observer method notifications, web service invocations, EJB remote method
invocations, EJB asynchronous method invocations, EJB timeouts and~ message deliveries to
message driven beans ~that execute within the same application.</text>
+ </assertion>
+
<assertion id="f">
<text>The application context is destroyed when the application
is undeployed.</text>