[weld-commits] Weld SVN: r6271 - in cdi-tck/branches/1.0/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-21 15:23:09 -0400 (Fri, 21 May 2010)
New Revision: 6271

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
   cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml
Log:
CDITCK-162

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-05-21 19:10:11 UTC (rev 6270)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-05-21 19:23:09 UTC (rev 6271)
@@ -85,6 +85,8 @@
       // Verify that the instance returned is a proxy by checking for all local interfaces
       assert getCurrentConfiguration().getBeans().isProxy(stadtInstance);
       Set<Class> interfaces = new HashSet<Class>(Arrays.asList(stadtInstance.getClass().getInterfaces()));
+      Class c = stadtInstance.getClass();
+      Class[] cs = c.getInterfaces();
       assert interfaces.contains(KleinStadt.class);
       assert interfaces.contains(SchoeneStadt.class);
       assert interfaces.contains(Serializable.class);

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2010-05-21 19:10:11 UTC (rev 6270)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2010-05-21 19:23:09 UTC (rev 6271)
@@ -47,7 +47,6 @@
       CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
       ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
       assert managedBean.getBeanManager() != null : "@Another Manager not found";
-      assert managedBean.getBeanManager().equals(getCurrentManager()): "Wrong manager found";
    }
    
    @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
@@ -62,7 +61,6 @@
       CreationalContext<BeanManager> beanManagerCc = getCurrentManager().createCreationalContext(beanManagerBean);
       BeanManager beanManager = beanManagerBean.create(beanManagerCc);
       assert beanManager != null;
-      assert beanManager.equals(getCurrentManager());
    }
    
    @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })

Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml	2010-05-21 19:10:11 UTC (rev 6270)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml	2010-05-21 19:23:09 UTC (rev 6271)
@@ -175,8 +175,15 @@
                <exclude name="testConstructorAnnotatedInjectCalled" />
             </methods>
          </class>
+         
+         <!-- CDITCK-162 -->
+         <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
+            <methods>
+               <exclude name="testInjectionOfResource" />
+               <exclude name="testPassivatingResource" />
+            </methods>
+         </class>
                   
-                  
          <!-- Issues in Weld (the RI) -->
 
          <!-- WELD-401 -->