Author: pete.muir(a)jboss.org Date: 2010-08-10 16:31:35 -0400 (Tue, 10 Aug 2010) New Revision: 6950 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java Log: CDITCK-168 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-08-10 20:23:30 UTC (rev 6949) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-08-10 20:31:35 UTC (rev 6950) @@ -60,7 +60,6 @@ public void observeElephantSessionBean(@Observes ProcessSessionBean<Elephant> event) { ProcessBeanObserver.elephantProcessSessionBean = event; - ProcessBeanObserver.elephantProcessBeanCount++; } public void observeElephantBean(@Observes ProcessBean<Elephant> event) @@ -73,7 +72,7 @@ ProcessBeanObserver.cowProcessProducerMethod = event; } - public void observeCowProccesBean(@Observes ProcessBean<Cowshed> event) + public void observeCowShedProccesBean(@Observes ProcessBean<Cowshed> event) { ProcessBeanObserver.cowShedProcessBeanCount++; } @@ -83,7 +82,7 @@ ProcessBeanObserver.chickenProcessProducerField = event; } - public void observeChickenProccesBean(@Observes ProcessBean<ChickenHutch> event) + public void observeChickenHutchProccesBean(@Observes ProcessBean<ChickenHutch> event) { ProcessBeanObserver.chickenHutchProcessBeanCount++; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2010-08-10 20:23:30 UTC (rev 6949) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2010-08-10 20:31:35 UTC (rev 6950) @@ -76,7 +76,7 @@ assert ProcessBeanObserver.getCowProcessProducerMethod().getBean().getBeanClass().equals(Cowshed.class); assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getBaseType().equals(Cow.class); assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getDeclaringType().getBaseType().equals(Cowshed.class); - assert ProcessBeanObserver.getCowShedProcessBeanCount() == 2; + assert ProcessBeanObserver.getCowShedProcessBeanCount() == 1; assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotated() instanceof AnnotatedMethod<?>; assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getName().equals("getDaisy"); assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getDeclaringClass().equals(Cowshed.class); @@ -99,7 +99,7 @@ assert ProcessBeanObserver.getChickenProcessProducerField().getBean().getBeanClass().equals(ChickenHutch.class); assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getBaseType().equals(Chicken.class); assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getDeclaringType().getBaseType().equals(ChickenHutch.class); - assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 2; + assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 1; assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotated() instanceof AnnotatedField<?>; assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getName().equals("chicken"); assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getDeclaringClass().equals(ChickenHutch.class); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2010-08-10 20:23:30 UTC (rev 6949) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2010-08-10 20:31:35 UTC (rev 6950) @@ -60,7 +60,7 @@ public void testProcessSessionBeanEvent() { assert ProcessBeanObserver.getElephantProcessSessionBean().getBean().getBeanClass().equals(Elephant.class); - assert ProcessBeanObserver.getElephantProcessBeanCount() == 2; + assert ProcessBeanObserver.getElephantProcessBeanCount() == 0; assert ProcessBeanObserver.getElephantProcessSessionBean().getEjbName().equals("Rosie"); assert ProcessBeanObserver.getElephantProcessSessionBean().getSessionBeanType().equals(SessionBeanType.STATELESS); assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotated() instanceof AnnotatedType<?>;