[webbeans-commits] Webbeans SVN: r2931 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/dependent and 8 other directories.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2009-06-29 17:42:01 -0400 (Mon, 29 Jun 2009)
New Revision: 2931

Added:
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml
Removed:
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
Log:
Fixed some problems with XML files not being relocated

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -15,14 +15,7 @@
    
    public void drawTarget(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) TargetEvent targetEvent)
    {
-      if (beanManager.getContext(ApplicationScoped.class).isActive())
-      {
-         applicationScopeActive = true;
-      }
-      else
-      {
-         applicationScopeActive = false;
-      }
+      applicationScopeActive = beanManager.getContext(ApplicationScoped.class).isActive();
    }
 
    public void drawNearMiss(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) NearMiss event)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ApplicationHorseStable.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -15,10 +15,7 @@
    
    public void horseEntered(@Observes HorseInStableEvent horseEvent)
    {
-      if (beanManager.getContext(Dependent.class).isActive())
-      {
-         dependentContextActive = true;
-      }
+      dependentContextActive = beanManager.getContext(Dependent.class).isActive();
    }
 
    public static boolean isDependentContextActive()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -167,7 +167,10 @@
    }
 
    @Test(groups = { "contexts", "ri-broken" }, expectedExceptions = ContextNotActiveException.class)
-   @SpecAssertion(section = "6.4.1", id = "ga")
+   @SpecAssertions({
+      @SpecAssertion(section = "6.2", id = "ha"),
+      @SpecAssertion(section = "6.4.1", id = "ga")
+   })
    public void testContextIsInactive()
    {
       // The RI test harness is broken here, it just enables the dependent context blindly
@@ -175,7 +178,10 @@
    }
 
    @Test(groups = { "contexts", "producerMethod" })
