Author: pete.muir(a)jboss.org Date: 2009-01-16 11:57:11 -0500 (Fri, 16 Jan 2009) New Revision: 1021 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java Log: Port instantiation by name tests Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2009-01-16 16:41:52 UTC (rev 1020) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -1,100 +0,0 @@ -package org.jboss.webbeans.test; - -import javax.webbeans.AmbiguousDependencyException; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.introspector.AnnotatedClass; -import org.jboss.webbeans.introspector.AnnotatedField; -import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; -import org.jboss.webbeans.introspector.jlr.AnnotatedFieldImpl; -import org.jboss.webbeans.test.beans.Cod; -import org.jboss.webbeans.test.beans.FishFarm; -import org.jboss.webbeans.test.beans.Haddock; -import org.jboss.webbeans.test.beans.Plaice; -import org.jboss.webbeans.test.beans.Salmon; -import org.jboss.webbeans.test.beans.ScottishFish; -import org.jboss.webbeans.test.beans.SeaBass; -import org.jboss.webbeans.test.beans.Sole; -import org.jboss.webbeans.test.beans.Tuna; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class InstantiationByNameTest extends AbstractTest -{ - - private AnnotatedClass<FishFarm> fishFarmClass = new AnnotatedClassImpl<FishFarm>(FishFarm.class); - - @Test(groups="resolution") @SpecAssertion(section="4.10") - public void testNoWebBeansFound() throws Exception - { - AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass); - Bean<Cod> codBean = SimpleBean.of(Cod.class, manager); - Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager); - manager.addBean(codBean); - manager.addBean(salmonBean); - - assert manager.getInstanceByName("foo") == null; - } - - @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="4.10.1") - public void testAmbiguousDependencies() throws Exception - { - AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass); - Bean<Cod> codBean = SimpleBean.of(Cod.class, manager); - Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager); - Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager); - manager.addBean(codBean); - manager.addBean(salmonBean); - manager.addBean(soleBean); - - manager.getInstanceByName("whitefish"); - } - - @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.10.1") - public void testGetInstanceByName() - { - Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager); - Bean<Cod> codBean = SimpleBean.of(Cod.class, manager); - Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager); - Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager); - Bean<SeaBass> seaBassBean = SimpleBean.of(SeaBass.class, manager); - Bean<Haddock> haddockBean = SimpleBean.of(Haddock.class, manager); - Bean<Plaice> plaiceBean = SimpleBean.of(Plaice.class, manager); - - manager.addBean(tunaBean); - manager.addBean(codBean); - manager.addBean(salmonBean); - manager.addBean(soleBean); - manager.addBean(haddockBean); - manager.addBean(seaBassBean); - manager.addBean(plaiceBean); - - try - { - activateDependentContext(); - assert manager.getInstanceByName("salmon") instanceof Salmon; - } - finally - { - deactivateDependentContext(); - } - } - - @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="4.10") - public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression() - { - assert false; - } - - /* - - @Test(groups="el") @SpecAssertion(section="4.10") - public void test - { - assert false; - } - - */ - -} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Chunky +{ + + boolean realChunky(); + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Chunky.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +class Cod implements ScottishFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Cod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Named +class Haddock implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Haddock.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,85 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.AmbiguousDependencyException; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class InstantiationByNameTest extends AbstractTest +{ + + @Test(groups="resolution") @SpecAssertion(section="4.10") + public void testNoWebBeansFound() throws Exception + { + Bean<Cod> codBean = getSimpleBean(Cod.class); + Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); + manager.addBean(codBean); + manager.addBean(salmonBean); + + assert manager.getInstanceByName("foo") == null; + } + + @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="4.10.1") + public void testAmbiguousDependencies() throws Exception + { + Bean<Cod> codBean = getSimpleBean(Cod.class); + Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); + Bean<Sole> soleBean = getSimpleBean(Sole.class); + manager.addBean(codBean); + manager.addBean(salmonBean); + manager.addBean(soleBean); + + manager.getInstanceByName("whitefish"); + } + + @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.10.1") + public void testGetInstanceByName() + { + Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<Cod> codBean = getSimpleBean(Cod.class); + Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); + Bean<Sole> soleBean = getSimpleBean(Sole.class); + Bean<SeaBass> seaBassBean = getSimpleBean(SeaBass.class); + Bean<Haddock> haddockBean = getSimpleBean(Haddock.class); + Bean<Plaice> plaiceBean = getSimpleBean(Plaice.class); + + manager.addBean(tunaBean); + manager.addBean(codBean); + manager.addBean(salmonBean); + manager.addBean(soleBean); + manager.addBean(haddockBean); + manager.addBean(seaBassBean); + manager.addBean(plaiceBean); + + try + { + activateDependentContext(); + assert manager.getInstanceByName("salmon") instanceof Salmon; + } + finally + { + deactivateDependentContext(); + } + } + + @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="4.10") + public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression() + { + assert false; + } + + /* + + @Test(groups="el") @SpecAssertion(section="4.10") + public void test + { + assert false; + } + + */ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.Named; + +@AnotherDeploymentType +@Whitefish +@Named("whitefish") +final class Plaice implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Plaice.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Named +class Salmon implements ScottishFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Salmon.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,7 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + + +interface ScottishFish extends Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ScottishFish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +class SeaBass implements Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/SeaBass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Whitefish +@Named("whitefish") +class Sole implements ScottishFish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Sole.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import javax.webbeans.RequestScoped; + +@AnotherDeploymentType +@RequestScoped +class Tuna +{ + + public String getName() + { + return "Ophir"; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Tuna.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java 2009-01-16 16:57:11 UTC (rev 1021) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Whitefish +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/Whitefish.java ___________________________________________________________________ Name: svn:mime-type + text/plain