Update tests for section 3.2 to PDR

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@164 1c488680-804c-0410-94cd-c6b725194a0e
weld · Oct 26, 2008 · fe7a559 · fe7a559
1 parent 9f2dddb
commit fe7a559
Show file tree

Hide file tree

Showing 14 changed files with 292 additions and 316 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractClassBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractClassBeanModel.java
@@ -143,7 +143,7 @@ protected void checkBeanImplementation()
    {
       if (Reflections.isAbstract(getType()))
       {
-         throw new RuntimeException("Web Bean implementation class " + type + " cannot be declared abstract");
+         throw new DefinitionException("Web Bean implementation class " + type + " cannot be declared abstract");
       }
    }
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
@@ -5,6 +5,7 @@
 import java.util.logging.Logger;
 
 import javax.webbeans.BindingType;
+import javax.webbeans.DefinitionException;
 import javax.webbeans.Initializer;
 
 import org.jboss.webbeans.ManagerImpl;
@@ -59,7 +60,7 @@ public static void checkType(Class<?> type)
    {
       if (type.isMemberClass())
       {
-         throw new RuntimeException("Simple Web Bean " + type + " cannot be an inner class");
+         throw new DefinitionException("Simple Web Bean " + type + " cannot be an inner class");
       }
    }
 

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java
diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java
@@ -87,7 +87,7 @@ public void testJavaNamedUsedWhenNoXmlSpecified()
       assert cod.getName().equals("whitefish");
    }
 
-   @Test @SpecAssertion(section="2.6.3")
+   @Test @SpecAssertion(section={"2.6.3", "3.2.7"})
    public void testDefaultNamed()
    {
       SimpleBeanModel<Haddock> haddock = new SimpleBeanModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedType(Haddock.class), manager);

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java
@@ -5,21 +5,21 @@
 public class ProducerExpressionBeanLifecycleTest
 {
 
-   @Test(groups={"beanLifecycle", "producerExpression"}) @SpecAssertion(section="3.4")
+   @Test(groups={"beanLifecycle", "producerMethod"}) @SpecAssertion(section="3.4")
    public void testNonDependentProducerExpressionThatReturnsNull()
    {
       // TODO Placeholder
       assert false;
    }
 
-   @Test(groups={"beanLifecycle", "producerExpression"}) @SpecAssertion(section="3.4")
+   @Test(groups={"beanLifecycle", "producerMethod"}) @SpecAssertion(section="3.4")
    public void testDependentProducerExpressionThatReturnsNull()
    {
       // TODO Placeholder
       assert false;
    }
 
-   @Test(groups={"beanLifecycle", "producerExpression"}) @SpecAssertion(section="3.4")
+   @Test(groups={"beanLifecycle", "producerMethod"}) @SpecAssertion(section="3.4")
    public void testProducerExpressionHasValidRuntimeApiType()
    {
       // TODO Placeholder

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.java
@@ -5,25 +5,25 @@
 public class ProducerExpressionBeanModelTest extends AbstractTest
 {
 
-   @Test(groups="producerExpression") @SpecAssertion(section="3.4")
+   @Test(groups="producerMethod") @SpecAssertion(section="3.4")
    public void testApiTypes()
    {
       assert false;
    }
 
-   @Test(groups="producerExpression") @SpecAssertion(section="3.4")
+   @Test(groups="producerMethod") @SpecAssertion(section="3.4")
    public void testFinalProducerExpression()
    {
       assert false;
    }
 
-   @Test(groups="producerExpression") @SpecAssertion(section="3.4")
+   @Test(groups="producerMethod") @SpecAssertion(section="3.4")
    public void testFinalDependentProducerExpression()
    {
       assert false;
    }
 
-   @Test(groups="producerExpression") @SpecAssertion(section="3.4.2")
+   @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
    public void testProducerExpressionCannotHaveDefaultName()
    {
       assert false;