Enabling unit tests for WELD-333.

weld · Dec 19, 2009 · 0063bd6 · 0063bd6
1 parent 983bbdb
commit 0063bd6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java b/tests/src/test/java/org/jboss/weld/tests/decorators/decoratedTypes/PartialDecoratorTest.java
@@ -30,7 +30,7 @@
 public class PartialDecoratorTest extends AbstractWeldTest
 {
 
-   @Test(groups = "broken")
+   @Test
    public void testDecoratorDoesNotDecorateOutsideDecoratedTypes()
    {
       TestBean testBean = getCurrentManager().getInstanceByType(TestBean.class);

diff --git a/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java b/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecorator.java
@@ -30,9 +30,9 @@ public class PartialDecorator<T> implements Decorated<T>
 
    @Inject @Delegate GenericBean<T> delegate;
 
-   static boolean decoratedInvoked;
+   static boolean decoratedInvoked = false;
 
-   static boolean notDecoratedInvoked;
+   static boolean notDecoratedInvoked = false;
 
    public T decoratedEcho(T parameter)
    {

diff --git a/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java b/tests/src/test/java/org/jboss/weld/tests/decorators/generic/PartialDecoratorTest.java
@@ -30,15 +30,16 @@
 public class PartialDecoratorTest extends AbstractWeldTest
 {
 
-   @Test(groups = "broken")
+   @Test
    public void testDecoratorDoesNotDecorateOutsideDecoratedTypes()
    {
       TestBean testBean = getCurrentManager().getInstanceByType(TestBean.class);
       testBean.invoke();
 
       assert PartialDecorator.decoratedInvoked;
       assert !PartialDecorator.notDecoratedInvoked;
-      assert AnotherPartialDecorator.invoked;
+      assert StringPartialDecorator.invoked;
+      assert !IntegerPartialDecorator.invoked;
       assert GenericBean.decoratedInvoked;
       assert GenericBean.notDecoratedInvoked;
    }

diff --git a/...tors/generic/AnotherPartialDecorator.java → ...ators/generic/StringPartialDecorator.java b/...tors/generic/AnotherPartialDecorator.java → ...ators/generic/StringPartialDecorator.java
@@ -25,13 +25,13 @@
  * @author Marius Bogoevici
  */
 @Decorator
-public class AnotherPartialDecorator implements Decorated<String>
+public class StringPartialDecorator implements Decorated<String>
 {
    @Inject
    @Delegate
    GenericBean<String> delegate;
 
-   static boolean invoked = true;
+   static boolean invoked = false;
 
    public String decoratedEcho(String parameter)
    {

diff --git a/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml b/tests/src/test/resources/org/jboss/weld/tests/decorators/generic/beans.xml
@@ -1,6 +1,6 @@
 <beans>
     <decorators>
         <decorator>org.jboss.weld.tests.decorators.generic.PartialDecorator</decorator>
-        <decorator>org.jboss.weld.tests.decorators.generic.AnotherPartialDecorator</decorator>
+        <decorator>org.jboss.weld.tests.decorators.generic.StringPartialDecorator</decorator>
     </decorators>
 </beans>