[webbeans-commits] Webbeans SVN: r3457 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod and 4 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Tue Aug 11 08:56:41 EDT 2009 

Author: pete.muir at jboss.org
Date: 2009-08-11 08:56:41 -0400 (Tue, 11 Aug 2009)
New Revision: 3457

Added:
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java
Log:
Fix tests

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/CityDecorator.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -6,13 +6,15 @@
 import javax.decorator.Decorator;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
 
 @SuppressWarnings("serial")
 @Decorator
-class CityDecorator implements CityInterface, Serializable
+public class CityDecorator implements CityInterface, Serializable
 {
    @Decorates @Any CityInterface city;
    
+   @Initializer
    public CityDecorator(@Current NonPassivating nonPassivating) {}
    
    public void foo()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -6,14 +6,16 @@
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 @Artifact
 @ExpectedDeploymentException(DeploymentError.class)
 @SpecVersion("20090625")
+ at BeansXml("beans.xml")
 public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
 {
-   @Test(groups = { "contexts", "passivation", "ri-broken" })
+   @Test(groups = { "contexts", "passivation" })
    @SpecAssertion(section = "6.6.4", id = "aag")
    public void testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails()
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/NonPassivating.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -2,5 +2,5 @@
 
 class NonPassivating
 {
-   private NonPassivating(String foo) {}
+   
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/UnderwaterCity.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -1,6 +1,8 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor;
 
-class UnderwaterCity implements CityInterface
+import java.io.Serializable;
+
+class UnderwaterCity implements CityInterface, Serializable
 {
 
    public void foo()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -6,11 +6,13 @@
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 @Artifact
 @ExpectedDeploymentException(DeploymentError.class)
 @SpecVersion("20090625")
+ at BeansXml("beans.xml")
 public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
 {
    @Test(groups = { "contexts", "passivation" })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/NonPassivating.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -2,5 +2,5 @@
 
 class NonPassivating
 {
-   private NonPassivating(String foo) {}
+   
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java	2009-08-11 12:39:04 UTC (rev 3456)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/UnderwaterCity.java	2009-08-11 12:56:41 UTC (rev 3457)
@@ -1,9 +1,11 @@
 package org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod;
 
+import java.io.Serializable;
+
 import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
-class UnderwaterCity implements CityInterface
+class UnderwaterCity implements CityInterface, Serializable
 {
 
    public void foo()

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml	2009-08-11 12:56:41 UTC (rev 3457)
@@ -0,0 +1,5 @@
+<beans> 
+   <decorators>
+      <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.CityDecorator</decorator>
+   </decorators>
+</beans>


Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml	2009-08-11 12:56:41 UTC (rev 3457)
@@ -0,0 +1,5 @@
+<beans> 
+   <decorators>
+      <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.CityDecorator</decorator>
+   </decorators>
+</beans>


Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

More information about the weld-commits mailing list