[webbeans-commits] Webbeans SVN: r3064 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/injectionpoint and 1 other directory.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Thu Jul 16 01:24:38 EDT 2009


Author: shane.bryzak at jboss.com
Date: 2009-07-16 01:24:38 -0400 (Thu, 16 Jul 2009)
New Revision: 3064

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
Log:
matched enterprise bean and injection point tests

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-07-16 04:32:53 UTC (rev 3063)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java	2009-07-16 05:24:38 UTC (rev 3064)
@@ -19,7 +19,7 @@
 /**
  * @author Nicklas Karlsson
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  */
 @Artifact
 @Packaging(PackagingType.EAR)
@@ -27,7 +27,7 @@
 public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test
 {
    @Test(groups = { "enterpriseBeans" })
-   @SpecAssertion(section = "3.3", id = "b")
+   @SpecAssertion(section = "3.2", id = "b")
    public void testStatelessMustBeDependentScoped()
    {
       assert getBeans(GiraffeLocal.class).size() == 1;
@@ -35,14 +35,14 @@
    }
 
    @Test(groups = { "enterpriseBeans" })
-   @SpecAssertion(section = "3.3", id = "c")
+   @SpecAssertion(section = "3.2", id = "c")
    public void testSingletonWithDependentScopeOK()
    {
       assert getBeans(Labrador.class).size() == 1;
    }
 
    @Test(groups = { "enterpriseBeans" })
-   @SpecAssertion(section = "3.3", id = "c")
+   @SpecAssertion(section = "3.2", id = "c")
    public void testSingletonWithApplicationScopeOK()
    {
       assert getBeans(Laika.class).size() == 1;
@@ -50,9 +50,9 @@
 
    @Test(groups = { "enterpriseBeans" })
    @SpecAssertions( {
-      @SpecAssertion(section = "3.2.1", id = "f"),
-      @SpecAssertion(section = "3.3.2", id = "aa"),
-      @SpecAssertion(section = "3.3.3", id = "c") } )
+      @SpecAssertion(section = "3.1.1", id = "f"),
+      @SpecAssertion(section = "3.2.2", id = "aa"),
+      @SpecAssertion(section = "3.2.3", id = "c") } )
    public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces()
    {
       Bean<DogLocal> dogBean = getBeans(DogLocal.class).iterator().next();
@@ -67,7 +67,7 @@
     * superclasses.
     */
    @Test(groups = { "ejb 3.1", "ri-broken" })
-   @SpecAssertion(section = "3.3.2", id = "ba")
+   @SpecAssertion(section = "3.2.2", id = "ba")
    public void testEnterpriseBeanWithLocalViewAndNotParameterizedTypeHasClassAndSuperclassesAsBeanTypes()
    {
       //TODO We need a 3.1 compliant container for this test
@@ -77,8 +77,8 @@
 
    @Test(groups = "enterpriseBeans")
    @SpecAssertions({
-      @SpecAssertion(section = "3.3.2", id = "c"),
-      @SpecAssertion(section = "3.3.3", id = "a"),
+      @SpecAssertion(section = "3.2.2", id = "c"),
+      @SpecAssertion(section = "3.2.3", id = "a"),
       @SpecAssertion(section = "2.2", id = "l")
    })
    public void testObjectIsInAPITypes()
@@ -88,7 +88,7 @@
    }
 
    @Test(groups = { "enterpriseBeans" })
-   @SpecAssertion(section = "3.3.2", id = "d")
+   @SpecAssertion(section = "3.2.2", id = "d")
    public void testRemoteInterfacesAreNotInAPITypes()
    {
       Bean<DogLocal> dogBean = getBeans(DogLocal.class).iterator().next();
@@ -96,7 +96,7 @@
    }
 
    @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.3.3", id = "ba")
+   @SpecAssertion(section = "3.2.3", id = "ba")
    public void testBeanWithScopeAnnotation()
    {
       Bean<LionLocal> lionBean = getBeans(LionLocal.class).iterator().next();
@@ -104,7 +104,7 @@
    }
 
    @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.3.3", id = "bb")
+   @SpecAssertion(section = "3.2.3", id = "bb")
    public void testBeanWithNamedAnnotation()
    {
       Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
@@ -112,7 +112,7 @@
    }
 
    @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.3.3", id = "bc")
+   @SpecAssertion(section = "3.2.3", id = "bc")
    public void testBeanWithDeploymentType()
    {
       Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
@@ -120,7 +120,7 @@
    }
 
    @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.3.3", id = "bd")
+   @SpecAssertion(section = "3.2.3", id = "bd")
    public void testBeanWithStereotype()
    {
       Bean<PolarBearLocal> polarBearBean = getBeans(PolarBearLocal.class).iterator().next();
@@ -130,7 +130,7 @@
    }
 
    @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.3.3", id = "be")
+   @SpecAssertion(section = "3.2.3", id = "be")
    public void testBeanWithBindings()
    {
       Annotation tame = new AnnotationLiteral<Tame>(){};
@@ -139,7 +139,7 @@
    }
 
    @Test(groups = "enterpriseBeans")
-   @SpecAssertion(section = "3.3.5", id = "a")
+   @SpecAssertion(section = "3.2.5", id = "a")
    public void testDefaultName()
    {
       assert getBeans(PitbullLocal.class).size() == 1;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java	2009-07-16 04:32:53 UTC (rev 3063)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java	2009-07-16 05:24:38 UTC (rev 3064)
@@ -40,14 +40,14 @@
  * 
  * @author David Allen
  * 
- * Spec version: 20090519
+ * Spec version: 20090625
  */
 @Artifact
 public class InjectionPointTest extends AbstractJSR299Test
 {
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "aa")
+   @SpecAssertion(section = "5.6.9", id = "aa")
    public void testGetBean() throws Exception
    {
 
@@ -70,7 +70,7 @@
    }
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "ba")
+   @SpecAssertion(section = "5.6.9", id = "ba")
    public void testGetType() throws Exception
    {
       // Get an instance of the bean which has another bean injected into it
@@ -89,7 +89,7 @@
    }
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "bc")
+   @SpecAssertion(section = "5.6.9", id = "bc")
    public void testGetBindingTypes() throws Exception
    {
       // Get an instance of the bean which has another bean injected into it
@@ -110,7 +110,7 @@
    }
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "ca")
+   @SpecAssertion(section = "5.6.9", id = "ca")
    public void testGetMemberField() throws Exception
    {
       // Get an instance of the bean which has another bean injected into it
@@ -129,7 +129,7 @@
    }
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "cb")
+   @SpecAssertion(section = "5.6.9", id = "cb")
    public void testGetMemberMethod() throws Exception
    {
       // Get an instance of the bean which has another bean injected into it
@@ -153,7 +153,7 @@
    }
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "cc")
+   @SpecAssertion(section = "5.6.9", id = "cc")
    public void testGetMemberConstructor() throws Exception
    {
       // Get an instance of the bean which has another bean injected into it
@@ -177,7 +177,7 @@
    }
 
    @Test(groups = { "injectionPoint", "rewrite" })
