4 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-11-04 17:00:32 -0500 (Wed, 04 Nov 2009)
New Revision: 4688
Added:
core/trunk/tests/src/test/resources/org/jboss/weld/test/event/
core/trunk/tests/src/test/resources/org/jboss/weld/test/event/tx/
core/trunk/tests/src/test/resources/org/jboss/weld/test/extensions/
Removed:
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/extensions/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/xml/
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java
core/trunk/tests/src/test/resources/org/jboss/weld/test/extensions/javax.enterprise.inject.spi.Extension
core/trunk/tests/unit-tests.xml
Log:
repackage resources and fix test, cleanup
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
---
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-11-04
21:58:32 UTC (rev 4687)
+++
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-11-04
22:00:32 UTC (rev 4688)
@@ -5,8 +5,6 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
@@ -14,6 +12,9 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.RequestContext;
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@@ -52,13 +53,13 @@
CreationalContext<KleinStadt> creationalContext = new
MockCreationalContext<KleinStadt>();
KleinStadt stadtInstance = stadtBean.create(creationalContext);
assert stadtInstance != null : "Expected instance to be created by
container";
- //assert frankfurt.isKleinStadtCreated() : "PostConstruct should be invoked
when bean instance is created";
+ assert frankfurt.isKleinStadtCreated() : "PostConstruct should be invoked when
bean instance is created";
frankfurt.resetCreatedFlags();
// Create a second one to make sure create always does create a new session bean
KleinStadt anotherStadtInstance = stadtBean.create(creationalContext);
assert anotherStadtInstance != null : "Expected second instance of session
bean";
- //assert frankfurt.isKleinStadtCreated();
+ assert frankfurt.isKleinStadtCreated();
assert anotherStadtInstance != stadtInstance : "create() should not return
same bean as before";
// Verify that the instance returned is a proxy by checking for all local
interfaces
@@ -68,7 +69,6 @@
assert interfaces.contains(KleinStadt.class);
assert interfaces.contains(SchoeneStadt.class);
- //frankfurt.dispose();
}
@Test(groups = { "enterpriseBeans", "clientProxy",
"lifecycle", "integration" })
@@ -77,15 +77,15 @@
GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
Bean<KleinStadt> stadtBean = getBean(KleinStadt.class);
assert stadtBean != null : "Expected a bean for stateful session bean
Kassel";
- Context requestContext = getCurrentManager().getContext(RequestScoped.class);
+ RequestContext requestContext =
Container.instance().deploymentServices().get(ContextLifecycle.class).getRequestContext();
CreationalContext<KleinStadt> creationalContext = new
MockCreationalContext<KleinStadt>();
KleinStadt kassel = requestContext.get(stadtBean, creationalContext);
stadtBean.destroy(kassel, creationalContext);
assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be
destroyed";
+ requestContext.destroy();
kassel = requestContext.get(stadtBean);
assert kassel == null : "SFSB bean should not exist after being
destroyed";
- //frankfurt.dispose();
}
@Test
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java
===================================================================
---
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java 2009-11-04
21:58:32 UTC (rev 4687)
+++
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java 2009-11-04
22:00:32 UTC (rev 4688)
@@ -2,16 +2,16 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.ejb.EJB;
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
@Stateful
@RequestScoped
public class Kassel implements KleinStadt, SchoeneStadt
{
- @EJB
+ @Inject
private GrossStadt grossStadt;
@PostConstruct
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/event/tx (from rev 4663,
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/implementation/event/tx)
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/extensions (from rev 4663,
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/extensions)
Modified:
core/trunk/tests/src/test/resources/org/jboss/weld/test/extensions/javax.enterprise.inject.spi.Extension
===================================================================
---
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/extensions/javax.enterprise.inject.spi.Extension 2009-11-04
18:04:46 UTC (rev 4663)
+++
core/trunk/tests/src/test/resources/org/jboss/weld/test/extensions/javax.enterprise.inject.spi.Extension 2009-11-04
22:00:32 UTC (rev 4688)
@@ -1 +1 @@
-org.jboss.weld.test.unit.extensions.SimpleExtension
\ No newline at end of file
+org.jboss.weld.test.extensions.SimpleExtension
\ No newline at end of file
Modified: core/trunk/tests/unit-tests.xml
===================================================================
--- core/trunk/tests/unit-tests.xml 2009-11-04 21:58:32 UTC (rev 4687)
+++ core/trunk/tests/unit-tests.xml 2009-11-04 22:00:32 UTC (rev 4688)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="Weld" verbose="0" >
+<suite name="Weld" verbose="3" >
<test name="Weld">
<method-selectors>
@@ -18,53 +18,53 @@
</run>
</groups>
<packages>
- <package name="org.jboss.weld.test.activities" />
- <package name="org.jboss.weld.test.activities.current" />
- <package name="org.jboss.weld.test.activities.child" />
- <package name="org.jboss.weld.test.annotatedType" />
- <package name="org.jboss.weld.test.annotatedType.decoration" />
- <package name="org.jboss.weld.test.beanDeployment.managed.multiple"
/>
- <package name="org.jboss.weld.test.beanDeployment.managed.single"
/>
- <package name="org.jboss.weld.test.beanDeployment.mixed" />
- <package
name="org.jboss.weld.test.beanDeployment.producers.singleProducerMethod" />
- <package name="org.jboss.weld.test.beanDeployment.session.multiple"
/>
- <package name="org.jboss.weld.test.beanDeployment.session.single"
/>
- <package name="org.jboss.weld.test.beanManager.serializability"
/>
- <package name="org.jboss.weld.test.contexts" />
- <package name="org.jboss.weld.test.decorators" />
- <package name="org.jboss.weld.test.el.resolver" />
- <package name="org.jboss.weld.test.enterprise" />
- <package name="org.jboss.weld.test.enterprise.lifecycle" />
- <package name="org.jboss.weld.test.event" />
- <package name="org.jboss.weld.test.event.tx" />
- <package name="org.jboss.weld.test.examples" />
- <package name="org.jboss.weld.test.extensions" />
- <package name="org.jboss.weld.test.interceptors.ejb" />
- <package name="org.jboss.weld.test.interceptors.ejb3model" />
- <package name="org.jboss.weld.test.interceptors.passivation" />
- <package name="org.jboss.weld.test.interceptors.simple" />
- <package name="org.jboss.weld.test.managed.newBean" />
- <package name="org.jboss.weld.test.nonContextual" />
- <package name="org.jboss.weld.test.producer.field" />
- <package name="org.jboss.weld.test.producer.method" />
- <package name="org.jboss.weld.test.proxy" />
- <package name="org.jboss.weld.test.proxy.enterprise" />
- <package name="org.jboss.weld.test.resolution" />
- <package name="org.jboss.weld.test.resolution.circular" />
- <package name="org.jboss.weld.test.resolution.named" />
- <package name="org.jboss.weld.test.resolution.wbri279" />
- <package name="org.jboss.weld.test.resolution.wbri293" />
- <package name="org.jboss.weld.test.session.newBean" />
- <package name="org.jboss.weld.test.stereotypes" />
- <package name="org.jboss.weld.test.unit.bootstrap" />
- <package name="org.jboss.weld.test.unit.cluster" />
- <package
name="org.jboss.weld.test.unit.deployment.structure.extensions" />
- <package
name="org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution"
/>
- <package
name="org.jboss.weld.test.unit.deployment.structure.resolution" />
- <package name="org.jboss.weld.test.unit.environments.servlet"
/>
- <package name="org.jboss.weld.test.unit.reflection.clazz" />
- <package name="org.jboss.weld.test.unit.reflection.method" />
- <package name="org.jboss.weld.test.unit.security" />
+<!-- <package name="org.jboss.weld.test.activities" />-->
+<!-- <package name="org.jboss.weld.test.activities.child"
/>-->
+<!-- <package name="org.jboss.weld.test.activities.current"
/>-->
+<!-- <package name="org.jboss.weld.test.annotatedType"
/>-->
+<!-- <package name="org.jboss.weld.test.annotatedType.decoration"
/>-->
+<!-- <package
name="org.jboss.weld.test.beanDeployment.managed.multiple" />-->
+<!-- <package
name="org.jboss.weld.test.beanDeployment.managed.single" />-->
+<!-- <package name="org.jboss.weld.test.beanDeployment.mixed"
/>-->
+<!-- <package
name="org.jboss.weld.test.beanDeployment.producers.singleProducerMethod"
/>-->
+<!-- <package
name="org.jboss.weld.test.beanDeployment.session.multiple" />-->
+<!-- <package
name="org.jboss.weld.test.beanDeployment.session.single" />-->
+<!-- <package
name="org.jboss.weld.test.beanManager.serializability" />-->
+<!-- <package name="org.jboss.weld.test.contexts" />-->
+<!-- <package name="org.jboss.weld.test.decorators" />-->
+<!-- <package name="org.jboss.weld.test.el.resolver" />-->
+<!-- <package name="org.jboss.weld.test.enterprise" />-->
+<!-- <package name="org.jboss.weld.test.enterprise.lifecycle"
/>-->
+<!-- <package name="org.jboss.weld.test.event" />-->
+<!-- <package name="org.jboss.weld.test.event.tx" />-->
+<!-- <package name="org.jboss.weld.test.examples" />-->
+<!-- <package name="org.jboss.weld.test.extensions" />-->
+<!-- <package name="org.jboss.weld.test.interceptors.ejb"
/>-->
+<!-- <package name="org.jboss.weld.test.interceptors.ejb3model"
/>-->
+<!-- <package name="org.jboss.weld.test.interceptors.passivation"
/>-->
+<!-- <package name="org.jboss.weld.test.interceptors.simple"
/>-->
+<!-- <package name="org.jboss.weld.test.managed.newBean"
/>-->
+<!-- <package name="org.jboss.weld.test.nonContextual"
/>-->
+<!-- <package name="org.jboss.weld.test.producer.field"
/>-->
+<!-- <package name="org.jboss.weld.test.producer.method"
/>-->
+<!-- <package name="org.jboss.weld.test.proxy" />-->
+<!-- <package name="org.jboss.weld.test.proxy.enterprise"
/>-->
+<!-- <package name="org.jboss.weld.test.resolution" />-->
+<!-- <package name="org.jboss.weld.test.resolution.circular"
/>-->
+<!-- <package name="org.jboss.weld.test.resolution.named"
/>-->
+<!-- <package name="org.jboss.weld.test.resolution.wbri279"
/>-->
+<!-- <package name="org.jboss.weld.test.resolution.wbri293"
/>-->
+<!-- <package name="org.jboss.weld.test.session.newBean"
/>-->
+<!-- <package name="org.jboss.weld.test.stereotypes" />-->
+<!-- <package name="org.jboss.weld.test.unit.bootstrap"
/>-->
+<!-- <package name="org.jboss.weld.test.unit.cluster"
/>-->
+<!-- <package
name="org.jboss.weld.test.unit.deployment.structure.extensions" />-->
+<!-- <package
name="org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution"
/>-->
+<!-- <package
name="org.jboss.weld.test.unit.deployment.structure.resolution" />-->
+<!-- <package
name="org.jboss.weld.test.unit.environments.servlet" />-->
+<!-- <package name="org.jboss.weld.test.unit.reflection.clazz"
/>-->
+<!-- <package name="org.jboss.weld.test.unit.reflection.method"
/>-->
+ <package name="org.jboss.weld.test" />
</packages>
</test>