[webbeans-commits] Webbeans SVN: r3157 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: deployment/lifecycle/broken/addDefinitionError and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Jul 23 12:45:38 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-07-23 12:45:38 -0400 (Thu, 23 Jul 2009)
New Revision: 3157
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java
Log:
Fixes to i/c tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -76,7 +76,7 @@
{
HttpClient client = new HttpClient();
ConversationState c1 = request(client, "/clouds.jsf");
- ConversationState c2 = request(client, "/clouds.jsf", c1);
+ ConversationState c2 = request(client, "/cloud.jsf", c1);
assert c2.isLongRunning();
assert c1.getId().equals(c2.getId());
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -5,6 +5,7 @@
import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
import org.testng.annotations.Test;
@@ -22,12 +23,12 @@
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
-//TODO I don't see why a test that uses the SPI extension mechanism must be an integration test (DRA)
-//@IntegrationTest
+// Must be an integration test as it needs a resource copied to a folder
+ at IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups="incontainer-ri-broken")
//TODO This test is not working in container due to exceptions being unwound on the server
@SpecAssertion(section = "11.5.2", id = "ca")
public void testObserverDefinitionErrorTreatedAsDefinitionError()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -25,7 +25,7 @@
@Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle" })
@SpecAssertion(section = "3.2.1", id = "a")
- public void applicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans() throws Exception
+ public void testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans() throws Exception
{
new RunInDependentContext()
{
@@ -45,7 +45,7 @@
@Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle" })
@SpecAssertion(section = "3.2.1", id = "da")
- public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() throws Exception
+ public void testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed() throws Exception
{
new RunInDependentContext()
{
@@ -66,7 +66,7 @@
@SpecAssertion(section = "3.2.1", id = "b"),
@SpecAssertion(section = "3.2.1", id = "c")
})
- public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean()
+ public void testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean()
{
SessionScopedSessionInterface sessionBean = getInstanceByType(SessionScopedSessionInterface.class);
sessionBean.remove();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/StateKeeper.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.remove;
+import java.io.Serializable;
+
import javax.enterprise.context.ApplicationScoped;
@ApplicationScoped
-class StateKeeper
+class StateKeeper implements Serializable
{
private boolean removeCalled = false;
private boolean beanDestroyed = false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -29,13 +29,6 @@
assert anotherHutch.getChicken().getName().equals("Standard");
}
- @Test(groups = { "stub", "initializerMethod", "interceptors" })
- @SpecAssertion(section = "3.8", id = "f")
- public void testMethodInterceptorNotCalledOnInitializerMethod()
- {
- assert false;
- }
-
@Test(groups = { "initializerMethod" })
@SpecAssertions({
@SpecAssertion(section = "3.8", id = "g"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -31,8 +31,6 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -46,9 +44,6 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
- at Resources({
- @Resource(source="web.xml", destination="WEB-INF/web.xml")
-})
@BeansXml("beans.xml")
public class EjbInjectionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java 2009-07-23 14:08:44 UTC (rev 3156)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java 2009-07-23 16:45:38 UTC (rev 3157)
@@ -11,7 +11,7 @@
import javax.transaction.UserTransaction;
public
- at Stateful(name="SampleRemoteEjb", mappedName="ejb/SampleRemoteEjb")
+ at Stateful
@TransactionManagement(TransactionManagementType.BEAN)
class RemoteEjbBean implements RemoteEjb
{
More information about the weld-commits
mailing list