[webbeans-commits] Webbeans SVN: r1658 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/unit and 2 other directories.

[webbeans-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-02-23 07:56:55 -0500 (Mon, 23 Feb 2009)
New Revision: 1658

Added:
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/beans.xml
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java
Log:
removed deployBeans()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java	2009-02-23 09:37:38 UTC (rev 1657)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java	2009-02-23 12:56:55 UTC (rev 1658)
@@ -9,18 +9,19 @@
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
 import org.testng.annotations.Test;
 
 /**
  * Spec version: Public Release Draft 2
  */
+ at Artifact
 public class DependentContextTest extends AbstractDeclarativeTest
 {
    @Test(groups = { "contexts", "injection" })
    @SpecAssertion(section = "8.3", id = "a")
    public void testInstanceNotSharedBetweenInjectionPoints()
    {
-      deployBeans(Fox.class, FoxRun.class);
       Set<Bean<Fox>> foxBeans = getCurrentManager().resolveByType(Fox.class);
       assert foxBeans.size() == 1;
       Set<Bean<FoxRun>> foxRunBeans = getCurrentManager().resolveByType(FoxRun.class);
@@ -44,7 +45,6 @@
    @SpecAssertion(section = "8.3", id = "c")
    public void testInstanceUsedForElEvaluationNotShared() throws Exception
    {
-      deployBeans(Fox.class);
       new RunInDependentContext()
       {
          @Override
@@ -64,7 +64,6 @@
    @SpecAssertion(section = "8.3", id = "d")
    public void testInstanceUsedForProducerMethodNotShared() throws Exception
    {
-      deployBeans(SpiderProducer.class);
       Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new MyCreationalContext<Tarantula>());
       Tarantula tarantula2 = tarantulaBean.create(new MyCreationalContext<Tarantula>());
@@ -77,7 +76,6 @@
    @SpecAssertion(section = "8.3", id = "d")
    public void testInstanceUsedForProducerFieldNotShared() throws Exception
    {
-      deployBeans(OtherSpiderProducer.class);
       Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new MyCreationalContext<Tarantula>());
       Tarantula tarantula2 = tarantulaBean.create(new MyCreationalContext<Tarantula>());
@@ -113,7 +111,6 @@
    @SpecAssertion(section = "8.3", id = "d")
    public void testInstanceUsedForObserverMethodNotShared() throws Exception
    {
-      deployBeans(HorseStable.class);
       new RunInDependentContext()
       {
 
@@ -133,7 +130,6 @@
    @SpecAssertion(section = "8.3", id = "e")
    public void testContextGetWithCreateTrueReturnsNewInstance() throws Exception
    {
-      deployBeans(Fox.class);
       new RunInDependentContext()
       {
 
@@ -155,7 +151,6 @@
    @SpecAssertion(section = "8.3", id = "f")
    public void testContextGetWithCreateFalseReturnsNull() throws Exception
    {
-      deployBeans(Fox.class);
       new RunInDependentContext()
       {
 
@@ -183,7 +178,6 @@
    @SpecAssertion(section = "8.3", id = "g")
    public void testContextIsActiveWhenInvokingProducerMethod()
    {
-      deployBeans(SpiderProducer.class);
       Bean<Tarantula> tarantulaBean = getCurrentManager().resolveByType(Tarantula.class).iterator().next();
       Tarantula tarantula = tarantulaBean.create(new MyCreationalContext<Tarantula>());
       assert tarantula != null;
@@ -216,7 +210,6 @@
    @SpecAssertion(section = "8.3", id = "g")
    public void testContextIsActiveWhenInvokingObserverMethod()
    {
-      deployBeans(HorseStable.class);
       getCurrentManager().fireEvent(new HorseInStableEvent());
       assert HorseStable.isDependentContextActive();
    }
@@ -225,7 +218,6 @@
    @SpecAssertion(section = "8.3", id = "h")
    public void testContextIsActiveWhenEvaluatingElExpression() throws Exception
    {
-      deployBeans(SensitiveFox.class);
       SensitiveFox.setManager(getCurrentManager());
       new RunInDependentContext()
       {
@@ -243,7 +235,6 @@
    @SpecAssertion(section = "8.3", id = "i")
    public void testContextIsActiveWhenInvokingObserver()
    {
-      deployBeans(ApplicationHorseStable.class);
       getCurrentManager().fireEvent(new HorseInStableEvent());
       assert ApplicationHorseStable.isDependentContextActive();
    }
@@ -252,7 +243,6 @@
    @SpecAssertion(section = "8.3", id = "j")
    public void testContextIsActiveDuringBeanCreation() throws Exception
    {
-      deployBeans(SensitiveFox.class);
       SensitiveFox.setManager(getCurrentManager());
       new RunInDependentContext()
       {
@@ -282,7 +272,6 @@
    @SpecAssertion(section = "8.3", id = "j")
    public void testContextIsActiveDuringInjection()
    {
-      deployBeans(FoxRun.class, Fox.class);
       Bean<FoxRun> foxRunBean = getCurrentManager().resolveByType(FoxRun.class).iterator().next();
       FoxRun foxRun = foxRunBean.create(new MyCreationalContext<FoxRun>());
       assert foxRun.fox != null;
@@ -292,7 +281,6 @@
    @SpecAssertion(section = "8.3.2", id = "a")
    public void testDestroyingParentDestroysDependents() throws Exception
    {
-      deployBeans(Farm.class, Horse.class, Stable.class);
       new RunInDependentContext()
       {
 
@@ -316,7 +304,6 @@
    @SpecAssertion(section = "8.3.2", id = "c")
    public void testDependentsDestroyedWhenElEvaluationCompletes() throws Exception
    {
-      deployBeans(Fox.class);
       new RunInDependentContext()
       {
          @Override
@@ -337,7 +324,6 @@
    @SpecAssertion(section = "8.3.2", id = "d")
    public void testDependentsDestroyedWhenProducerMethodCompletes() throws Exception
    {
-      deployBeans(SpiderProducer.class);
       new RunInDependentContext()
       {
 
@@ -364,7 +350,6 @@
    @SpecAssertion(section = "8.3.2", id = "d")
    public void testDependentsDestroyedWhenProducerFieldCompletes() throws Exception
    {
-      deployBeans(OtherSpiderProducer.class);
       new RunInDependentContext()
       {
 
@@ -391,7 +376,6 @@
    @SpecAssertion(section = "8.3.2", id = "d")
    public void testDependentsDestroyedWhenDisposalMethodCompletes() throws Exception
    {
-      deployBeans(SpiderProducer.class);
       new RunInDependentContext()
       {
 
@@ -414,7 +398,6 @@
    @SpecAssertion(section = "8.3.2", id = "d")
    public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes() throws Exception
    {
-      deployBeans(HorseStable.class);
       new RunInDependentContext()
       {
 

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/dependent/beans.xml	2009-02-23 12:56:55 UTC (rev 1658)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+       xmlns:test="urn:java:org.jboss.jsr299.tck.unit.context.dependent"> 
+   <Deploy>
+      <Standard />
+      <Production />
+      <test:AnotherDeploymentType />      
+   </Deploy>
+</Beans>