[weld-commits] Weld SVN: r6280 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation: simple/resource/resource and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-21 18:19:43 -0400 (Fri, 21 May 2010)
New Revision: 6280

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

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-05-21 22:17:34 UTC (rev 6279)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2010-05-21 22:19:43 UTC (rev 6280)
@@ -84,9 +84,10 @@
       
       // Verify that the instance returned is a proxy by checking for all local interfaces
       assert getCurrentConfiguration().getBeans().isProxy(stadtInstance);
-      assert stadtInstance instanceof KleinStadt;
-      assert stadtInstance instanceof SchoeneStadt;
-      assert stadtInstance instanceof Serializable;
+      Set<Class> interfaces = new HashSet<Class>(Arrays.asList(stadtInstance.getClass().getInterfaces()));
+      assert interfaces.contains(KleinStadt.class);
+      assert interfaces.contains(SchoeneStadt.class);
+      assert interfaces.contains(Serializable.class);
    }
    
    @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2010-05-21 22:17:34 UTC (rev 6279)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2010-05-21 22:19:43 UTC (rev 6280)
@@ -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" })