[webbeans-commits] Webbeans SVN: r2263 - in tck/trunk/impl/src/main: resources and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-03-29 21:31:29 -0400 (Sun, 29 Mar 2009)
New Revision: 2263

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/BorderCollie.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
fixed test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/BorderCollie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/BorderCollie.java	2009-03-30 01:22:04 UTC (rev 2262)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/BorderCollie.java	2009-03-30 01:31:29 UTC (rev 2263)
@@ -2,6 +2,7 @@
 
 import javax.ejb.Stateless;
 
+ at Woof
 @Stateless
 public class BorderCollie extends Dog implements BorderCollieLocal
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java	2009-03-30 01:22:04 UTC (rev 2262)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/EnterpriseDeploymentTypeDefinitionTest.java	2009-03-30 01:31:29 UTC (rev 2263)
@@ -19,8 +19,8 @@
    @SpecAssertion(section = "4.1", id = "cb")
    public void testDeploymentTypeDeclaredInheritedIsInherited() throws Exception
    {
-      assert getCurrentManager().resolveByType(BorderCollieLocal.class).size() == 1;
-      assert getCurrentManager().resolveByType(BorderCollieLocal.class).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
+      assert getCurrentManager().resolveByType(BorderCollieLocal.class, new WoofBinding()).size() == 1;
+      assert getCurrentManager().resolveByType(BorderCollieLocal.class, new WoofBinding()).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
    }
    
    @Test(groups = { "deploymentType" })

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/Woof.java	2009-03-30 01:31:29 UTC (rev 2263)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.definition.deployment.enterprise;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+public @interface Woof
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/enterprise/WoofBinding.java	2009-03-30 01:31:29 UTC (rev 2263)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.definition.deployment.enterprise;
+
+import javax.inject.AnnotationLiteral;
+
+public class WoofBinding extends AnnotationLiteral<Woof> implements Woof
+{
+
+}

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-03-30 01:22:04 UTC (rev 2262)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-03-30 01:31:29 UTC (rev 2263)
@@ -2937,7 +2937,7 @@
   </section>
   
   <section id="5.7.1" title="Resolving dependencies">
-    <assertion id="a">
+    <assertion id="a" testable="false">
       <text>Implementations of Bean maintain a reference to an instance of |Manager|</text>
     </assertion>