[webbeans-commits] Webbeans SVN: r236 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Nov 4 12:33:49 EST 2008
Author: pete.muir at 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>
More information about the weld-commits
mailing list