[webbeans-commits] Webbeans SVN: r230 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/model/bean and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Nov 4 03:27:26 EST 2008
Author: nickarls
Date: 2008-11-04 03:27:26 -0500 (Tue, 04 Nov 2008)
New Revision: 230
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.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/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java
Log:
More EJB tests + fixes
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java 2008-11-04 07:19:07 UTC (rev 229)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -14,6 +14,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.webbeans.Destructor;
+
import org.jboss.webbeans.util.Reflections;
public class EjbMetaData<T>
@@ -58,6 +60,10 @@
{
removeMethods.add(removeMethod);
}
+ for (Method destructorMethod : Reflections.getMethods(type, Destructor.class))
+ {
+ removeMethods.add(destructorMethod);
+ }
}
else if (type.isAnnotationPresent(MESSAGE_DRIVEN_ANNOTATION))
{
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 07:19:07 UTC (rev 229)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractEnterpriseBeanModel.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -20,7 +20,6 @@
AnnotatedType<T> xmlAnnotatedItem)
{
super(annotatedItem, xmlAnnotatedItem);
-
}
@Override
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 07:19:07 UTC (rev 229)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -98,11 +98,11 @@
}
else if (possibleRemoveMethods.size() > 1)
{
- throw new RuntimeException("Multiple remove methods are annotated @Destroys for " + getType());
+ throw new DefinitionException("Multiple remove methods are annotated @Destructor for " + getType());
}
else if (possibleRemoveMethods.size() == 0)
{
- throw new RuntimeException("Multiple remove methods are declared, and none are annotated @Destroys for " + getType());
+ throw new RuntimeException("Multiple remove methods are declared, and none are annotated @Destructor for " + getType());
}
}
else if (getEjbMetaData().getRemoveMethods().isEmpty() && !getScopeType().equals(Dependent.class))
@@ -115,7 +115,7 @@
List<Method> destroysMethods = Reflections.getMethods(getType(), Destructor.class);
if (destroysMethods.size() > 0)
{
- throw new RuntimeException("Only stateful enterprise beans can have methods annotated @Destroys; " + getType() + " is not a stateful enterprise bean");
+ throw new RuntimeException("Only stateful enterprise beans can have methods annotated @Destructor; " + getType() + " is not a stateful enterprise bean");
}
}
}
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 07:19:07 UTC (rev 229)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -4,7 +4,6 @@
import javax.webbeans.DeploymentException;
import javax.webbeans.UnremovedException;
-import org.jboss.webbeans.model.StereotypeModel;
import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
import org.jboss.webbeans.test.beans.Giraffe;
import org.jboss.webbeans.test.beans.GreatDane;
@@ -18,7 +17,12 @@
import org.jboss.webbeans.test.beans.broken.Husky;
import org.jboss.webbeans.test.beans.broken.IrishTerrier;
import org.jboss.webbeans.test.beans.broken.Pekingese;
+import org.jboss.webbeans.test.beans.broken.Poodle;
import org.jboss.webbeans.test.beans.broken.Pug;
+import org.jboss.webbeans.test.beans.broken.Rottweiler;
+import org.jboss.webbeans.test.beans.broken.Saluki;
+import org.jboss.webbeans.test.beans.broken.Spitz;
+import org.jboss.webbeans.test.beans.broken.Whippet;
import org.jboss.webbeans.test.util.Util;
import org.testng.annotations.Test;
@@ -204,7 +208,7 @@
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.4")
- public void testMessageDrivenBeansNotOK()
+ public void testMessageDrivenBeansDefinedWithXMLNotOK()
{
assert false;
}
@@ -227,28 +231,28 @@
@SpecAssertion(section = "3.3.5")
public void testStatefulEJBWithoutRemoveMethodInApplicationScopeFails()
{
- assert false;
+ EnterpriseBeanModel<Poodle> poodle = Util.createEnterpriseBeanModel(Poodle.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEJBWithoutRemoveMethodInSessionScopeFails()
{
- assert false;
+ EnterpriseBeanModel<Rottweiler> rottweiler = Util.createEnterpriseBeanModel(Rottweiler.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEJBWithoutRemoveMethodInConversationScopeFails()
{
- assert false;
+ EnterpriseBeanModel<Spitz> spitz = Util.createEnterpriseBeanModel(Spitz.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.5")
public void testStatefulEJBWithoutRemoveMethodInRequestScopeFails()
{
- assert false;
+ EnterpriseBeanModel<Saluki> saluki = Util.createEnterpriseBeanModel(Saluki.class, manager);
}
@Test(expectedExceptions = UnremovedException.class)
@@ -290,7 +294,7 @@
@SpecAssertion(section = "3.3.5.1")
public void testEJBWithMultipleDestructorAnnotationsFail()
{
- assert false;
+ EnterpriseBeanModel<Whippet> whippet = Util.createEnterpriseBeanModel(Whippet.class, manager);
}
@Test(expectedExceptions = DefinitionException.class)
@@ -376,7 +380,8 @@
@SpecAssertion(section = "3.3.7")
public void testDefaultName()
{
- assert false;
+ EnterpriseBeanModel<Pitbull> pitbull = Util.createEnterpriseBeanModel(Pitbull.class, manager);
+ assert pitbull.getName().equals("pitbull");
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java 2008-11-04 07:19:07 UTC (rev 229)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Pitbull.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -1,8 +1,10 @@
package org.jboss.webbeans.test.beans;
import javax.ejb.Stateful;
+import javax.webbeans.Named;
@Stateful
+ at Named
public class Pitbull
{
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Poodle.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Stateful;
+import javax.webbeans.ApplicationScoped;
+
+ at Stateful
+ at ApplicationScoped
+public class Poodle
+{
+
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Rottweiler.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Stateful;
+import javax.webbeans.SessionScoped;
+
+ at Stateful
+ at SessionScoped
+public class Rottweiler
+{
+
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Saluki.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Stateful;
+import javax.webbeans.RequestScoped;
+
+ at Stateful
+ at RequestScoped
+public class Saluki
+{
+
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Spitz.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Stateful;
+import javax.webbeans.ConversationScoped;
+
+ at Stateful
+ at ConversationScoped
+public class Spitz
+{
+
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Whippet.java 2008-11-04 08:27:26 UTC (rev 230)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.ejb.Stateful;
+import javax.webbeans.Destructor;
+
+ at Stateful
+public class Whippet
+{
+ @Destructor
+ public void destroy1() {
+
+ }
+
+ @Destructor
+ public void destroy2() {
+
+ }
+}
More information about the weld-commits
mailing list