[webbeans-commits] Webbeans SVN: r2817 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-06-10 12:23:15 -0400 (Wed, 10 Jun 2009)
New Revision: 2817

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
Log:
TCK updates

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java	2009-06-10 16:12:53 UTC (rev 2816)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java	2009-06-10 16:23:15 UTC (rev 2817)
@@ -1,7 +1,6 @@
 package org.jboss.jsr299.tck.tests.definition.name;
 
 import javax.enterprise.inject.spi.Bean;
-import javax.inject.DefinitionException;
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
@@ -11,20 +10,13 @@
 
 /**
  * 
- * Spec version: PRD2
+ * Spec version: 20090519
  *
  */
 @Artifact
 public class NameDefinitionTest extends AbstractJSR299Test
 {
    
-   @Test(groups="stub", expectedExceptions=DefinitionException.class) 
-   @SpecAssertion(section="2.6", id = "a")
-   public void testInvalidElIdentifierUsedAsWebBeanName()
-   {
-      assert false;
-   }
-   
    @Test 
    @SpecAssertions({
       @SpecAssertion(section="2.6.1", id = "a"),
@@ -40,8 +32,8 @@
    
    @Test 
    @SpecAssertions({
-      @SpecAssertion(section= "2.6.3", id = "a"),
-      @SpecAssertion(section = "3.2.8", id = "a"),
+      @SpecAssertion(section= "2.6.2", id = "a"),
+      @SpecAssertion(section = "3.2.6", id = "a"),
       @SpecAssertion(section = "2.6.1", id = "d")
    })
    public void testDefaultNamed()
@@ -53,8 +45,7 @@
    }
    
    @Test 
-   @SpecAssertions({
-      @SpecAssertion(section = "2.6.3", id = "c"), 
+   @SpecAssertions({ 
       @SpecAssertion(section = "2.7", id = "a"),
       @SpecAssertion(section = "2.7.1.3", id = "b")
    })
@@ -67,7 +58,7 @@
    
    @Test 
    @SpecAssertions({
-      @SpecAssertion(section="2.6.4", id = "a"),
+      @SpecAssertion(section="2.6.3", id = "a"),
       @SpecAssertion(section="2", id="e")
    })
    public void testNotNamedInJava()
@@ -77,13 +68,7 @@
       assert bean.getName() == null;
    }
    
-   @Test(groups="stub") @SpecAssertion(section="2.6.4", id = "a")
-   public void testNotNamedInXml()
-   {
-      assert false;
-   }
-   
-   @Test @SpecAssertion(section="2.6.4", id = "a")
+   @Test @SpecAssertion(section="2.6.3", id = "a")
    public void testNotNamedInStereotype()
    {
       assert getBeans(Minnow.class).size() == 1;