[webbeans-commits] Webbeans SVN: r872 - in ri/trunk/webbeans-ri: src/test/java/org/jboss/webbeans and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-09 20:11:54 -0500 (Fri, 09 Jan 2009) New Revision: 872 Added: ri/trunk/webbeans-ri/unit-tests.xml Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/tck/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java ri/trunk/webbeans-ri/testng.xml Modified: ri/trunk/webbeans-ri/pom.xml Log: move stuff Modified: ri/trunk/webbeans-ri/pom.xml =================================================================== --- ri/trunk/webbeans-ri/pom.xml 2009-01-10 01:11:28 UTC (rev 871) +++ ri/trunk/webbeans-ri/pom.xml 2009-01-10 01:11:54 UTC (rev 872) @@ -134,7 +134,7 @@ <version>2.4.3</version> <configuration> <suiteXmlFiles> - <suiteXmlFile>testng.xml,</suiteXmlFile> + <suiteXmlFile>unit-tests.xml,</suiteXmlFile> <suiteXmlFile>${project.build.directory}/dependency/webbeans-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile> </suiteXmlFiles> </configuration> Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2009-01-10 01:11:28 UTC (rev 871) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2009-01-10 01:11:54 UTC (rev 872) @@ -1,169 +0,0 @@ -package org.jboss.webbeans.test; - -import java.lang.reflect.Method; - -import javax.webbeans.Current; - -import org.jboss.webbeans.bean.ProducerMethodBean; -import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.binding.CurrentBinding; -import org.jboss.webbeans.test.annotations.Synchronous; -import org.jboss.webbeans.test.beans.Barn; -import org.jboss.webbeans.test.beans.Cat; -import org.jboss.webbeans.test.beans.Cod; -import org.jboss.webbeans.test.beans.DefangedTarantula; -import org.jboss.webbeans.test.beans.Order; -import org.jboss.webbeans.test.beans.Spider; -import org.jboss.webbeans.test.beans.SpiderProducer; -import org.jboss.webbeans.test.beans.Tarantula; -import org.jboss.webbeans.test.beans.Tuna; -import org.jboss.webbeans.util.Reflections; -import org.testng.annotations.Test; - -@SpecVersion("2001206") -public class BindingTypeTest extends AbstractTest -{ - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) - public void testDefaultBindingTypeDeclaredInJava() - { - SimpleBean<Order> order = SimpleBean.of(Order.class, manager); - assert order.getBindingTypes().size() == 1; - order.getBindingTypes().iterator().next().annotationType().equals(Current.class); - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingTypeHasCorrectTarget() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingTypeHasCorrectRetention() - { - assert false; - } - - @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.3.2") - public void testBindingTypeDeclaresBindingTypeAnnotation() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.3.3") - public void testBindingTypesDeclaredInJava() - { - SimpleBean<Cat> cat = SimpleBean.of(Cat.class, manager); - assert cat.getBindingTypes().size() == 1; - assert Reflections.annotationSetMatches(cat.getBindingTypes(), Synchronous.class); - } - - @Test @SpecAssertion(section="2.3.3") - public void testMultipleBindingTypes() - { - SimpleBean<?> model = SimpleBean.of(Cod.class, manager); - assert model.getBindingTypes().size() == 2; - } - - @SuppressWarnings("unchecked") - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testBindingTypesDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass annotatedItem = new SimpleAnnotatedClass(Antelope.class, annotations); - - //SimpleBean<Antelope> antelope = createSimpleBean(Antelope.class, annotatedItem, manager); - // assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testXmlBindingTypeOverridesAndIgnoresJava() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Asynchronous>() {}); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section="2.3.4") - public void testNoBindingTypesDeclaredInXml() - { - //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - //AnnotatedClass<Cat> annotatedItem = new SimpleAnnotatedClass<Cat>(Cat.class, annotations); - - //SimpleBean<Cat> cat = createSimpleBean(Cat.class, annotatedItem, manager); - //assert cat.getBindingTypes().size() == 1; - //assert cat.getBindingTypes().contains(new AnnotationLiteral<Synchronous>() {}); - assert false; - } - - @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) - public void testDefaultBindingTypeDeclaredInXml() - { - SimpleBean<?> model = SimpleBean.of(Tuna.class, manager); - assert model.getBindingTypes().size() == 1; - assert model.getBindingTypes().contains(new CurrentBinding()); - assert false; - } - - - - @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5") - public void testFieldInjectedFromProducerMethod() throws Exception - { - SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(ProducerMethodBean.of(method, spiderProducer, manager)); - Barn barn = SimpleBean.of(Barn.class, manager).create(); - assert barn.petSpider != null; - assert barn.petSpider instanceof DefangedTarantula; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingTypeInXml() - { - assert false; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.5") - public void testFieldWithBindingTypeInXmlIgnoresAnnotations() - { - assert false; - } - - @Test(groups={"injection", "producerMethod"}) - public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception - { - SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(ProducerMethodBean.of(method, spiderProducer, manager)); - method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); - ProducerMethodBean<Spider> spiderBean = ProducerMethodBean.of(method, spiderProducer, manager); - Spider spider = spiderBean.create(); - assert spider != null; - assert spider instanceof DefangedTarantula; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") - public void testMethodWithBindingAnnotationsOnParametersDeclaredInXml() - { - assert false; - } - - @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="2.3.6") - public void testMethodWithBindingAnnotationsOnParametersDeclaredInXmlIgnoresAnnotations() - { - assert false; - } - -} Deleted: ri/trunk/webbeans-ri/testng.xml =================================================================== --- ri/trunk/webbeans-ri/testng.xml 2009-01-10 01:11:28 UTC (rev 871) +++ ri/trunk/webbeans-ri/testng.xml 2009-01-10 01:11:54 UTC (rev 872) @@ -1,45 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > - -<suite name="WebBeans RI" verbose="1" > - - <test name="Web Beans RI"> - <groups> - <run> -<!-- - <exclude name="specialization" /> - <exclude name="deployment" /> - <exclude name="disposalMethod" /> - - <exclude name="observerMethod" /> - <exclude name="deferredEvent" /> - <exclude name="ejb3" /> - <exclude name="webservice" /> - <exclude name="annotationDefinition" /> - <exclude name="webbeansxml" /> - <exclude name="el" /> - <exclude name="jms" /> - <exclude name="interceptors" /> - <exclude name="decorators" /> - <exclude name="servlet" /> - - <exclude name="passivation" /> - <exclude name="singletons" /> - <exclude name="ejbjarxml" /> - <exclude name="beanDestruction" /> - <exclude name="commonAnnotations" /> ---> - <exclude name="stub" /> - <exclude name="broken" /> - </run> - </groups> - <packages> - <package name="org.jboss.webbeans.test.tck"></package> - <package name="org.jboss.webbeans.test"></package> - <package name="org.jboss.webbeans.test.contexts"></package> - <package name="org.jboss.webbeans.examples"></package> - <package name="org.jboss.webbeans.test.ejb"></package> - <package name="org.jboss.webbeans.test.newbean"></package> - </packages> - </test> - -</suite> \ No newline at end of file Copied: ri/trunk/webbeans-ri/unit-tests.xml (from rev 864, ri/trunk/webbeans-ri/testng.xml) =================================================================== --- ri/trunk/webbeans-ri/unit-tests.xml (rev 0) +++ ri/trunk/webbeans-ri/unit-tests.xml 2009-01-10 01:11:54 UTC (rev 872) @@ -0,0 +1,45 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > + +<suite name="Web Beans RI" verbose="1" > + + <test name="Web Beans RI"> + <groups> + <run> +<!-- + <exclude name="specialization" /> + <exclude name="deployment" /> + <exclude name="disposalMethod" /> + + <exclude name="observerMethod" /> + <exclude name="deferredEvent" /> + <exclude name="ejb3" /> + <exclude name="webservice" /> + <exclude name="annotationDefinition" /> + <exclude name="webbeansxml" /> + <exclude name="el" /> + <exclude name="jms" /> + <exclude name="interceptors" /> + <exclude name="decorators" /> + <exclude name="servlet" /> + + <exclude name="passivation" /> + <exclude name="singletons" /> + <exclude name="ejbjarxml" /> + <exclude name="beanDestruction" /> + <exclude name="commonAnnotations" /> +--> + <exclude name="stub" /> + <exclude name="broken" /> + </run> + </groups> + <packages> + <package name="org.jboss.webbeans.test.tck"></package> + <package name="org.jboss.webbeans.test"></package> + <package name="org.jboss.webbeans.test.contexts"></package> + <package name="org.jboss.webbeans.examples"></package> + <package name="org.jboss.webbeans.test.ejb"></package> + <package name="org.jboss.webbeans.test.newbean"></package> + </packages> + </test> + +</suite> \ No newline at end of file Property changes on: ri/trunk/webbeans-ri/unit-tests.xml ___________________________________________________________________ Name: svn:mime-type + text/plain