Author: pete.muir(a)jboss.org
Date: 2010-12-07 12:33:26 -0500 (Tue, 07 Dec 2010)
New Revision: 7112
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java
Log:
CDITCK-137
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2010-12-07
17:30:38 UTC (rev 7111)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2010-12-07
17:33:26 UTC (rev 7112)
@@ -70,14 +70,8 @@
FooImpl.reset();
getInstanceByType(CowShed.class).washDown();
assert FooDecorator1.getMessage().equals(CowShed.MESSAGE);
- assert
FooDecorator1.getInjectionPoint().getBean().getBeanClass().equals(CowShed.class);
- assert !FooDecorator1.getInjectionPoint().isDelegate();
assert FooDecorator2.getMessage().equals(CowShed.MESSAGE + FooDecorator1.SUFFIX);
- assert
FooDecorator2.getInjectionPoint().getBean().getBeanClass().equals(FooDecorator1.class);
- assert FooDecorator2.getInjectionPoint().isDelegate();
assert FooImpl.getMessage().equals(CowShed.MESSAGE + FooDecorator1.SUFFIX +
FooDecorator2.SUFFIX);
- assert
FooImpl.getInjectionPoint().getBean().getBeanClass().equals(FooDecorator2.class);
- assert FooImpl.getInjectionPoint().isDelegate();
FooDecorator1.reset();
FooDecorator2.reset();
FooImpl.reset();
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2010-12-07
17:30:38 UTC (rev 7111)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2010-12-07
17:33:26 UTC (rev 7112)
@@ -18,7 +18,6 @@
import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.enterprise.inject.spi.InjectionPoint;
import javax.inject.Inject;
/**
@@ -29,19 +28,6 @@
public class FooDecorator1 implements Foo
{
- private static InjectionPoint injectionPoint;
-
- @Inject
- public void setInjectionPoint(InjectionPoint injectionPoint)
- {
- FooDecorator1.injectionPoint = injectionPoint;
- }
-
- public static InjectionPoint getInjectionPoint()
- {
- return injectionPoint;
- }
-
public static final String SUFFIX = "fooDecorator1";
private static String message;
@@ -60,7 +46,6 @@
public static void reset()
{
FooDecorator1.message = null;
- FooDecorator1.injectionPoint = null;
}
@Inject @Delegate Foo foo;
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2010-12-07
17:30:38 UTC (rev 7111)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2010-12-07
17:33:26 UTC (rev 7112)
@@ -18,7 +18,6 @@
import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.enterprise.inject.spi.InjectionPoint;
import javax.inject.Inject;
/**
@@ -29,15 +28,6 @@
public class FooDecorator2 implements Foo
{
- private static InjectionPoint injectionPoint;
-
- @Inject InjectionPoint ip;
-
- public static InjectionPoint getInjectionPoint()
- {
- return injectionPoint;
- }
-
public static final String SUFFIX = "fooDecorator2";
private static String message;
@@ -56,7 +46,6 @@
public static void reset()
{
FooDecorator2.message = null;
- FooDecorator2.injectionPoint = null;
}
@Inject @Delegate Foo foo;
@@ -65,7 +54,6 @@
{
FooDecorator2.message = message;
foo.log(message + SUFFIX);
- injectionPoint = ip;
}
}
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java 2010-12-07
17:30:38 UTC (rev 7111)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooImpl.java 2010-12-07
17:33:26 UTC (rev 7112)
@@ -16,8 +16,6 @@
*/
package org.jboss.jsr299.tck.tests.decorators.invocation;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
/**
* @author pmuir
@@ -26,23 +24,6 @@
public class FooImpl implements Foo
{
- private static InjectionPoint injectionPoint;
-
- public FooImpl()
- {
- }
-
- @Inject
- public FooImpl(InjectionPoint injectionPoint)
- {
- FooImpl.injectionPoint = injectionPoint;
- }
-
- public static InjectionPoint getInjectionPoint()
- {
- return injectionPoint;
- }
-
private static String message;
/**
@@ -59,7 +40,6 @@
public static void reset()
{
FooImpl.message = null;
- FooImpl.injectionPoint = null;
}
public void log(String message)
Show replies by date