[webbeans-commits] Webbeans SVN: r1033 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests: definition/binding and 13 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-16 13:58:14 -0500 (Fri, 16 Jan 2009) New Revision: 1033 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.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/ResolutionByNameTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java Log: Refactor to fix method names and signatures Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -48,17 +48,17 @@ manager = null; } - public <T> Bean<T> getSimpleBean(Class<T> beanClass) + public <T> Bean<T> createSimpleBean(Class<T> beanClass) { return configuration().getBeans().createSimpleBean(beanClass); } - public <T> Bean<T> getProducerMethodBean(Method method, Bean<?> producerBean) + public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean) { return configuration().getBeans().createProducerMethodBean(method, producerBean); } - public <T> Bean<?> getProducerFieldBean(Field field, Bean<?> producerBean) + public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean) { return configuration().getBeans().createProducerFieldBean(field, producerBean); } @@ -67,42 +67,16 @@ { manager = configuration().getContainers().deploy(classes); } - - protected <T> Bean<T> registerBean(Class<T> clazz) - { - Bean<T> bean = null; - if (configuration().getBeans().isEnterpriseBean(clazz)) - { - bean = configuration().getBeans().createEnterpriseBean(clazz); - } - else - { - bean = getSimpleBean(clazz); - } - manager.addBean(bean); - return bean; - } - protected void registerBeans(Class<?>... classes) + protected List<Class<? extends Annotation>> getStandardDeploymentTypes() { - for (Class<?> clazz : classes) - { - registerBean(clazz); - } + return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); } - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); + return getStandardDeploymentTypes(); } - -/* - protected <T> void addToEjbCache(Class<T> clazz) - { - manager.getEjbDescriptorCache().add(new MockEjbDescriptor<T>(clazz)); - } - */ protected byte[] serialize(Object instance) throws IOException { Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -24,7 +24,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } @@ -32,7 +32,7 @@ @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) public void testDefaultBindingDeclaredInJava() { - Bean<Order> order = getSimpleBean(Order.class); + Bean<Order> order = createSimpleBean(Order.class); assert order.getBindings().size() == 1; order.getBindings().iterator().next().annotationType().equals(Production.class); } @@ -59,7 +59,7 @@ @Test @SpecAssertion(section="2.3.3") public void testBindingsDeclaredInJava() { - Bean<Cat> cat = getSimpleBean(Cat.class); + Bean<Cat> cat = createSimpleBean(Cat.class); assert cat.getBindings().size() == 1; assert Reflections.annotationSetMatches(cat.getBindings(), Synchronous.class); } @@ -67,7 +67,7 @@ @Test @SpecAssertion(section="2.3.3") public void testMultipleBindings() { - Bean<?> model = getSimpleBean(Cod.class); + Bean<?> model = createSimpleBean(Cod.class); assert model.getBindings().size() == 2; } @@ -111,7 +111,7 @@ @Test(groups={"stub", "webbeansxml"}) @SpecAssertion(section={"2.3.4", "2.3.1"}) public void testDefaultBindingDeclaredInXml() { - Bean<?> model = getSimpleBean(Tuna.class); + Bean<?> model = createSimpleBean(Tuna.class); assert model.getBindings().size() == 1; assert model.getBindings().contains(new CurrentBinding()); assert false; @@ -120,11 +120,11 @@ @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="2.3.5") public void testFieldInjectedFromProducerMethod() throws Exception { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(getProducerMethodBean(method, spiderProducer)); - Barn barn = getSimpleBean(Barn.class).create(); + manager.addBean(createProducerMethodBean(method, spiderProducer)); + Barn barn = createSimpleBean(Barn.class).create(); assert barn.petSpider != null; assert barn.petSpider instanceof DefangedTarantula; } @@ -145,12 +145,12 @@ @Test(groups={"injection", "producerMethod"}) public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - manager.addBean(getProducerMethodBean(method, spiderProducer)); + manager.addBean(createProducerMethodBean(method, spiderProducer)); method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); - Bean<Spider> spiderBean = getProducerMethodBean(method, spiderProducer); + Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer); Spider spider = spiderBean.create(); assert spider != null; assert spider instanceof DefangedTarantula; @@ -171,7 +171,7 @@ @Test @SpecAssertion(section="4.1") public void testBindingDeclaredInheritedIsInherited() throws Exception { - Set<? extends Annotation> bindings = getSimpleBean(BorderCollie.class).getBindings(); + Set<? extends Annotation> bindings = createSimpleBean(BorderCollie.class).getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Hairy.class); } @@ -179,7 +179,7 @@ @Test @SpecAssertion(section="4.1") public void testBindingNotDeclaredInheritedIsNotInherited() { - Set<? extends Annotation> bindings = getSimpleBean(ShetlandPony.class).getBindings(); + Set<? extends Annotation> bindings = createSimpleBean(ShetlandPony.class).getBindings(); assert bindings.size() == 1; assert bindings.iterator().next().annotationType().equals(Current.class); } @@ -187,7 +187,7 @@ @Test @SpecAssertion(section="4.1") public void testBindingDeclaredInheritedIsBlockedByIntermediateClass() { - Set<? extends Annotation> bindings = getSimpleBean(ClippedBorderCollie.class).getBindings(); + Set<? extends Annotation> bindings = createSimpleBean(ClippedBorderCollie.class).getBindings(); assert bindings.size() == 1; Annotation binding = bindings.iterator().next(); assert binding.annotationType().equals(Hairy.class); Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -28,7 +28,7 @@ @SpecAssertion(section = "2") public void testApiTypesNonEmpty() { - Bean<?> model = getSimpleBean(RedSnapper.class); + Bean<?> model = createSimpleBean(RedSnapper.class); assert model.getTypes().size() > 0; } @@ -36,7 +36,7 @@ @SpecAssertion(section = "2") public void testBindingTypesNonEmpty() { - Bean<?> model = getSimpleBean(RedSnapper.class); + Bean<?> model = createSimpleBean(RedSnapper.class); assert model.getBindings().size() > 0; } @@ -44,7 +44,7 @@ @SpecAssertion(section = "2") public void testHasScopeType() { - Bean<?> model = getSimpleBean(RedSnapper.class); + Bean<?> model = createSimpleBean(RedSnapper.class); assert model.getScopeType().equals(RequestScoped.class); } @@ -52,7 +52,7 @@ @SpecAssertion(section = "2") public void testHasDeploymentType() { - Bean<?> model = getSimpleBean(RedSnapper.class); + Bean<?> model = createSimpleBean(RedSnapper.class); assert model.getDeploymentType().equals(Production.class); } @@ -61,13 +61,13 @@ @SpecAssertion(section = "5.2") public void testIsNullable() throws Exception { - Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> spiderProducerBean = createSimpleBean(SpiderProducer.class); manager.addBean(spiderProducerBean); Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); - Bean<Integer> bean = getProducerMethodBean(method, spiderProducerBean); + Bean<Integer> bean = createProducerMethodBean(method, spiderProducerBean); assert !bean.isNullable(); method = SpiderProducer.class.getMethod("makeASpider"); - Bean<Spider> spiderBean = getProducerMethodBean(method, spiderProducerBean); + Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducerBean); assert spiderBean.isNullable(); } @@ -75,7 +75,7 @@ @SpecAssertion(section = { "3.2.2", "2.2" }) public void testApiTypes() { - Bean<Tarantula> bean = getSimpleBean(Tarantula.class); + Bean<Tarantula> bean = createSimpleBean(Tarantula.class); assert bean.getTypes().size() == 6; assert bean.getTypes().contains(Tarantula.class); assert bean.getTypes().contains(Spider.class); @@ -89,7 +89,7 @@ @SpecAssertion(section = "2.2") public void testFinalApiType() { - getSimpleBean(DependentFinalTuna.class); + createSimpleBean(DependentFinalTuna.class); } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -26,7 +26,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(HornedAnimalDeploymentType.class); return deploymentTypes; } @@ -34,7 +34,7 @@ @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.1") public void testNonBuiltInComponentUsesStandard() { - getSimpleBean(Gazelle_Broken.class); + createSimpleBean(Gazelle_Broken.class); } @Test(groups={"stub", "annotationDefinition"}) @SpecAssertion(section="2.5.2") @@ -58,17 +58,17 @@ @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.5.3") public void testTooManyDeploymentTypes() { - getSimpleBean(BeanWithTooManyDeploymentTypes_Broken.class); + createSimpleBean(BeanWithTooManyDeploymentTypes_Broken.class); } @SuppressWarnings("unchecked") @Test @SpecAssertion(section="2.5.3") public void testDeploymentTypeInhertitedFromDeclaringBean() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = getProducerMethodBean(method, bean); + Bean<BlackWidow> blackWidowSpiderModel = createProducerMethodBean(method, bean); assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); } @@ -107,7 +107,7 @@ @Test @SpecAssertion(section="2.5.5") public void testHighestPrecedenceDeploymentTypeFromStereotype() { - Bean<?> bean = getSimpleBean(Rhinoceros.class); + Bean<?> bean = createSimpleBean(Rhinoceros.class); assert bean.getDeploymentType().equals(HornedAnimalDeploymentType.class); } @@ -119,7 +119,7 @@ Arrays.asList(Standard.class, AnotherDeploymentType.class, HornedAnimalDeploymentType.class)); - Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); + Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class); manager.addBean(bean); manager.getInstanceByType(RedSnapper.class); } @@ -154,7 +154,7 @@ @Test @SpecAssertion(section={"2.5.5", "2.7.2"}) public void testWebBeanDeploymentTypeOverridesStereotype() { - Bean<Reindeer> bean = getSimpleBean(Reindeer.class); + Bean<Reindeer> bean = createSimpleBean(Reindeer.class); assert bean.getDeploymentType().equals(Production.class); } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/name/NameTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -18,7 +18,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } @@ -32,7 +32,7 @@ @Test @SpecAssertion(section="2.6.1") public void testNonDefaultNamed() { - Bean<Moose> moose = getSimpleBean(Moose.class); + Bean<Moose> moose = createSimpleBean(Moose.class); assert moose.getName().equals("aMoose"); } @@ -88,7 +88,7 @@ @Test @SpecAssertion(section={"2.6.3", "3.2.7"}) public void testDefaultNamed() { - Bean<Haddock> haddock = getSimpleBean(Haddock.class); + Bean<Haddock> haddock = createSimpleBean(Haddock.class); assert haddock.getName() != null; assert haddock.getName().equals("haddock"); } @@ -116,28 +116,28 @@ @Test @SpecAssertion(section={"2.6.3", "2.7"}) public void testSterotypeDefaultsName() { - Bean<RedSnapper> model = getSimpleBean(RedSnapper.class); + Bean<RedSnapper> model = createSimpleBean(RedSnapper.class); assert model.getName().equals("redSnapper"); } @Test @SpecAssertion(section="2.6.4") public void testNotNamedInJava() { - Bean<SeaBass> model = getSimpleBean(SeaBass.class); + Bean<SeaBass> model = createSimpleBean(SeaBass.class); assert model.getName() == null; } @Test @SpecAssertion(section="2.6.4") public void testNotNamedInXml() { - Bean<SeaBass> model = getSimpleBean(SeaBass.class); + Bean<SeaBass> model = createSimpleBean(SeaBass.class); assert model.getName() == null; } @Test @SpecAssertion(section="2.6.4") public void testNotNamedInStereotype() { - Bean<Minnow> model = getSimpleBean(Minnow.class); + Bean<Minnow> model = createSimpleBean(Minnow.class); assert model.getName() == null; } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/scope/ScopeTypeTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -19,7 +19,7 @@ @Test @SpecAssertion(section="2.4") public void testScopeTypesAreExtensible() { - Bean<Mullet> mullet = getSimpleBean(Mullet.class); + Bean<Mullet> mullet = createSimpleBean(Mullet.class); assert mullet.getScopeType().equals(AnotherScopeType.class); } @@ -44,14 +44,14 @@ @Test @SpecAssertion(section="2.4.3") public void testScopeDeclaredInJava() { - Bean<SeaBass> trout = getSimpleBean(SeaBass.class); + Bean<SeaBass> trout = createSimpleBean(SeaBass.class); assert trout.getScopeType().equals(RequestScoped.class); } @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.3") public void testTooManyScopesSpecifiedInJava() { - getSimpleBean(BeanWithTooManyScopeTypes.class); + createSimpleBean(BeanWithTooManyScopeTypes.class); } @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"}) @@ -101,54 +101,54 @@ @Test @SpecAssertion(section="2.4.5") public void testDefaultScope() { - Bean<Order> order = getSimpleBean(Order.class); + Bean<Order> order = createSimpleBean(Order.class); assert order.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section={"2.4.5", "2.7.2"}) public void testScopeSpecifiedAndStereotyped() { - Bean<Minnow> minnow = getSimpleBean(Minnow.class); + Bean<Minnow> minnow = createSimpleBean(Minnow.class); assert minnow.getScopeType().equals(RequestScoped.class); } @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.4.5") public void testMutipleIncompatibleScopeStereotypes() { - getSimpleBean(Scallop_Broken.class); + createSimpleBean(Scallop_Broken.class); } @Test @SpecAssertion(section="2.4.5") public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() { - Bean<Pollock> pollock = getSimpleBean(Pollock.class); + Bean<Pollock> pollock = createSimpleBean(Pollock.class); assert pollock.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section="2.4.5") public void testMutipleCompatibleScopeStereotypes() { - Bean<Grayling> grayling = getSimpleBean(Grayling.class); + Bean<Grayling> grayling = createSimpleBean(Grayling.class); assert grayling.getScopeType().equals(ApplicationScoped.class); } @Test @SpecAssertion(section="2.7.2") public void testWebBeanScopeTypeOverridesStereotype() { - Bean<RedSnapper> bean = getSimpleBean(RedSnapper.class); + Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class); assert bean.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="4.1") public void testScopeTypeDeclaredInheritedIsInherited() throws Exception { - assert getSimpleBean(BorderCollie.class).getScopeType().equals(RequestScoped.class); + assert createSimpleBean(BorderCollie.class).getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="4.1") public void testScopeTypeNotDeclaredInheritedIsNotInherited() { - assert getSimpleBean(ShetlandPony.class).getScopeType().equals(Dependent.class); + assert createSimpleBean(ShetlandPony.class).getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section="4.1") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/type/TypeTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -12,7 +12,7 @@ @Test @SpecAssertion(section="2.6.3") public void testDefaultNamed() { - Bean<Haddock> haddock = getSimpleBean(Haddock.class); + Bean<Haddock> haddock = createSimpleBean(Haddock.class); assert haddock.getName() != null; assert haddock.getName().equals("haddock"); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -16,7 +16,7 @@ @Test(expectedExceptions=DefinitionException.class, groups="initializerMethod") @SpecAssertion(section="3.8") public void testStaticInitializerMethodNotAllowed() { - getSimpleBean(Dottrel.class); + createSimpleBean(Dottrel.class); } @Test(groups={"stub", "initializerMethod", "servlet"}) @SpecAssertion(section="3.8") @@ -58,10 +58,10 @@ @Test(groups={"initializerMethod"}) @SpecAssertion(section={"3.8", "5.3", "3.8.2", "3.8.3"}) public void testMultipleInitializerMethodsAreCalled() { - manager.addBean(getSimpleBean(Fox.class)); - manager.addBean(getSimpleBean(Chicken.class)); + manager.addBean(createSimpleBean(Fox.class)); + manager.addBean(createSimpleBean(Chicken.class)); - Bean<ChickenHutch> chickenHutchBean = getSimpleBean(ChickenHutch.class); + Bean<ChickenHutch> chickenHutchBean = createSimpleBean(ChickenHutch.class); ChickenHutch chickenHutch = chickenHutchBean.create(); assert chickenHutch.fox != null; assert chickenHutch.chicken != null; @@ -70,25 +70,25 @@ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section={"3.8.1", "3.4.2"}) public void testInitializerMethodAnnotatedProduces() { - getSimpleBean(Pheasant.class); + createSimpleBean(Pheasant.class); } @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1") public void testInitializerMethodAnnotatedDestructor() { - getSimpleBean(Shrike.class); + createSimpleBean(Shrike.class); } @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1") public void testInitializerMethodHasParameterAnnotatedDisposes() { - getSimpleBean(Capercaillie.class); + createSimpleBean(Capercaillie.class); } @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1") public void testInitializerMethodHasParameterAnnotatedObserves() { - getSimpleBean(Grouse.class); + createSimpleBean(Grouse.class); } @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.8.2") Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -18,10 +18,10 @@ @Test(groups={"producerField", "broken"}) @SpecAssertion(section="5.6") public void testProducerFieldBeanCreate() throws Exception { - Bean<OtherSpiderProducer> spiderProducer = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class); manager.addBean(spiderProducer); Field method = OtherSpiderProducer.class.getField("produceTarantula"); - Bean<Tarantula> tarantulaBean = (Bean<Tarantula>) getProducerFieldBean(method, spiderProducer); + Bean<Tarantula> tarantulaBean = createProducerFieldBean(method, spiderProducer); Tarantula tarantula = tarantulaBean.create(); assert tarantula != null; } @@ -38,10 +38,10 @@ @Test(groups={"producerField", "broken"}) @SpecAssertion(section={"3.5", "5.6", "8.3"}) public void testProducerFieldReturnsNullIsDependent() throws Exception { - Bean<OtherSpiderProducer> spiderProducer = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class); manager.addBean(spiderProducer); Field method = OtherSpiderProducer.class.getField("getNullSpider"); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerFieldBean(method, spiderProducer); + Bean<Spider> spiderBean = createProducerFieldBean(method, spiderProducer); Spider spider = spiderBean.create(); assert spider == null; } @@ -49,10 +49,10 @@ @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"}) public void testProducerFieldReturnsNullIsNotDependent() throws Exception { - Bean<OtherSpiderProducer_Broken> spiderProducer = getSimpleBean(OtherSpiderProducer_Broken.class); + Bean<OtherSpiderProducer_Broken> spiderProducer = createSimpleBean(OtherSpiderProducer_Broken.class); manager.addBean(spiderProducer); Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider"); - getProducerFieldBean(method, spiderProducer).create(); + createProducerFieldBean(method, spiderProducer).create(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -21,10 +21,10 @@ @Test(groups="producerField") @SpecAssertion(section="2.5.3") public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + Bean<Tarantula> tarantulaModel = createProducerFieldBean(field, bean); tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class); } @@ -46,19 +46,19 @@ @Test(groups="producerField") @SpecAssertion(section="3.5") public void testParameterizedReturnType() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("getFunnelWeaverSpider"); - getProducerFieldBean(field, bean); + createProducerFieldBean(field, bean); } @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5") public void testParameterizedReturnTypeWithWildcard() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("getAnotherFunnelWeaver"); - getProducerFieldBean(field, bean); + createProducerFieldBean(field, bean); } @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.5") @@ -71,10 +71,10 @@ @Test(groups="producerField") @SpecAssertion(section={"3.5", "2.3.1"}) public void testDefaultBindingType() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + Bean<Tarantula> tarantulaModel = createProducerFieldBean(field, bean); assert tarantulaModel.getBindings().size() == 1; assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class); } @@ -83,10 +83,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.1") public void testApiTypeForClassReturn() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + Bean<Tarantula> tarantulaModel = createProducerFieldBean(field, bean); assert tarantulaModel.getTypes().size() == 6; assert tarantulaModel.getTypes().contains(Tarantula.class); assert tarantulaModel.getTypes().contains(DeadlySpider.class); @@ -100,10 +100,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.1") public void testApiTypeForInterfaceReturn() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("makeASpider"); - Bean<Animal> animalModel = (Bean<Animal>) getProducerFieldBean(field, bean); + Bean<Animal> animalModel = createProducerFieldBean(field, bean); assert animalModel.getTypes().size() == 2; assert animalModel.getTypes().contains(Animal.class); assert animalModel.getTypes().contains(Object.class); @@ -113,10 +113,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.1") public void testApiTypeForPrimitiveReturn() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("getWolfSpiderSize"); - Bean<Integer> intModel = (Bean<Integer>) getProducerFieldBean(field, bean); + Bean<Integer> intModel = createProducerFieldBean(field, bean); assert intModel.getTypes().size() == 2; assert intModel.getTypes().contains(int.class); assert intModel.getTypes().contains(Object.class); @@ -126,10 +126,10 @@ @Test(groups="producerField") @SpecAssertion(section={"3.5.1", "2.2"}) public void testApiTypeForArrayTypeReturn() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("getSpiders"); - Bean<Spider[]> spidersModel = (Bean<Spider[]>) getProducerFieldBean(field, bean); + Bean<Spider[]> spidersModel = createProducerFieldBean(field, bean); assert spidersModel.getTypes().size() == 2; assert spidersModel.getTypes().contains(Spider[].class); assert spidersModel.getTypes().contains(Object.class); @@ -139,10 +139,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.2") public void testBindingType() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + Bean<Tarantula> tarantulaModel = createProducerFieldBean(field, bean); assert tarantulaModel.getBindings().size() == 1; assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); } @@ -151,10 +151,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.2") public void testScopeType() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsModel = (Bean<DaddyLongLegs>) getProducerFieldBean(field, bean); + Bean<DaddyLongLegs> daddyLongLegsModel = createProducerFieldBean(field, bean); assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class); // TODO Inherit scope from returned web bean? @@ -164,10 +164,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.2") public void testDeploymentType() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("getLadybirdSpider"); - Bean<LadybirdSpider> ladybirdSpiderModel = (Bean<LadybirdSpider>) getProducerFieldBean(field, bean); + Bean<LadybirdSpider> ladybirdSpiderModel = createProducerFieldBean(field, bean); assert ladybirdSpiderModel.getDeploymentType().equals(Production.class); } @@ -175,10 +175,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.2") public void testNamedField() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerFieldBean(field, bean); + Bean<BlackWidow> blackWidowSpiderModel = createProducerFieldBean(field, bean); assert blackWidowSpiderModel.getName().equals("blackWidow"); } @@ -186,10 +186,10 @@ @Test(groups="producerField") @SpecAssertion(section="3.5.2") public void testDefaultNamedField() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsSpiderModel = (Bean<DaddyLongLegs>) getProducerFieldBean(field, bean); + Bean<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerFieldBean(field, bean); assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); } @@ -257,10 +257,10 @@ @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.5.2", "2.2"}) public void testStereotype() throws Exception { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + Bean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class); manager.addBean(bean); Field field = OtherSpiderProducer.class.getField("produceWolfSpider"); - Bean<WolfSpider> wolfSpiderModel = (Bean<WolfSpider>) getProducerFieldBean(field, bean); + Bean<WolfSpider> wolfSpiderModel = createProducerFieldBean(field, bean); // TODO reimplement stereotype tests Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -17,10 +17,10 @@ @Test(groups={"producerMethod", "broken"}) @SpecAssertion(section="5.6") public void testProducerMethodBeanCreate() throws Exception { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("produceTarantula"); - Bean<Tarantula> tarantulaBean = getProducerMethodBean(method, spiderProducer); + Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer); Tarantula tarantula = tarantulaBean.create(); assert tarantula != null; } @@ -50,10 +50,10 @@ @Test(groups={"producerMethod", "broken"}) @SpecAssertion(section={"3.4", "5.6", "8.3"}) public void testProducerMethodReturnsNullIsDependent() throws Exception { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); manager.addBean(spiderProducer); Method method = SpiderProducer.class.getMethod("getNullSpider"); - Bean<Spider> spiderBean = getProducerMethodBean(method, spiderProducer); + Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer); Spider spider = spiderBean.create(); assert spider == null; } @@ -61,10 +61,10 @@ @Test(groups="producerMethod", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.4", "5.6"}) public void testProducerMethodReturnsNullIsNotDependent() throws Exception { - Bean<SpiderProducer_Broken> spiderProducer = getSimpleBean(SpiderProducer_Broken.class); + Bean<SpiderProducer_Broken> spiderProducer = createSimpleBean(SpiderProducer_Broken.class); manager.addBean(spiderProducer); Method method = SpiderProducer_Broken.class.getMethod("getRequestScopedSpider"); - getProducerMethodBean(method, spiderProducer).create(); + createProducerMethodBean(method, spiderProducer).create(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -20,20 +20,20 @@ @Test(groups="producerMethod") @SpecAssertion(section="2.5.3") public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean); + Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class); } @Test(groups="producerMethod") @SpecAssertion(section="3.4") public void testStaticMethod() throws Exception { - Bean<BeanWithStaticProducerMethod> bean = getSimpleBean(BeanWithStaticProducerMethod.class); + Bean<BeanWithStaticProducerMethod> bean = createSimpleBean(BeanWithStaticProducerMethod.class); manager.addBean(bean); Method method = BeanWithStaticProducerMethod.class.getMethod("getString"); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups={"stub", "producerMethod", "enterpriseBeans", "stub"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4") @@ -45,37 +45,37 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4") public void testParameterizedReturnType() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("getFunnelWeaverSpider"); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4") public void testParameterizedReturnTypeWithWildcard() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("getAnotherFunnelWeaver"); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4") public void testParameterizedReturnTypeWithTypeParameter() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("getFunnelWeaver"); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups="producerMethod") @SpecAssertion(section={"3.4", "2.3.1"}) public void testDefaultBindingType() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceTarantula"); - Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean); + Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); assert tarantulaModel.getBindings().size() == 1; assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class); } @@ -83,10 +83,10 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4.1") public void testApiTypeForClassReturn() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceTarantula"); - Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean); + Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); assert tarantulaModel.getTypes().size() == 6; assert tarantulaModel.getTypes().contains(Tarantula.class); assert tarantulaModel.getTypes().contains(DeadlySpider.class); @@ -99,10 +99,10 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4.1") public void testApiTypeForInterfaceReturn() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("makeASpider"); - Bean<Animal> animalModel = getProducerMethodBean(method, bean); + Bean<Animal> animalModel = createProducerMethodBean(method, bean); assert animalModel.getTypes().size() == 2; assert animalModel.getTypes().contains(Animal.class); assert animalModel.getTypes().contains(Object.class); @@ -111,10 +111,10 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4.1") public void testApiTypeForPrimitiveReturn() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); - Bean<Integer> intModel = getProducerMethodBean(method, bean); + Bean<Integer> intModel = createProducerMethodBean(method, bean); assert intModel.getTypes().size() == 2; assert intModel.getTypes().contains(int.class); assert intModel.getTypes().contains(Object.class); @@ -123,10 +123,10 @@ @Test(groups="producerMethod") @SpecAssertion(section={"3.4.1", "2.2"}) public void testApiTypeForArrayTypeReturn() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("getSpiders"); - Bean<Spider[]> spidersModel = getProducerMethodBean(method, bean); + Bean<Spider[]> spidersModel = createProducerMethodBean(method, bean); assert spidersModel.getTypes().size() == 2; assert spidersModel.getTypes().contains(Spider[].class); assert spidersModel.getTypes().contains(Object.class); @@ -135,10 +135,10 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2") public void testBindingType() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean); + Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); assert tarantulaModel.getBindings().size() == 1; assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); } @@ -146,10 +146,10 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2") public void testScopeType() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsModel = getProducerMethodBean(method, bean); + Bean<DaddyLongLegs> daddyLongLegsModel = createProducerMethodBean(method, bean); assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class); // TODO Inherit scope from returned web bean? @@ -158,58 +158,58 @@ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2") public void testDeploymentType() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("getLadybirdSpider"); - Bean<LadybirdSpider> ladybirdSpiderModel = getProducerMethodBean(method, bean); + Bean<LadybirdSpider> ladybirdSpiderModel = createProducerMethodBean(method, bean); assert ladybirdSpiderModel.getDeploymentType().equals(Production.class); } @Test(groups="producerMethod") @SpecAssertion(section="3.4.2") public void testNamedMethod() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = getProducerMethodBean(method, bean); + Bean<BlackWidow> blackWidowSpiderModel = createProducerMethodBean(method, bean); assert blackWidowSpiderModel.getName().equals("blackWidow"); } @Test(groups="producerMethod") @SpecAssertion(section="3.4.2") public void testDefaultNamedMethod() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsSpiderModel = getProducerMethodBean(method, bean); + Bean<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerMethodBean(method, bean); assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); } @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4") public void testProducerMethodAnnotatedDestructor() throws Exception { - Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class); + Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); manager.addBean(bean); Method method = SpiderProducer_Broken.class.getMethod("destroy"); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4") public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception { - Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class); + Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); manager.addBean(bean); Method method = SpiderProducer_Broken.class.getMethod("dispose", String.class); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4") public void testProducerMethodWithParameterAnnotatedObserves() throws Exception { - Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class); + Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); manager.addBean(bean); Method method = SpiderProducer_Broken.class.getMethod("observe", String.class); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4") @@ -275,10 +275,10 @@ @Test(groups="producerMethod") @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"}) public void testStereotypeSpecifiesScope() throws Exception { - Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceWolfSpider"); - Bean<WolfSpider> wolfSpider = getProducerMethodBean(method, bean); + Bean<WolfSpider> wolfSpider = createProducerMethodBean(method, bean); //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1; //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class); assert wolfSpider.getScopeType().equals(RequestScoped.class); @@ -287,9 +287,9 @@ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"}) public void testStereotypeEnforcesTypes() throws Exception { - Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class); + Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); manager.addBean(bean); Method method = SpiderProducer_Broken.class.getMethod("produceInteger"); - getProducerMethodBean(method, bean); + createProducerMethodBean(method, bean); } } Modified: 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 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/InstantiationByNameTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -15,8 +15,8 @@ @Test(groups="resolution") @SpecAssertion(section="4.10") public void testNoWebBeansFound() throws Exception { - Bean<Cod> codBean = getSimpleBean(Cod.class); - Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); manager.addBean(codBean); manager.addBean(salmonBean); @@ -26,9 +26,9 @@ @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); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); + Bean<Sole> soleBean = createSimpleBean(Sole.class); manager.addBean(codBean); manager.addBean(salmonBean); manager.addBean(soleBean); @@ -39,13 +39,13 @@ @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); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); + Bean<Sole> soleBean = createSimpleBean(Sole.class); + Bean<SeaBass> seaBassBean = createSimpleBean(SeaBass.class); + Bean<Haddock> haddockBean = createSimpleBean(Haddock.class); + Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class); manager.addBean(tunaBean); manager.addBean(codBean); Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -17,7 +17,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } @@ -44,13 +44,13 @@ public void testNamedBasedResolution() { - 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); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); + Bean<Sole> soleBean = createSimpleBean(Sole.class); + Bean<SeaBass> seaBassBean = createSimpleBean(SeaBass.class); + Bean<Haddock> haddockBean = createSimpleBean(Haddock.class); + Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class); manager.addBean(tunaBean); manager.addBean(codBean); @@ -75,8 +75,8 @@ @Test(groups="resolution") @SpecAssertion(section="5.11.1") public void testNoWebBeansFound() throws Exception { - Bean<Cod> codBean = getSimpleBean(Cod.class); - Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); manager.addBean(codBean); manager.addBean(salmonBean); Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -22,7 +22,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } @@ -31,7 +31,7 @@ @SpecAssertion(section = { "5.4" }) public void testClientProxyUsedForNormalScope() { - Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); Tuna tuna = manager.getInstance(tunaBean); assert configuration().getBeans().isProxy(tuna); @@ -41,7 +41,7 @@ @SpecAssertion(section = { "5.4" }) public void testClientProxyNotUsedForPseudoScope() { - Bean<Fox> foxBean = getSimpleBean(Fox.class); + Bean<Fox> foxBean = createSimpleBean(Fox.class); try { activateDependentContext(); @@ -58,7 +58,7 @@ @SpecAssertion(section = "5.4") public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException { - Bean<TunedTuna> tunaBean = getSimpleBean(TunedTuna.class); + Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class); manager.addBean(tunaBean); TunedTuna tuna = manager.getInstance(tunaBean); assert configuration().getBeans().isProxy(tuna); @@ -72,7 +72,7 @@ @SpecAssertion(section = "5.4.1") public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean() { - Bean<FinalTuna_Broken> tunaBean = getSimpleBean(FinalTuna_Broken.class); + Bean<FinalTuna_Broken> tunaBean = createSimpleBean(FinalTuna_Broken.class); manager.addBean(tunaBean); @SuppressWarnings("unused") FinalTuna_Broken tuna = manager.getInstanceByType(FinalTuna_Broken.class); @@ -83,7 +83,7 @@ @SpecAssertion(section = "5.4.2") public void testClientProxyInvocation() { - Bean<TunedTuna> tunaBean = getSimpleBean(TunedTuna.class); + Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class); manager.addBean(tunaBean); TunedTuna tuna = manager.getInstance(tunaBean); assert configuration().getBeans().isProxy(tuna); @@ -92,7 +92,7 @@ @Test(groups = "configuration().getBeans()", expectedExceptions=DefinitionException.class) public void testGettingUnknownBeanFails() { - Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); @SuppressWarnings("unused") Tuna tuna = manager.getInstance(tunaBean); assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -23,7 +23,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } @@ -32,10 +32,10 @@ @SpecAssertion(section = "5.2") public void testInjectionPerformsBoxingIfNecessary() throws Exception { - Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class); manager.addBean(spiderProducer); - Bean<SpiderNest> spiderNestBean = getSimpleBean(SpiderNest.class); - manager.addBean(getProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer)); + Bean<SpiderNest> spiderNestBean = createSimpleBean(SpiderNest.class); + manager.addBean(createProducerMethodBean(SpiderProducer.class.getMethod("getWolfSpiderSize"), spiderProducer)); SpiderNest spiderNest = spiderNestBean.create(); assert spiderNest.numberOfSpiders != null; assert spiderNest.numberOfSpiders.equals(4); @@ -52,8 +52,8 @@ @SpecAssertion(section = "5.3") public void testInvokeNormalInjectedWebBeanWhenContextNotActive() { - Bean<TunaFarm> tunaFarmBean = getSimpleBean(TunaFarm.class); - Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); TunaFarm tunaFarm = tunaFarmBean.create(); assert tunaFarm.tuna != null; @@ -65,8 +65,8 @@ @SpecAssertion(section = "5.3") public void testInvokeDependentScopeWhenContextNotActive() { - Bean<FoxRun> foxRunBean = getSimpleBean(FoxRun.class); - Bean<Fox> foxBean = getSimpleBean(Fox.class); + Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class); + Bean<Fox> foxBean = createSimpleBean(Fox.class); manager.addBean(foxBean); FoxRun foxRun = foxRunBean.create(); assert foxRun.fox.getName().equals("gavin"); @@ -76,8 +76,8 @@ @SpecAssertion(section = "3.7") public void testInjectingStaticField() { - Bean<BeanWithStaticBoundField_Broken> bean = getSimpleBean(BeanWithStaticBoundField_Broken.class); - Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<BeanWithStaticBoundField_Broken> bean = createSimpleBean(BeanWithStaticBoundField_Broken.class); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); bean.create(); } @@ -86,8 +86,8 @@ @SpecAssertion(section = "3.7") public void testInjectingFinalField() { - Bean<BeanWithFinalBoundField_Broken> bean = getSimpleBean(BeanWithFinalBoundField_Broken.class); - Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<BeanWithFinalBoundField_Broken> bean = createSimpleBean(BeanWithFinalBoundField_Broken.class); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); bean.create(); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -10,7 +10,7 @@ @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.8") public void testInjectingManager() { - FishFarmOffice fishFarmOffice = getSimpleBean(FishFarmOffice.class).create(); + FishFarmOffice fishFarmOffice = createSimpleBean(FishFarmOffice.class).create(); assert fishFarmOffice.manager != null; } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java 2009-01-16 18:51:53 UTC (rev 1032) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java 2009-01-16 18:58:14 UTC (rev 1033) @@ -24,7 +24,7 @@ @Override protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { - List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes(); + List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes(); deploymentTypes.add(AnotherDeploymentType.class); return deploymentTypes; } @@ -32,7 +32,7 @@ @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="5.9") public void testCurrentBindingTypeAssumed() { - Bean<Tuna> tunaBean = getSimpleBean(Tuna.class); + Bean<Tuna> tunaBean = createSimpleBean(Tuna.class); manager.addBean(tunaBean); assert manager.getInstanceByType(Tuna.class) != null; } @@ -65,9 +65,9 @@ @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="5.9") public void testAmbiguousDependencies() throws Exception { - Bean<Cod> codBean = getSimpleBean(Cod.class); - Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); - Bean<Sole> soleBean = getSimpleBean(Sole.class); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); + Bean<Sole> soleBean = createSimpleBean(Sole.class); manager.addBean(codBean); manager.addBean(salmonBean); manager.addBean(soleBean); @@ -77,9 +77,9 @@ @Test(expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="5.9") public void testUnsatisfiedDependencies() throws Exception { - Bean<Cod> codBean = getSimpleBean(Cod.class); - Bean<Salmon> salmonBean = getSimpleBean(Salmon.class); - Bean<Sole> soleBean = getSimpleBean(Sole.class); + Bean<Cod> codBean = createSimpleBean(Cod.class); + Bean<Salmon> salmonBean = createSimpleBean(Salmon.class); + Bean<Sole> soleBean = createSimpleBean(Sole.class); manager.addBean(codBean); manager.addBean(salmonBean); manager.addBean(soleBean);