[webbeans-commits] Webbeans SVN: r1022 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-01-16 12:05:57 -0500 (Fri, 16 Jan 2009)
New Revision: 1022
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
Log:
Changed getConstructor to always return a matching constructor even if it is not accessible.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-16 16:57:11 UTC (rev 1021)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-16 17:05:57 UTC (rev 1022)
@@ -214,7 +214,7 @@
{
try
{
- return clazz.getConstructor(parameterTypes);
+ return clazz.getDeclaredConstructor(parameterTypes);
}
catch (NoSuchMethodException e)
{
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1021 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 11:57:11 -0500 (Fri, 16 Jan 2009)
New Revision: 1021
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java
Log:
Port instantiation by name tests
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2009-01-16 16:41:52 UTC (rev 1020)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -1,100 +0,0 @@
-package org.jboss.webbeans.test;
-
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedField;
-import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
-import org.jboss.webbeans.introspector.jlr.AnnotatedFieldImpl;
-import org.jboss.webbeans.test.beans.Cod;
-import org.jboss.webbeans.test.beans.FishFarm;
-import org.jboss.webbeans.test.beans.Haddock;
-import org.jboss.webbeans.test.beans.Plaice;
-import org.jboss.webbeans.test.beans.Salmon;
-import org.jboss.webbeans.test.beans.ScottishFish;
-import org.jboss.webbeans.test.beans.SeaBass;
-import org.jboss.webbeans.test.beans.Sole;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.testng.annotations.Test;
-
-@SpecVersion("20081206")
-public class InstantiationByNameTest extends AbstractTest
-{
-
- private AnnotatedClass<FishFarm> fishFarmClass = new AnnotatedClassImpl<FishFarm>(FishFarm.class);
-
- @Test(groups="resolution") @SpecAssertion(section="4.10")
- public void testNoWebBeansFound() throws Exception
- {
- AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
- manager.addBean(codBean);
- manager.addBean(salmonBean);
-
- assert manager.getInstanceByName("foo") == null;
- }
-
- @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="4.10.1")
- public void testAmbiguousDependencies() throws Exception
- {
- AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
- Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager);
- manager.addBean(codBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
-
- manager.getInstanceByName("whitefish");
- }
-
- @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.10.1")
- public void testGetInstanceByName()
- {
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
- Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager);
- Bean<SeaBass> seaBassBean = SimpleBean.of(SeaBass.class, manager);
- Bean<Haddock> haddockBean = SimpleBean.of(Haddock.class, manager);
- Bean<Plaice> plaiceBean = SimpleBean.of(Plaice.class, manager);
-
- manager.addBean(tunaBean);
- manager.addBean(codBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
- manager.addBean(haddockBean);
- manager.addBean(seaBassBean);
- manager.addBean(plaiceBean);
-
- try
- {
- activateDependentContext();
- assert manager.getInstanceByName("salmon") instanceof Salmon;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="4.10")
- public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression()
- {
- assert false;
- }
-
- /*
-
- @Test(groups="el") @SpecAssertion(section="4.10")
- public void test
- {
- assert false;
- }
-
- */
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+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.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,24 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+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.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Chunky
+{
+
+ boolean realChunky();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Whitefish
+@Chunky(realChunky=true)
+@Named("whitefish")
+class Cod implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Named
+class Haddock implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,85 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.AmbiguousDependencyException;
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.tests.AbstractTest;
+import org.testng.annotations.Test;
+
+@SpecVersion("20081206")
+public class InstantiationByNameTest extends AbstractTest
+{
+
+ @Test(groups="resolution") @SpecAssertion(section="4.10")
+ public void testNoWebBeansFound() throws Exception
+ {
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+
+ assert manager.getInstanceByName("foo") == null;
+ }
+
+ @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="4.10.1")
+ public void testAmbiguousDependencies() throws Exception
+ {
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = getSimpleBean(Sole.class);
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+
+ manager.getInstanceByName("whitefish");
+ }
+
+ @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.10.1")
+ public void testGetInstanceByName()
+ {
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = getSimpleBean(Sole.class);
+ Bean<SeaBass> seaBassBean = getSimpleBean(SeaBass.class);
+ Bean<Haddock> haddockBean = getSimpleBean(Haddock.class);
+ Bean<Plaice> plaiceBean = getSimpleBean(Plaice.class);
+
+ manager.addBean(tunaBean);
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+ manager.addBean(haddockBean);
+ manager.addBean(seaBassBean);
+ manager.addBean(plaiceBean);
+
+ try
+ {
+ activateDependentContext();
+ assert manager.getInstanceByName("salmon") instanceof Salmon;
+ }
+ finally
+ {
+ deactivateDependentContext();
+ }
+ }
+
+ @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="4.10")
+ public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression()
+ {
+ assert false;
+ }
+
+ /*
+
+ @Test(groups="el") @SpecAssertion(section="4.10")
+ public void test
+ {
+ assert false;
+ }
+
+ */
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.Named;
+
+@AnotherDeploymentType
+@Whitefish
+@Named("whitefish")
+final class Plaice implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Named
+class Salmon implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,7 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+
+interface ScottishFish extends Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.Production;
+import javax.webbeans.RequestScoped;
+
+@Production
+@RequestScoped
+class SeaBass implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Whitefish
+@Named("whitefish")
+class Sole implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+class Tuna
+{
+
+ public String getName()
+ {
+ return "Ophir";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java 2009-01-16 16:57:11 UTC (rev 1021)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+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.webbeans.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Whitefish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1020 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 11:41:52 -0500 (Fri, 16 Jan 2009)
New Revision: 1020
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/DeferredEventNotificationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouseProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouse_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Fox.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FoxRun.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderNest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/TunaFarm.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java
Log:
port injection tests (one broken, david is working on a fix)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java 2009-01-16 15:04:20 UTC (rev 1019)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanValidation.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -45,6 +45,8 @@
*
* @param beans The beans to validate
*/
+ // TODO THIS SHOULD NOT BE A STATIC UTITLITY CLASS
+ @Deprecated
public static void validate(List<Bean<?>> beans)
{
for (Bean<?> bean : beans)
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2009-01-16 15:04:20 UTC (rev 1019)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -1,81 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.util.Arrays;
-
-import javax.webbeans.Observes;
-import javax.webbeans.Standard;
-
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.introspector.AnnotatedMethod;
-import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
-import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl;
-import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
-import org.jboss.webbeans.test.annotations.Asynchronous;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for the deferred event notification object used to delay
- * notification till the end of a transaction.
- *
- * @author David Allen
- *
- */
-public class DeferredEventNotificationTest extends AbstractTest
-{
-
- public class Event
- {
- // Simple class used for testing
- }
-
- @Override
- protected void addStandardDeploymentTypesForTests()
- {
- manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, AnotherDeploymentType.class));
- }
-
- public class AnObserver
- {
- protected boolean notified = false;
-
- public void observe(@Observes @Asynchronous Event e)
- {
- // An observer method
- this.notified = true;
- }
- }
-
- /**
- * Test method for
- * {@link org.jboss.webbeans.event.DeferredEventNotification#beforeCompletion()}
- * .
- */
- @Test(groups={"deferredEvent", "broken"})
- public final void testBeforeCompletion() throws Exception
- {
- // When the transaction is committed, the beforeCompletion() method is
- // invoked which in turn invokes the observer. Here the mock observer
- // is used to keep track of the event being fired.
- SimpleBean<Tuna> tuna;
- AnnotatedMethod<Object> om;
-
-
- // Create an observer with known binding types
- //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral());
- //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, annotations);
- // TODO This should test a real class
- tuna = SimpleBean.of(Tuna.class, manager);
- om = new AnnotatedMethodImpl<Object>(AnObserver.class.getMethod("observe", new Class[] { Event.class }), new AnnotatedClassImpl<AnObserver>(AnObserver.class));
-
- AnObserver observerInstance = new AnObserver();
- // TODO Fix this Observer<Event> observer = new MockObserverImpl<Event>(tuna, om, Event.class);
- //((MockObserverImpl<Event>) observer).setInstance(observerInstance);
- Event event = new Event();
- //DeferredEventNotification<Event> deferredNotification = new DeferredEventNotification<Event>(event, observer);
- //deferredNotification.beforeCompletion();
- assert observerInstance.notified;
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2009-01-16 15:04:20 UTC (rev 1019)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -1,139 +0,0 @@
-package org.jboss.webbeans.test;
-
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.NonexistentFieldException;
-import javax.webbeans.NullableDependencyException;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.bean.AbstractProducerBean;
-import org.jboss.webbeans.bean.ProducerMethodBean;
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.context.RequestContext;
-import org.jboss.webbeans.test.beans.Fox;
-import org.jboss.webbeans.test.beans.FoxRun;
-import org.jboss.webbeans.test.beans.SpiderNest;
-import org.jboss.webbeans.test.beans.SpiderProducer;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.jboss.webbeans.test.beans.TunaFarm;
-import org.jboss.webbeans.test.beans.broken.BeanWithFinalBoundField;
-import org.jboss.webbeans.test.beans.broken.BeanWithStaticBoundField;
-import org.jboss.webbeans.test.beans.broken.FarmHouse;
-import org.jboss.webbeans.test.beans.broken.FarmHouseProducer;
-import org.jboss.webbeans.util.BeanValidation;
-import org.testng.annotations.Test;
-
-@SpecVersion("20081206")
-public class InjectionTests extends AbstractTest
-{
-
- @Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.2")
- public void testInjectionPerformsBoxingIfNecessary() throws Exception
- {
- SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(spiderProducer);
- Bean<SpiderNest> spiderNestBean = SimpleBean.of(SpiderNest.class, manager);
- manager.addBean(ProducerMethodBean.of(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer, manager));
- SpiderNest spiderNest = spiderNestBean.create();
- assert spiderNest.numberOfSpiders != null;
- assert spiderNest.numberOfSpiders.equals(4);
- }
-
- @Test(groups = { "injection", "producerMethod" }, expectedExceptions = NullableDependencyException.class)
- @SpecAssertion(section = "5.2")
- public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
- {
- registerProducerBean(FarmHouseProducer.class, "getNumberOfBedrooms", Integer.class);
- manager.addBean(SimpleBean.of(FarmHouse.class, manager));
- BeanValidation.validate(manager.getBeans());
- }
-
- @Test(groups = { "injection", "clientProxy" }, expectedExceptions = ContextNotActiveException.class)
- @SpecAssertion(section = "5.3")
- public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
- {
- SimpleBean<TunaFarm> tunaFarmBean = SimpleBean.of(TunaFarm.class, manager);
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- manager.addBean(tunaBean);
- TunaFarm tunaFarm = tunaFarmBean.create();
- assert tunaFarm.tuna != null;
- RequestContext requestContext = (RequestContext) manager.getContext(RequestScoped.class);
- requestContext.setActive(false);
- tunaFarm.tuna.getName();
- }
-
- @Test(groups = "injection")
- @SpecAssertion(section = "5.3")
- public void testInvokeDependentScopeWhenContextNotActive()
- {
- Bean<FoxRun> foxRunBean = SimpleBean.of(FoxRun.class, manager);
- Bean<Fox> foxBean = SimpleBean.of(Fox.class, manager);
- manager.addBean(foxBean);
- FoxRun foxRun = foxRunBean.create();
- assert foxRun.fox.getName().equals("gavin");
- }
-
- @Test(groups = "injection", expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.7")
- public void testInjectingStaticField()
- {
- SimpleBean<BeanWithStaticBoundField> bean = SimpleBean.of(BeanWithStaticBoundField.class, manager);
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- manager.addBean(tunaBean);
- BeanWithStaticBoundField instance = bean.create();
- }
-
- @Test(groups = "injection", expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.7")
- public void testInjectingFinalField()
- {
- SimpleBean<BeanWithFinalBoundField> bean = SimpleBean.of(BeanWithFinalBoundField.class, manager);
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- manager.addBean(tunaBean);
- BeanWithFinalBoundField instance = bean.create();
- }
-
- @Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
- public void testInjectFieldsDeclaredInXml()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
- public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
- public void testInjectedFieldDeclaredInXmlAssumesCurrent()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = NonexistentFieldException.class)
- @SpecAssertion(section = "3.7.2")
- public void testNonexistentFieldDefinedInXml()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
- public void testInjectFieldsDeclaredInXmlAndJava()
- {
- assert false;
- }
-
- /*
- *
- * @Test(groups="injection") @SpecAssertion(section="4.2") public void test {
- * assert false; }
- */
-
-}
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/DeferredEventNotificationTest.java (from rev 1017, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/DeferredEventNotificationTest.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/DeferredEventNotificationTest.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,82 @@
+package org.jboss.webbeans.test.unit;
+
+import java.util.Arrays;
+
+import javax.webbeans.Observes;
+import javax.webbeans.Standard;
+
+import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
+import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
+import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl;
+import org.jboss.webbeans.test.AbstractTest;
+import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
+import org.jboss.webbeans.test.annotations.Asynchronous;
+import org.jboss.webbeans.test.beans.Tuna;
+import org.testng.annotations.Test;
+
+/**
+ * Unit tests for the deferred event notification object used to delay
+ * notification till the end of a transaction.
+ *
+ * @author David Allen
+ *
+ */
+public class DeferredEventNotificationTest extends AbstractTest
+{
+
+ public class Event
+ {
+ // Simple class used for testing
+ }
+
+ @Override
+ protected void addStandardDeploymentTypesForTests()
+ {
+ manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, AnotherDeploymentType.class));
+ }
+
+ public class AnObserver
+ {
+ protected boolean notified = false;
+
+ public void observe(@Observes @Asynchronous Event e)
+ {
+ // An observer method
+ this.notified = true;
+ }
+ }
+
+ /**
+ * Test method for
+ * {@link org.jboss.webbeans.event.DeferredEventNotification#beforeCompletion()}
+ * .
+ */
+ @Test(groups={"deferredEvent", "broken"})
+ public final void testBeforeCompletion() throws Exception
+ {
+ // When the transaction is committed, the beforeCompletion() method is
+ // invoked which in turn invokes the observer. Here the mock observer
+ // is used to keep track of the event being fired.
+ SimpleBean<Tuna> tuna;
+ AnnotatedMethod<Object> om;
+
+
+ // Create an observer with known binding types
+ //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
+ //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral());
+ //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, annotations);
+ // TODO This should test a real class
+ tuna = SimpleBean.of(Tuna.class, manager);
+ om = new AnnotatedMethodImpl<Object>(AnObserver.class.getMethod("observe", new Class[] { Event.class }), new AnnotatedClassImpl<AnObserver>(AnObserver.class));
+
+ AnObserver observerInstance = new AnObserver();
+ // TODO Fix this Observer<Event> observer = new MockObserverImpl<Event>(tuna, om, Event.class);
+ //((MockObserverImpl<Event>) observer).setInstance(observerInstance);
+ Event event = new Event();
+ //DeferredEventNotification<Event> deferredNotification = new DeferredEventNotification<Event>(event, observer);
+ //deferredNotification.beforeCompletion();
+ assert observerInstance.notified;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/DeferredEventNotificationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/AnotherDeploymentType.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+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.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Current;
+
+class BeanWithFinalBoundField_Broken
+{
+
+ @Current
+ public final Tuna tuna = null;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithFinalBoundField_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Current;
+
+class BeanWithStaticBoundField_Broken
+{
+
+ @Current
+ public static Tuna tuna;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/BeanWithStaticBoundField_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouseProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouseProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouseProducer_Broken.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Produces;
+
+class FarmHouseProducer_Broken
+{
+
+ @Produces public Integer getNumberOfBedrooms()
+ {
+ return null;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouseProducer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouse_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouse_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouse_Broken.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Current;
+
+class FarmHouse_Broken
+{
+
+ @Current
+ public int noOfBedrooms;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FarmHouse_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Fox.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Fox.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Dependent;
+
+@Dependent
+class Fox
+{
+
+ public String getName()
+ {
+ return "gavin";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Fox.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FoxRun.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FoxRun.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FoxRun.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Current;
+
+class FoxRun
+{
+
+ @Current
+ public Fox fox;
+
+ @Current
+ public Fox anotherFox;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/FoxRun.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,136 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.webbeans.ContextNotActiveException;
+import javax.webbeans.DefinitionException;
+import javax.webbeans.NonexistentFieldException;
+import javax.webbeans.NullableDependencyException;
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.tests.AbstractTest;
+import org.testng.annotations.Test;
+
+@SpecVersion("20081206")
+public class InjectionTest extends AbstractTest
+{
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes();
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ @Test(groups = { "injection", "producerMethod" })
+ @SpecAssertion(section = "5.2")
+ public void testInjectionPerformsBoxingIfNecessary() throws Exception
+ {
+ Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class);
+ manager.addBean(spiderProducer);
+ Bean<SpiderNest> spiderNestBean = getSimpleBean(SpiderNest.class);
+ manager.addBean(getProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer));
+ SpiderNest spiderNest = spiderNestBean.create();
+ assert spiderNest.numberOfSpiders != null;
+ assert spiderNest.numberOfSpiders.equals(4);
+ }
+
+ @Test(groups = { "injection", "producerMethod" }, expectedExceptions = NullableDependencyException.class)
+ @SpecAssertion(section = "5.2")
+ public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
+ {
+ deployBeans(FarmHouseProducer_Broken.class, FarmHouse_Broken.class);
+ }
+
+ @Test(groups = { "injection", "clientProxy" }, expectedExceptions = ContextNotActiveException.class)
+ @SpecAssertion(section = "5.3")
+ public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
+ {
+ Bean<TunaFarm> tunaFarmBean = getSimpleBean(TunaFarm.class);
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ manager.addBean(tunaBean);
+ TunaFarm tunaFarm = tunaFarmBean.create();
+ assert tunaFarm.tuna != null;
+ configuration().getContexts().setActive(configuration().getContexts().getRequestContext());
+ tunaFarm.tuna.getName();
+ }
+
+ @Test(groups = "injection")
+ @SpecAssertion(section = "5.3")
+ public void testInvokeDependentScopeWhenContextNotActive()
+ {
+ Bean<FoxRun> foxRunBean = getSimpleBean(FoxRun.class);
+ Bean<Fox> foxBean = getSimpleBean(Fox.class);
+ manager.addBean(foxBean);
+ FoxRun foxRun = foxRunBean.create();
+ assert foxRun.fox.getName().equals("gavin");
+ }
+
+ @Test(groups = "injection", expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "3.7")
+ public void testInjectingStaticField()
+ {
+ Bean<BeanWithStaticBoundField_Broken> bean = getSimpleBean(BeanWithStaticBoundField_Broken.class);
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ manager.addBean(tunaBean);
+ bean.create();
+ }
+
+ @Test(groups = "injection", expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "3.7")
+ public void testInjectingFinalField()
+ {
+ Bean<BeanWithFinalBoundField_Broken> bean = getSimpleBean(BeanWithFinalBoundField_Broken.class);
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ manager.addBean(tunaBean);
+ bean.create();
+ }
+
+ @Test(groups = { "stub", "injection", "webbeansxml" })
+ @SpecAssertion(section = "3.7.2")
+ public void testInjectFieldsDeclaredInXml()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "stub", "injection", "webbeansxml" })
+ @SpecAssertion(section = "3.7.2")
+ public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "stub", "injection", "webbeansxml" })
+ @SpecAssertion(section = "3.7.2")
+ public void testInjectedFieldDeclaredInXmlAssumesCurrent()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = NonexistentFieldException.class)
+ @SpecAssertion(section = "3.7.2")
+ public void testNonexistentFieldDefinedInXml()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "stub", "injection", "webbeansxml" })
+ @SpecAssertion(section = "3.7.2")
+ public void testInjectFieldsDeclaredInXmlAndJava()
+ {
+ assert false;
+ }
+
+ /*
+ *
+ * @Test(groups="injection") @SpecAssertion(section="4.2") public void test {
+ * assert false; }
+ */
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderNest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderNest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderNest.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Initializer;
+
+class SpiderNest
+{
+
+ public Integer numberOfSpiders;
+
+ @Initializer
+ public SpiderNest(Integer numberOfSpiders)
+ {
+ this.numberOfSpiders = numberOfSpiders;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderNest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderProducer.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Produces;
+
+@AnotherDeploymentType
+class SpiderProducer
+{
+
+ @Produces public int getWolfSpiderSize()
+ {
+ return 4;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/SpiderProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Tuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Tuna.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+class Tuna
+{
+
+ public String getName()
+ {
+ return "Ophir";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/Tuna.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/TunaFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/TunaFarm.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/TunaFarm.java 2009-01-16 16:41:52 UTC (rev 1020)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.tck.tests.lookup.injection;
+
+import javax.webbeans.Current;
+import javax.webbeans.Production;
+
+@Production
+class TunaFarm
+{
+
+ @SuppressWarnings("unused")
+ @Current
+ public Tuna tuna;
+
+ public Tuna notInjectedTuna = new Tuna();
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/TunaFarm.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1019 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 10:04:20 -0500 (Fri, 16 Jan 2009)
New Revision: 1019
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
Log:
Remove client proxy tests
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2009-01-16 15:02:47 UTC (rev 1018)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2009-01-16 15:04:20 UTC (rev 1019)
@@ -1,92 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.io.IOException;
-
-import javax.webbeans.DefinitionException;
-import javax.webbeans.UnproxyableDependencyException;
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.beans.Fox;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.jboss.webbeans.test.beans.TunedTuna;
-import org.jboss.webbeans.test.beans.broken.FinalTuna;
-import org.jboss.webbeans.util.Reflections;
-import org.testng.annotations.Test;
-
-@SpecVersion("20081206")
-public class ClientProxyTest extends AbstractTest
-{
-
- @Test(groups = "Reflections")
- @SpecAssertion(section = { "5.4" })
- public void testClientProxyUsedForNormalScope()
- {
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- manager.addBean(tunaBean);
- Tuna tuna = manager.getInstance(tunaBean);
- assert Reflections.isProxy(tuna);
- }
-
- @Test(groups = "Reflections")
- @SpecAssertion(section = { "5.4" })
- public void testClientProxyNotUsedForPseudoScope()
- {
- Bean<Fox> foxBean = SimpleBean.of(Fox.class, manager);
- try
- {
- activateDependentContext();
- Fox fox = manager.getInstance(foxBean);
- assert !Reflections.isProxy(fox);
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = "Reflections")
- @SpecAssertion(section = "5.4")
- public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
- {
- Bean<TunedTuna> tunaBean = SimpleBean.of(TunedTuna.class, manager);
- manager.addBean(tunaBean);
- TunedTuna tuna = manager.getInstance(tunaBean);
- assert Reflections.isProxy(tuna);
- byte[] bytes = serialize(tuna);
- tuna = (TunedTuna) deserialize(bytes);
- assert Reflections.isProxy(tuna);
- assert tuna.getState().equals("tuned");
- }
-
- @Test(groups = "Reflections", expectedExceptions = UnproxyableDependencyException.class)
- @SpecAssertion(section = "5.4.1")
- public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
- {
- Bean<FinalTuna> tunaBean = SimpleBean.of(FinalTuna.class, manager);
- manager.addBean(tunaBean);
- @SuppressWarnings("unused")
- FinalTuna tuna = manager.getInstanceByType(FinalTuna.class);
- assert false;
- }
-
- @Test(groups = "Reflections")
- @SpecAssertion(section = "5.4.2")
- public void testClientProxyInvocation()
- {
- Bean<TunedTuna> tunaBean = SimpleBean.of(TunedTuna.class, manager);
- manager.addBean(tunaBean);
- TunedTuna tuna = manager.getInstance(tunaBean);
- assert Reflections.isProxy(tuna);
- assert tuna.getState().equals("tuned");
- }
-
- @Test(groups = "Reflections", expectedExceptions=DefinitionException.class)
- public void testGettingUnknownBeanFails() {
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- @SuppressWarnings("unused")
- Tuna tuna = manager.getInstance(tunaBean);
- assert false;
- }
-
-}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1018 - ri/trunk/webbeans-ri.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 10:02:47 -0500 (Fri, 16 Jan 2009)
New Revision: 1018
Modified:
ri/trunk/webbeans-ri/unit-tests.xml
Log:
Oops
Modified: ri/trunk/webbeans-ri/unit-tests.xml
===================================================================
--- ri/trunk/webbeans-ri/unit-tests.xml 2009-01-16 14:03:04 UTC (rev 1017)
+++ ri/trunk/webbeans-ri/unit-tests.xml 2009-01-16 15:02:47 UTC (rev 1018)
@@ -39,6 +39,7 @@
<package name="org.jboss.webbeans.examples"></package>
<package name="org.jboss.webbeans.test.ejb"></package>
<package name="org.jboss.webbeans.test.newbean"></package>
+ <package name="org.jboss.webbeans.test.unit"></package>
</packages>
</test>
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1017 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 09:03:04 -0500 (Fri, 16 Jan 2009)
New Revision: 1017
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/BoostrapTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/ClassAnnotatedItemTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/FinalTuna_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Fox.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/TunedTuna.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java
Log:
port client proxy tests, and tidy up
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -1,287 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.bean.AbstractBean;
-import org.jboss.webbeans.bean.EnterpriseBean;
-import org.jboss.webbeans.bean.ProducerMethodBean;
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.beans.Elephant;
-import org.jboss.webbeans.test.beans.InitializedObserver;
-import org.jboss.webbeans.test.beans.InitializedObserverWhichUsesApplicationContext;
-import org.jboss.webbeans.test.beans.InitializedObserverWhichUsesRequestContext;
-import org.jboss.webbeans.test.beans.LadybirdSpider;
-import org.jboss.webbeans.test.beans.Panther;
-import org.jboss.webbeans.test.beans.Salmon;
-import org.jboss.webbeans.test.beans.SeaBass;
-import org.jboss.webbeans.test.beans.Sole;
-import org.jboss.webbeans.test.beans.Tarantula;
-import org.jboss.webbeans.test.beans.TarantulaProducer;
-import org.jboss.webbeans.test.beans.Tiger;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.jboss.webbeans.test.ejb.valid.Hound;
-import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
-import org.testng.annotations.Test;
-
-public class BoostrapTest extends AbstractTest
-{
- @Test(groups="bootstrap")
- public void testSingleSimpleBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Tuna.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Tuna.class);
- }
-
- @Test(groups="bootstrap")
- public void testSingleEnterpriseBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Hound.class);
- }
-
- @Test(groups="bootstrap")
- public void testMultipleSimpleBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Tuna.class, Salmon.class, SeaBass.class, Sole.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Tuna.class);
- assert classes.containsKey(Salmon.class);
- assert classes.containsKey(SeaBass.class);
- assert classes.containsKey(Sole.class);
-
- assert classes.get(Tuna.class) instanceof SimpleBean;
- assert classes.get(Salmon.class) instanceof SimpleBean;
- assert classes.get(SeaBass.class) instanceof SimpleBean;
- assert classes.get(Sole.class) instanceof SimpleBean;
- }
-
- @Test(groups="bootstrap")
- public void testProducerMethodBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TarantulaProducer.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(TarantulaProducer.class);
- assert classes.containsKey(Tarantula.class);
-
- assert classes.get(TarantulaProducer.class) instanceof SimpleBean;
- assert classes.get(Tarantula.class) instanceof ProducerMethodBean;
- }
-
- @Test(groups="bootstrap")
- public void testMultipleEnterpriseBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Hound.class);
- assert classes.containsKey(Elephant.class);
- assert classes.containsKey(Panther.class);
- assert classes.containsKey(Tiger.class);
-
- assert classes.get(Hound.class) instanceof EnterpriseBean;
- assert classes.get(Elephant.class) instanceof EnterpriseBean;
- assert classes.get(Panther.class) instanceof EnterpriseBean;
- assert classes.get(Tiger.class) instanceof EnterpriseBean;
- }
-
- @Test(groups="bootstrap")
- public void testMultipleEnterpriseAndSimpleBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Hound.class);
- assert classes.containsKey(Elephant.class);
- assert classes.containsKey(Panther.class);
- assert classes.containsKey(Tiger.class);
- assert classes.containsKey(Tuna.class);
- assert classes.containsKey(Salmon.class);
- assert classes.containsKey(SeaBass.class);
- assert classes.containsKey(Sole.class);
-
- assert classes.get(Hound.class) instanceof EnterpriseBean;
- assert classes.get(Elephant.class) instanceof EnterpriseBean;
- assert classes.get(Panther.class) instanceof EnterpriseBean;
- assert classes.get(Tiger.class) instanceof EnterpriseBean;
- assert classes.get(Tuna.class) instanceof SimpleBean;
- assert classes.get(Salmon.class) instanceof SimpleBean;
- assert classes.get(SeaBass.class) instanceof SimpleBean;
- assert classes.get(Sole.class) instanceof SimpleBean;
- }
-
- @Test(groups="bootstrap")
- public void testRegisterProducerMethodBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TarantulaProducer.class));
- webBeansBootstrap.boot();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : manager.getBeans())
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(TarantulaProducer.class);
- assert classes.containsKey(Tarantula.class);
-
-
- assert classes.get(TarantulaProducer.class) instanceof SimpleBean;
- assert classes.get(Tarantula.class) instanceof ProducerMethodBean;
- }
-
- @Test(groups="bootstrap")
- public void testRegisterMultipleEnterpriseAndSimpleBean()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class));
- webBeansBootstrap.boot();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : manager.getBeans())
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Hound.class);
- assert classes.containsKey(Elephant.class);
- assert classes.containsKey(Panther.class);
- assert classes.containsKey(Tiger.class);
- assert classes.containsKey(Tuna.class);
- assert classes.containsKey(Salmon.class);
- assert classes.containsKey(SeaBass.class);
- assert classes.containsKey(Sole.class);
-
- assert classes.get(Hound.class) instanceof EnterpriseBean;
- assert classes.get(Elephant.class) instanceof EnterpriseBean;
- assert classes.get(Panther.class) instanceof EnterpriseBean;
- assert classes.get(Tiger.class) instanceof EnterpriseBean;
- assert classes.get(Tuna.class) instanceof SimpleBean;
- assert classes.get(Salmon.class) instanceof SimpleBean;
- assert classes.get(SeaBass.class) instanceof SimpleBean;
- assert classes.get(Sole.class) instanceof SimpleBean;
- }
-
- @Test(groups="bootstrap", expectedExceptions=IllegalStateException.class)
- public void testDiscoverFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(null);
- webBeansBootstrap.boot();
- }
-
- @Test(groups="bootstrap")
- public void testDiscover()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class));
- webBeansBootstrap.boot();
-
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : manager.getBeans())
- {
- if (bean instanceof AbstractBean)
- {
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
- }
- }
- assert classes.containsKey(Hound.class);
- assert classes.containsKey(Elephant.class);
- assert classes.containsKey(Panther.class);
- assert classes.containsKey(Tiger.class);
- assert classes.containsKey(Tuna.class);
- assert classes.containsKey(Salmon.class);
- assert classes.containsKey(SeaBass.class);
- assert classes.containsKey(Sole.class);
-
- assert classes.get(Hound.class) instanceof EnterpriseBean;
- assert classes.get(Elephant.class) instanceof EnterpriseBean;
- assert classes.get(Panther.class) instanceof EnterpriseBean;
- assert classes.get(Tiger.class) instanceof EnterpriseBean;
- assert classes.get(Tuna.class) instanceof SimpleBean;
- assert classes.get(Salmon.class) instanceof SimpleBean;
- assert classes.get(SeaBass.class) instanceof SimpleBean;
- assert classes.get(Sole.class) instanceof SimpleBean;
- }
-
- @Test(groups="bootstrap")
- public void testInitializedEvent()
- {
- assert !InitializedObserver.observered;
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserver.class));
- webBeansBootstrap.boot();
-
- assert InitializedObserver.observered;
- }
-
- @Test(groups="bootstrap")
- public void testRequestContextActiveDuringInitializtionEvent()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesRequestContext.class, Tuna.class));
- webBeansBootstrap.boot();
- }
-
- @Test(groups={"bootstrap", "broken"})
- public void testApplicationContextActiveDuringInitializtionEvent()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesApplicationContext.class, LadybirdSpider.class));
- webBeansBootstrap.boot();
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -1,50 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.lang.annotation.Annotation;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.webbeans.DeploymentType;
-import javax.webbeans.Production;
-import javax.webbeans.Stereotype;
-
-import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
-import org.jboss.webbeans.test.beans.Antelope;
-import org.jboss.webbeans.test.beans.Order;
-import org.testng.annotations.Test;
-
-public class ClassAnnotatedItemTest
-{
-
- @Test
- public void testDeclaredAnnotations()
- {
- AnnotatedClass<Order> annotatedElement = new AnnotatedClassImpl<Order>(Order.class);
- assert annotatedElement.getAnnotations().size() == 1;
- assert annotatedElement.getAnnotation(Production.class) != null;
- assert annotatedElement.getType().equals(Order.class);
- }
-
- @Test
- public void testMetaAnnotations()
- {
- AnnotatedClass<Order> annotatedElement = new AnnotatedClassImpl<Order>(Order.class);
- Set<Annotation> annotations = annotatedElement.getMetaAnnotations(DeploymentType.class);
- assert annotations.size() == 1;
- Iterator<Annotation> it = annotations.iterator();
- Annotation production = it.next();
- assert Production.class.equals(production.annotationType());
- }
-
- @Test
- public void testEmpty()
- {
- AnnotatedClass<Order> annotatedElement = new AnnotatedClassImpl<Order>(Order.class);
- assert annotatedElement.getAnnotation(Stereotype.class) == null;
- assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
- AnnotatedClass<Antelope> classWithNoAnnotations = new AnnotatedClassImpl<Antelope>(Antelope.class);
- assert classWithNoAnnotations.getAnnotations().size() == 0;
- }
-
-}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -11,7 +11,9 @@
import org.jboss.webbeans.bean.ProducerFieldBean;
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
import org.jboss.webbeans.tck.api.Beans;
+import org.jboss.webbeans.util.Reflections;
/**
* Implements the Beans SPI for the TCK specifically for the JBoss RI.
@@ -65,20 +67,52 @@
public boolean isEntityBean(Class<?> clazz)
{
- // TODO Auto-generated method stub
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+ {
+ if (!ejbDescriptor.isMessageDriven() && !ejbDescriptor.isSingleton() && !ejbDescriptor.isStateful() && !ejbDescriptor.isStateless())
+ {
+ return true;
+ }
+ }
+ }
return false;
}
public boolean isStatefulBean(Class<?> clazz)
{
- // TODO Auto-generated method stub
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+ {
+ if (ejbDescriptor.isStateful())
+ {
+ return true;
+ }
+ }
+ }
return false;
}
public boolean isStatelessBean(Class<?> clazz)
{
- // TODO Auto-generated method stub
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+ {
+ if (ejbDescriptor.isStateless())
+ {
+ return true;
+ }
+ }
+ }
return false;
}
+
+ public boolean isProxy(Object instance)
+ {
+ return Reflections.isProxy(instance);
+ }
}
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/BoostrapTest.java (from rev 1012, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/BoostrapTest.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/BoostrapTest.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,288 @@
+package org.jboss.webbeans.test.unit;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.bean.AbstractBean;
+import org.jboss.webbeans.bean.EnterpriseBean;
+import org.jboss.webbeans.bean.ProducerMethodBean;
+import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.test.AbstractTest;
+import org.jboss.webbeans.test.beans.Elephant;
+import org.jboss.webbeans.test.beans.InitializedObserver;
+import org.jboss.webbeans.test.beans.InitializedObserverWhichUsesApplicationContext;
+import org.jboss.webbeans.test.beans.InitializedObserverWhichUsesRequestContext;
+import org.jboss.webbeans.test.beans.LadybirdSpider;
+import org.jboss.webbeans.test.beans.Panther;
+import org.jboss.webbeans.test.beans.Salmon;
+import org.jboss.webbeans.test.beans.SeaBass;
+import org.jboss.webbeans.test.beans.Sole;
+import org.jboss.webbeans.test.beans.Tarantula;
+import org.jboss.webbeans.test.beans.TarantulaProducer;
+import org.jboss.webbeans.test.beans.Tiger;
+import org.jboss.webbeans.test.beans.Tuna;
+import org.jboss.webbeans.test.ejb.valid.Hound;
+import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
+import org.testng.annotations.Test;
+
+public class BoostrapTest extends AbstractTest
+{
+ @Test(groups="bootstrap")
+ public void testSingleSimpleBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Tuna.class));
+ webBeansBootstrap.boot();
+ List<Bean<?>> beans = manager.getBeans();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : beans)
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Tuna.class);
+ }
+
+ @Test(groups="bootstrap")
+ public void testSingleEnterpriseBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class));
+ webBeansBootstrap.boot();
+ List<Bean<?>> beans = manager.getBeans();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : beans)
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Hound.class);
+ }
+
+ @Test(groups="bootstrap")
+ public void testMultipleSimpleBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Tuna.class, Salmon.class, SeaBass.class, Sole.class));
+ webBeansBootstrap.boot();
+ List<Bean<?>> beans = manager.getBeans();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : beans)
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Tuna.class);
+ assert classes.containsKey(Salmon.class);
+ assert classes.containsKey(SeaBass.class);
+ assert classes.containsKey(Sole.class);
+
+ assert classes.get(Tuna.class) instanceof SimpleBean;
+ assert classes.get(Salmon.class) instanceof SimpleBean;
+ assert classes.get(SeaBass.class) instanceof SimpleBean;
+ assert classes.get(Sole.class) instanceof SimpleBean;
+ }
+
+ @Test(groups="bootstrap")
+ public void testProducerMethodBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TarantulaProducer.class));
+ webBeansBootstrap.boot();
+ List<Bean<?>> beans = manager.getBeans();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : beans)
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(TarantulaProducer.class);
+ assert classes.containsKey(Tarantula.class);
+
+ assert classes.get(TarantulaProducer.class) instanceof SimpleBean;
+ assert classes.get(Tarantula.class) instanceof ProducerMethodBean;
+ }
+
+ @Test(groups="bootstrap")
+ public void testMultipleEnterpriseBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class));
+ webBeansBootstrap.boot();
+ List<Bean<?>> beans = manager.getBeans();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : beans)
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Hound.class);
+ assert classes.containsKey(Elephant.class);
+ assert classes.containsKey(Panther.class);
+ assert classes.containsKey(Tiger.class);
+
+ assert classes.get(Hound.class) instanceof EnterpriseBean;
+ assert classes.get(Elephant.class) instanceof EnterpriseBean;
+ assert classes.get(Panther.class) instanceof EnterpriseBean;
+ assert classes.get(Tiger.class) instanceof EnterpriseBean;
+ }
+
+ @Test(groups="bootstrap")
+ public void testMultipleEnterpriseAndSimpleBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class));
+ webBeansBootstrap.boot();
+ List<Bean<?>> beans = manager.getBeans();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : beans)
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Hound.class);
+ assert classes.containsKey(Elephant.class);
+ assert classes.containsKey(Panther.class);
+ assert classes.containsKey(Tiger.class);
+ assert classes.containsKey(Tuna.class);
+ assert classes.containsKey(Salmon.class);
+ assert classes.containsKey(SeaBass.class);
+ assert classes.containsKey(Sole.class);
+
+ assert classes.get(Hound.class) instanceof EnterpriseBean;
+ assert classes.get(Elephant.class) instanceof EnterpriseBean;
+ assert classes.get(Panther.class) instanceof EnterpriseBean;
+ assert classes.get(Tiger.class) instanceof EnterpriseBean;
+ assert classes.get(Tuna.class) instanceof SimpleBean;
+ assert classes.get(Salmon.class) instanceof SimpleBean;
+ assert classes.get(SeaBass.class) instanceof SimpleBean;
+ assert classes.get(Sole.class) instanceof SimpleBean;
+ }
+
+ @Test(groups="bootstrap")
+ public void testRegisterProducerMethodBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TarantulaProducer.class));
+ webBeansBootstrap.boot();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : manager.getBeans())
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(TarantulaProducer.class);
+ assert classes.containsKey(Tarantula.class);
+
+
+ assert classes.get(TarantulaProducer.class) instanceof SimpleBean;
+ assert classes.get(Tarantula.class) instanceof ProducerMethodBean;
+ }
+
+ @Test(groups="bootstrap")
+ public void testRegisterMultipleEnterpriseAndSimpleBean()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class));
+ webBeansBootstrap.boot();
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : manager.getBeans())
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Hound.class);
+ assert classes.containsKey(Elephant.class);
+ assert classes.containsKey(Panther.class);
+ assert classes.containsKey(Tiger.class);
+ assert classes.containsKey(Tuna.class);
+ assert classes.containsKey(Salmon.class);
+ assert classes.containsKey(SeaBass.class);
+ assert classes.containsKey(Sole.class);
+
+ assert classes.get(Hound.class) instanceof EnterpriseBean;
+ assert classes.get(Elephant.class) instanceof EnterpriseBean;
+ assert classes.get(Panther.class) instanceof EnterpriseBean;
+ assert classes.get(Tiger.class) instanceof EnterpriseBean;
+ assert classes.get(Tuna.class) instanceof SimpleBean;
+ assert classes.get(Salmon.class) instanceof SimpleBean;
+ assert classes.get(SeaBass.class) instanceof SimpleBean;
+ assert classes.get(Sole.class) instanceof SimpleBean;
+ }
+
+ @Test(groups="bootstrap", expectedExceptions=IllegalStateException.class)
+ public void testDiscoverFails()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(null);
+ webBeansBootstrap.boot();
+ }
+
+ @Test(groups="bootstrap")
+ public void testDiscover()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class));
+ webBeansBootstrap.boot();
+
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : manager.getBeans())
+ {
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
+ }
+ assert classes.containsKey(Hound.class);
+ assert classes.containsKey(Elephant.class);
+ assert classes.containsKey(Panther.class);
+ assert classes.containsKey(Tiger.class);
+ assert classes.containsKey(Tuna.class);
+ assert classes.containsKey(Salmon.class);
+ assert classes.containsKey(SeaBass.class);
+ assert classes.containsKey(Sole.class);
+
+ assert classes.get(Hound.class) instanceof EnterpriseBean;
+ assert classes.get(Elephant.class) instanceof EnterpriseBean;
+ assert classes.get(Panther.class) instanceof EnterpriseBean;
+ assert classes.get(Tiger.class) instanceof EnterpriseBean;
+ assert classes.get(Tuna.class) instanceof SimpleBean;
+ assert classes.get(Salmon.class) instanceof SimpleBean;
+ assert classes.get(SeaBass.class) instanceof SimpleBean;
+ assert classes.get(Sole.class) instanceof SimpleBean;
+ }
+
+ @Test(groups="bootstrap")
+ public void testInitializedEvent()
+ {
+ assert !InitializedObserver.observered;
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserver.class));
+ webBeansBootstrap.boot();
+
+ assert InitializedObserver.observered;
+ }
+
+ @Test(groups="bootstrap")
+ public void testRequestContextActiveDuringInitializtionEvent()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesRequestContext.class, Tuna.class));
+ webBeansBootstrap.boot();
+ }
+
+ @Test(groups={"bootstrap", "broken"})
+ public void testApplicationContextActiveDuringInitializtionEvent()
+ {
+ webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesApplicationContext.class, LadybirdSpider.class));
+ webBeansBootstrap.boot();
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/BoostrapTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/ClassAnnotatedItemTest.java (from rev 1012, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java)
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/ClassAnnotatedItemTest.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/ClassAnnotatedItemTest.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,50 @@
+package org.jboss.webbeans.test.unit;
+
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.webbeans.DeploymentType;
+import javax.webbeans.Production;
+import javax.webbeans.Stereotype;
+
+import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
+import org.jboss.webbeans.test.beans.Antelope;
+import org.jboss.webbeans.test.beans.Order;
+import org.testng.annotations.Test;
+
+public class ClassAnnotatedItemTest
+{
+
+ @Test
+ public void testDeclaredAnnotations()
+ {
+ AnnotatedClass<Order> annotatedElement = new AnnotatedClassImpl<Order>(Order.class);
+ assert annotatedElement.getAnnotations().size() == 1;
+ assert annotatedElement.getAnnotation(Production.class) != null;
+ assert annotatedElement.getType().equals(Order.class);
+ }
+
+ @Test
+ public void testMetaAnnotations()
+ {
+ AnnotatedClass<Order> annotatedElement = new AnnotatedClassImpl<Order>(Order.class);
+ Set<Annotation> annotations = annotatedElement.getMetaAnnotations(DeploymentType.class);
+ assert annotations.size() == 1;
+ Iterator<Annotation> it = annotations.iterator();
+ Annotation production = it.next();
+ assert Production.class.equals(production.annotationType());
+ }
+
+ @Test
+ public void testEmpty()
+ {
+ AnnotatedClass<Order> annotatedElement = new AnnotatedClassImpl<Order>(Order.class);
+ assert annotatedElement.getAnnotation(Stereotype.class) == null;
+ assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
+ AnnotatedClass<Antelope> classWithNoAnnotations = new AnnotatedClassImpl<Antelope>(Antelope.class);
+ assert classWithNoAnnotations.getAnnotations().size() == 0;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/ClassAnnotatedItemTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Beans.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -85,6 +85,7 @@
* @return true only if class declares an entity bean
*/
public boolean isEntityBean(Class<?> clazz);
+
/**
* Create a new producer field bean from the given method.
*
@@ -95,4 +96,6 @@
*/
public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> declaringBean);
+ public boolean isProxy(Object instance);
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterable.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -9,7 +9,7 @@
* @author Pete Muir
* @see org.jboss.webbeans.util.EnumerationIterator
*/
-public class EnumerationIterable<T> implements Iterable<T>
+class EnumerationIterable<T> implements Iterable<T>
{
// The enumeration-iteartor
private EnumerationIterator<T> iterator;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/EnumerationIterator.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -9,7 +9,7 @@
* @author Pete Muir
*/
@SuppressWarnings("unchecked")
-public class EnumerationIterator<T> implements Iterator<T>
+class EnumerationIterator<T> implements Iterator<T>
{
// The enumeration
private Enumeration e;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Reflections.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -1,25 +1,11 @@
package org.jboss.webbeans.tck.impl.util;
-import java.beans.Introspector;
-import java.io.Serializable;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.webbeans.BindingType;
-import javax.webbeans.ExecutionException;
-
/**
* Utility class for static reflection-type operations
*
@@ -28,299 +14,7 @@
*/
public class Reflections
{
-
/**
- * Gets the property name from a getter method
- *
- * @param method The getter method
- * @return The name of the property. Returns null if method wasn't JavaBean
- * getter-styled
- */
- public static String getPropertyName(Method method)
- {
- String methodName = method.getName();
- if (methodName.matches("^(get).*") && method.getParameterTypes().length == 0)
- {
- return Introspector.decapitalize(methodName.substring(3));
- }
- else if (methodName.matches("^(is).*") && method.getParameterTypes().length == 0)
- {
- return Introspector.decapitalize(methodName.substring(2));
- }
- else
- {
- return null;
- }
-
- }
-
- /**
- * Checks if class is final
- *
- * @param clazz The class to check
- * @return True if final, false otherwise
- */
- public static boolean isFinal(Class<?> clazz)
- {
- return Modifier.isFinal(clazz.getModifiers());
- }
-
- /**
- * Checks if member is final
- *
- * @param member The member to check
- * @return True if final, false otherwise
- */
- public static boolean isFinal(Member member)
- {
- return Modifier.isFinal(member.getModifiers());
- }
-
- /**
- * Checks if type or member is final
- *
- * @param type Type or member
- * @return True if final, false otherwise
- */
- public static boolean isTypeOrAnyMethodFinal(Class<?> type)
- {
- if (isFinal(type))
- {
- return true;
- }
- for (Method method : type.getDeclaredMethods())
- {
- if (isFinal(method))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Checks if type is primitive
- *
- * @param type Type to check
- * @return True if primitive, false otherwise
- */
- public static boolean isPrimitive(Class<?> type)
- {
- return type.isPrimitive();
- }
-
- /**
- * Checks if type is static
- *
- * @param type Type to check
- * @return True if static, false otherwise
- */
- public static boolean isStatic(Class<?> type)
- {
- return Modifier.isStatic(type.getModifiers());
- }
-
- /**
- * Checks if member is static
- *
- * @param member Member to check
- * @return True if static, false otherwise
- */
- public static boolean isStatic(Member member)
- {
- return Modifier.isStatic(member.getModifiers());
- }
-
- public static boolean isTransient(Member member)
- {
- return Modifier.isTransient(member.getModifiers());
- }
-
- /**
- * Checks if clazz is abstract
- *
- * @param clazz Class to check
- * @return True if abstract, false otherwise
- */
- public static boolean isAbstract(Class<?> clazz)
- {
- return Modifier.isAbstract(clazz.getModifiers());
- }
-
- /**
- * Checks if class is a static inner one
- *
- * @param clazz Class to check
- * @return True if static, false otherwise
- */
- public static boolean isStaticInnerClass(Class<?> clazz)
- {
- return clazz.isMemberClass() && isStatic(clazz);
- }
-
- /**
- * Checks if class is a non-static inner one
- *
- * @param clazz Class to Check
- * @return True if static, false otherwise
- */
- public static boolean isNonStaticInnerClass(Class<?> clazz)
- {
- return clazz.isMemberClass() && !isStatic(clazz);
- }
-
- /**
- * Gets a constructor with matching parameter types
- *
- * @param <T> The type
- * @param clazz The class
- * @param parameterTypes The parameter types
- * @return The matching constructor. Null is returned if none is found
- */
- public static <T> Constructor<T> getConstructor(Class<T> clazz, Class<?>... parameterTypes)
- {
- try
- {
- return clazz.getConstructor(parameterTypes);
- }
- catch (NoSuchMethodException e)
- {
- return null;
- }
- catch (Exception e)
- {
- throw new RuntimeException("Error accessing constructor (with parameters " + parameterTypes + ") of " + clazz, e);
- }
- }
-
- /**
- * Gets all methods with a given annotation
- *
- * @param clazz The class the examine
- * @param annotationType The annotation type to search for
- * @return A list of matching methods. An empty list is returned if no
- * matches are found
- */
- public static List<Method> getMethods(Class<?> clazz, Class<? extends Annotation> annotationType)
- {
- List<Method> methods = new ArrayList<Method>();
- for (Method method : clazz.getMethods())
- {
- if (method.isAnnotationPresent(annotationType))
- {
- methods.add(method);
- }
- }
- return methods;
- }
-
- /**
- * Gets all constructors with a given annotation
- *
- * @param <T> The type of the class
- * @param clazz The class
- * @param annotationType The annotation type
- * @return A list of matching constructors. An empty list is returned if no
- * matches are found
- */
- @SuppressWarnings("unchecked")
- public static <T> List<Constructor<T>> getAnnotatedConstructors(Class<? extends T> clazz, Class<? extends Annotation> annotationType)
- {
- List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
- for (Constructor<?> constructor : clazz.getConstructors())
- {
- if (constructor.isAnnotationPresent(annotationType))
- {
- constructors.add((Constructor<T>) constructor);
- }
- }
- return constructors;
- }
-
- /**
- * Gets constructors with a given annotated parameter
- *
- * @param <T> The type
- * @param clazz The class
- * @param parameterAnnotationType The parameter annotation type
- * @return A list of matching constructors. An empty list is returned if no
- * matches are found
- */
- @SuppressWarnings("unchecked")
- public static <T> List<Constructor<T>> getConstructorsForAnnotatedParameter(Class<? extends T> clazz, Class<? extends Annotation> parameterAnnotationType)
- {
- List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
- for (Constructor<?> constructor : clazz.getConstructors())
- {
- for (Annotation[] annotations : constructor.getParameterAnnotations())
- {
- for (Annotation annotation : annotations)
- {
- if (annotation.annotationType().equals(parameterAnnotationType))
- {
- constructors.add((Constructor<T>) constructor);
- }
- }
- }
- }
- return constructors;
- }
-
- /**
- * Gets constructors with a given meta-annotated parameter
- *
- * @param <T> The type
- * @param clazz The class
- * @param metaAnnotationType The parameter meta-annotation type
- * @return A list of matching constructors. An empty list is returned if no
- * matches are found
- */
- @SuppressWarnings("unchecked")
- public static <T> List<Constructor<T>> getConstructorsForMetaAnnotatedParameter(Class<? extends T> clazz, Class<? extends Annotation> metaAnnotationType)
- {
- List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
- for (Constructor<?> constructor : clazz.getConstructors())
- {
- for (Annotation[] annotations : constructor.getParameterAnnotations())
- {
- for (Annotation annotation : annotations)
- {
- if (annotation.annotationType().isAnnotationPresent(metaAnnotationType))
- {
- constructors.add((Constructor<T>) constructor);
- }
- }
- }
- }
- return constructors;
- }
-
- /**
- * Checks if all annotations types are in a given set of annotations
- *
- * @param annotations The annotation set
- * @param annotationTypes The annotation types to match
- * @return True if match, false otherwise
- */
- public static boolean annotationTypeSetMatches(Set<Class<? extends Annotation>> annotations, Class<? extends Annotation>... annotationTypes)
- {
- List<Class<? extends Annotation>> annotationTypeList = new ArrayList<Class<? extends Annotation>>();
- annotationTypeList.addAll(Arrays.asList(annotationTypes));
- for (Class<? extends Annotation> annotation : annotations)
- {
- if (annotationTypeList.contains(annotation))
- {
- annotationTypeList.remove(annotation);
- }
- else
- {
- return false;
- }
- }
- return annotationTypeList.size() == 0;
- }
-
- /**
* Checks if all annotations are in a given set of annotations
*
* @param annotations The annotation set
@@ -345,285 +39,4 @@
return annotationTypeList.size() == 0;
}
- /**
- * Gets the actual type arguments of a class
- *
- * @param clazz The class to examine
- * @return The type arguments
- */
- public static Type[] getActualTypeArguments(Class<?> clazz)
- {
- if (clazz.getGenericSuperclass() instanceof ParameterizedType)
- {
- return ((ParameterizedType) clazz.getGenericSuperclass()).getActualTypeArguments();
- }
- else
- {
- return new Type[0];
- }
- }
-
- /**
- * Checks if raw type is array type
- *
- * @param rawType The raw type to check
- * @return True if array, false otherwise
- */
- public static boolean isArrayType(Class<?> rawType)
- {
- return rawType.isArray();
- }
-
- /**
- * Checks if type is parameterized type
- *
- * @param type The type to check
- * @return True if parameterized, false otherwise
- */
- public static boolean isParameterizedType(Class<?> type)
- {
- return type.getTypeParameters().length > 0;
- }
-
- /**
- * Invokes a method and wraps exceptions
- *
- * @param method The method to invoke
- * @param instance The instance to invoke on
- * @param parameters The parameters
- * @return The return value
- */
- public static Object invokeAndWrap(Method method, Object instance, Object... parameters)
- {
- try
- {
- return method.invoke(instance, parameters);
- }
- catch (IllegalArgumentException e)
- {
- throw new ExecutionException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new ExecutionException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e);
- }
- catch (InvocationTargetException e)
- {
- throw new ExecutionException("Error invoking method " + method.getName() + " on " + method.getDeclaringClass(), e);
- }
- }
-
- /**
- * Invokes a method and wraps exceptions
- *
- * @param methodName The method name to find on the instance and invoke
- * @param parameterTypes The method name to find on the instance and invoke
- * @param instance The instance to invoke on
- * @param parameterValues The parameters values
- * @return The return value
- */
- public static Object invokeAndWrap(String methodName, Class<?>[] parameterTypes, Object instance, Object[] parameterValues)
- {
- try
- {
- return instance.getClass().getMethod(methodName, parameterTypes).invoke(instance, parameterValues);
- }
- catch (IllegalArgumentException e)
- {
- throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e);
- }
- catch (InvocationTargetException e)
- {
- throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e);
- }
- catch (SecurityException e)
- {
- throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e);
- }
- catch (NoSuchMethodException e)
- {
- throw new ExecutionException("Error invoking method " + methodName + " on " + instance.getClass(), e);
- }
- }
-
- /**
- * Sets value of a field and wraps exceptions
- *
- * @param field The field to set on
- * @param target The instance to set on
- * @param value The value to set
- */
- public static void setAndWrap(Field field, Object target, Object value)
- {
- try
- {
- field.set(target, value);
- }
- catch (IllegalArgumentException e)
- {
- throw new ExecutionException("Error setting field " + field.getName() + " on " + field.getDeclaringClass(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new ExecutionException("Error setting field " + field.getName() + " on " + field.getDeclaringClass(), e);
- }
- }
-
- /**
- * Sets value of a field and wraps exceptions
- *
- * @param field The field to set on
- * @param target The instance to set on
- * @param value The value to set
- */
- public static void setAndWrap(String fieldName, Object target, Object value)
- {
- try
- {
- target.getClass().getField(fieldName).set(target, value);
- }
- catch (IllegalArgumentException e)
- {
- throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
- }
- catch (SecurityException e)
- {
- throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
- }
- catch (NoSuchFieldException e)
- {
- throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
- }
- }
-
- /**
- * Gets value of a field and wraps exceptions
- *
- * @param field The field to set on
- * @param target The instance to set on
- * @return The value to set
- */
- public static Object getAndWrap(Field field, Object target)
- {
- try
- {
- return field.get(target);
- }
- catch (IllegalArgumentException e)
- {
- throw new ExecutionException("Error getting field " + field.getName() + " on " + field.getDeclaringClass(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new ExecutionException("Error getting field " + field.getName() + " on " + field.getDeclaringClass(), e);
- }
- }
-
- /**
- * Looks up a method in the type hierarchy of an instance
- *
- * @param method The method to look for
- * @param instance The instance to start from
- * @return The method found, or an NoSuchMethodException if it is not found
- */
- public static Method lookupMethod(Method method, Object instance)
- {
- for (Class<? extends Object> clazz = instance.getClass(); clazz != null; clazz = clazz.getSuperclass())
- {
- try
- {
- Method targetMethod = clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
- if (!targetMethod.isAccessible())
- {
- targetMethod.setAccessible(true);
- }
- return targetMethod;
- }
- catch (NoSuchMethodException nsme)
- {
- // Expected, nothing to see here.
- }
- }
- throw new IllegalArgumentException("Method " + method.getName() + " not implemented by instance");
- }
-
- /**
- * Indicates if an instance is a Javassist proxy
- *
- * @param instance The instance to examine
- * @return True if proxy, false otherwise
- */
- public static boolean isProxy(Object instance)
- {
- return instance.getClass().getName().indexOf("_$$_javassist_") > 0;
- }
-
- /**
- * Gets the type hierarchy for a class
- *
- * A recursive function that adds the class to the set of type and then calls
- * itself with the suprerclass as paramater until the top of the hierarchy is
- * reached. For each steps, adds all interfaces of the class to the set.
- * Since the data structure is a set, duplications are eliminated
- *
- * @param clazz The class to examine
- * @return The set of classes and interfaces in the hierarchy
- * @see #getTypeHierachy(Class, Set)
- */
- public static Set<Class<?>> getTypeHierachy(Class<?> clazz)
- {
- Set<Class<?>> classes = new HashSet<Class<?>>();
- getTypeHierachy(clazz, classes);
- return classes;
- }
-
- /**
- * Gets the flattened type hierarchy for a class, including all super classes
- * and the entire interface type hierarchy
- *
- * @param clazz the class to examine
- * @param classes the set of types
- */
- public static void getTypeHierachy(Class<?> clazz, Set<? super Class<?>> classes)
- {
- if (clazz != null)
- {
- classes.add(clazz);
- getTypeHierachy(clazz.getSuperclass(), classes);
- for (Class<?> c : clazz.getInterfaces())
- {
- getTypeHierachy(c, classes);
- }
- }
- }
-
- /**
- * Checks the bindingType to make sure the annotation was declared properly
- * as a binding type (annotated with @BindingType).
- *
- * @param bindingType The binding type to check
- * @return true only if the annotation is really a binding type
- */
- public static boolean isBindingType(Annotation bindingType)
- {
- boolean isBindingAnnotation = false;
- if (bindingType.annotationType().isAnnotationPresent(BindingType.class))
- {
- isBindingAnnotation = true;
- }
- return isBindingAnnotation;
- }
-
- public static boolean isSerializable(Class<?> clazz)
- {
- return getTypeHierachy(clazz).contains(Serializable.class);
- }
-}
\ No newline at end of file
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/ResourceLoadingException.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -8,7 +8,7 @@
* @author Pete Muir
*
*/
-public class ResourceLoadingException extends ExecutionException
+class ResourceLoadingException extends ExecutionException
{
private static final long serialVersionUID = 1L;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/SimpleResourceLoader.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -3,7 +3,7 @@
import java.io.IOException;
import java.net.URL;
-public class SimpleResourceLoader
+class SimpleResourceLoader
{
public Class<?> classForName(String name)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java 2009-01-16 13:44:43 UTC (rev 1016)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/Strings.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -2,7 +2,7 @@
import java.util.StringTokenizer;
-public class Strings
+class Strings
{
public static String[] split(String strings, String delims)
{
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/AnotherDeploymentType.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.tests.lookup.clientProxy;
+
+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.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.webbeans.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,101 @@
+package org.jboss.webbeans.tck.tests.lookup.clientProxy;
+
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.webbeans.DefinitionException;
+import javax.webbeans.UnproxyableDependencyException;
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.tests.AbstractTest;
+import org.testng.annotations.Test;
+
+@SpecVersion("20081206")
+public class ClientProxyTest extends AbstractTest
+{
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes();
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ @Test(groups = "configuration().getBeans()")
+ @SpecAssertion(section = { "5.4" })
+ public void testClientProxyUsedForNormalScope()
+ {
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ manager.addBean(tunaBean);
+ Tuna tuna = manager.getInstance(tunaBean);
+ assert configuration().getBeans().isProxy(tuna);
+ }
+
+ @Test(groups = "configuration().getBeans()")
+ @SpecAssertion(section = { "5.4" })
+ public void testClientProxyNotUsedForPseudoScope()
+ {
+ Bean<Fox> foxBean = getSimpleBean(Fox.class);
+ try
+ {
+ activateDependentContext();
+ Fox fox = manager.getInstance(foxBean);
+ assert !configuration().getBeans().isProxy(fox);
+ }
+ finally
+ {
+ deactivateDependentContext();
+ }
+ }
+
+ @Test(groups = "configuration().getBeans()")
+ @SpecAssertion(section = "5.4")
+ public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
+ {
+ Bean<TunedTuna> tunaBean = getSimpleBean(TunedTuna.class);
+ manager.addBean(tunaBean);
+ TunedTuna tuna = manager.getInstance(tunaBean);
+ assert configuration().getBeans().isProxy(tuna);
+ byte[] bytes = serialize(tuna);
+ tuna = (TunedTuna) deserialize(bytes);
+ assert configuration().getBeans().isProxy(tuna);
+ assert tuna.getState().equals("tuned");
+ }
+
+ @Test(groups = "configuration().getBeans()", expectedExceptions = UnproxyableDependencyException.class)
+ @SpecAssertion(section = "5.4.1")
+ public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
+ {
+ Bean<FinalTuna_Broken> tunaBean = getSimpleBean(FinalTuna_Broken.class);
+ manager.addBean(tunaBean);
+ @SuppressWarnings("unused")
+ FinalTuna_Broken tuna = manager.getInstanceByType(FinalTuna_Broken.class);
+ assert false;
+ }
+
+ @Test(groups = "configuration().getBeans()")
+ @SpecAssertion(section = "5.4.2")
+ public void testClientProxyInvocation()
+ {
+ Bean<TunedTuna> tunaBean = getSimpleBean(TunedTuna.class);
+ manager.addBean(tunaBean);
+ TunedTuna tuna = manager.getInstance(tunaBean);
+ assert configuration().getBeans().isProxy(tuna);
+ assert tuna.getState().equals("tuned");
+ }
+
+ @Test(groups = "configuration().getBeans()", expectedExceptions=DefinitionException.class)
+ public void testGettingUnknownBeanFails() {
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ @SuppressWarnings("unused")
+ Tuna tuna = manager.getInstance(tunaBean);
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/FinalTuna_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/FinalTuna_Broken.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.tests.lookup.clientProxy;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+final class FinalTuna_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/FinalTuna_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Fox.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Fox.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.tests.lookup.clientProxy;
+
+import javax.webbeans.Dependent;
+
+@Dependent
+class Fox
+{
+
+ public String getName()
+ {
+ return "gavin";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Fox.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Tuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Tuna.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.tests.lookup.clientProxy;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+class Tuna
+{
+
+ public String getName()
+ {
+ return "Ophir";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/Tuna.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/TunedTuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/TunedTuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/TunedTuna.java 2009-01-16 14:03:04 UTC (rev 1017)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.tck.tests.lookup.clientProxy;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+class TunedTuna
+{
+ public String getState()
+ {
+ return "tuned";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/TunedTuna.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1016 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-01-16 08:44:43 -0500 (Fri, 16 Jan 2009)
New Revision: 1016
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/AustralianTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BorderTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BostonTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/CairnsTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/FoxTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/TibetanTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/YorkshireTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/BullTerrier.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/PomeranianInterface.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotypeAnnotationLiteral.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AuroraFinch.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AustralianTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BirdCage.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlackRumpedWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BorderTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Boxer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BullTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CairnsTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CommonWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FinchKeeper.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FoxTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/GoldbreastWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/JavaSparrow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OwlFinch_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Pomeranian.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Role.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RoleBinding.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/StarFinch.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/SweeWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Tame.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TameAnnotationLiteral.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TeaCupPomeranian.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TibetanTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/YorkshireTerrier.java
Log:
Deleted the event bus tests and classes from RI; most of these tests now run in the TCK suite.
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,986 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Set;
-
-import javax.webbeans.DefinitionException;
-import javax.webbeans.DuplicateBindingTypeException;
-import javax.webbeans.Observer;
-import javax.webbeans.ObserverException;
-import javax.webbeans.TypeLiteral;
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.test.beans.AuroraFinch;
-import org.jboss.webbeans.test.beans.BananaSpider;
-import org.jboss.webbeans.test.beans.BirdCage;
-import org.jboss.webbeans.test.beans.BlueFacedParrotFinch;
-import org.jboss.webbeans.test.beans.EuropeanGoldfinch;
-import org.jboss.webbeans.test.beans.FinchKeeper;
-import org.jboss.webbeans.test.beans.OrangeCheekedWaxbill;
-import org.jboss.webbeans.test.beans.RecluseSpider;
-import org.jboss.webbeans.test.beans.StarFinch;
-import org.jboss.webbeans.test.beans.TeaCupPomeranian;
-import org.jboss.webbeans.test.beans.broken.BlackRumpedWaxbill;
-import org.jboss.webbeans.test.beans.broken.CommonWaxbill;
-import org.jboss.webbeans.test.beans.broken.GoldbreastWaxbill;
-import org.jboss.webbeans.test.beans.broken.JavaSparrow;
-import org.jboss.webbeans.test.beans.broken.OwlFinch;
-import org.jboss.webbeans.test.beans.broken.SweeWaxbill;
-import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
-import org.jboss.webbeans.test.bindings.RoleBinding;
-import org.jboss.webbeans.test.bindings.TameAnnotationLiteral;
-import org.jboss.webbeans.test.ejb.invalid.AustralianTerrier;
-import org.jboss.webbeans.test.ejb.invalid.BorderTerrier;
-import org.jboss.webbeans.test.ejb.invalid.BostonTerrier;
-import org.jboss.webbeans.test.ejb.invalid.CairnsTerrier;
-import org.jboss.webbeans.test.ejb.invalid.FoxTerrier;
-import org.jboss.webbeans.test.ejb.invalid.TibetanTerrier;
-import org.jboss.webbeans.test.ejb.invalid.YorkshireTerrier;
-import org.jboss.webbeans.test.ejb.valid.BullTerrier;
-import org.jboss.webbeans.test.ejb.valid.Pomeranian;
-import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
-import org.testng.annotations.Test;
-
-/**
- * Event bus tests
- *
- * @author Nicklas Karlsson
- * @author David Allen
- *
- */
-@SpecVersion("20081206")
-public class EventBusTest extends AbstractTest
-{
- public static class AnEventType
- {
- }
-
- public static class ATemplatedEventType<T>
- {
- }
-
- public static class AnObserver implements Observer<AnEventType>
- {
- public boolean wasNotified = false;
-
- public void notify(AnEventType event)
- {
- wasNotified = true;
- }
- }
-
- public static class AnObserverWithException implements Observer<AnEventType>
- {
- public boolean wasNotified = false;
- public RuntimeException theException = new RuntimeException("RE1");
-
- public void notify(AnEventType event)
- {
- wasNotified = true;
- throw theException;
- }
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.1")
- public void testEventTypeIncludesAllSuperclassesAndInterfacesOfEventObject()
- {
- assert false;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.2")
- public void testManagerFireEvent()
- {
- // First a simple event with no bindings is fired
- AnEventType anEvent = new AnEventType();
- manager.fireEvent(anEvent);
-
- // Next an event with some event bindings is fired
- manager.fireEvent(anEvent, new RoleBinding("Admin"));
- }
-
- /**
- * If the type of the event object passed to fireEvent() contains type
- * variables or wildcards, an IllegalArgumentException is thrown
- */
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = { "8.1", "8.2" })
- public void testManagerFireEventWithEventTypeParametersFails()
- {
- ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>();
- manager.fireEvent(anEvent);
- }
-
- /**
- * If the type of the event object passed to fireEvent() contains type
- * variables or wildcards, an IllegalArgumentException is thrown
- */
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = { "8.1", "8.2" })
- public void testManagerFireEventWithEventTypeWildcardsFails()
- {
- // Although the above test is really the same as with a wildcard, we will
- // test
- // it anyhow since the specification calls it out separately.
- ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>();
- manager.fireEvent(anEventOnAnyType);
- }
-
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = { "8.1", "8.2" })
- public void testManagerFireEventWithNonBindingAnnotationsFails()
- {
- // The specs are not exactly clear on what is supposed to happen here,
- // but borrowing from Section 8.3, we'll expect the same behavior here
- // for a consistent API.
- // TODO Verify that fireEvent should fail on non-binding annotations
- AnEventType anEvent = new AnEventType();
- manager.fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral());
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.3")
- public void testManagerAddObserver()
- {
- Observer<AnEventType> observer = new AnObserver();
-
- // First test with the Class<T> of the event type
- manager.addObserver(observer, AnEventType.class);
- Set<Observer<AnEventType>> resolvedObservers = manager.resolveObservers(new AnEventType());
- assert !resolvedObservers.isEmpty();
- assert resolvedObservers.size() == 1;
- assert resolvedObservers.iterator().next() == observer;
-
- // Now test with the TypeLiteral<T> of the event type
- observer = new AnObserver();
- manager.addObserver(observer, new TypeLiteral<AnEventType>()
- {
- });
- resolvedObservers = manager.resolveObservers(new AnEventType());
- assert !resolvedObservers.isEmpty();
- assert resolvedObservers.size() == 2;
- boolean foundObserver = false;
- for (Observer<AnEventType> obs : resolvedObservers)
- {
- if (obs == observer)
- {
- foundObserver = true;
- break;
- }
- }
- assert foundObserver;
-
- // Try adding an observer with some binding types
- observer = new AnObserver();
- Annotation[] bindingTypes = new Annotation[] { new RoleBinding("Admin"), new RoleBinding("Manager") };
- manager.addObserver(observer, AnEventType.class, bindingTypes);
- resolvedObservers = manager.resolveObservers(new AnEventType(), bindingTypes);
- assert !resolvedObservers.isEmpty();
- assert resolvedObservers.size() == 3;
- foundObserver = false;
- for (Observer<AnEventType> obs : resolvedObservers)
- {
- if (obs == observer)
- {
- foundObserver = true;
- break;
- }
- }
- assert foundObserver;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.3")
- public void testManagerRemoveObserver()
- {
- Observer<AnEventType> observer = new AnObserver();
-
- // First test with the Class<T> of the event type
- manager.addObserver(observer, AnEventType.class);
- manager.removeObserver(observer, AnEventType.class);
- Set<Observer<AnEventType>> resolvedObservers = manager.resolveObservers(new AnEventType());
- assert resolvedObservers.isEmpty();
-
- // Now test with the TypeLiteral<T> of the event type
- observer = new AnObserver();
- manager.addObserver(observer, new TypeLiteral<AnEventType>()
- {
- });
- manager.removeObserver(observer, new TypeLiteral<AnEventType>()
- {
- });
- resolvedObservers = manager.resolveObservers(new AnEventType());
- assert resolvedObservers.isEmpty();
-
- // Also test with binding types
- Annotation[] bindings = new Annotation[] { new RoleBinding("Admin") };
- manager.addObserver(observer, AnEventType.class, bindings);
- manager.removeObserver(observer, AnEventType.class);
- resolvedObservers = manager.resolveObservers(new AnEventType(), bindings);
- assert !resolvedObservers.isEmpty();
- manager.removeObserver(observer, AnEventType.class, new RoleBinding("Admin"));
- resolvedObservers = manager.resolveObservers(new AnEventType(), bindings);
- assert resolvedObservers.isEmpty();
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
- @SpecAssertion(section = "8.3")
- public void testMultipleInstancesOfSameBindingTypeWhenAddingObserverFails()
- {
- Observer<AnEventType> observer = new AnObserver();
- manager.addObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
- }
-
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "8.3")
- public void testNonBindingTypePassedToAddObserverFails()
- {
- Observer<AnEventType> observer = new AnObserver();
- manager.addObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
- @SpecAssertion(section = "8.3")
- public void testMultipleInstancesOfSameBindingTypeWhenRemovingObserverFails()
- {
- Observer<AnEventType> observer = new AnObserver();
- manager.addObserver(observer, AnEventType.class);
- manager.removeObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
- }
-
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "8.3")
- public void testNonBindingTypePassedToRemoveObserverFails()
- {
- Observer<AnEventType> observer = new AnObserver();
- manager.addObserver(observer, AnEventType.class);
- manager.removeObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = { "8.1", "8.4" })
- public void testConsumerNotifiedWhenEventTypeAndAllBindingsMatch()
- {
- AnObserver observer1 = new AnObserver();
- AnObserver observer2 = new AnObserver();
- manager.addObserver(observer1, AnEventType.class);
- manager.addObserver(observer2, AnEventType.class);
-
- // Fire an event that will be delivered to the two above observers
- AnEventType anEvent = new AnEventType();
- manager.fireEvent(anEvent);
-
- assert observer1.wasNotified;
- assert observer2.wasNotified;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.4")
- public void testObserverThrowsExceptionAbortsNotifications()
- {
- AnObserver observer = new AnObserver();
- AnObserverWithException anotherObserver = new AnObserverWithException();
- manager.addObserver(anotherObserver, AnEventType.class);
- manager.addObserver(observer, AnEventType.class);
-
- // Fire an event that will be delivered to the two above observers
- AnEventType anEvent = new AnEventType();
- boolean fireFailed = false;
- try
- {
- manager.fireEvent(anEvent);
- }
- catch (Exception e)
- {
- if (anotherObserver.theException.equals(e))
- fireFailed = true;
- }
- assert fireFailed;
-
- assert anotherObserver.wasNotified;
- // TODO This cannot properly test for event processing abort
- // assert !observer.wasNotified;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.4")
- public void testObserverCalledBeforeTransactionCompleteMaySetRollbackOnly()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.4")
- public void testObserverManipulatingJTATransactionsDirectlyFails()
- {
- assert false;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5")
- public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Pomeranian.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans.size() == 2 + BUILT_IN_BEANS;
- Set<Observer<String>> observers = manager.resolveObservers("An event");
- assert observers.size() == 2;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5")
- public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TibetanTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans.size() == 2 + BUILT_IN_BEANS;
- Set<Observer<String>> observers = manager.resolveObservers("An event");
- assert observers.size() == 1;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5")
- public void testMultipleObserverMethodsOK()
- {
- // Somewhat of a cheat, but this other test already does have 2 observer
- // methods
- // for the same event type and event bindings.
- testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = { "8.5.1", "8.5.2" })
- public void testObserverMethodMustHaveOnlyOneEventParameter()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(YorkshireTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.5.1")
- public void testObserverMethodCannotObserveParameterizedEvents()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(BostonTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5.1")
- public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes()
- {
- // This observer has no binding types specified
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Pomeranian.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans.size() == 2 + BUILT_IN_BEANS;
-
- // Resolve registered observers with an event containing no binding types
- Set<Observer<String>> resolvedObservers = manager.resolveObservers("A new event");
- assert !resolvedObservers.isEmpty();
- assert resolvedObservers.size() == 2;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.5.2")
- public void testObserverMethodAnnotatedProducesFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(BorderTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.5.2")
- public void testObserverMethodAnnotatedInitializerFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(AustralianTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.5.2")
- public void testObserverMethodAnnotatedDestructorFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(CairnsTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.5.2")
- public void testObserverMethodWithDisposesParamFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(FoxTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5.2")
- public void testObserverMethodMayHaveMultipleBindingTypes()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(BullTerrier.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- // If we can resolve the observer with the two binding types,
- // then it worked
- Set<Observer<String>> resolvedObservers = manager.resolveObservers("An event object", new RoleBinding("Admin"), new TameAnnotationLiteral());
- assert !resolvedObservers.isEmpty();
- assert resolvedObservers.size() == 1;
-
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.3")
- public void testXMLDefinedObserverMethodIgnoresBindingAnnotations()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.3")
- public void testXMLDefinedObserverNotFindingImplementationMethodFails()
- {
- assert false;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5.4")
- public void testObserverMethodReceivesInjectionsOnNonObservesParameters()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(BananaSpider.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans != null;
- }
-
- /**
- * Tests that a conditional observer is not notified of events until after it
- * is created by some other separate action.
- */
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5.5")
- public void testConditionalObserver()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(RecluseSpider.class));
- webBeansBootstrap.boot();
-
- manager.fireEvent("New string event");
- // Should not be notified since bean is not instantiated yet
- assert !RecluseSpider.notified;
-
- // Now instantiate the bean and fire another event
- try
- {
- activateDependentContext();
- RecluseSpider bean = manager.getInstanceByType(RecluseSpider.class);
- assert bean != null;
-
- manager.fireEvent("Another event");
- assert RecluseSpider.notified;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.1")
- public void testTransactionalObserverCanOnlyObserveSinglePhase()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.6")
- public void testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.6")
- public void testAfterTransactionCompletionObserver()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.6")
- public void testAfterTransactionSuccessObserver()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.6")
- public void testAfterTransactionFailureObserver()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.6")
- public void testBeforeTransactionCompletionObserver()
- {
- assert false;
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.5.7")
- public void testObserverMethodRegistration()
- {
- // For now, this test is checking the registration of methods
- testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
- }
-
- /**
- *
- */
- @Test(groups = { "broken", "events" })
- @SpecAssertion(section = "8.5.7")
- public void testEnterpriseBeanObserverMethodCalledWithCallerContext()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Pomeranian.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert beans.size() == 1;
- String event = "A new event";
- Set<Observer<String>> observers = manager.resolveObservers(event);
- assert observers.size() == 1;
-
- manager.fireEvent(event);
- assert Thread.currentThread().equals(Pomeranian.notificationThread);
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.5.7")
- public void testTransactionalObserverThrownExceptionIsCaughtAndLogged()
- {
- assert false;
- }
-
- @Test(groups = { "events" }, expectedExceptions={ TeaCupPomeranian.OversizedException.class })
- @SpecAssertion(section = "8.5.7")
- public void testNonTransactionalObserverThrownNonCheckedExceptionIsRethrown()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TeaCupPomeranian.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert !beans.isEmpty();
- manager.fireEvent("Another event");
- }
-
- @Test(groups = { "events" }, expectedExceptions={ ObserverException.class })
- @SpecAssertion(section = "8.5.7")
- public void testNonTransactionalObserverThrownCheckedExceptionIsWrappedAndRethrown()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TeaCupPomeranian.class));
- webBeansBootstrap.boot();
- List<Bean<?>> beans = manager.getBeans();
- assert !beans.isEmpty();
- manager.fireEvent(new Integer(1));
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
- @SpecAssertion(section = "8.6")
- public void testDuplicateBindingsToFireFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(SweeWaxbill.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- SweeWaxbill bean = manager.getInstanceByType(SweeWaxbill.class);
- bean.methodThatFiresEvent();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions={ DuplicateBindingTypeException.class })
- @SpecAssertion(section = "8.6")
- public void testDuplicateBindingsToObservesFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(SweeWaxbill.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- SweeWaxbill bean = manager.getInstanceByType(SweeWaxbill.class);
- bean.methodThatRegistersObserver();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "8.6")
- public void testNonBindingTypePassedToFireFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(OwlFinch.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- OwlFinch bean = manager.getInstanceByType(OwlFinch.class);
- bean.methodThatFiresEvent();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "8.6")
- public void testNonBindingTypePassedToObservesFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(OwlFinch.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- OwlFinch bean = manager.getInstanceByType(OwlFinch.class);
- bean.methodThatRegistersObserver();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnField()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(BlueFacedParrotFinch.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- BlueFacedParrotFinch bean = manager.getInstanceByType(BlueFacedParrotFinch.class);
- bean.methodThatRegistersObserver();
-
- Set<Observer<String>> observers = manager.resolveObservers("String type event");
- assert observers.size() == 1;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfProducerMethod()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(StarFinch.class, FinchKeeper.class, BirdCage.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- StarFinch starFinch = manager.getInstanceByType(StarFinch.class);
- FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
- BirdCage birdCage = manager.getInstanceByType(BirdCage.class);
- assert starFinch != null;
- assert birdCage != null;
- assert birdCage.getSomeMess() != null;
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfInitializerMethod()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(OrangeCheekedWaxbill.class, FinchKeeper.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- OrangeCheekedWaxbill bird = manager.getInstanceByType(OrangeCheekedWaxbill.class);
- FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
- assert bird != null;
- assert bird.getSomeMess() != null;
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- //TODO Implement once disposal methods are included
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfDisposalMethod()
- {
- assert false;
- }
-
- //TODO Make sure this test works once EJBs are fully supported
- @Test(groups = { "broken", "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfRemoveMethod()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(EuropeanGoldfinch.class, FinchKeeper.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- EuropeanGoldfinch bird = manager.getInstanceByType(EuropeanGoldfinch.class);
- FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
- assert bird != null;
-
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfConstructor()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(AuroraFinch.class, FinchKeeper.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- AuroraFinch bird = manager.getInstanceByType(AuroraFinch.class);
- FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
- assert bird != null;
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnNonEventTypeInjectionPointFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(CommonWaxbill.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- CommonWaxbill bean = manager.getInstanceByType(CommonWaxbill.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnInjectionPointWithoutTypeParameterFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(BlackRumpedWaxbill.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- BlackRumpedWaxbill bean = manager.getInstanceByType(BlackRumpedWaxbill.class);
- webBeansBootstrap.boot();
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(GoldbreastWaxbill.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- GoldbreastWaxbill bean = manager.getInstanceByType(GoldbreastWaxbill.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
- {
- webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(JavaSparrow.class));
- webBeansBootstrap.boot();
- try
- {
- activateDependentContext();
- JavaSparrow bean = manager.getInstanceByType(JavaSparrow.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanMatchesAPITypeOfInectionPoint()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanMatchesBindingAnnotationsOfInjectionPoint()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanHasStandardDeploymentType()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanHasDependentScope()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testFireMethodCallsManagerFireWithEventObject()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptObservable()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObserveMethodCallsManagerAddObserverWithObserverObject()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptObservable()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testEventObjectContainsTypeVariablesWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testEventObjectContainsWildcardsWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testDuplicateBindingTypesWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testNonBindingTypeAnnotationWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksEventType()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksTypeParameters()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksBindingTypes()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksBindingTypeMembers()
- {
- assert false;
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Initializer;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
-public class AuroraFinch
-{
-
- private Mess someMess;
-
- @Initializer
- public AuroraFinch(@Fires Event<Mess> eventObject)
- {
- // Create a new mess and fire the event for it
- someMess = new Mess();
- eventObject.fire(someMess);
- }
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BirdCage.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,24 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Current;
-import javax.webbeans.Named;
-import javax.webbeans.RequestScoped;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
-@RequestScoped
-@Named("BirdCage")
-public class BirdCage
-{
- @Current
- private Mess someMess;
-
- public BirdCage()
- {
- }
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-
-public class BlueFacedParrotFinch
-{
- @Fires
- private Event<String> simpleEvent;
-
- public void methodThatFiresEvent()
- {
- simpleEvent.fire("An event");
- }
-
- public void methodThatRegistersObserver()
- {
- simpleEvent.observe(new Observer<String>()
- {
- public void notify(String event)
- {
- }
- });
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.Destructor;
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
-@ConversationScoped @Stateful
-public class EuropeanGoldfinch
-{
- private Mess someMess;
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-
- @Destructor @Remove
- public void remove(@Fires Event<Mess> eventObject)
- {
- // Create a new mess and fire the event for it
- someMess = new Mess();
- eventObject.fire(someMess);
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FinchKeeper.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,28 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
-import javax.webbeans.RequestScoped;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
-@RequestScoped
-@Named("FinchKeeper")
-public class FinchKeeper
-{
- public FinchKeeper()
- {
- }
-
- private boolean newMessDetected = false;
-
- public void observesMesses(@Observes Mess aNewMess)
- {
- newMessDetected = true;
- }
-
- public boolean isNewMessDetected()
- {
- return newMessDetected;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Initializer;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
-public class OrangeCheekedWaxbill
-{
-
- private Mess someMess;
-
- public OrangeCheekedWaxbill()
- {
- }
-
- @Initializer
- public void theInitializerMethod(@Fires Event<Mess> eventObject)
- {
- // Create a new mess and fire the event for it
- someMess = new Mess();
- eventObject.fire(someMess);
- }
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,28 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
-
-@RequestScoped
-@Named("StarFinch")
-public class StarFinch
-{
- public static class Mess
- {
- }
-
- public StarFinch()
- {
- }
-
- @Produces
- public Mess producerOfMesses(@Fires Event<Mess> messEvent)
- {
- Mess newMess = new Mess();
- messEvent.fire(newMess);
- return newMess;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,32 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
-
-import org.jboss.webbeans.test.annotations.Tame;
-
-@Tame
-@Named("Teddy")
-public class TeaCupPomeranian
-{
- public static class OversizedException extends RuntimeException
- {
- private static final long serialVersionUID = 1L;
-
- }
-
- public static class TooSmallException extends Exception
- {
- private static final long serialVersionUID = 1L;
- }
-
- public void observeSimpleEvent(@Observes String someEvent)
- {
- throw new OversizedException();
- }
-
- public void observeAnotherSimpleEvent(@Observes Integer someEvent) throws TooSmallException
- {
- throw new TooSmallException();
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-public class BlackRumpedWaxbill
-{
- @Fires
- private Event simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import java.util.ArrayList;
-
-import javax.webbeans.Fires;
-
-public class CommonWaxbill
-{
- @Fires
- private ArrayList<String> simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-public class GoldbreastWaxbill
-{
- @Fires
- private Event<?> simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import java.util.ArrayList;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-public class JavaSparrow
-{
- @Fires
- private Event<ArrayList<String>> simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,28 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-
-import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
-
-public class OwlFinch
-{
- @Fires
- private Event<String> simpleEvent;
-
- public void methodThatFiresEvent()
- {
- simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral());
- }
-
- public void methodThatRegistersObserver()
- {
- simpleEvent.observe(new Observer<String>()
- {
- public void notify(String event)
- {
- }
- }, new AnimalStereotypeAnnotationLiteral());
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-
-import org.jboss.webbeans.test.annotations.Role;
-import org.jboss.webbeans.test.bindings.RoleBinding;
-
-public class SweeWaxbill
-{
- @Fires @Role("Admin")
- private Event<String> simpleEvent;
-
- public void methodThatFiresEvent()
- {
- simpleEvent.fire("An event", new RoleBinding("Admin"));
- }
-
- public void methodThatRegistersObserver()
- {
- simpleEvent.observe(new Observer<String>()
- {
-
- public void notify(String event)
- {
- }
- }, new RoleBinding("Admin"));
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/AustralianTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/AustralianTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/AustralianTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Initializer;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
-@Stateless
-public class AustralianTerrier
-{
- @Initializer
- public void observeInitialized(@Observes @Initialized Manager manager)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BorderTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BorderTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BorderTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
-@Stateless
-public class BorderTerrier
-{
- @Produces
- public void observeInitialized(@Observes @Initialized Manager manager)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BostonTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BostonTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/BostonTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,14 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import java.util.List;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-
-@Stateless
-public class BostonTerrier
-{
- public void observesBadEvent(@Observes List<String> someArray)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/CairnsTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/CairnsTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/CairnsTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Destructor;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
-@Stateless
-public class CairnsTerrier
-{
- @Destructor
- public void observeInitialized(@Observes @Initialized Manager manager)
- {
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/FoxTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/FoxTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/FoxTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Disposes;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
-@Stateless
-public class FoxTerrier
-{
- public void observeInitialized(@Observes @Initialized Manager manager, @Disposes String badParam)
- {
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/TibetanTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/TibetanTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/TibetanTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,12 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-
-@Stateless
-public class TibetanTerrier implements Terrier
-{
- public void observeInitialized(@Observes String someEvent)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/YorkshireTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/YorkshireTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/YorkshireTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,14 +0,0 @@
-package org.jboss.webbeans.test.ejb.invalid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
-@Stateless
-public class YorkshireTerrier
-{
- public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/BullTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/BullTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/BullTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test.ejb.valid;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Observes;
-
-import org.jboss.webbeans.test.annotations.Role;
-import org.jboss.webbeans.test.annotations.Tame;
-
-@Stateless
-public class BullTerrier
-{
- public void observesBadEvent(@Observes @Role("Admin") @Tame String someEvent)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,24 +0,0 @@
-package org.jboss.webbeans.test.ejb.valid;
-
-import javax.ejb.Stateful;
-import javax.webbeans.Named;
-import javax.webbeans.Observes;
-
-import org.jboss.webbeans.test.annotations.Tame;
-
-@Stateful
-@Tame
-@Named("Teddy")
-public class Pomeranian implements PomeranianInterface
-{
- public static Thread notificationThread;
-
- public void observeSimpleEvent(@Observes String someEvent)
- {
- notificationThread = Thread.currentThread();
- }
-
- public static void staticallyObserveEvent(@Observes String someEvent)
- {
- }
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/PomeranianInterface.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/PomeranianInterface.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/PomeranianInterface.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.test.ejb.valid;
-
-public interface PomeranianInterface
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotype.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotype.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -15,7 +15,7 @@
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
-public @interface AnimalStereotype
+@interface AnimalStereotype
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotypeAnnotationLiteral.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AnimalStereotypeAnnotationLiteral.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -2,7 +2,7 @@
import javax.webbeans.AnnotationLiteral;
-public class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
+class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AuroraFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AuroraFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AuroraFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -6,7 +6,7 @@
import org.jboss.webbeans.tck.tests.event.StarFinch.Mess;
-public class AuroraFinch
+class AuroraFinch
{
private Mess someMess;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AustralianTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AustralianTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/AustralianTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -7,7 +7,7 @@
import javax.webbeans.manager.Manager;
@Stateless
-public class AustralianTerrier
+class AustralianTerrier
{
@Initializer
public void observeInitialized(@Observes @Initialized Manager manager)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -10,7 +10,7 @@
* Simple bean with observer method and another injectable parameter.
*
*/
-public class BananaSpider
+class BananaSpider
{
public void observeStringEvent(@Observes String someEvent, Manager manager)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BirdCage.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BirdCage.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BirdCage.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -8,7 +8,7 @@
@RequestScoped
@Named("BirdCage")
-public class BirdCage
+class BirdCage
{
@Current
private Mess someMess;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlackRumpedWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlackRumpedWaxbill_Broken.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlackRumpedWaxbill_Broken.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -3,7 +3,7 @@
import javax.webbeans.Event;
import javax.webbeans.Fires;
-public class BlackRumpedWaxbill_Broken
+class BlackRumpedWaxbill_Broken
{
@SuppressWarnings("unchecked")
@Fires
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -4,7 +4,7 @@
import javax.webbeans.Fires;
import javax.webbeans.Observer;
-public class BlueFacedParrotFinch
+class BlueFacedParrotFinch
{
@Fires
private Event<String> simpleEvent;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BorderTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BorderTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BorderTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -7,7 +7,7 @@
import javax.webbeans.manager.Manager;
@Stateless
-public class BorderTerrier
+class BorderTerrier
{
@Produces
public void observeInitialized(@Observes @Initialized Manager manager)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BostonTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BostonTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -6,7 +6,7 @@
import javax.webbeans.Observes;
@Stateless
-public class BostonTerrier
+class BostonTerrier
{
public void observesBadEvent(@Observes List<String> someArray)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Boxer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Boxer.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Boxer.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -5,7 +5,7 @@
@Stateless
@ConversationScoped
-public class Boxer
+class Boxer
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BullTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BullTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BullTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -4,7 +4,7 @@
import javax.webbeans.Observes;
@Stateless
-public class BullTerrier
+class BullTerrier
{
public void observesBadEvent(@Observes @Role("Admin") @Tame String someEvent)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CairnsTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CairnsTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CairnsTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -7,7 +7,7 @@
import javax.webbeans.manager.Manager;
@Stateless
-public class CairnsTerrier
+class CairnsTerrier
{
@Destructor
public void observeInitialized(@Observes @Initialized Manager manager)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CommonWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CommonWaxbill_Broken.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/CommonWaxbill_Broken.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -4,7 +4,7 @@
import javax.webbeans.Fires;
-public class CommonWaxbill_Broken
+class CommonWaxbill_Broken
{
@Fires
private ArrayList<String> simpleEvent;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -10,7 +10,7 @@
import org.jboss.webbeans.tck.tests.event.StarFinch.Mess;
@ConversationScoped @Stateful
-public class EuropeanGoldfinch
+class EuropeanGoldfinch
{
private Mess someMess;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -62,7 +62,7 @@
assert false;
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.2")
public void testManagerFireEvent()
{
@@ -78,7 +78,7 @@
* If the type of the event object passed to fireEvent() contains type
* variables or wildcards, an IllegalArgumentException is thrown
*/
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = { "8.1", "8.2" })
public void testManagerFireEventWithEventTypeParametersFails()
{
@@ -90,7 +90,7 @@
* If the type of the event object passed to fireEvent() contains type
* variables or wildcards, an IllegalArgumentException is thrown
*/
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = { "8.1", "8.2" })
public void testManagerFireEventWithEventTypeWildcardsFails()
{
@@ -101,7 +101,7 @@
manager.fireEvent(anEventOnAnyType);
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = { "8.1", "8.2" })
public void testManagerFireEventWithNonBindingAnnotationsFails()
{
@@ -206,7 +206,7 @@
manager.addObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "8.3")
public void testNonBindingTypePassedToAddObserverFails()
{
@@ -223,7 +223,7 @@
manager.removeObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "8.3")
public void testNonBindingTypePassedToRemoveObserverFails()
{
@@ -232,7 +232,7 @@
manager.removeObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = { "8.1", "8.4" })
public void testConsumerNotifiedWhenEventTypeAndAllBindingsMatch()
{
@@ -249,7 +249,7 @@
assert observer2.wasNotified;
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.4")
public void testObserverThrowsExceptionAbortsNotifications()
{
@@ -323,7 +323,7 @@
testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = { "8.5.1", "8.5.2" })
public void testObserverMethodMustHaveOnlyOneEventParameter()
{
@@ -333,7 +333,7 @@
assert beans != null;
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.5.1")
public void testObserverMethodCannotObserveParameterizedEvents()
{
@@ -357,7 +357,7 @@
assert resolvedObservers.size() == 2;
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.5.2")
public void testObserverMethodAnnotatedProducesFails()
{
@@ -366,7 +366,7 @@
assert beans != null;
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.5.2")
public void testObserverMethodAnnotatedInitializerFails()
{
@@ -375,7 +375,7 @@
assert beans != null;
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.5.2")
public void testObserverMethodAnnotatedDestructorFails()
{
@@ -384,7 +384,7 @@
assert beans != null;
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.5.2")
public void testObserverMethodWithDisposesParamFails()
{
@@ -393,7 +393,7 @@
assert beans != null;
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.5.2")
public void testObserverMethodMayHaveMultipleBindingTypes()
{
@@ -422,7 +422,7 @@
assert false;
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.5.4")
public void testObserverMethodReceivesInjectionsOnNonObservesParameters()
{
@@ -536,7 +536,7 @@
assert false;
}
- @Test(groups = { "broken", "events" }, expectedExceptions={ TeaCupPomeranian.OversizedException.class })
+ @Test(groups = { "events" }, expectedExceptions={ TeaCupPomeranian.OversizedException.class })
@SpecAssertion(section = "8.5.7")
public void testNonTransactionalObserverThrownNonCheckedExceptionIsRethrown()
{
@@ -546,7 +546,7 @@
manager.fireEvent("Another event");
}
- @Test(groups = { "broken", "events" }, expectedExceptions={ ObserverException.class })
+ @Test(groups = { "events" }, expectedExceptions={ ObserverException.class })
@SpecAssertion(section = "8.5.7")
public void testNonTransactionalObserverThrownCheckedExceptionIsWrappedAndRethrown()
{
@@ -590,7 +590,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "8.6")
public void testNonBindingTypePassedToFireFails()
{
@@ -607,7 +607,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
+ @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "8.6")
public void testNonBindingTypePassedToObservesFails()
{
@@ -624,7 +624,7 @@
}
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnField()
{
@@ -644,7 +644,7 @@
}
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnParameterOfProducerMethod()
{
@@ -666,7 +666,7 @@
}
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnParameterOfInitializerMethod()
{
@@ -715,7 +715,7 @@
}
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnParameterOfConstructor()
{
@@ -734,7 +734,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnNonEventTypeInjectionPointFails()
{
@@ -751,7 +751,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnInjectionPointWithoutTypeParameterFails()
{
@@ -768,7 +768,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
{
@@ -785,7 +785,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.6")
public void testObservableAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FinchKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FinchKeeper.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FinchKeeper.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -8,7 +8,7 @@
@RequestScoped
@Named("FinchKeeper")
-public class FinchKeeper
+class FinchKeeper
{
public FinchKeeper()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FoxTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FoxTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FoxTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -7,7 +7,7 @@
import javax.webbeans.manager.Manager;
@Stateless
-public class FoxTerrier
+class FoxTerrier
{
public void observeInitialized(@Observes @Initialized Manager manager, @Disposes String badParam)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/GoldbreastWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/GoldbreastWaxbill_Broken.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/GoldbreastWaxbill_Broken.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -3,7 +3,7 @@
import javax.webbeans.Event;
import javax.webbeans.Fires;
-public class GoldbreastWaxbill_Broken
+class GoldbreastWaxbill_Broken
{
@Fires
private Event<?> simpleEvent;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/JavaSparrow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/JavaSparrow_Broken.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/JavaSparrow_Broken.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -5,7 +5,7 @@
import javax.webbeans.Event;
import javax.webbeans.Fires;
-public class JavaSparrow_Broken
+class JavaSparrow_Broken
{
@Fires
private Event<ArrayList<String>> simpleEvent;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -6,7 +6,7 @@
import org.jboss.webbeans.tck.tests.event.StarFinch.Mess;
-public class OrangeCheekedWaxbill
+class OrangeCheekedWaxbill
{
private Mess someMess;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OwlFinch_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OwlFinch_Broken.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OwlFinch_Broken.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -5,7 +5,7 @@
import javax.webbeans.Observer;
-public class OwlFinch_Broken
+class OwlFinch_Broken
{
@Fires
private Event<String> simpleEvent;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Pomeranian.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Pomeranian.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -7,7 +7,7 @@
@Stateful
@Tame
@Named("Teddy")
-public class Pomeranian implements PomeranianInterface
+class Pomeranian implements PomeranianInterface
{
public static Thread notificationThread;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.event;
-public interface PomeranianInterface
+interface PomeranianInterface
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -9,7 +9,7 @@
*
*/
@RequestScoped
-public class RecluseSpider
+class RecluseSpider
{
public static boolean notified = false;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Role.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Role.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -8,7 +8,7 @@
@BindingType
@Retention(RUNTIME)
-public @interface Role
+@interface Role
{
String value();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RoleBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RoleBinding.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RoleBinding.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -3,7 +3,7 @@
import javax.webbeans.AnnotationLiteral;
-public class RoleBinding extends AnnotationLiteral<Role> implements Role
+class RoleBinding extends AnnotationLiteral<Role> implements Role
{
private String value = null;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/StarFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/StarFinch.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/StarFinch.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -8,7 +8,7 @@
@RequestScoped
@Named("StarFinch")
-public class StarFinch
+class StarFinch
{
public static class Mess
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/SweeWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/SweeWaxbill_Broken.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/SweeWaxbill_Broken.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -5,7 +5,7 @@
import javax.webbeans.Observer;
-public class SweeWaxbill_Broken
+class SweeWaxbill_Broken
{
@Fires @Role("Admin")
private Event<String> simpleEvent;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Tame.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Tame.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -16,7 +16,7 @@
@Retention(RUNTIME)
@Documented
@BindingType
-public @interface Tame
+@interface Tame
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TameAnnotationLiteral.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TameAnnotationLiteral.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -2,7 +2,7 @@
import javax.webbeans.AnnotationLiteral;
-public class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
+class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TeaCupPomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TeaCupPomeranian.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TeaCupPomeranian.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -5,7 +5,7 @@
@Tame
@Named("Teddy")
-public class TeaCupPomeranian
+class TeaCupPomeranian
{
public static class OversizedException extends RuntimeException
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -3,7 +3,7 @@
import javax.ejb.Local;
@Local
-public interface Terrier
+interface Terrier
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TibetanTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TibetanTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/TibetanTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -4,7 +4,7 @@
import javax.webbeans.Observes;
@Stateless
-public class TibetanTerrier implements Terrier
+class TibetanTerrier implements Terrier
{
public void observeInitialized(@Observes String someEvent)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/YorkshireTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/YorkshireTerrier.java 2009-01-16 13:22:38 UTC (rev 1015)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/YorkshireTerrier.java 2009-01-16 13:44:43 UTC (rev 1016)
@@ -6,7 +6,7 @@
import javax.webbeans.manager.Manager;
@Stateless
-public class YorkshireTerrier
+class YorkshireTerrier
{
public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
{
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1015 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 08:22:38 -0500 (Fri, 16 Jan 2009)
New Revision: 1015
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/
Log:
clean up
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1014 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation: producer and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 08:21:41 -0500 (Fri, 16 Jan 2009)
New Revision: 1014
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java
Log:
Clean up TCK beans
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Capercaillie.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Disposes;
import javax.webbeans.Initializer;
-public class Capercaillie
+class Capercaillie
{
@Initializer
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Chicken.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Production;
@Production
-public class Chicken
+class Chicken
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/ChickenHutch.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -2,7 +2,7 @@
import javax.webbeans.Initializer;
-public class ChickenHutch
+class ChickenHutch
{
public Fox fox;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/DangerCall.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Production;
@Production
-public class DangerCall
+class DangerCall
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Dottrel.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -2,7 +2,7 @@
import javax.webbeans.Initializer;
-public class Dottrel
+class Dottrel
{
@Initializer
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Fox.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Dependent;
@Dependent
-public class Fox
+class Fox
{
public String getName()
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Grouse.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Initializer;
import javax.webbeans.Observes;
-public class Grouse
+class Grouse
{
@Initializer
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Pheasant.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Initializer;
import javax.webbeans.Produces;
-public class Pheasant
+class Pheasant
{
@Initializer
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/Shrike.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.Destructor;
import javax.webbeans.Initializer;
-public class Shrike
+class Shrike
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public interface Animal
+interface Animal
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -14,7 +14,7 @@
@Retention(RUNTIME)
@Documented
@DeploymentType
-public @interface AnotherDeploymentType
+@interface AnotherDeploymentType
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public class BlackWidow extends Spider implements DeadlySpider
+class BlackWidow extends Spider implements DeadlySpider
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public class DaddyLongLegs extends Spider
+class DaddyLongLegs extends Spider
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public interface DeadlyAnimal
+interface DeadlyAnimal
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public interface DeadlySpider extends DeadlyAnimal
+interface DeadlySpider extends DeadlyAnimal
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public class FunnelWeaver<T>
+class FunnelWeaver<T>
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -3,7 +3,7 @@
import javax.webbeans.ApplicationScoped;
@ApplicationScoped
-public class LadybirdSpider extends Spider
+class LadybirdSpider extends Spider
{
public void spinWeb()
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,34 +0,0 @@
-package org.jboss.webbeans.tck.tests.implementation.producer;
-
-import javax.webbeans.Destructor;
-import javax.webbeans.Disposes;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-
-@Production
-public class OtherBrokenSpiderProducer
-{
-
- @Produces
- public String observe(@Observes String foo)
- {
- return "foo";
- }
-
- @Produces
- public String dispose(@Disposes String foo)
- {
- return "foo";
- }
-
- @Produces @Destructor
- public String destroy()
- {
- return "foo";
- }
-
- @Produces @RequestScoped public Spider getRequestScopedSpider = null;
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,13 +1,13 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-import javax.webbeans.Dependent;
import javax.webbeans.Named;
import javax.webbeans.Produces;
import javax.webbeans.Production;
import javax.webbeans.RequestScoped;
+
@AnotherDeploymentType
-public class OtherSpiderProducer
+class OtherSpiderProducer
{
private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() };
@@ -16,15 +16,11 @@
@Produces public Tarantula produceTarantula = new Tarantula();
- @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider = new TrapdoorSpider();
-
@Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow();
@Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs = new DaddyLongLegs();
@Produces @Named @Production public LadybirdSpider getLadybirdSpider = new LadybirdSpider();
-
- @Produces @Named("Shelob") public Tarantula produceShelob;
@Produces @AnimalStereotype public WolfSpider produceWolfSpider = new WolfSpider();
@@ -34,8 +30,6 @@
@Produces public Spider[] getSpiders = ALL_SPIDERS;
- @Produces public String[] getStrings = new String[0];
-
@Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>();
@Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>();
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java (from rev 1012, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherBrokenSpiderProducer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -0,0 +1,34 @@
+package org.jboss.webbeans.tck.tests.implementation.producer;
+
+import javax.webbeans.Destructor;
+import javax.webbeans.Disposes;
+import javax.webbeans.Observes;
+import javax.webbeans.Produces;
+import javax.webbeans.Production;
+import javax.webbeans.RequestScoped;
+
+@Production
+class OtherSpiderProducer_Broken
+{
+
+ @Produces
+ public String observe(@Observes String foo)
+ {
+ return "foo";
+ }
+
+ @Produces
+ public String dispose(@Disposes String foo)
+ {
+ return "foo";
+ }
+
+ @Produces @Destructor
+ public String destroy()
+ {
+ return "foo";
+ }
+
+ @Produces @RequestScoped public Spider getRequestScopedSpider = null;
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -49,9 +49,9 @@
@Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"})
public void testProducerFieldReturnsNullIsNotDependent() throws Exception
{
- Bean<OtherBrokenSpiderProducer> spiderProducer = getSimpleBean(OtherBrokenSpiderProducer.class);
+ Bean<OtherSpiderProducer_Broken> spiderProducer = getSimpleBean(OtherSpiderProducer_Broken.class);
manager.addBean(spiderProducer);
- Field method = OtherBrokenSpiderProducer.class.getField("getRequestScopedSpider");
+ Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider");
getProducerFieldBean(method, spiderProducer).create();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public class Spider implements Animal
+class Spider implements Animal
{
public final void layEggs()
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -16,7 +16,7 @@
@Retention(RUNTIME)
@Documented
@BindingType
-public @interface Tame
+@interface Tame
{
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public class Tarantula extends Spider implements DeadlySpider
+class Tarantula extends Spider implements DeadlySpider
{
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/TrapdoorSpider.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.tests.implementation.producer;
-
-public class TrapdoorSpider
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java 2009-01-16 13:06:02 UTC (rev 1013)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java 2009-01-16 13:21:41 UTC (rev 1014)
@@ -1,6 +1,6 @@
package org.jboss.webbeans.tck.tests.implementation.producer;
-public class WolfSpider implements Animal
+class WolfSpider implements Animal
{
}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1013 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 08:06:02 -0500 (Fri, 16 Jan 2009)
New Revision: 1013
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/test/beans/
Log:
cleanup
17 years, 3 months
- 1
- 0