Author: pete.muir(a)jboss.org Date: 2008-12-07 13:53:25 -0500 (Sun, 07 Dec 2008) New Revision: 450 Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java Log: Updates to 20081206 Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-07 18:46:45 UTC (rev 449) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-07 18:53:25 UTC (rev 450) @@ -18,13 +18,13 @@ import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; -@SpecVersion("PDR") +@SpecVersion("20081206") public class ClientProxyTest extends AbstractTest { @Test(groups = "Reflections") - @SpecAssertion(section = { "4.4", "5.8" }) - public void testReflectionsUsedForNormalScope() + @SpecAssertion(section = { "5.4" }) + public void testClientProxyUsedForNormalScope() { Bean<Tuna> tunaBean = BeanFactory.createSimpleBean(Tuna.class); manager.addBean(tunaBean); @@ -33,8 +33,8 @@ } @Test(groups = "Reflections") - @SpecAssertion(section = { "4.4", "5.8" }) - public void testReflectionsNotUsedForPseudoScope() + @SpecAssertion(section = { "5.4" }) + public void testClientProxyNotUsedForPseudoScope() { Bean<Fox> foxBean = BeanFactory.createSimpleBean(Fox.class); Fox fox = manager.getInstance(foxBean); @@ -54,8 +54,8 @@ } @Test(groups = "Reflections") - @SpecAssertion(section = "4.4") - public void testSimpleWebBeanReflectionsIsSerializable() throws IOException, ClassNotFoundException + @SpecAssertion(section = "5.4") + public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException { Bean<TunedTuna> tunaBean = BeanFactory.createSimpleBean(TunedTuna.class); manager.addBean(tunaBean); @@ -68,7 +68,7 @@ } @Test(groups = "Reflections", expectedExceptions = UnproxyableDependencyException.class) - @SpecAssertion(section = "4.4.1") + @SpecAssertion(section = "5.4.1") public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean() { Bean<FinalTuna> tunaBean = BeanFactory.createSimpleBean(FinalTuna.class); @@ -78,8 +78,8 @@ } @Test(groups = "Reflections") - @SpecAssertion(section = "4.4.2") - public void testReflectionsInvocation() + @SpecAssertion(section = "5.4.2") + public void testClientProxyInvocation() { Bean<TunedTuna> tunaBean = BeanFactory.createSimpleBean(TunedTuna.class); manager.addBean(tunaBean); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-12-07 18:46:45 UTC (rev 449) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-12-07 18:53:25 UTC (rev 450) @@ -25,11 +25,11 @@ import org.jboss.webbeans.test.beans.broken.FarmHouseProducer; import org.testng.annotations.Test; -@SpecVersion("PDR") +@SpecVersion("20081206") public class InjectionTests extends AbstractTest { - @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2") + @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="5.2") public void testInjectionPerformsBoxingIfNecessary() throws Exception { SimpleBean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); @@ -41,7 +41,7 @@ assert spiderNest.numberOfSpiders.equals(4); } - @Test(groups={"injection", "producerMethod"}, expectedExceptions=NullableDependencyException.class) @SpecAssertion(section="4.2") + @Test(groups={"injection", "producerMethod"}, expectedExceptions=NullableDependencyException.class) @SpecAssertion(section="5.2") public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception { Bean<FarmHouse> farmHouseBean = createSimpleBean(FarmHouse.class); @@ -50,7 +50,7 @@ farmHouseBean.create(); } - @Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="4.3") + @Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="5.3") public void testInvokeNormalInjectedWebBeanWhenContextNotActive() { SimpleBean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); @@ -63,7 +63,7 @@ tunaFarm.tuna.getName(); } - @Test(groups="injection") @SpecAssertion(section="4.3") + @Test(groups="injection") @SpecAssertion(section="5.3") public void testInvokeDependentScopeWhenContextNotActive() { Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class); @@ -73,7 +73,7 @@ assert foxRun.fox.getName().equals("gavin"); } - @Test(groups="injection", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6") + @Test(groups="injection", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7") public void testInjectingStaticField() { SimpleBean<BeanWithStaticBoundField> bean = createSimpleBean(BeanWithStaticBoundField.class); @@ -82,7 +82,7 @@ BeanWithStaticBoundField instance = bean.create(); } - @Test(groups="injection",expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6") + @Test(groups="injection",expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7") public void testInjectingFinalField() { SimpleBean<BeanWithFinalBoundField> bean = createSimpleBean(BeanWithFinalBoundField.class); @@ -91,31 +91,31 @@ BeanWithFinalBoundField instance = bean.create(); } - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2") + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2") public void testInjectFieldsDeclaredInXml() { assert false; } - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2") + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2") public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations() { assert false; } - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2") + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2") public void testInjectedFieldDeclaredInXmlAssumesCurrent() { assert false; } - @Test(groups={"stub", "injection", "webbeansxml"}, expectedExceptions=NonexistentFieldException.class) @SpecAssertion(section="3.6.2") + @Test(groups={"stub", "injection", "webbeansxml"}, expectedExceptions=NonexistentFieldException.class) @SpecAssertion(section="3.7.2") public void testNonexistentFieldDefinedInXml() { assert false; } - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2") + @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2") public void testInjectFieldsDeclaredInXmlAndJava() { assert false;