[webbeans-commits] Webbeans SVN: r242 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: beans and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Nov 4 14:00:48 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-04 14:00:48 -0500 (Tue, 04 Nov 2008)
New Revision: 242
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Capercaillie.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dottrel.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Grouse.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pheasant.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Shrike.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java
Log:
Implement initializer tests
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java 2008-11-04 18:36:46 UTC (rev 241)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -1,17 +1,29 @@
package org.jboss.webbeans.test;
+import static org.jboss.webbeans.test.util.Util.createSimpleWebBean;
+
import javax.webbeans.DefinitionException;
import javax.webbeans.NonexistentMethodException;
+import javax.webbeans.manager.Bean;
+import org.jboss.webbeans.test.beans.Chicken;
+import org.jboss.webbeans.test.beans.ChickenHutch;
+import org.jboss.webbeans.test.beans.Fox;
+import org.jboss.webbeans.test.beans.broken.Capercaillie;
+import org.jboss.webbeans.test.beans.broken.Dottrel;
+import org.jboss.webbeans.test.beans.broken.Grouse;
+import org.jboss.webbeans.test.beans.broken.Pheasant;
+import org.jboss.webbeans.test.beans.broken.Shrike;
import org.testng.annotations.Test;
-public class InitializerMethodTest
+ at SpecVersion("PDR")
+public class InitializerMethodTest extends AbstractTest
{
@Test(expectedExceptions=DefinitionException.class, groups="initializerMethod") @SpecAssertion(section="3.7")
public void testStaticInitializerMethodNotAllowed()
{
- assert false;
+ createSimpleWebBean(Dottrel.class, manager);
}
@Test(groups={"initializerMethod", "servlet"}) @SpecAssertion(section="3.7")
@@ -50,34 +62,40 @@
assert false;
}
- @Test(groups={"initializerMethod"}) @SpecAssertion(section="3.7")
+ @Test(groups={"initializerMethod"}) @SpecAssertion(section={"3.7", "5.3", "3.7.2", "3.7.3"})
public void testMultipleInitializerMethodsAreCalled()
{
- assert false;
+ manager.addBean(createSimpleWebBean(Fox.class, manager));
+ manager.addBean(createSimpleWebBean(Chicken.class, manager));
+
+ Bean<ChickenHutch> chickenHutchBean = createSimpleWebBean(ChickenHutch.class, manager);
+ ChickenHutch chickenHutch = chickenHutchBean.create();
+ assert chickenHutch.chicken != null;
+ assert chickenHutch.fox != null;
}
@Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
public void testInitializerMethodAnnotatedProduces()
{
- assert false;
+ createSimpleWebBean(Pheasant.class, manager);
}
@Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
public void testInitializerMethodAnnotatedDestructor()
{
- assert false;
+ createSimpleWebBean(Shrike.class, manager);
}
@Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
- assert false;
+ createSimpleWebBean(Capercaillie.class, manager);
}
@Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
public void testInitializerMethodHasParameterAnnotatedObserves()
{
- assert false;
+ createSimpleWebBean(Grouse.class, manager);
}
@Test(groups={"initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
@@ -98,24 +116,12 @@
assert false;
}
- @Test(groups={"initializerMethod"}) @SpecAssertion(section="3.7.2")
- public void testBeanHasAllInitializerMethodsDeclaredInJava()
- {
- assert false;
- }
-
@Test(groups={"initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml()
{
assert false;
}
- @Test(groups={"initializerMethod"}) @SpecAssertion(section="3.7.3")
- public void testInitializerMethodParametersAreInjected()
- {
- assert false;
- }
-
/*
@Test(groups="initializerMethod") @SpecAssertion(section="3.7")
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-04 18:36:46 UTC (rev 241)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -81,12 +81,6 @@
assert tunaFarm.tuna != null;
}
- @Test(groups="initializerMethod") @SpecAssertion(section="5.3")
- public void testInitializerMethodsCalled()
- {
- assert false;
- }
-
@Test(groups={"beanConstruction", "commonAnnotations"}) @SpecAssertion(section="5.3")
public void testPostConstructMethodCalled()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java 2008-11-04 18:36:46 UTC (rev 241)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -1,21 +1,10 @@
package org.jboss.webbeans.test.beans;
-import javax.webbeans.Initializer;
import javax.webbeans.Production;
@Production
public class Chicken
{
- @Initializer
- public Chicken(String foo)
- {
- }
-
- @Initializer
- public Chicken(String foo, Double bar)
- {
-
- }
}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -0,0 +1,23 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Initializer;
+
+public class ChickenHutch
+{
+
+ public Fox fox;
+ public Chicken chicken;
+
+ @Initializer
+ public void setFox(Fox fox)
+ {
+ this.fox = fox;
+ }
+
+ @Initializer
+ public void setChicken(Chicken chicken)
+ {
+ this.chicken = chicken;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ChickenHutch.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Capercaillie.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Capercaillie.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Capercaillie.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Disposes;
+import javax.webbeans.Initializer;
+
+import org.jboss.webbeans.test.beans.ChickenHutch;
+
+public class Capercaillie
+{
+
+ @Initializer
+ public void setName(String name, @Disposes ChickenHutch chickenHutch)
+ {
+ // No-op
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Capercaillie.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dottrel.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dottrel.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dottrel.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Initializer;
+
+public class Dottrel
+{
+
+ @Initializer
+ public static void setName(String name)
+ {
+ // No-op
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Dottrel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Grouse.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Grouse.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Grouse.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Observes;
+
+import org.jboss.webbeans.test.beans.DangerCall;
+
+
+public class Grouse
+{
+
+ public void setName(String name, @Observes DangerCall dangerCall)
+ {
+ // No-op
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Grouse.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pheasant.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pheasant.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pheasant.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Initializer;
+import javax.webbeans.Produces;
+
+public class Pheasant
+{
+
+ @Initializer
+ @Produces
+ public void setName(String name)
+ {
+ // No-op
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pheasant.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Shrike.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Shrike.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Shrike.java 2008-11-04 19:00:48 UTC (rev 242)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Destructor;
+import javax.webbeans.Initializer;
+
+public class Shrike
+{
+
+
+ @Initializer
+ @Destructor
+ public void setName(String name)
+ {
+ // No-op
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Shrike.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the weld-commits
mailing list