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

[webbeans-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-03-25 23:53:58 -0400 (Wed, 25 Mar 2009)
New Revision: 2211

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
Log:
implement tests for 2.4.2.aa, 2.4.2.b

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java	2009-03-26 03:34:01 UTC (rev 2210)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/AnotherScopeType.java	2009-03-26 03:53:58 UTC (rev 2211)
@@ -2,6 +2,7 @@
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
@@ -10,7 +11,7 @@
 
 import javax.context.ScopeType;
 
- at Target( { TYPE, METHOD })
+ at Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
 @Documented
 @ScopeType

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java	2009-03-26 03:34:01 UTC (rev 2210)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java	2009-03-26 03:53:58 UTC (rev 2211)
@@ -1,8 +1,15 @@
 package org.jboss.jsr299.tck.tests.definition.scope;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
 import javax.context.ApplicationScoped;
 import javax.context.Dependent;
 import javax.context.RequestScoped;
+import javax.context.ScopeType;
 import javax.inject.manager.Bean;
 
 import org.hibernate.tck.annotations.SpecAssertion;
@@ -28,18 +35,26 @@
       assert bean.getScopeType().equals(AnotherScopeType.class);
    }
    
-   @Test(groups={"stub", "annotationDefinition"}) 
+   @Test(groups={"annotationDefinition"}) 
    @SpecAssertion(section="2.4.2", id = "aa")
    public void testScopeTypeHasCorrectTarget()
    {
-      assert false;
+      assert getCurrentManager().resolveByType(Mullet.class).size() == 1; 
+      Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next();
+      Target target = bean.getScopeType().getAnnotation(Target.class);
+      List<ElementType> elements = Arrays.asList(target.value());
+      assert elements.contains(ElementType.TYPE);
+      assert elements.contains(ElementType.METHOD);
+      assert elements.contains(ElementType.FIELD);      
    }
 
-   @Test(groups={"stub", "annotationDefinition"}) 
+   @Test(groups={"annotationDefinition"}) 
    @SpecAssertion(section="2.4.2", id = "b")
    public void testScopeTypeDeclaresScopeTypeAnnotation()
    {
-      assert false;
+      assert getCurrentManager().resolveByType(Mullet.class).size() == 1; 
+      Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next();
+      assert bean.getScopeType().getAnnotation(ScopeType.class) != null;
    }
    
    @Test @SpecAssertion(section="2.4.3", id = "a")
@@ -135,7 +150,6 @@
    @SpecAssertion(section = "4.1", id = "bc")
    public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
    {
-
       assert getCurrentManager().resolveByType(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
    }