-   @SpecAssertion(section = "6.4.1", id = "gb")
+   @SpecAssertions({
+      @SpecAssertion(section = "6.2", id = "ha"),
+      @SpecAssertion(section = "6.4.1", id = "gb")
+   })
    public void testContextIsActiveWhenInvokingProducerMethod()
    {
       Bean<Tarantula> tarantulaBean = getBeans(Tarantula.class).iterator().next();

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HorseStable.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -17,10 +17,7 @@
    @Initializer
    public HorseStable(@Current BeanManager beanManager)
    {
-      if (beanManager.getContext(Dependent.class).isActive())
-      {
-         dependentContextActive = true;
-      }
+      dependentContextActive = beanManager.getContext(Dependent.class).isActive();
    }
 
    public void horseEntered(@Observes HorseInStableEvent horseEvent)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SensitiveFox.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -16,10 +16,7 @@
 
    public SensitiveFox()
    {
-      if (beanManager.getContext(Dependent.class).isActive())
-      {
-         dependentContextActiveDuringCreate = true;
-      }
+      dependentContextActiveDuringCreate = beanManager.getContext(Dependent.class).isActive();
    }
 
    public String getName()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/SpiderProducer.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -20,19 +20,13 @@
    
    @Produces public Tarantula produceTarantula()
    {
-      if (beanManager.getContext(Dependent.class).isActive())
-      {
-         dependentContextActive = true;
-      }
+      dependentContextActive = beanManager.getContext(Dependent.class).isActive();
       return new Tarantula();
    }
 
    public void disposeTarantula(@Disposes Tarantula tarantula)
    {
-      if (beanManager.getContext(Dependent.class).isActive())
-      {
-         dependentContextActive = true;
-      }
+      dependentContextActive = beanManager.getContext(Dependent.class).isActive();
       instanceUsedForDisposal = this;
    }
 

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-06-29 17:07:32 UTC (rev 2930)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java	2009-06-29 21:42:01 UTC (rev 2931)
@@ -79,8 +79,9 @@
 
    @Test(groups = "beanLifecycle")
    @SpecAssertions({
-      @SpecAssertion(section = "6.1", id = "d"),
-      @SpecAssertion(section = "6.1", id = "e")
+      @SpecAssertion(section = "6.1.1", id = "c"),
+      @SpecAssertion(section = "6.1.1", id = "d"),
+      @SpecAssertion(section = "6.1.1", id = "e")
    })
    public void testCreateReturnsSameBeanPushed() throws Exception
    {

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed (from rev 2927, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3)

Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/beans.xml	2009-06-29 14:10:44 UTC (rev 2927)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -1,7 +0,0 @@
-<beans> 
-   <deploy>
-      <type>javax.enterprise.inject.deployment.Standard</type>
-      <type>javax.enterprise.inject.deployment.Production</type>
-      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3.AnotherDeploymentType</type>
-   </deploy>
-</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml (from rev 2930, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -0,0 +1,7 @@
+<beans> 
+   <deploy>
+      <type>javax.enterprise.inject.deployment.Standard</type>
+      <type>javax.enterprise.inject.deployment.Production</type>
+      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed.AnotherDeploymentType</type>
+   </deploy>
+</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams (from rev 2927, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1)

Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/beans.xml	2009-06-29 14:10:44 UTC (rev 2927)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -1,7 +0,0 @@
-<beans> 
-   <deploy>
-      <type>javax.enterprise.inject.deployment.Standard</type>
-      <type>javax.enterprise.inject.deployment.Production</type>
-      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1.AnotherDeploymentType</type>
-   </deploy>
-</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml (from rev 2930, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -0,0 +1,7 @@
+<beans> 
+   <deploy>
+      <type>javax.enterprise.inject.deployment.Standard</type>
+      <type>javax.enterprise.inject.deployment.Production</type>
+      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.multiParams.AnotherDeploymentType</type>
+   </deploy>
+</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed (from rev 2927, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4)

Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/beans.xml	2009-06-29 14:10:44 UTC (rev 2927)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -1,7 +0,0 @@
-<beans> 
-   <deploy>
-      <type>javax.enterprise.inject.deployment.Standard</type>
-      <type>javax.enterprise.inject.deployment.Production</type>
-      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4.AnotherDeploymentType</type>
-   </deploy>
-</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml (from rev 2930, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -0,0 +1,7 @@
+<beans> 
+   <deploy>
+      <type>javax.enterprise.inject.deployment.Standard</type>
+      <type>javax.enterprise.inject.deployment.Production</type>
+      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.observesUnallowed.AnotherDeploymentType</type>
+   </deploy>
+</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed (from rev 2927, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2)

Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/beans.xml	2009-06-29 14:10:44 UTC (rev 2927)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -1,7 +0,0 @@
-<beans> 
-   <deploy>
-      <type>javax.enterprise.inject.deployment.Standard</type>
-      <type>javax.enterprise.inject.deployment.Production</type>
-      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2.AnotherDeploymentType</type>
-   </deploy>
-</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml (from rev 2930, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -0,0 +1,7 @@
+<beans> 
+   <deploy>
+      <type>javax.enterprise.inject.deployment.Standard</type>
+      <type>javax.enterprise.inject.deployment.Production</type>
+      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed.AnotherDeploymentType</type>
+   </deploy>
+</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod (from rev 2927, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5)

Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/beans.xml	2009-06-29 14:10:44 UTC (rev 2927)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -1,7 +0,0 @@
-<beans> 
-   <deploy>
-      <type>javax.enterprise.inject.deployment.Standard</type>
-      <type>javax.enterprise.inject.deployment.Production</type>
-      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5.AnotherDeploymentType</type>
-   </deploy>
-</beans>

Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml (from rev 2930, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/beans.xml	2009-06-29 21:42:01 UTC (rev 2931)
@@ -0,0 +1,7 @@
+<beans> 
+   <deploy>
+      <type>javax.enterprise.inject.deployment.Standard</type>
+      <type>javax.enterprise.inject.deployment.Production</type>
+      <type>org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod.AnotherDeploymentType</type>
+   </deploy>
+</beans>