Author: pete.muir(a)jboss.org
Date: 2009-06-10 07:57:21 -0400 (Wed, 10 Jun 2009)
New Revision: 2808
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/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/ejb/EJBApplicationContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-06-10
11:50:17 UTC (rev 2807)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-06-10
11:57:21 UTC (rev 2808)
@@ -21,7 +21,7 @@
public class EJBApplicationContextTest extends AbstractJSR299Test
{
@Test(groups = { "broken", "contexts", "webservice",
"integration" })
- @SpecAssertion(section = "8.5.3", id = "c")
+ @SpecAssertion(section = "6.7.3", id = "b")
public void testApplicationScopeActiveDuringWebSericeInvocation()
{
//TODO This test might work better with a separate client over HTTP
@@ -32,7 +32,7 @@
}
@Test(groups = { "contexts", "ejb3", "integration" })
- @SpecAssertion(section = "8.5.3", id = "f")
+ @SpecAssertion(section = "6.7.3", id = "dc")
public void testApplicationScopeActiveDuringCallToEjbTimeoutMethod() throws Exception
{
FMS flightManagementSystem = getInstanceByType(FMS.class);
@@ -42,8 +42,8 @@
}
@Test(groups = { "contexts", "ejb3", "integration" })
- @SpecAssertion(section = "8.5.3", id = "l")
- public void testApplicationContextSharedBetweenEJBTimeoutInvokations() throws
Exception
+ @SpecAssertion(section = "6.7.3", id = "ef")
+ public void testApplicationContextSharedBetweenEJBTimeoutInvocations() throws
Exception
{
FMS flightManagementSystem = getInstanceByType(FMS.class);
flightManagementSystem.climb();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java 2009-06-10
11:50:17 UTC (rev 2807)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/ApplicationContextTest.java 2009-06-10
11:57:21 UTC (rev 2808)
@@ -32,7 +32,7 @@
public class ApplicationContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "events" })
- @SpecAssertion(section = "8.5.3", id = "d")
+ @SpecAssertion(section = "6.7.3", id = "c")
public void testApplicationScopeActiveDuringAsynchronousObserverMethodInvocation()
throws Exception
{
getCurrentManager().fireEvent(new TargetEvent());
@@ -41,7 +41,7 @@
}
@Test(groups = { "contexts", "events", "integration" })
- @SpecAssertion(section = "8.5.3", id = "i")
+ @SpecAssertion(section = "6.7.3", id = "eb")
public void testApplicationContextSharedBetweenAsynchronousObservers() throws
Exception
{
NearMiss event = new NearMiss();
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 11:50:17 UTC (rev 2807)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-06-10 11:57:21 UTC (rev 2808)
@@ -2937,10 +2937,22 @@
<text>The application scope is active during any asynchronous observer method
notification.</text>
</assertion>
- <assertion id="d">
- <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 id="da">
+ <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="db">
+ <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="dc">
+ <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="dd">
+ <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="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>