[webbeans-commits] Webbeans SVN: r241 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 13:36:46 -0500 (Tue, 04 Nov 2008)
New Revision: 241
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java
Log:
stubs for initializer method tests
Added: 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 (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java 2008-11-04 18:36:46 UTC (rev 241)
@@ -0,0 +1,129 @@
+package org.jboss.webbeans.test;
+
+import javax.webbeans.DefinitionException;
+import javax.webbeans.NonexistentMethodException;
+
+import org.testng.annotations.Test;
+
+public class InitializerMethodTest
+{
+
+ @Test(expectedExceptions=DefinitionException.class, groups="initializerMethod") @SpecAssertion(section="3.7")
+ public void testStaticInitializerMethodNotAllowed()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "servlet"}) @SpecAssertion(section="3.7")
+ public void testInitializerMethodCalledOnServlet()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "ejb3"}) @SpecAssertion(section="3.7")
+ public void testInitializerMethodCalledOnEJBSessionBean()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "ejb3"}) @SpecAssertion(section="3.7")
+ public void testInitializerMethodCalledOnEJBMDB()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "ejb3", "singletons"}) @SpecAssertion(section="3.7")
+ public void testInitializerMethodCalledOnEJBSingleton()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "ejb3"}) @SpecAssertion(section="3.7")
+ public void testInitializerMethodNotABusinessMethod()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "interceptors"}) @SpecAssertion(section="3.7")
+ public void testMethodInterceptorNotCalledOnInitializerMethod()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod"}) @SpecAssertion(section="3.7")
+ public void testMultipleInitializerMethodsAreCalled()
+ {
+ assert false;
+ }
+
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ public void testInitializerMethodAnnotatedProduces()
+ {
+ assert false;
+ }
+
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ public void testInitializerMethodAnnotatedDestructor()
+ {
+ assert false;
+ }
+
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ public void testInitializerMethodHasParameterAnnotatedDisposes()
+ {
+ assert false;
+ }
+
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ public void testInitializerMethodHasParameterAnnotatedObserves()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
+ public void testInitializerMethodDeclaredInXml()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
+ public void testInitializerMethodDeclaredInXmlIgnoresBindingAnnotationsInJava()
+ {
+ assert false;
+ }
+
+ @Test(groups={"initializerMethod", "webbeansxml"}, expectedExceptions=NonexistentMethodException.class) @SpecAssertion(section="3.7.2")
+ public void testInitializerMethodDeclaredInXmlDoesNotExist()
+ {
+ 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")
+ public void test
+ {
+ assert false;
+ }
+
+ */
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 5 months
[webbeans-commits] Webbeans SVN: r240 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans/model/bean and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 13:04:44 -0500 (Tue, 04 Nov 2008)
New Revision: 240
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
ri/trunk/webbeans-ri/testng.xml
Log:
fix inner class support
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-04 17:59:11 UTC (rev 239)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-04 18:04:44 UTC (rev 240)
@@ -58,9 +58,9 @@
public static void checkType(Class<?> type)
{
- if (Reflections.isStaticInnerClass(type))
+ if (Reflections.isNonStaticInnerClass(type))
{
- throw new DefinitionException("Simple Web Bean " + type + " cannot be a static inner class");
+ throw new DefinitionException("Simple Web Bean " + type + " cannot be a non-static inner class");
}
if (Reflections.isParameterizedType(type))
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-04 17:59:11 UTC (rev 239)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-04 18:04:44 UTC (rev 240)
@@ -48,14 +48,14 @@
new SimpleBeanModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedType(Cow.class), manager);
}
- @Test(expectedExceptions=DefinitionException.class, groups="innerClass") @SpecAssertion(section="3.2")
- public void testStaticInnerClassDeclaredInJavaIsNotAllowed()
+ @Test(groups="innerClass") @SpecAssertion(section="3.2")
+ public void testStaticInnerClassDeclaredInJavaAllowed()
{
new SimpleBeanModel<StaticInnerBean>(new SimpleAnnotatedType<StaticInnerBean>(StaticInnerBean.class), getEmptyAnnotatedType(StaticInnerBean.class), manager);
}
- @Test(groups="innerClass") @SpecAssertion(section="3.2")
- public void testNonStaticInnerClassDeclaredInJavaAllowed()
+ @Test(expectedExceptions=DefinitionException.class, groups="innerClass") @SpecAssertion(section="3.2")
+ public void testNonStaticInnerClassDeclaredInJavaNotAllowed()
{
new SimpleBeanModel<InnerBean>(new SimpleAnnotatedType<InnerBean>(InnerBean.class), getEmptyAnnotatedType(InnerBean.class), manager);
}
@@ -116,14 +116,14 @@
new SimpleBeanModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedType(Cow.class), manager);
}
- @Test(expectedExceptions=DefinitionException.class, groups="innerClass") @SpecAssertion(section="3.2.4")
- public void testStaticInnerClassDeclaredInXmlIsNotAllowed()
+ @Test(groups="innerClass") @SpecAssertion(section="3.2.4")
+ public void testStaticInnerClassDeclaredInXmlAllowed()
{
new SimpleBeanModel<StaticInnerBean>(new SimpleAnnotatedType<StaticInnerBean>(StaticInnerBean.class), getEmptyAnnotatedType(StaticInnerBean.class), manager);
}
- @Test(groups="innerClass") @SpecAssertion(section="3.2.4")
- public void testNonStaticInnerClassDeclaredInXmlAllowed()
+ @Test(expectedExceptions=DefinitionException.class, groups="innerClass") @SpecAssertion(section="3.2.4")
+ public void testNonStaticInnerClassDeclaredInXmlNotAllowed()
{
new SimpleBeanModel<InnerBean>(new SimpleAnnotatedType<InnerBean>(InnerBean.class), getEmptyAnnotatedType(InnerBean.class), manager);
}
Modified: ri/trunk/webbeans-ri/testng.xml
===================================================================
--- ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:59:11 UTC (rev 239)
+++ ri/trunk/webbeans-ri/testng.xml 2008-11-04 18:04:44 UTC (rev 240)
@@ -19,7 +19,6 @@
<exclude name="jms" />
<exclude name="interceptors" />
<exclude name="decorators" />
- <exclude name="innerClass" />
<exclude name="servlet" />
<exclude name="clientProxy" />
<exclude name="passivation" />
15 years, 5 months
[webbeans-commits] Webbeans SVN: r239 - in ri/trunk/webbeans-ri: src/test/java/org/jboss/webbeans/test and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 12:59:11 -0500 (Tue, 04 Nov 2008)
New Revision: 239
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
ri/trunk/webbeans-ri/testng.xml
Log:
leave initializer methods to tomorrow
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 17:57:28 UTC (rev 238)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-04 17:59:11 UTC (rev 239)
@@ -81,7 +81,7 @@
assert tunaFarm.tuna != null;
}
- @Test(groups="beanConstruction") @SpecAssertion(section="5.3")
+ @Test(groups="initializerMethod") @SpecAssertion(section="5.3")
public void testInitializerMethodsCalled()
{
assert false;
Modified: ri/trunk/webbeans-ri/testng.xml
===================================================================
--- ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:57:28 UTC (rev 238)
+++ ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:59:11 UTC (rev 239)
@@ -28,6 +28,7 @@
<exclude name="singletons" />
<exclude name="ejbjarxml" />
<exclude name="beanDestruction" />
+ <exclude name="initializerMethod" />
<exclude name="commonAnnotations" />
</run>
</groups>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r238 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 12:57:28 -0500 (Tue, 04 Nov 2008)
New Revision: 238
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
Log:
oops, i broke the build
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 17:52:18 UTC (rev 237)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 17:57:28 UTC (rev 238)
@@ -83,7 +83,7 @@
if (key.getType().equals(Object.class))
{
// TODO Fix this cast
- beans = new HashSet<Bean<T>>((List<? extends Bean<T>>) manager.getBeans());
+ beans = new HashSet<Bean<T>>((List) manager.getBeans());
}
else
{
15 years, 5 months
[webbeans-commits] Webbeans SVN: r237 - in ri/trunk/webbeans-ri: src/test/java/org/jboss/webbeans/test and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 12:52:18 -0500 (Tue, 04 Nov 2008)
New Revision: 237
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
ri/trunk/webbeans-ri/testng.xml
Log:
Bean constructor test
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 17:33:49 UTC (rev 236)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-04 17:52:18 UTC (rev 237)
@@ -5,6 +5,8 @@
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.test.beans.FishPond;
+import org.jboss.webbeans.test.beans.Goldfish;
import org.jboss.webbeans.test.beans.RedSnapper;
import org.jboss.webbeans.test.beans.Tuna;
import org.jboss.webbeans.test.beans.TunaFarm;
@@ -17,8 +19,12 @@
@Test(groups="beanConstruction") @SpecAssertion(section="3.1.3")
public void testInjectionOfParametersIntoBeanConstructor()
{
- // TODO Placeholder
- assert false;
+ Bean<FishPond> goldfishPondBean = createSimpleWebBean(FishPond.class, manager);
+ Bean<Goldfish> goldfishBean = createSimpleWebBean(Goldfish.class, manager);
+ manager.addBean(goldfishBean);
+ manager.addBean(goldfishPondBean);
+ FishPond fishPond = goldfishPondBean.create();
+ assert fishPond.goldfish != null;
}
@Test(groups="specialization") @SpecAssertion(section="3.1.4")
@@ -75,6 +81,18 @@
assert tunaFarm.tuna != null;
}
+ @Test(groups="beanConstruction") @SpecAssertion(section="5.3")
+ public void testInitializerMethodsCalled()
+ {
+ assert false;
+ }
+
+ @Test(groups={"beanConstruction", "commonAnnotations"}) @SpecAssertion(section="5.3")
+ public void testPostConstructMethodCalled()
+ {
+ assert false;
+ }
+
@Test(groups="injection")
public void testFieldMissingBindingAnnotationsAreNotInjected()
{
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java 2008-11-04 17:33:49 UTC (rev 236)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java 2008-11-04 17:52:18 UTC (rev 237)
@@ -1,10 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype;
-import org.jboss.webbeans.test.beans.Animal;
-
-@RequestScopedAnimalStereotype
-public class Carp implements Animal
-{
-
-}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java 2008-11-04 17:52:18 UTC (rev 237)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Initializer;
+
+public class FishPond
+{
+
+ public Animal goldfish;
+
+ @Initializer
+ public FishPond(Goldfish goldfish)
+ {
+ this.goldfish = goldfish;
+ }
+
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishPond.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/testng.xml
===================================================================
--- ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:33:49 UTC (rev 236)
+++ ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:52:18 UTC (rev 237)
@@ -28,7 +28,6 @@
<exclude name="singletons" />
<exclude name="ejbjarxml" />
<exclude name="beanDestruction" />
- <exclude name="beanConstruction" />
<exclude name="commonAnnotations" />
</run>
</groups>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r236 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 12:33:49 -0500 (Tue, 04 Nov 2008)
New Revision: 236
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
ri/trunk/webbeans-ri/testng.xml
Log:
enable bean lifecycle tests where approproiate
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -0,0 +1,92 @@
+package org.jboss.webbeans;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
+
+public class BeanWrapper<T> extends Bean<T>
+{
+
+ private Bean<T> delegate;
+
+ public BeanWrapper(Manager manager, Bean<T> delegate)
+ {
+ super(manager);
+ this.delegate = delegate;
+ }
+
+ @Override
+ public T create()
+ {
+ return delegate.create();
+ }
+
+ @Override
+ public void destroy(T instance)
+ {
+ delegate.destroy(instance);
+ }
+
+ @Override
+ public Set<Annotation> getBindingTypes()
+ {
+ return delegate.getBindingTypes();
+ }
+
+ @Override
+ public Class<? extends Annotation> getDeploymentType()
+ {
+ return delegate.getDeploymentType();
+ }
+
+ @Override
+ public String getName()
+ {
+ return delegate.getName();
+ }
+
+ @Override
+ public Class<? extends Annotation> getScopeType()
+ {
+ return delegate.getScopeType();
+ }
+
+ @Override
+ public Set<Class<?>> getTypes()
+ {
+ return delegate.getTypes();
+ }
+
+ @Override
+ public boolean isNullable()
+ {
+ return delegate.isNullable();
+ }
+
+ @Override
+ public boolean isSerializable()
+ {
+ return delegate.isSerializable();
+ }
+
+ @Override
+ public String toString()
+ {
+ return delegate.toString();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return delegate.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ return delegate.equals(obj);
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -130,13 +130,17 @@
possibleDeploymentTypes.add(bean.getDeploymentType());
}
possibleDeploymentTypes.retainAll(enabledDeploymentTypes);
- Class<? extends Annotation> highestPrecedencePossibleDeploymentType = possibleDeploymentTypes.last();
Set<Bean<?>> trimmed = new HashSet<Bean<?>>();
- for (Bean<?> bean : beans)
+ if (possibleDeploymentTypes.size() > 0)
{
- if (bean.getDeploymentType().equals(highestPrecedencePossibleDeploymentType))
+ Class<? extends Annotation> highestPrecedencePossibleDeploymentType = possibleDeploymentTypes.last();
+
+ for (Bean<?> bean : beans)
{
- trimmed.add(bean);
+ if (bean.getDeploymentType().equals(highestPrecedencePossibleDeploymentType))
+ {
+ trimmed.add(bean);
+ }
}
}
return trimmed;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -92,10 +92,15 @@
@Test(groups={"contexts", "beanLifecycle"}) @SpecAssertion(section="8.3")
public void testContextIsActiveDuringBeanCreation()
{
- assert false;
+ // Slightly roundabout, but I can't see a better way to test atm
+ Bean<FoxRun> foxRunBean = createSimpleWebBean(FoxRun.class, manager);
+ Bean<Fox> foxBean = createSimpleWebBean(Fox.class, manager);
+ manager.addBean(foxBean);
+ FoxRun foxRun = foxRunBean.create();
+ assert foxRun.fox != null;
}
- @Test(groups={"contexts", "beanLifecycle"}) @SpecAssertion(section="8.3")
+ @Test(groups={"contexts", "beanDestruction"}) @SpecAssertion(section="8.3")
public void testContextIsActiveDuringBeanDestruction()
{
assert false;
@@ -135,7 +140,7 @@
assert false;
}
- @Test(groups={"contexts", "beanLifecycle"}) @SpecAssertion(section="8.3")
+ @Test(groups={"contexts", "beanDestruction"}) @SpecAssertion(section="8.3")
public void testDestroyingParentDestroysDependents()
{
assert false;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -14,6 +14,7 @@
import javax.webbeans.Production;
import javax.webbeans.RequestScoped;
import javax.webbeans.Standard;
+import javax.webbeans.UnsatisfiedDependencyException;
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.introspector.AnnotatedType;
@@ -23,6 +24,7 @@
import org.jboss.webbeans.test.annotations.FishStereotype;
import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType;
import org.jboss.webbeans.test.beans.Antelope;
+import org.jboss.webbeans.test.beans.RedSnapper;
import org.jboss.webbeans.test.beans.Reindeer;
import org.jboss.webbeans.test.beans.Rhinoceros;
import org.jboss.webbeans.test.beans.SeaBass;
@@ -113,10 +115,18 @@
assert trout.getScopeType().equals(RequestScoped.class);
}
- @Test(groups="beanLifecycle") @SpecAssertion(section="2.5.6")
+ @Test(groups="beanLifecycle", expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="2.5.6")
public void testBeanWithDisabledDeploymentTypeNotInstantiated()
{
- assert false;
+ List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>();
+ enabledDeploymentTypes.add(Standard.class);
+ enabledDeploymentTypes.add(AnotherDeploymentType.class);
+ enabledDeploymentTypes.add(HornedAnimalDeploymentType.class);
+ manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
+
+ Bean<RedSnapper> bean = createSimpleWebBean(RedSnapper.class, manager);
+ manager.addBean(bean);
+ manager.getInstanceByType(RedSnapper.class);
}
@Test @SpecAssertion(section={"2.5.6", "2.5.7"})
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -5,7 +5,7 @@
public class EnterpriseBeanLifecycleTest
{
- @Test(groups="beanLifecycle") @SpecAssertion(section="3.2.3")
+ @Test(groups="removeMethod") @SpecAssertion(section="3.2.3")
public void testInjectonOfParametersIntoRemoveMethod()
{
// TODO Placeholder
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -31,7 +31,9 @@
@Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.9")
public void testCurrentBindingTypeAssumed()
{
- assert false;
+ Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
+ manager.addBean(tunaBean);
+ assert manager.getInstanceByType(Tuna.class) != null;
}
@Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="4.9")
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -76,7 +76,7 @@
//assert context.get(shelobBean, true) == null;
}
- @Test(groups="contexts")
+ @Test(groups={"contexts", "beanDestruction"})
public void testDestroy() {
Bean<Tuna> tunaBean = Util.createSimpleWebBean(Tuna.class, manager);
assert context.get(tunaBean, true) instanceof Tuna;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -5,14 +5,14 @@
public class ProducerMethodBeanLifecycleTest
{
- @Test(groups="beanLifecycle") @SpecAssertion(section="3.3")
+ @Test(groups="producerMethod") @SpecAssertion(section="3.3")
public void testNonDependentProducerMethodThatReturnsNull()
{
// TODO Placeholder
assert false;
}
- @Test(groups="beanLifecycle") @SpecAssertion(section="3.3")
+ @Test(groups="producerMethod") @SpecAssertion(section="3.3")
public void testDependentProducerMethodThatReturnsNull()
{
// TODO Placeholder
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test;
-
-import org.testng.annotations.Test;
-
-public class RemoteBeanLifecycleTest
-{
-
- @Test(groups="beanLifecycle") @SpecAssertion(section="3.5.3")
- public void testRemoveMethodCalledCausesContainerToRemoveInstance()
- {
- assert false;
- }
-
-
-}
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 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-04 17:33:49 UTC (rev 236)
@@ -14,7 +14,7 @@
public class SimpleBeanLifecycleTest extends AbstractTest
{
- @Test(groups="beanLifecycle") @SpecAssertion(section="3.1.3")
+ @Test(groups="beanConstruction") @SpecAssertion(section="3.1.3")
public void testInjectionOfParametersIntoBeanConstructor()
{
// TODO Placeholder
Modified: ri/trunk/webbeans-ri/testng.xml
===================================================================
--- ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:09:28 UTC (rev 235)
+++ ri/trunk/webbeans-ri/testng.xml 2008-11-04 17:33:49 UTC (rev 236)
@@ -6,7 +6,6 @@
<groups>
<run>
<exclude name="specialization" />
- <exclude name="beanLifecycle" />
<exclude name="deployment" />
<exclude name="disposalMethod" />
<exclude name="producerMethod" />
@@ -28,6 +27,9 @@
<exclude name="removeMethod" />
<exclude name="singletons" />
<exclude name="ejbjarxml" />
+ <exclude name="beanDestruction" />
+ <exclude name="beanConstruction" />
+ <exclude name="commonAnnotations" />
</run>
</groups>
<packages>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r235 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 12:09:28 -0500 (Tue, 04 Nov 2008)
New Revision: 235
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
Log:
Fix compilation problem
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 16:50:11 UTC (rev 234)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 17:09:28 UTC (rev 235)
@@ -1,7 +1,6 @@
package org.jboss.webbeans;
import java.lang.annotation.Annotation;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -84,7 +83,7 @@
if (key.getType().equals(Object.class))
{
// TODO Fix this cast
- beans = new HashSet<Bean<T>>((Collection<? extends Bean<T>>) manager.getBeans());
+ beans = new HashSet<Bean<T>>((List<? extends Bean<T>>) manager.getBeans());
}
else
{
15 years, 5 months
[webbeans-commits] Webbeans SVN: r234 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 11:50:11 -0500 (Tue, 04 Nov 2008)
New Revision: 234
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java
Log:
Fix import
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-11-04 16:48:18 UTC (rev 233)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-11-04 16:50:11 UTC (rev 234)
@@ -9,14 +9,13 @@
import javax.webbeans.Standard;
import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.event.EventImpl;
import org.jboss.webbeans.injectable.BeanConstructor;
import org.jboss.webbeans.injectable.SimpleConstructor;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.introspector.SimpleAnnotatedField;
import org.jboss.webbeans.util.LoggerUtil;
-import com.sun.org.apache.xerces.internal.dom.events.EventImpl;
-
/**
* Web Beans bean meta model for the container instantiated, injectable,
* observable events (Section 7.4).
15 years, 5 months
[webbeans-commits] Webbeans SVN: r233 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-11-04 11:48:18 -0500 (Tue, 04 Nov 2008)
New Revision: 233
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java
ri/trunk/webbeans-ri/testng.xml
Log:
Exclude unwritten tests, fix resolveObject
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 12:45:24 UTC (rev 232)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-11-04 16:48:18 UTC (rev 233)
@@ -1,6 +1,8 @@
package org.jboss.webbeans;
import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -78,27 +80,33 @@
public <T> Set<Bean<T>> get(Injectable<T, ?> key)
{
+ Set<Bean<T>> beans;
if (key.getType().equals(Object.class))
{
// TODO Fix this cast
- return (Set<Bean<T>>) (Set) manager.getBeans();
+ beans = new HashSet<Bean<T>>((Collection<? extends Bean<T>>) manager.getBeans());
}
- if (!resolvedInjectionPoints.containsKey(key))
+ else
{
- registerInjectionPoint(key);
+ if (!resolvedInjectionPoints.containsKey(key))
+ {
+ registerInjectionPoint(key);
+ }
+ beans = resolvedInjectionPoints.get(key);
}
- return resolvedInjectionPoints.get(key);
+ return Collections.unmodifiableSet(beans);
}
public Set<Bean<?>> get(String name)
{
+ Set<Bean<?>> beans;
if (resolvedNames.containsKey(name))
{
- return resolvedNames.get(name);
+ beans = resolvedNames.get(name);
}
else
{
- Set<Bean<?>> beans = new HashSet<Bean<?>>();
+ beans = new HashSet<Bean<?>>();
for (Bean<?> bean : manager.getBeans())
{
if ( (bean.getName() == null && name == null) || (bean.getName() != null && bean.getName().equals(name)))
@@ -108,8 +116,9 @@
}
beans = retainHighestPrecedenceBeans(beans, manager.getEnabledDeploymentTypes());
resolvedNames.put(name, beans);
- return beans;
+
}
+ return Collections.unmodifiableSet(beans);
}
private static Set<Bean<?>> retainHighestPrecedenceBeans(Set<Bean<?>> beans, List<Class<? extends Annotation>> enabledDeploymentTypes)
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-04 12:45:24 UTC (rev 232)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-04 16:48:18 UTC (rev 233)
@@ -111,77 +111,77 @@
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
- public void testEJBInterceptorFails()
+ public void testEnterpriseBeanInterceptorFails()
{
EnterpriseBeanModel<Pug> pug = Util.createEnterpriseBeanModel(Pug.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3")
- public void testEJBDecoratorFails()
+ public void testEnterpriseBeanDecoratorFails()
{
EnterpriseBeanModel<Pekingese> pekingese = Util.createEnterpriseBeanModel(Pekingese.class, manager);
}
- @Test(expectedExceptions = DefinitionException.class)
+ @Test(expectedExceptions = DefinitionException.class, groups="enterpriseBeans")
@SpecAssertion(section = "3.3")
- public void testMultipleAnnotationDefinedEJBsWithSameImplementationClassFails()
+ public void testMultipleAnnotationDefinedEnterpriseBeansWithSameImplementationClassFails()
{
assert false;
}
- @Test
+ @Test(groups={"webbeansxml", "enterpriseBeans"})
@SpecAssertion(section = "3.3")
- public void testMultipleXMLDefinedEJBsWithSameImplementationClassOK()
+ public void testMultipleXMLDefinedEnterpriseBeansWithSameImplementationClassOK()
{
assert false;
}
- @Test(expectedExceptions = DeploymentException.class)
+ @Test(expectedExceptions = DeploymentException.class, groups={"enterpriseBeans", "specialization"})
@SpecAssertion(section = "3.3")
- public void testMultipleEnabledSpecializedEJBFails()
+ public void testMultipleEnabledSpecializedEnterpriseBeanFails()
{
assert false;
}
- @Test
+ @Test(groups="enterpriseBeans")
@SpecAssertion(section = "3.3.1")
- public void testAnnotatedEJB()
+ public void testAnnotatedEnterpriseBean()
{
assert false;
}
- @Test
+ @Test(groups="enterpriseBeans")
@SpecAssertion(section = "3.3.1")
- public void testAnnotatedEJBComplementedWithXML()
+ public void testAnnotatedEnterpriseBeanComplementedWithXML()
{
assert false;
}
- @Test
+ @Test(groups={"enterpriseBeans", "ejbjarxml"})
@SpecAssertion(section = "3.3.1")
- public void testEJBJARDefinedEJB()
+ public void testEJBJARDefinedEnterpriseBean()
{
assert false;
}
- @Test
+ @Test(groups={"enterpriseBeans", "ejbjarxml"})
@SpecAssertion(section = "3.3.1")
- public void testEJBJARDefinedEJBComplementedWithXML()
+ public void testEJBJARDefinedEnterpriseBeanComplementedWithXML()
{
assert false;
}
- @Test
+ @Test(groups="enterpriseBeans")
@SpecAssertion(section = "3.3.2")
public void testAPITypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces()
{
assert false;
}
- @Test
+ @Test(groups="enterpriseBeans")
@SpecAssertion(section = "3.3.2")
- public void testEJBWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInAPITypes()
+ public void testEnterpriseBeanWithLocalViewAndParameterizedTypeIncludesBeanClassAndSuperclassesInAPITypes()
{
assert false;
}
@@ -194,21 +194,21 @@
assert laika.getApiTypes().contains(Object.class);
}
- @Test
+ @Test(groups="enterpriseBeans")
@SpecAssertion(section = "3.3.2")
public void testRemoteInterfacesAreNotInAPITypes()
{
assert false;
}
- @Test
+ @Test(groups={"enterpriseBeans", "producerMethod", "observerMethod", "renoveMethod", "webbeansxml"})
@SpecAssertion(section = "3.3.4")
- public void testXMLDefinedEJBIgnoresProducerAndDisposalAndObserverAnnotations()
+ public void testXMLDefinedEnterpriseBeanIgnoresProducerAndDisposalAndObserverAnnotations()
{
assert false;
}
- @Test(expectedExceptions = DefinitionException.class)
+ @Test(expectedExceptions = DefinitionException.class, groups={"enterpriseBeans", "ejbjarxml", "singletons"})
@SpecAssertion(section = "3.3.4")
public void testXMLDefinedSingletonsFail()
{
@@ -222,63 +222,63 @@
EnterpriseBeanModel<Leopard> Leopard = Util.createEnterpriseBeanModel(Leopard.class, manager);
}
- @Test
+ @Test(groups={"enterpriseBeans", "removeMethod"})
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBRemoveMethodCalledOnDestroy()
+ public void testStatefulEnterpriseBeanRemoveMethodCalledOnDestroy()
{
assert false;
}
@Test
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBWithoutRemoveMethodInDependentScopeOK()
+ public void testStatefulEnterpriseBeanWithoutRemoveMethodInDependentScopeOK()
{
EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBWithoutRemoveMethodInApplicationScopeFails()
+ public void testStatefulEnterpriseBeanWithoutRemoveMethodInApplicationScopeFails()
{
EnterpriseBeanModel<Poodle> poodle = Util.createEnterpriseBeanModel(Poodle.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBWithoutRemoveMethodInSessionScopeFails()
+ public void testStatefulEnterpriseBeanWithoutRemoveMethodInSessionScopeFails()
{
EnterpriseBeanModel<Rottweiler> rottweiler = Util.createEnterpriseBeanModel(Rottweiler.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBWithoutRemoveMethodInConversationScopeFails()
+ public void testStatefulEnterpriseBeanWithoutRemoveMethodInConversationScopeFails()
{
EnterpriseBeanModel<Spitz> spitz = Util.createEnterpriseBeanModel(Spitz.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBWithoutRemoveMethodInRequestScopeFails()
+ public void testStatefulEnterpriseBeanWithoutRemoveMethodInRequestScopeFails()
{
EnterpriseBeanModel<Saluki> saluki = Util.createEnterpriseBeanModel(Saluki.class, manager);
}
- @Test(expectedExceptions = UnremovedException.class)
+ @Test(expectedExceptions = UnremovedException.class, groups={"enterpriseMethods", "removeMethod"})
@SpecAssertion(section = "3.3.5")
- public void testStatefulEJBWithoutRemoveMethodNotExplicitlyDestroyedBeforeManagerAttemptFails()
+ public void testStatefulEnterpriseBeanWithoutRemoveMethodNotExplicitlyDestroyedBeforeManagerAttemptFails()
{
assert false;
}
- @Test
+ @Test(groups={"enterpriseBeans", "removeMethod"})
@SpecAssertion(section = "3.3.5")
- public void testNoParametersPassedWhenEJBRemoveMethodCalledFromApplication()
+ public void testNoParametersPassedWhenEnterpriseBeanRemoveMethodCalledFromApplication()
{
assert false;
}
- @Test
+ @Test(groups={"enterpriseBeans", "removeMethod"})
@SpecAssertion(section = "3.3.5")
public void testWebBeanRemoveMethodCallRemovesInstanceFromContext()
{
@@ -287,7 +287,7 @@
@Test
@SpecAssertion(section = "3.3.5.1")
- public void testAnnotationDefinedEJBWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod()
+ public void testAnnotationDefinedEnterpriseBeanWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod()
{
EnterpriseBeanModel<Armant> whippet = Util.createEnterpriseBeanModel(Armant.class, manager);
assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy");
@@ -295,7 +295,7 @@
@Test
@SpecAssertion(section = "3.3.5.1")
- public void testAnnotationDefinedEJBWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod()
+ public void testAnnotationDefinedEnterpriseBeanWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod()
{
EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager);
assert laika.getRemoveMethod() == null;
@@ -303,91 +303,91 @@
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
- public void testEJBWithMultipleDestructorAnnotationsFail()
+ public void testEnterpriseBeanWithMultipleDestructorAnnotationsFail()
{
EnterpriseBeanModel<Whippet> whippet = Util.createEnterpriseBeanModel(Whippet.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
- public void testAnnotationDefinedEJBWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails()
+ public void testAnnotationDefinedEnterpriseBeanWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails()
{
EnterpriseBeanModel<GoldenRetriever> goldenRetriever = Util.createEnterpriseBeanModel(GoldenRetriever.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
- public void testAnnotationDefinedEJBWithDestructorWithDisposesParameterFails()
+ public void testAnnotationDefinedEnterpriseBeanWithDestructorWithDisposesParameterFails()
{
EnterpriseBeanModel<Pumi> pumi = Util.createEnterpriseBeanModel(Pumi.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
- public void testEJBWithInitializerAnnotationOnRemoveMethodFails()
+ public void testEnterpriseBeanWithInitializerAnnotationOnRemoveMethodFails()
{
EnterpriseBeanModel<JackRussellTerrier> jackRussellTerrier = Util.createEnterpriseBeanModel(JackRussellTerrier.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
- public void testEJBWithProducerAnnotationOnRemoveMethodFails()
+ public void testEnterpriseBeanWithProducerAnnotationOnRemoveMethodFails()
{
EnterpriseBeanModel<RussellTerrier> russellTerrier = Util.createEnterpriseBeanModel(RussellTerrier.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5.1")
- public void testEJBWithRemoveMethodTakingObserverAnnotatedParameterFails()
+ public void testEnterpriseBeanWithRemoveMethodTakingObserverAnnotatedParameterFails()
{
EnterpriseBeanModel<Toller> toller = Util.createEnterpriseBeanModel(Toller.class, manager);
}
// TODO Separate section for XML defined beans?
- @Test
+ @Test(groups={"removeMethod", "enterpriseBeans"})
@SpecAssertion(section = "3.3.5.3")
public void testRemoveMethodParameters()
{
assert false;
}
- @Test(expectedExceptions=DefinitionException.class)
+ @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"})
@SpecAssertion(section = "3.3.6")
public void testSpecializingNotExtendingSpecializedBeanDirectlyFailes()
{
assert false;
}
- @Test
+ @Test(groups={"specialization", "enterpriseBeans"})
@SpecAssertion(section = "3.3.6")
public void testSpecializingBeanInheritsBindingTypes()
{
assert false;
}
- @Test
+ @Test(groups={"specialization", "enterpriseBeans"})
@SpecAssertion(section = "3.3.6")
public void testSpecializingBeanInheritsNameIfAny()
{
assert false;
}
- @Test(expectedExceptions=DefinitionException.class)
+ @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"})
@SpecAssertion(section = "3.3.6")
public void testSpecializingNotSupportingLocalInterfacesOfSpecializedFails()
{
assert false;
}
- @Test(expectedExceptions=DefinitionException.class)
+ @Test(expectedExceptions=DefinitionException.class, groups={"specialization", "enterpriseBeans"})
@SpecAssertion(section = "3.3.6")
public void testSpecializingNotSupportingLocalViewOfSpecializedFails()
{
assert false;
}
- @Test
+ @Test(groups={"specialization", "enterpriseBeans"})
@SpecAssertion(section = "3.3.6")
public void testXMLDefinedSpecializationOnAnnotationDefinedBean()
{
@@ -403,7 +403,7 @@
}
@Test(expectedExceptions=DefinitionException.class)
- public void testStatelessEJBsWithDestructorAnnotationFails()
+ public void testStatelessEnterpriseBeansWithDestructorAnnotationFails()
{
EnterpriseBeanModel<WelshCorgie> welshCorgie = Util.createEnterpriseBeanModel(WelshCorgie.class, manager);
}
Modified: ri/trunk/webbeans-ri/testng.xml
===================================================================
--- ri/trunk/webbeans-ri/testng.xml 2008-11-04 12:45:24 UTC (rev 232)
+++ ri/trunk/webbeans-ri/testng.xml 2008-11-04 16:48:18 UTC (rev 233)
@@ -24,6 +24,10 @@
<exclude name="servlet" />
<exclude name="clientProxy" />
<exclude name="passivation" />
+ <exclude name="enterpriseBeans" />
+ <exclude name="removeMethod" />
+ <exclude name="singletons" />
+ <exclude name="ejbjarxml" />
</run>
</groups>
<packages>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r232 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/event and 7 other directories.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2008-11-04 07:45:24 -0500 (Tue, 04 Nov 2008)
New Revision: 232
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exceptions/TypesafeResolutionLocation.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java
Log:
Some more tests.
arguement -> argument
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -247,7 +247,7 @@
{
// TODO Using the eventType TypeLiteral<T>, the Class<T> object must be
// retrieved
- this.eventBus.addObserver(observer, (Class<T>) Reflections.getActualTypeArguements(eventType.getClass())[0], bindings);
+ this.eventBus.addObserver(observer, (Class<T>) Reflections.getActualTypeArguments(eventType.getClass())[0], bindings);
return this;
}
@@ -374,7 +374,7 @@
{
// TODO The Class<T> for the event type must be retrieved from the
// TypeLiteral<T> instance
- this.eventBus.removeObserver(observer, (Class<T>) Reflections.getActualTypeArguements(eventType.getClass())[0], bindings);
+ this.eventBus.removeObserver(observer, (Class<T>) Reflections.getActualTypeArguments(eventType.getClass())[0], bindings);
return this;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -76,7 +76,7 @@
Set<Annotation> eventBindings = new HashSet<Annotation>();
eventBindings.addAll(this.getBindingTypes());
addAnnotationBindings(eventBindings, bindings);
- Type[] observerTypeArguments = Reflections.getActualTypeArguements(observer.getClass());
+ Type[] observerTypeArguments = Reflections.getActualTypeArguments(observer.getClass());
webBeansManager.addObserver(observer, (Class<T>) observerTypeArguments[0], bindings);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exceptions/TypesafeResolutionLocation.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exceptions/TypesafeResolutionLocation.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/exceptions/TypesafeResolutionLocation.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -43,16 +43,16 @@
return location;
}
- public static String createMessage(Class<?> type, Type[] actualTypeArguements, Set<Annotation> annotations)
+ public static String createMessage(Class<?> type, Type[] actualTypeArguments, Set<Annotation> annotations)
{
String string = type.toString();
- if (actualTypeArguements.length > 0)
+ if (actualTypeArguments.length > 0)
{
string += "<";
- for (int i = 0; i < actualTypeArguements.length; i++)
+ for (int i = 0; i < actualTypeArguments.length; i++)
{
- string += actualTypeArguements[i].toString();
- if (i < actualTypeArguements.length - 1)
+ string += actualTypeArguments[i].toString();
+ if (i < actualTypeArguments.length - 1)
{
string += ",";
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -79,9 +79,9 @@
this(new SimpleAnnotatedItem<T, Object>(bindingTypes, type), modelManager);
}
- public ResolverInjectable(Class<T> type, Annotation[] bindingTypes, ModelManager modelManager, Type ... actualTypeArguements)
+ public ResolverInjectable(Class<T> type, Annotation[] bindingTypes, ModelManager modelManager, Type ... actualTypeArguments)
{
- this(new SimpleAnnotatedItem<T, Object>(bindingTypes, type, actualTypeArguements), modelManager);
+ this(new SimpleAnnotatedItem<T, Object>(bindingTypes, type, actualTypeArguments), modelManager);
}
public ResolverInjectable(TypeLiteral<T> apiType, Annotation[] bindingTypes, ModelManager modelManager)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -131,14 +131,14 @@
public boolean isAssignableFrom(AnnotatedItem<?, ?> that)
{
- return isAssignableFrom(that.getType(), that.getActualTypeArguements());
+ return isAssignableFrom(that.getType(), that.getActualTypeArguments());
}
public boolean isAssignableFrom(Set<Class<?>> types)
{
for (Class<?> type : types)
{
- if (isAssignableFrom(type, Reflections.getActualTypeArguements(type)))
+ if (isAssignableFrom(type, Reflections.getActualTypeArguments(type)))
{
return true;
}
@@ -146,9 +146,9 @@
return false;
}
- private boolean isAssignableFrom(Class<?> type, Type[] actualTypeArguements)
+ private boolean isAssignableFrom(Class<?> type, Type[] actualTypeArguments)
{
- return getType().isAssignableFrom(type) && Arrays.equals(getActualTypeArguements(), actualTypeArguements);
+ return getType().isAssignableFrom(type) && Arrays.equals(getActualTypeArguments(), actualTypeArguments);
}
@Override
@@ -160,7 +160,7 @@
@Override
public String toString()
{
- return TypesafeResolutionLocation.createMessage(getType(), getActualTypeArguements(), getAnnotations());
+ return TypesafeResolutionLocation.createMessage(getType(), getActualTypeArguments(), getAnnotations());
}
}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -57,6 +57,6 @@
public boolean isAssignableFrom(Set<Class<?>> types);
- public Type[] getActualTypeArguements();
+ public Type[] getActualTypeArguments();
}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -23,7 +23,7 @@
this.clazz = annotationType;
}
- public Type[] getActualTypeArguements()
+ public Type[] getActualTypeArguments()
{
return new Type[0];
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -6,7 +6,7 @@
public class SimpleAnnotatedConstructor<T> extends AbstractAnnotatedItem<T, Constructor<T>> implements AnnotatedConstructor<T>
{
- private static final Type[] actualTypeArguements = new Type[0];
+ private static final Type[] actualTypeArguments = new Type[0];
private Constructor<T> constructor;
@@ -31,9 +31,9 @@
return constructor.getDeclaringClass();
}
- public Type[] getActualTypeArguements()
+ public Type[] getActualTypeArguments()
{
- return actualTypeArguements;
+ return actualTypeArguments;
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -7,7 +7,7 @@
public class SimpleAnnotatedField<T> extends AbstractAnnotatedItem<T, Field> implements AnnotatedField<T>
{
- private Type[] actualTypeArguements = new Type[0];
+ private Type[] actualTypeArguments = new Type[0];
private Field field;
@@ -18,7 +18,7 @@
if (field.getGenericType() instanceof ParameterizedType)
{
ParameterizedType type = (ParameterizedType) field.getGenericType();
- actualTypeArguements = type.getActualTypeArguments();
+ actualTypeArguments = type.getActualTypeArguments();
}
}
@@ -37,9 +37,9 @@
return (Class<T>) field.getType();
}
- public Type[] getActualTypeArguements()
+ public Type[] getActualTypeArguments()
{
- return actualTypeArguements;
+ return actualTypeArguments;
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -35,10 +35,10 @@
}
}
- private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type, Type[] actualTypeArguements)
+ private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type, Type[] actualTypeArguments)
{
this(annotationMap, type);
- this.actualTypeArguments = actualTypeArguements;
+ this.actualTypeArguments = actualTypeArguments;
}
public SimpleAnnotatedItem(Annotation[] annotations)
@@ -59,9 +59,9 @@
this.actualAnnotations = annotations;
}
- public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type, Type[] actualTypeArguements)
+ public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type, Type[] actualTypeArguments)
{
- this(buildAnnotationMap(annotations), type, actualTypeArguements);
+ this(buildAnnotationMap(annotations), type, actualTypeArguments);
this.actualAnnotations = annotations;
}
@@ -75,7 +75,7 @@
return type;
}
- public Type[] getActualTypeArguements()
+ public Type[] getActualTypeArguments()
{
return actualTypeArguments;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -6,7 +6,7 @@
public class SimpleAnnotatedMethod<T> extends AbstractAnnotatedItem<T, Method> implements AnnotatedMethod<T>
{
- private static final Type[] actualTypeArguements = new Type[0];
+ private static final Type[] actualTypeArgements = new Type[0];
private Method method;
@@ -31,9 +31,9 @@
return (Class<T>) method.getReturnType();
}
- public Type[] getActualTypeArguements()
+ public Type[] getActualTypeArguments()
{
- return actualTypeArguements;
+ return actualTypeArgements;
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -20,7 +20,7 @@
{
private Class<T> clazz;
- private Type[] actualTypeArguements;
+ private Type[] actualTypeArguments;
private Set<AnnotatedField<Object>> fields;
private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> annotatedFields;
private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> metaAnnotatedFields;
@@ -32,11 +32,11 @@
if (this.clazz.getGenericSuperclass() instanceof ParameterizedType)
{
ParameterizedType type = (ParameterizedType) this.clazz.getGenericSuperclass();
- actualTypeArguements = type.getActualTypeArguments();
+ actualTypeArguments = type.getActualTypeArguments();
}
else
{
- actualTypeArguements = new Type[0];
+ actualTypeArguments = new Type[0];
}
}
@@ -143,9 +143,9 @@
return clazz;
}
- public Type[] getActualTypeArguements()
+ public Type[] getActualTypeArguments()
{
- return actualTypeArguements;
+ return actualTypeArguments;
}
}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -27,10 +27,18 @@
{
super.init(container);
ejbMetaData = container.getEjbManager().getEjbMetaData(getType());
+ checkEnterpriseBeanTypeAllowed();
checkEnterpriseScopeAllowed();
checkConflictingRoles();
}
+ private void checkEnterpriseBeanTypeAllowed()
+ {
+ if (getEjbMetaData().isMessageDriven()) {
+ throw new DefinitionException("Message Driven Beans can't be Web Beans");
+ }
+ }
+
protected EjbMetaData<T> getEjbMetaData()
{
return ejbMetaData;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -16,6 +16,7 @@
import javax.webbeans.Produces;
import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.ejb.EJB;
import org.jboss.webbeans.injectable.BeanConstructor;
import org.jboss.webbeans.injectable.EnterpriseConstructor;
import org.jboss.webbeans.injectable.InjectableMethod;
@@ -132,6 +133,9 @@
private InjectableMethod<?> checkRemoveMethod(Method method)
{
+ if (method.isAnnotationPresent(Destructor.class) && !method.isAnnotationPresent(EJB.REMOVE_ANNOTATION)) {
+ throw new DefinitionException("Methods marked @Destructor must also be marked @Remove on " + method.getName());
+ }
if (method.isAnnotationPresent(Initializer.class)) {
throw new DefinitionException("Remove methods cannot be initializers on " + method.getName());
}
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 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -230,7 +230,7 @@
return annotationTypeList.size() == 0;
}
- public static Type[] getActualTypeArguements(Class<?> clazz)
+ public static Type[] getActualTypeArguments(Class<?> clazz)
{
if (clazz.getGenericSuperclass() instanceof ParameterizedType)
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-04 10:45:28 UTC (rev 231)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -8,11 +8,14 @@
import org.jboss.webbeans.test.beans.Giraffe;
import org.jboss.webbeans.test.beans.GreatDane;
import org.jboss.webbeans.test.beans.Laika;
+import org.jboss.webbeans.test.beans.Leopard;
import org.jboss.webbeans.test.beans.Pitbull;
+import org.jboss.webbeans.test.beans.broken.Armant;
import org.jboss.webbeans.test.beans.broken.Beagle;
import org.jboss.webbeans.test.beans.broken.Boxer;
import org.jboss.webbeans.test.beans.broken.Bullmastiff;
import org.jboss.webbeans.test.beans.broken.Dachshund;
+import org.jboss.webbeans.test.beans.broken.GoldenRetriever;
import org.jboss.webbeans.test.beans.broken.Greyhound;
import org.jboss.webbeans.test.beans.broken.Husky;
import org.jboss.webbeans.test.beans.broken.IrishTerrier;
@@ -213,10 +216,10 @@
}
@Test(expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.3.4")
- public void testMessageDrivenBeansDefinedWithXMLNotOK()
+ @SpecAssertion(section = "3.3")
+ public void testMessageDrivenBeansNotOK()
{
- assert false;
+ EnterpriseBeanModel<Leopard> Leopard = Util.createEnterpriseBeanModel(Leopard.class, manager);
}
@Test
@@ -286,14 +289,16 @@
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEJBWithoutDestructorUsesRemoveMethodWithoutParamsAsWebBeansRemoveMethod()
{
- assert false;
+ EnterpriseBeanModel<Armant> whippet = Util.createEnterpriseBeanModel(Armant.class, manager);
+ assert whippet.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("destroy");
}
@Test
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEJBWithoutDestructorAndRemoveMethodWithoutParamsHasNoWebBeansRemoveMethod()
{
- assert false;
+ EnterpriseBeanModel<Laika> laika = Util.createEnterpriseBeanModel(Laika.class, manager);
+ assert laika.getRemoveMethod() == null;
}
@Test(expectedExceptions = DefinitionException.class)
@@ -307,7 +312,7 @@
@SpecAssertion(section = "3.3.5.1")
public void testAnnotationDefinedEJBWithDestructorAnnotationOnMethodNotAnEJBRemoveMethodFails()
{
- assert false;
+ EnterpriseBeanModel<GoldenRetriever> goldenRetriever = Util.createEnterpriseBeanModel(GoldenRetriever.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Armant.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@Stateful
+public class Armant
+{
+ @Remove
+ public void destroy() {
+
+ }
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldenRetriever.java 2008-11-04 12:45:24 UTC (rev 232)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Destructor;
+
+@Stateful
+public class GoldenRetriever
+{
+ @Destructor
+ public void destroy() {
+
+ }
+}
15 years, 5 months