[webbeans-commits] Webbeans SVN: r3470 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/definition/binding/enterprise and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-12 22:13:56 -0400 (Wed, 12 Aug 2009)
New Revision: 3470
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
some restructuring of 4.1 assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-12 23:09:56 UTC (rev 3469)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-13 02:13:56 UTC (rev 3470)
@@ -115,7 +115,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "aa")
+ @SpecAssertion(section = "4.1", id = "aaa")
public void testBindingNotDeclaredInheritedIsNotInherited()
{
Set<? extends Annotation> bindings = getBeans(ShetlandPony.class).iterator().next().getBindings();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-12 23:09:56 UTC (rev 3469)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 02:13:56 UTC (rev 3470)
@@ -27,7 +27,7 @@
public class EnterpriseBindingDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.1", id = "an")
+ @SpecAssertion(section = "4.1", id = "al")
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
Set<? extends Annotation> bindings = getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
@@ -35,7 +35,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "ar")
+ @SpecAssertion(section = "4.1", id = "ap")
public void testBindingDeclaredInheritedIsIndirectlyInherited()
{
Set<? extends Annotation> bindings = getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-12 23:09:56 UTC (rev 3469)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-13 02:13:56 UTC (rev 3470)
@@ -82,7 +82,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "ab")
+ @SpecAssertion(section = "4.1", id = "aba")
public void testStereotypeNotDeclaredInheritedIsNotInherited()
{
assert getBeans(ShetlandPony.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-12 23:09:56 UTC (rev 3469)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-13 02:13:56 UTC (rev 3470)
@@ -19,14 +19,14 @@
public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.1", id = "ao")
+ @SpecAssertion(section = "4.1", id = "am")
public void testStereotypeDeclaredInheritedIsInherited() throws Exception
{
assert getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
@Test
- @SpecAssertion(section = "4.1", id = "as")
+ @SpecAssertion(section = "4.1", id = "aq")
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
{
assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-12 23:09:56 UTC (rev 3469)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-13 02:13:56 UTC (rev 3470)
@@ -1387,71 +1387,107 @@
</section>
- <section id="4.1" title="Inheritance of type-level metadata">
- <assertion id="aa">
- <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
+ <section id="4.1" title="Inheritance of type-level metadata">
+ <group>
+ <text>Suppose a class X is extended directly or indirectly by the bean class of a managed bean or session bean Y. If X is annotated with a binding type, stereotype or interceptor binding type Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
+
+ <assertion id="aa">
+ <text>Test binding type for directly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aaa">
+ <text>Test binding type for directly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ab">
- <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
+ <assertion id="ab">
+ <text>Test stereotype for directly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aba">
+ <text>Test stereotype for directly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ad">
- <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
+ <assertion id="ad">
+ <text>Test interceptor binding type for directly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ada">
+ <text>Test interceptor binding type for directly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="ag">
+ <text>Test binding type for indirectly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aga">
+ <text>Test binding type for indirectly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ae">
- <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
+ <assertion id="ah">
+ <text>Test stereotype for indirectly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aha">
+ <text>Test stereotype for indirectly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ag">
- <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
+ <assertion id="aj">
+ <text>Test interceptor binding type for indirectly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aja">
+ <text>Test interceptor binding type for indirectly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="al">
+ <text>Test binding type for directly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ala">
+ <text>Test binding type for directly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ah">
- <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
+ <assertion id="am">
+ <text>Test stereotype for directly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ama">
+ <text>Test stereotype for directly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="aj">
- <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
+ <assertion id="an">
+ <text>Test interceptor binding type for directly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ana">
+ <text>Test interceptor binding type for directly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ak">
- <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
-
- <assertion id="al">
- <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
+ <assertion id="ap">
+ <text>Test binding type for indirectly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="apa">
+ <text>Test binding type for indirectly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="am">
- <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
+ <assertion id="aq">
+ <text>Test stereotype for indirectly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="aqa">
+ <text>Test stereotype for indirectly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="ar">
+ <text>Test interceptor binding type for indirectly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="ara">
+ <text>Test interceptor binding type for indirectly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+ </group>
- <assertion id="an">
- <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
-
- <assertion id="ao">
- <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text>
- </assertion>
-
- <assertion id="ap">
- <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
-
- <assertion id="aq">
- <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
-
- <assertion id="ar">
- <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
-
- <assertion id="as">
- <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text>
- </assertion>
-
<assertion id="ba">
<text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
</assertion>
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3469 - in ri/trunk: tests and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-12 19:09:56 -0400 (Wed, 12 Aug 2009)
New Revision: 3469
Added:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java
ri/trunk/tests/unit-tests.xml
Log:
WBRI-351
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java 2009-08-12 16:19:48 UTC (rev 3468)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java 2009-08-12 23:09:56 UTC (rev 3469)
@@ -78,6 +78,9 @@
public void postConstruct(T instance)
{
+ if (postConstruct == null)
+ return;
+
try
{
postConstruct.invoke(instance);
@@ -90,6 +93,9 @@
public void preDestroy(T instance)
{
+ if (preDestroy == null)
+ return;
+
try
{
preDestroy.invoke(instance);
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java 2009-08-12 23:09:56 UTC (rev 3469)
@@ -0,0 +1,53 @@
+package org.jboss.webbeans.test.unit.noncontextual;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+@Artifact
+public class ExampleTest extends AbstractWebBeansTest
+{
+ @Test
+ public void testNonContextual() throws Exception
+ {
+ NonContextual<External> nonContextual = new NonContextual<External>(getCurrentManager(), External.class);
+
+ External external = new External();
+ Assert.assertNull(external.bean);
+ nonContextual.postConstruct(external);
+ Assert.assertNotNull(external.bean);
+ nonContextual.preDestroy(external);
+ // preDestroy doesn't cause any dis-injection
+ Assert.assertNotNull(external.bean);
+ }
+
+ public class NonContextual<T> {
+
+ final InjectionTarget<T> it;
+ final BeanManager manager;
+
+ public NonContextual(BeanManager manager, Class<T> clazz) {
+ this.manager = manager;
+ AnnotatedType<T> type = manager.createAnnotatedType(clazz);
+ this.it = manager.createInjectionTarget(type);
+ }
+
+ public CreationalContext<T> postConstruct(T instance) {
+ CreationalContext<T> cc = manager.createCreationalContext(null);
+ it.inject(instance, cc);
+ it.postConstruct(instance);
+ return cc;
+ }
+
+ public void preDestroy(T instance) {
+ it.preDestroy(instance);
+ }
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/ExampleTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java 2009-08-12 23:09:56 UTC (rev 3469)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.webbeans.test.unit.noncontextual;
+
+import javax.enterprise.inject.Current;
+
+/**
+ *
+ * @author <a href="kabir.khan(a)jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class External
+{
+
+ public External()
+ {
+ // TODO Auto-generated constructor stub
+ }
+
+ @Current WebBean bean;
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/External.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java 2009-08-12 23:09:56 UTC (rev 3469)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.test.unit.noncontextual;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+public @interface Random
+{
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/Random.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java 2009-08-12 23:09:56 UTC (rev 3469)
@@ -0,0 +1,5 @@
+package org.jboss.webbeans.test.unit.noncontextual;
+
+public class WebBean
+{
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/noncontextual/WebBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/tests/unit-tests.xml
===================================================================
--- ri/trunk/tests/unit-tests.xml 2009-08-12 16:19:48 UTC (rev 3468)
+++ ri/trunk/tests/unit-tests.xml 2009-08-12 23:09:56 UTC (rev 3469)
@@ -52,6 +52,7 @@
<package name="org.jboss.webbeans.test.unit.lookup.circular" />
<package name="org.jboss.webbeans.test.unit.lookup.wbri279" />
<package name="org.jboss.webbeans.test.unit.manager" />
+ <package name="org.jboss.webbeans.test.unit.noncontextual" />
<package name="org.jboss.webbeans.test.unit.security" />
</packages>
</test>
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3468 - ri/trunk/impl/src/main/java/org/jboss/webbeans and 9 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-12 12:19:48 -0400 (Wed, 12 Aug 2009)
New Revision: 3468
Added:
ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java
Modified:
ri/trunk/api/src/main/java/javax/enterprise/inject/New.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/AccessibleManagerResolutionTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBeanLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/MonkeyLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java
Log:
WBRI-320, add support for @New(value=XXX.class)
Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/New.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/New.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/New.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -40,4 +40,7 @@
@BindingType
public @interface New
{
+
+ Class<?> value() default New.class;
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -489,6 +489,7 @@
public void addAccessibleBeanManager(BeanManagerImpl accessibleBeanManager)
{
accessibleManagers.add(accessibleBeanManager);
+ beanResolver.clear();
}
protected Set<BeanManagerImpl> getAccessibleManagers()
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewEnterpriseBean.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -17,7 +17,6 @@
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -35,7 +34,6 @@
*/
public class NewEnterpriseBean<T> extends EnterpriseBean<T> implements NewBean
{
- private static Set<Annotation> NEW_BINDING_SET = new HashSet<Annotation>(Arrays.asList(new NewLiteral()));
/**
* Creates an instance of a NewEnterpriseBean from an annotated class
@@ -48,6 +46,8 @@
{
return new NewEnterpriseBean<T>(clazz, manager, environment);
}
+
+ private Set<Annotation> bindings;
/**
* Protected constructor
@@ -55,9 +55,19 @@
* @param type An annotated class
* @param manager The Web Beans manager
*/
- protected NewEnterpriseBean(WBClass<T> type, BeanManagerImpl manager, BeanDeployerEnvironment environment)
+ protected NewEnterpriseBean(final WBClass<T> type, BeanManagerImpl manager, BeanDeployerEnvironment environment)
{
super(type, manager, environment);
+ this.bindings = new HashSet<Annotation>();
+ this.bindings.add(new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return type.getJavaClass();
+ }
+
+ });
}
/**
@@ -96,7 +106,7 @@
@Override
public Set<Annotation> getBindings()
{
- return NEW_BINDING_SET;
+ return bindings;
}
@Override
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -17,7 +17,6 @@
package org.jboss.webbeans.bean;
import java.lang.annotation.Annotation;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -34,7 +33,6 @@
*/
public class NewSimpleBean<T> extends SimpleBean<T> implements NewBean
{
- private static Set<Annotation> NEW_BINDING_SET = new HashSet<Annotation>(Arrays.asList(new NewLiteral()));
/**
* Creates an instance of a NewSimpleBean from an annotated class
@@ -47,6 +45,8 @@
{
return new NewSimpleBean<T>(clazz, manager);
}
+
+ private Set<Annotation> bindings;
/**
* Protected constructor
@@ -54,9 +54,19 @@
* @param type An annotated class
* @param manager The Web Beans manager
*/
- protected NewSimpleBean(WBClass<T> type, BeanManagerImpl manager)
+ protected NewSimpleBean(final WBClass<T> type, BeanManagerImpl manager)
{
super(type, manager);
+ this.bindings = new HashSet<Annotation>();
+ this.bindings.add(new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return type.getJavaClass();
+ }
+
+ });
}
/**
@@ -95,7 +105,7 @@
@Override
public Set<Annotation> getBindings()
{
- return NEW_BINDING_SET;
+ return bindings;
}
@Override
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/literal/NewLiteral.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -24,4 +24,12 @@
*
* @author Pete Muir
*/
-public class NewLiteral extends AnnotationLiteral<New> implements New {}
+public class NewLiteral extends AnnotationLiteral<New> implements New
+{
+
+ public Class<?> value()
+ {
+ return New.class;
+ }
+
+}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -44,5 +44,33 @@
{
return delegate().isAssignableTo(clazz);
}
+
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+ {
+ return delegate().getAnnotation(annotationType);
+ }
+
+ public Class<?> getJavaClass()
+ {
+ return delegate().getJavaClass();
+ }
+ @Override
+ public boolean equals(Object obj)
+ {
+ return delegate().equals(obj);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return delegate().hashCode();
+ }
+
+ @Override
+ public String toString()
+ {
+ return delegate().toString();
+ }
+
}
Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java (rev 0)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.webbeans.resolution;
+
+import java.lang.annotation.Annotation;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.New;
+
+import org.jboss.webbeans.literal.NewLiteral;
+
+/**
+ * @author pmuir
+ *
+ */
+public class NewResolvableTransformer implements ResolvableTransformer
+{
+
+ public Resolvable transform(final Resolvable element)
+ {
+ if (element.isAnnotationPresent(New.class) && element.getJavaClass() != null)
+ {
+ New originalNewAnnotation = element.getAnnotation(New.class);
+ if (originalNewAnnotation.value().equals(New.class))
+ {
+ final Set<Annotation> bindings = new HashSet<Annotation>(element.getBindings());
+ final New newNewAnnotation = new NewLiteral()
+ {
+
+ @Override
+ public Class<?> value()
+ {
+ return element.getJavaClass();
+ }
+
+ };
+ bindings.remove(originalNewAnnotation);
+ bindings.add(newNewAnnotation);
+ return new ForwardingResolvable()
+ {
+
+ @Override
+ protected Resolvable delegate()
+ {
+ return element;
+ }
+
+ @Override
+ public Set<Annotation> getBindings()
+ {
+ return bindings;
+ }
+
+ @Override
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+ {
+ if (annotationType.equals(New.class))
+ {
+ return annotationType.cast(newNewAnnotation);
+ }
+ else
+ {
+ return delegate().getAnnotation(annotationType);
+ }
+ }
+
+ };
+ }
+ }
+ return element;
+ }
+
+}
Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/NewResolvableTransformer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/Resolvable.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -21,20 +21,62 @@
import java.util.Set;
/**
- * Something that is resovable by the resolver
+ * Something that is resovable by the resolver. A resolvable is defined by it's
+ * bindings and type closure
*
* @author pmuir
- *
+ *
*/
public interface Resolvable
{
-
+
+ /**
+ * Get the bindings to use for resolution. @Current will be returned if no
+ * bindings were specified
+ *
+ * @return the bindings
+ */
public Set<Annotation> getBindings();
-
+
+ /**
+ * Check if an annotation is present
+ *
+ * @param annotationType the annotation type to look for
+ * @return true if it is present
+ */
public boolean isAnnotationPresent(Class<? extends Annotation> annotationType);
+ /**
+ * Get the instance of the Annotation
+ *
+ * @param <A> the type of the annotation
+ * @param annotationType the type of the annotation
+ * @return the annotation instance
+ */
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType);
+
+ /**
+ * Check if this resolvable's type closure includes the clazz passed as an
+ * argument
+ *
+ * @param clazz the class to check for
+ * @return true if clazz is present
+ */
public boolean isAssignableTo(Class<?> clazz);
-
+
+ /**
+ * The type closure of this resolvable
+ *
+ * @return
+ */
public Set<Type> getTypeClosure();
+ /**
+ * Get the underlying java class used to generate this resolvable, or null
+ * if no java class was used
+ *
+ * @return the java class
+ */
+ public Class<?> getJavaClass();
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ResolvableFactory.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -19,7 +19,9 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import org.jboss.webbeans.introspector.WBAnnotated;
@@ -59,7 +61,7 @@
{
private final Set<Annotation> bindings;
- private final Set<Class<? extends Annotation>> annotationTypes;
+ private final Map<Class<? extends Annotation>, Annotation> annotations;
private final Set<Type> typeClosure;
public ResolvableImpl(Set<Annotation> bindings, Set<Type> typeClosure)
@@ -69,11 +71,11 @@
{
this.bindings.add(new CurrentLiteral());
}
- this.annotationTypes = new HashSet<Class<? extends Annotation>>();
+ this.annotations = new HashMap<Class<? extends Annotation>, Annotation>();
this.typeClosure = typeClosure;
for (Annotation annotation : bindings)
{
- annotationTypes.add(annotation.annotationType());
+ annotations.put(annotation.annotationType(), annotation);
}
}
@@ -84,7 +86,7 @@
public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
{
- return annotationTypes.contains(annotationType);
+ return annotations.containsKey(annotationType);
}
public Set<Type> getTypeClosure()
@@ -96,6 +98,17 @@
{
return Reflections.isAssignableFrom(clazz, typeClosure);
}
+
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType)
+ {
+ return (A) annotations.get(annotationType);
+ }
+
+ public Class<?> getJavaClass()
+ {
+ // No underlying java class
+ return null;
+ }
@Override
public String toString()
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeBeanResolver.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -47,6 +47,7 @@
TRANSFORMERS = new HashSet<ResolvableTransformer>();
TRANSFORMERS.add(EventBean.TRANSFORMER);
TRANSFORMERS.add(InstanceBean.TRANSFORMER);
+ TRANSFORMERS.add(new NewResolvableTransformer());
}
public TypeSafeBeanResolver(BeanManagerImpl manager, Iterable<T> beans)
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/AccessibleManagerResolutionTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/AccessibleManagerResolutionTest.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/deployment/structure/AccessibleManagerResolutionTest.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,7 +1,11 @@
package org.jboss.webbeans.test.unit.deployment.structure;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.ContextualIdStore;
-import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
@@ -41,7 +45,7 @@
}
@Test
- public void testAccessibleSingleLevel()
+ public void testAccessibleDynamicallySingleLevel()
{
BeanManagerImpl root = BeanManagerImpl.newRootManager(services);
BeanManagerImpl child = BeanManagerImpl.newRootManager(services);
@@ -49,6 +53,7 @@
assert root.getBeans(Cow.class).size() == 1;
assert child.getBeans(Cow.class).size() == 0;
child.addAccessibleBeanManager(root);
+ Set<Bean<?>> beans = child.getBeans(Cow.class);
assert child.getBeans(Cow.class).size() == 1;
addBean(child, Chicken.class);
assert child.getBeans(Chicken.class).size() == 1;
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -19,7 +19,15 @@
public class NewEnterpriseBeanTest extends AbstractWebBeansTest
{
- private static final New NEW_LITERAL = new NewLiteral();
+ private static final New NEW_LITERAL = new NewLiteral()
+ {
+
+ public java.lang.Class<?> value()
+ {
+ return WrappedEnterpriseBean.class;
+ }
+
+ };
private EnterpriseBean<WrappedEnterpriseBeanLocal> wrappedEnterpriseBean;
private NewEnterpriseBean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
@@ -40,7 +48,7 @@
public void testNewBeanHasImplementationClassOfInjectionPointType()
{
initNewBean();
- assert newEnterpriseBean.getType().equals(WrappedEnterpriseBeanLocal.class);
+ assert newEnterpriseBean.getType().equals(WrappedEnterpriseBean.class);
}
@Test(groups = { "new" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -3,7 +3,7 @@
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.New;
-public class NewLiteral extends AnnotationLiteral<New> implements New
+public abstract class NewLiteral extends AnnotationLiteral<New> implements New
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -3,16 +3,17 @@
import java.lang.annotation.Annotation;
import java.util.Set;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.jsr299.tck.literals.CurrentLiteral;
import org.jboss.jsr299.tck.literals.NewLiteral;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -49,9 +50,18 @@
@SpecAssertion(section = "2.3.1", id = "a0")
public void testNewBindingAndAnyBindingMutualExclusive()
{
- Bean<OrderProcessor> order = getBeans(OrderProcessor.class, new NewLiteral()).iterator().next();
+ New newOrderProcessor = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return OrderProcessor.class;
+ }
+ };
+ assert getBeans(OrderProcessor.class, newOrderProcessor).size() == 1;
+ Bean<OrderProcessor> order = getBeans(OrderProcessor.class, newOrderProcessor).iterator().next();
assert order.getBindings().size() == 1;
- assert order.getBindings().iterator().next().equals(new NewLiteral());
+ assert order.getBindings().iterator().next().equals(newOrderProcessor);
}
@Test(groups = { "annotationDefinition", "rewrite" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,7 +1,10 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Local;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Local
public interface FoxLocal
{
@@ -19,5 +22,14 @@
public void disposeLitter(Litter litter);
public boolean isLitterDisposed();
+
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Fox.class;
+ }
+ };
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBeanLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBeanLocal.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/InitializerSimpleBeanLocal.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,10 +1,22 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Local;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Local
public interface InitializerSimpleBeanLocal
{
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return InitializerSimpleBean.class;
+ }
+ };
+
public void initializer();
public void businessMethod();
public int getInitializerCalls();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/LionLocal.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,9 +1,21 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Local;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Local
public interface LionLocal
{
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Lion.class;
+ }
+ };
+
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/MonkeyLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/MonkeyLocal.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/MonkeyLocal.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,9 +1,21 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Local;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Local
public interface MonkeyLocal
{
+
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Monkey.class;
+ }
+ };
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -7,7 +7,6 @@
import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.literals.NewLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -22,13 +21,13 @@
@SpecVersion("20090625")
public class NewEnterpriseBeanICTest extends AbstractJSR299Test
{
-
+
@Test(groups = { "new" })
@SpecAssertion(section = "3.10", id = "m")
public void testNewBeanHasSameInitializers()
{
InitializerSimpleBeanLocal bean = getInstanceByType(InitializerSimpleBeanLocal.class);
- InitializerSimpleBeanLocal newBean = getInstanceByType(InitializerSimpleBeanLocal.class,new NewLiteral());
+ InitializerSimpleBeanLocal newBean = getInstanceByType(InitializerSimpleBeanLocal.class, InitializerSimpleBeanLocal.NEW);
assert bean != newBean;
assert bean.getInitializerCalls() == 2;
}
@@ -44,7 +43,7 @@
public void testNewBeanHasNoProducerMethods() throws Exception
{
FoxLocal fox = getInstanceByType(FoxLocal.class);
- FoxLocal newFox = getInstanceByType(FoxLocal.class,new NewLiteral());
+ FoxLocal newFox = getInstanceByType(FoxLocal.class, FoxLocal.NEW);
fox.setNextLitterSize(3);
newFox.setNextLitterSize(5);
Litter theOnlyLitter = getInstanceByType(Litter.class,new AnnotationLiteral<Tame>(){});
@@ -56,7 +55,7 @@
public void testNewBeanHasNoDisposalMethods() throws Exception
{
FoxLocal fox = getInstanceByType(FoxLocal.class);
- FoxLocal newFox = getInstanceByType(FoxLocal.class,new NewLiteral());
+ FoxLocal newFox = getInstanceByType(FoxLocal.class, FoxLocal.NEW);
Set<Bean<Litter>> beans = getBeans(Litter.class, new AnnotationLiteral<Tame>() {});
assert beans.size() == 1;
Bean<Litter> litterBean = beans.iterator().next();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -12,7 +12,6 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.jsr299.tck.literals.CurrentLiteral;
-import org.jboss.jsr299.tck.literals.NewLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -34,29 +33,28 @@
@SpecAssertion(section = "3.10", id = "p")
public void testNewBeanIsDependentScoped()
{
- Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
assert beans.size() == 1;
newEnterpriseBean = beans.iterator().next();
assert Dependent.class.equals(newEnterpriseBean.getScopeType());
}
- @Test(groups = { "new", "broken" })
+ @Test(groups = { "new" })
@SpecAssertion(section = "3.10", id = "r")
- // @New has a member value now!
public void testNewBeanIsHasOnlyNewBinding()
{
- Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
assert beans.size() == 1;
newEnterpriseBean = beans.iterator().next();
assert newEnterpriseBean.getBindings().size() == 1;
- assert newEnterpriseBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType());
+ assert newEnterpriseBean.getBindings().iterator().next().annotationType().equals(New.class);
}
@Test(groups = { "new" })
@SpecAssertion(section = "3.10", id = "s")
public void testNewBeanHasNoBeanELName()
{
- Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
assert beans.size() == 1;
newEnterpriseBean = beans.iterator().next();
assert newEnterpriseBean.getName() == null;
@@ -67,7 +65,7 @@
public void testNewBeanHasNoStereotypes()
{
Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
- Bean<MonkeyLocal> newMonkeyBean = getBeans(MonkeyLocal.class, new NewLiteral()).iterator().next();
+ Bean<MonkeyLocal> newMonkeyBean = getBeans(MonkeyLocal.class, MonkeyLocal.NEW).iterator().next();
assert monkeyBean.getScopeType().equals(RequestScoped.class);
assert newMonkeyBean.getScopeType().equals(Dependent.class);
assert monkeyBean.getName().equals("monkey");
@@ -89,25 +87,25 @@
public void testForEachEnterpriseBeanANewBeanExists()
{
Bean<OrderLocal> orderBean = getBeans(OrderLocal.class).iterator().next();
- Bean<OrderLocal> newOrderBean = getBeans(OrderLocal.class, new NewLiteral()).iterator().next();
+ Bean<OrderLocal> newOrderBean = getBeans(OrderLocal.class, OrderLocal.NEW).iterator().next();
assert orderBean.getBindings().size() == 2;
assert orderBean.getBindings().contains(new CurrentLiteral());
assert orderBean.getBindings().contains(new AnyLiteral());
- assert getBeans(OrderLocal.class, new NewLiteral()).size() == 1;
+ assert getBeans(OrderLocal.class, OrderLocal.NEW).size() == 1;
assert newOrderBean.getBindings().size() == 1;
assert newOrderBean.getBindings().iterator().next().annotationType().equals(New.class);
assert orderBean.getTypes().equals(newOrderBean.getTypes());
Bean<LionLocal> lionBean = getBeans(LionLocal.class, TAME_LITERAL).iterator().next();
- Bean<LionLocal> newLionBean = getBeans(LionLocal.class, new NewLiteral()).iterator().next();
+ Bean<LionLocal> newLionBean = getBeans(LionLocal.class, LionLocal.NEW).iterator().next();
assert getBeans(LionLocal.class, TAME_LITERAL).size() == 1;
assert lionBean.getBindings().size() == 2;
assert lionBean.getBindings().contains(TAME_LITERAL);
assert lionBean.getBindings().contains(new AnyLiteral());
- assert getBeans(LionLocal.class, new NewLiteral()).size() == 1;
+ assert getBeans(LionLocal.class, LionLocal.NEW).size() == 1;
assert newLionBean.getBindings().size() == 1;
assert newLionBean.getBindings().iterator().next().annotationType().equals(New.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/OrderLocal.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,9 +1,21 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Local;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Local
public interface OrderLocal
{
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Order.class;
+ }
+ };
+
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,9 +1,21 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
import javax.ejb.Local;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Local
public interface WrappedEnterpriseBeanLocal
{
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return WrappedEnterpriseBean.class;
+ }
+ };
+
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/ExplicitContructorSimpleBean.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -4,7 +4,10 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Named;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@SessionScoped
@Named("Fred")
class ExplicitContructorSimpleBean implements Serializable
@@ -12,6 +15,15 @@
private static final long serialVersionUID = 1L;
private static int constructorCalls = 0;
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return ExplicitContructorSimpleBean.class;
+ }
+ };
+
public ExplicitContructorSimpleBean() {
constructorCalls++;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -2,11 +2,25 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.Produces;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@AnimalStereotype
class Fox
{
+
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Fox.class;
+ }
+
+ };
+
@Produces
private Den den = new Den("FoxDen");
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/InitializerSimpleBean.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -6,11 +6,25 @@
import javax.enterprise.inject.Current;
import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Named;
+import javax.enterprise.inject.New;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@SessionScoped
@Named("Charlie")
class InitializerSimpleBean implements Serializable
{
+
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return InitializerSimpleBean.class;
+ }
+
+ };
+
private static final long serialVersionUID = 1L;
private static int initializerCalls = 0;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Lion.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -1,7 +1,20 @@
package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+import javax.enterprise.inject.New;
+
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
@Tame
class Lion
{
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Lion.class;
+ }
+ };
+
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+
+import javax.enterprise.inject.New;
+
+/**
+ * @author pmuir
+ *
+ */
+public class NewLionConsumer
+{
+
+ @New Lion lion;
+
+ public Lion getLion()
+ {
+ return lion;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewLionConsumer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -13,7 +13,6 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
import org.jboss.jsr299.tck.literals.CurrentLiteral;
-import org.jboss.jsr299.tck.literals.NewLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -35,29 +34,28 @@
})
public void testNewBeanIsDependentScoped()
{
- Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
+ Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
assert beans.size() == 1;
Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
assert Dependent.class.equals(newSimpleBean.getScopeType());
}
- @Test(groups = { "new", "broken" })
+ @Test(groups = { "new" })
@SpecAssertion(section = "3.10", id = "r")
- // @New has a member value now!
public void testNewBeanHasOnlyNewBinding()
{
- Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
+ Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
assert beans.size() == 1;
Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
assert newSimpleBean.getBindings().size() == 1;
- assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType());
+ assert newSimpleBean.getBindings().iterator().next().annotationType().equals(New.class);
}
@Test(groups = { "new" })
@SpecAssertion(section = "3.10", id = "s")
public void testNewBeanHasNoBeanELName()
{
- Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, new NewLiteral());
+ Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
assert beans.size() == 1;
Bean<ExplicitContructorSimpleBean> newSimpleBean = beans.iterator().next();
assert newSimpleBean.getName() == null;
@@ -70,7 +68,7 @@
Bean<Fox> foxBean = getBeans(Fox.class).iterator().next();
assert foxBean.getScopeType().equals(RequestScoped.class);
assert foxBean.getName().equals("fox");
- Bean<Fox> newFoxBean = getBeans(Fox.class, new NewLiteral()).iterator().next();
+ Bean<Fox> newFoxBean = getBeans(Fox.class, Fox.NEW).iterator().next();
assert newFoxBean.getScopeType().equals(Dependent.class);
assert newFoxBean.getName() == null;
}
@@ -88,7 +86,7 @@
public void testNewBeanHasNoProducerFields() throws Exception
{
Fox fox = getInstanceByType(Fox.class);
- Fox newFox = getInstanceByType(Fox.class,new NewLiteral());
+ Fox newFox = getInstanceByType(Fox.class, Fox.NEW);
newFox.setDen(new Den("NewFoxDen"));
Den theOnlyDen = getInstanceByType(Den.class);
assert theOnlyDen.getName().equals(fox.getDen().getName());
@@ -99,7 +97,7 @@
public void testNewBeanHasNoProducerMethods() throws Exception
{
Fox fox = getInstanceByType(Fox.class);
- Fox newFox = getInstanceByType(Fox.class,new NewLiteral());
+ Fox newFox = getInstanceByType(Fox.class, Fox.NEW);
fox.setNextLitterSize(3);
newFox.setNextLitterSize(5);
Litter theOnlyLitter = getInstanceByType(Litter.class);
@@ -111,7 +109,7 @@
public void testNewBeanHasNoDisposerMethods() throws Exception
{
Fox fox = getInstanceByType(Fox.class);
- Fox newFox = getInstanceByType(Fox.class,new NewLiteral());
+ Fox newFox = getInstanceByType(Fox.class, Fox.NEW);
Bean<Litter> litterBean = getBeans(Litter.class).iterator().next();
CreationalContext<Litter> creationalContext = getCurrentManager().createCreationalContext(litterBean);
Litter litter = getInstanceByType(Litter.class);
@@ -128,18 +126,18 @@
assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().size() == 2;
assert getCurrentManager().getBeans(Order.class).iterator().next().getBindings().contains(new CurrentLiteral());
- assert getBeans(Order.class, new NewLiteral()).size() == 1;
- assert getBeans(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
- assert getBeans(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+ assert getBeans(Order.class, Order.NEW).size() == 1;
+ assert getBeans(Order.class, Order.NEW).iterator().next().getBindings().size() == 1;
+ assert getBeans(Order.class, Order.NEW).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).size() == 1;
assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 2;
assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().contains(TAME_LITERAL);
assert getCurrentManager().getBeans(Lion.class, TAME_LITERAL).iterator().next().getBindings().contains(new AnyLiteral());
- assert getBeans(Lion.class, new NewLiteral()).size() == 1;
- assert getBeans(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
- assert getBeans(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+ assert getBeans(Lion.class, Lion.NEW).size() == 1;
+ assert getBeans(Lion.class, Lion.NEW).iterator().next().getBindings().size() == 1;
+ assert getBeans(Lion.class, Lion.NEW).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
}
@Test(groups = { "new" })
@@ -148,7 +146,7 @@
{
ExplicitContructorSimpleBean.setConstructorCalls(0);
ExplicitContructorSimpleBean bean = getInstanceByType(ExplicitContructorSimpleBean.class);
- ExplicitContructorSimpleBean newBean = getInstanceByType(ExplicitContructorSimpleBean.class,new NewLiteral());
+ ExplicitContructorSimpleBean newBean = getInstanceByType(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
assert bean != newBean;
assert ExplicitContructorSimpleBean.getConstructorCalls() == 2;
}
@@ -160,7 +158,7 @@
InitializerSimpleBean.setInitializerCalls(0);
InitializerSimpleBean bean = getInstanceByType(InitializerSimpleBean.class);
bean.businessMethod(); // Cause proxy to initialize the bean
- InitializerSimpleBean newBean = getInstanceByType(InitializerSimpleBean.class,new NewLiteral());
+ InitializerSimpleBean newBean = getInstanceByType(InitializerSimpleBean.class, InitializerSimpleBean.NEW);
assert bean != newBean;
assert InitializerSimpleBean.getInitializerCalls() == 2;
}
@@ -170,8 +168,15 @@
public void testNewBeanHasSameInjectedFields()
{
Bean<InitializerSimpleBean> simpleBean = getBeans(InitializerSimpleBean.class).iterator().next();
- Bean<InitializerSimpleBean> newSimpleBean = getBeans(InitializerSimpleBean.class, new NewLiteral()).iterator().next();
+ Bean<InitializerSimpleBean> newSimpleBean = getBeans(InitializerSimpleBean.class, InitializerSimpleBean.NEW).iterator().next();
assert !newSimpleBean.getInjectionPoints().isEmpty();
assert simpleBean.getInjectionPoints().equals(newSimpleBean.getInjectionPoints());
}
+
+ @Test
+ @SpecAssertion(section="3.10", id="z")
+ public void testNewBeanWithNoMemberValue()
+ {
+ assert getInstanceByType(NewLionConsumer.class).getLion() instanceof Lion;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java 2009-08-12 13:34:36 UTC (rev 3467)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Order.java 2009-08-12 16:19:48 UTC (rev 3468)
@@ -2,9 +2,23 @@
import java.io.Serializable;
+import javax.enterprise.inject.New;
+
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
class Order implements Serializable
{
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return Order.class;
+ }
+
+ };
+
private static final long serialVersionUID = 1L;
public static boolean constructed = true;
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3467 - extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se.
by webbeans-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-08-12 09:34:36 -0400 (Wed, 12 Aug 2009)
New Revision: 3467
Modified:
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
Log:
Updated to latest SPI changes (WBRI-332)
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-08-12 12:14:14 UTC (rev 3466)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-08-12 13:34:36 UTC (rev 3467)
@@ -62,9 +62,9 @@
bootstrap.setEnvironment(Environments.SE);
bootstrap.getServices().add(Deployment.class, new SEWebBeansDeployment() {});
bootstrap.setApplicationContext(applicationBeanStore);
- bootstrap.initialize();
+ bootstrap.startContainer();
+ bootstrap.startInitialization().deployBeans().validateBeans().endInitialization();
this.manager = bootstrap.getManager();
- bootstrap.boot();
WebBeansManagerUtils.getInstanceByType(manager, ShutdownManager.class).
setBootstrap(bootstrap);
return this.manager;
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3466 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-12 08:14:14 -0400 (Wed, 12 Aug 2009)
New Revision: 3466
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/Horse.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
WBRI-318
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-08-11 20:18:25 UTC (rev 3465)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -77,6 +77,8 @@
{
beanNameDefaulted = true;
}
+ // Merge in inherited stereotypes
+ merge(stereotype.getInheritedSterotypes());
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-08-11 20:18:25 UTC (rev 3465)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -56,6 +56,8 @@
private boolean beanNameDefaulted;
// The interceptor bindings
private Set<Annotation> interceptorBindings;
+
+ private Set<Annotation> inheritedSterotypes;
/**
* Constructor
@@ -69,6 +71,7 @@
initDefaultScopeType();
initBeanNameDefaulted();
initInterceptorBindings();
+ initInheritedStereotypes();
checkBindings();
}
@@ -91,6 +94,11 @@
{
interceptorBindings = getAnnotatedAnnotation().getMetaAnnotations(InterceptorBindingType.class);
}
+
+ private void initInheritedStereotypes()
+ {
+ this.inheritedSterotypes = getAnnotatedAnnotation().getMetaAnnotations(Stereotype.class);
+ }
/**
* Initializes the bean name defaulted
@@ -206,5 +214,10 @@
{
return policy;
}
+
+ public Set<Annotation> getInheritedSterotypes()
+ {
+ return inheritedSterotypes;
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/Horse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/Horse.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/Horse.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.definition.stereotype.inheritance;
+
+/**
+ * @author pmuir
+ *
+ */
+@NamedRequestPolicyStereotype
+public class Horse
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/Horse.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.inheritance;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.stereotype.Stereotype;
+
+@Stereotype
+@NamedRequestStereotype
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Policy
+@Inherited
+@interface NamedRequestPolicyStereotype
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.inheritance;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.stereotype.Stereotype;
+
+@Stereotype
+@NamedStereotype
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@RequestScoped
+@Inherited
+@interface NamedRequestStereotype
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.inheritance;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.stereotype.Stereotype;
+
+@Stereotype
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Named
+@Inherited
+@interface NamedStereotype
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/NamedStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-08-12 12:14:14 UTC (rev 3466)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.definition.stereotype.inheritance;
+
+import java.util.Set;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+@Artifact
+@BeansXml("beans.xml")
+@SpecVersion("20090625")
+public class StereotypeInheritenceTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertions( {
+ @SpecAssertion(section = "2.7.1.5", id = "a"),
+ @SpecAssertion(section = "2.7.1.5", id = "b")
+ })
+ public void testInheritence()
+ {
+ Set<Bean<Horse>> beans = getBeans(Horse.class);
+ assert beans.size() == 1;
+ Bean<Horse> bean = beans.iterator().next();
+ assert bean.getScopeType().equals(RequestScoped.class);
+ assert bean.isPolicy();
+ assert bean.getName().equals("horse");
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml 2009-08-12 12:14:14 UTC (rev 3466)
@@ -0,0 +1,5 @@
+<beans>
+ <policies>
+ <class>org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.NamedRequestPolicyStereotype</class>
+ </policies>
+</beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-11 20:18:25 UTC (rev 3465)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-12 12:14:14 UTC (rev 3466)
@@ -467,22 +467,11 @@
<text>Stereotype declarations are transitive - a stereotype declared by a second stereotype is inherited by all beans and other stereotypes that declare the second stereotype.</text>
</assertion>
- <assertion id="c" >
- <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target({TYPE, METHOD, FIELD})|.</text>
+ <assertion id="c" testable="false">
+ <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target({TYPE, METHOD, FIELD})|, |@Target(METHOD)|, |@Target(FIELD)|, |@Target({METHOD, FIELD})|.</text>
+ <note>No definition of what happens if you do this</note>
</assertion>
- <assertion id="d">
- <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target(METHOD)|.</text>
- </assertion>
-
- <assertion id="e">
- <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target(FIELD)|.</text>
- </assertion>
-
- <assertion id="f">
- <text>Stereotypes declared |@Target(TYPE)| may not be applied to stereotypes declared |@Target({METHOD, FIELD})|.</text>
- </assertion>
-
</section>
<section id="2.7.2" title="Declaring the stereotypes for a bean">
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3465 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 16:18:25 -0400 (Tue, 11 Aug 2009)
New Revision: 3465
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
Log:
WBRI-343
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 16:09:30 UTC (rev 3464)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 20:18:25 UTC (rev 3465)
@@ -278,6 +278,10 @@
}
for (Class<?> clazz : beanManager.getEnabledDecoratorClasses())
{
+ if (beanManager.getEnabledDecoratorClasses().indexOf(clazz) < beanManager.getEnabledDecoratorClasses().lastIndexOf(clazz))
+ {
+ throw new DeploymentException("Enabled decorator class" + clazz + " specified twice");
+ }
if (!decoratorBeanClasses.contains(clazz))
{
throw new DeploymentException("Enabled decorator class " + clazz + " is not the bean class of at least one decorator bean (detected decorator beans " + decoratorBeanClasses + ")");
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-08-11 16:09:30 UTC (rev 3464)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-08-11 20:18:25 UTC (rev 3465)
@@ -19,7 +19,7 @@
@SpecVersion("20090625")
public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
- @Test(groups = { "ri-broken" })
+ @Test
@SpecAssertion(section="8.2", id="bc")
public void testDecoratorListedTwiceInBeansXmlNotOK()
{
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3464 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: finalProducerFieldNotPassivationCapable and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 12:09:30 -0400 (Tue, 11 Aug 2009)
New Revision: 3464
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/Broken_Record.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/RecordProducer.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/Broken_Record.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/RecordProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
Log:
Fix a few tests
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/Broken_Record.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/Broken_Record.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/Broken_Record.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable;
+
+final class Broken_Record
+{
+ public Broken_Record() {}
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/Broken_Record.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -0,0 +1,33 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+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.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@SpecVersion("20090625")
+(a)ExpectedDeploymentException(DeploymentError.class)
+public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
+{
+ @Test(groups = { "passivation", "ri-wrong-cause" })
+ @SpecAssertions({
+ @SpecAssertion(section = "6.6.1", id = "db")
+ })
+ // TODO RI is causing a deployement problem, but for the wrong reason
+ public void testNonPassivationCapableProducerFieldNotOk()
+ {
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/RecordProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/RecordProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/RecordProducer.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.finalProducerFieldNotPassivationCapable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+class RecordProducer
+{
+ public @RequestScoped @Produces Broken_Record record = new Broken_Record();
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/RecordProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/Broken_Record.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/Broken_Record.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/Broken_Record.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField;
-class Broken_Record
+final class Broken_Record
{
- public Broken_Record(String foo) {}
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -1,5 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerField;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -18,15 +19,13 @@
@Packaging(PackagingType.EAR)
@SpecVersion("20090625")
@ExpectedDeploymentException(DeploymentError.class)
-public class NonPassivationCapableProducerFieldTest
+public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-broken" })
+ @Test(groups = { "passivation", "ri-wrong-cause" })
@SpecAssertions({
- @SpecAssertion(section = "6.6.1", id = "db"),
- @SpecAssertion(section = "6.6.3", id = "a"),
- @SpecAssertion(section = "6.6.3", id = "b"),
@SpecAssertion(section = "6.6.4", id = "d")
})
+ // TODO RI is erroring, but for the wrong reason
public void testNonPassivationCapableProducerFieldNotOk()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/RecordProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/RecordProducer.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/RecordProducer.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -4,5 +4,5 @@
class RecordProducer
{
- public final @Produces @FooScoped Broken_Record record = new Broken_Record(null);
+ public @Produces @FooScoped Broken_Record record = new Broken_Record();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/Broken_Record.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod;
-class Broken_Record
+final class Broken_Record
{
- public Broken_Record(String foo) {}
+ public Broken_Record() {}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -1,5 +1,6 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivationCapableProducerMethod;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -18,13 +19,14 @@
@Packaging(PackagingType.EAR)
@SpecVersion("20090625")
@ExpectedDeploymentException(DeploymentError.class)
-public class NonPassivationCapableProducerMethodTest
+public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test
{
- @Test(groups = { "passivation", "ri-broken" })
+ @Test(groups = { "passivation", "ri-wrong-cause" })
@SpecAssertions({
@SpecAssertion(section = "6.6.1", id = "cb"),
@SpecAssertion(section = "6.6.4", id = "ca")
})
+ // TODO Test passes, but with wrong exception
public void testNonPassivationCapableProducerMethodNotOk()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/RecordProducer.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -7,6 +7,6 @@
{
public final @Produces @SessionScoped Broken_Record getRecord()
{
- return new Broken_Record(null);
+ return new Broken_Record();
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-08-11 15:54:22 UTC (rev 3463)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-08-11 16:09:30 UTC (rev 3464)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingManagedBeanWithNonPassivatingBeanConstructor;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3463 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/context/passivating/broken and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 11:54:22 -0400 (Tue, 11 Aug 2009)
New Revision: 3463
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-08-11 15:50:07 UTC (rev 3462)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/BrokenDecorator.java 2009-08-11 15:54:22 UTC (rev 3463)
@@ -1,11 +1,13 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator;
+import java.io.Serializable;
+
import javax.decorator.Decorates;
import javax.decorator.Decorator;
import javax.enterprise.inject.Current;
@Decorator
-class BrokenDecorator implements EspooLocal_Broken
+class BrokenDecorator implements EspooLocal_Broken, Serializable
{
@Decorates EspooLocal_Broken espooLocal;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-08-11 15:50:07 UTC (rev 3462)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-08-11 15:54:22 UTC (rev 3463)
@@ -8,15 +8,17 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
@SpecVersion("20090625")
+@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @Test(groups = { "contexts", "passivation"})
@SpecAssertion(section = "6.6.4", id = "bdd")
public void testSessionBeanWithNonPassivatingInjectedFieldInDecoratorFails()
{
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml 2009-08-11 15:54:22 UTC (rev 3463)
@@ -0,0 +1,5 @@
+<beans>
+ <decorators>
+ <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator.BrokenDecorator</decorator>
+ </decorators>
+</beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml 2009-08-11 15:54:22 UTC (rev 3463)
@@ -0,0 +1,5 @@
+<beans>
+ <decorators>
+ <decorator>org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInjectedFieldInDecorator.BrokenDecorator</decorator>
+ </decorators>
+</beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3462 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: enterpriseBeanWithNonPassivatingInitializerInDecorator and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 11:50:07 -0400 (Tue, 11 Aug 2009)
New Revision: 3462
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerFieldInDecoratorTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/District.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EspooLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/Espoo_Broken.java
Log:
Fix test
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator (from rev 3453, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator/BrokenDecorator.java 2009-08-11 12:33:36 UTC (rev 3453)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/BrokenDecorator.java 2009-08-11 15:50:07 UTC (rev 3462)
@@ -1,12 +1,14 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerFieldInDecorator;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator;
+import java.io.Serializable;
+
import javax.decorator.Decorates;
import javax.decorator.Decorator;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.Initializer;
@Decorator
-class BrokenDecorator implements EspooLocal_Broken
+class BrokenDecorator implements EspooLocal_Broken, Serializable
{
@Decorates EspooLocal_Broken espooLocal;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/District.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator/District.java 2009-08-11 12:33:36 UTC (rev 3453)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/District.java 2009-08-11 15:50:07 UTC (rev 3462)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerFieldInDecorator;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator;
import javax.enterprise.context.Dependent;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerFieldInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator/EnterpriseBeanWithNonPassivatingInitializerFieldInDecoratorTest.java 2009-08-11 12:33:36 UTC (rev 3453)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerFieldInDecoratorTest.java 2009-08-11 15:50:07 UTC (rev 3462)
@@ -1,26 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerFieldInDecorator;
-
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
-import org.jboss.test.audit.annotations.SpecAssertion;
-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.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion("20090625")
-public class EnterpriseBeanWithNonPassivatingInitializerFieldInDecoratorTest extends AbstractJSR299Test
-{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
- @SpecAssertion(section = "6.6.4", id = "bdf")
- public void testSessionBeanWithNonPassivatingInitializerFieldInDecoratorFails()
- {
- assert false;
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-08-11 15:50:07 UTC (rev 3462)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+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.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+(a)ExpectedDeploymentException(DeploymentError.class)
+@SpecVersion("20090625")
+@BeansXml("beans.xml")
+public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test
+{
+ @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @SpecAssertion(section = "6.6.4", id = "bdf")
+ public void testSessionBeanWithNonPassivatingInitializerFieldInDecoratorFails()
+ {
+ assert false;
+ }
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EspooLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator/EspooLocal_Broken.java 2009-08-11 12:33:36 UTC (rev 3453)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EspooLocal_Broken.java 2009-08-11 15:50:07 UTC (rev 3462)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerFieldInDecorator;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator;
import javax.ejb.Local;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerFieldInDecorator/Espoo_Broken.java 2009-08-11 12:33:36 UTC (rev 3453)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/Espoo_Broken.java 2009-08-11 15:50:07 UTC (rev 3462)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerFieldInDecorator;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerInDecorator;
import javax.ejb.Remove;
import javax.ejb.Stateful;
14 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3461 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 11:30:08 -0400 (Tue, 11 Aug 2009)
New Revision: 3461
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
Log:
Really fix the test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-08-11 15:28:34 UTC (rev 3460)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-08-11 15:30:08 UTC (rev 3461)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.testharness.api.DeploymentException;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-(a)ExpectedDeploymentException(DeploymentException.class)
+(a)ExpectedDeploymentException(DeploymentError.class)
@SpecVersion("20090625")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
14 years, 9 months
- 1
- 0