-   @SpecAssertion(section = "5.4.9", id = "daa")
+   @SpecAssertion(section = "5.6.9", id = "daa")
    public void testGetAnnotation() throws Exception
    {
       // Get an instance of the bean which has another bean injected into it
@@ -195,10 +195,10 @@
       }.run();
    }
 
-   @Test(groups = { "injectionPoint" })
+   @Test(groups = { "injectionPoint", "deployment" })
    @SpecAssertions({
-      @SpecAssertion(section = "5.4.9", id = "e"),
-      @SpecAssertion(section = "2.5.1", id="a")
+      @SpecAssertion(section = "5.6.9", id = "e"),
+      @SpecAssertion(section = "2.5.1", id="review") // deployment types removed from spec
    })
    public void testStandardDeployment() throws Exception
    {
@@ -216,7 +216,7 @@
    }
 
    @Test(groups = { "injectionPoint" })
-   @SpecAssertion(section = "5.4.9", id = "e")
+   @SpecAssertion(section = "5.6.9", id = "e")
    public void testDependentScope() throws Exception
    {
       new RunInDependentContext()
@@ -234,7 +234,7 @@
 
    @Test(groups = { "injectionPoint" })
    @SpecAssertions({
-      @SpecAssertion(section = "5.4.9", id = "e")
+      @SpecAssertion(section = "5.6.9", id = "e")
    })
    public void testApiTypeInjectionPoint()  throws Exception
    {
@@ -255,7 +255,7 @@
 
    @Test(groups = { "injectionPoint" })
    @SpecAssertions({
-      @SpecAssertion(section = "5.4.9", id = "e")
+      @SpecAssertion(section = "5.6.9", id = "e")
    })
    public void testCurrentBinding() throws Exception
    {




More information about the weld-commits mailing list