[webbeans-commits] Webbeans SVN: r1673 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng and 20 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-23 20:38:26 -0500 (Mon, 23 Feb 2009) New Revision: 1673 Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml Modified: ri/trunk/jboss-tck-runner/pom.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/resources/tck-tests.xml Log: Fix runner, fix up some classes Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-24 00:59:02 UTC (rev 1672) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-24 01:38:26 UTC (rev 1673) @@ -75,11 +75,10 @@ <overWrite>true</overWrite> </artifactItem> <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-porting-package</artifactId> <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> </artifactItem> <artifactItem> <groupId>javax.el</groupId> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -18,7 +18,8 @@ { if (!ConfigurationImpl.get().isStandalone() || method.getMethod().getDeclaringClass().isAnnotationPresent(IntegrationTest.class)) { - if (Arrays.asList(method.getGroups()).contains("incontainer-underInvestigation")) + List<String> groups = Arrays.asList(method.getGroups()); + if (groups.contains("incontainer-ri-broken") || groups.contains("incontainer-broken")) { methodContext.setStopped(true); return false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -36,7 +36,7 @@ getCurrentManager().addContext(context); } - @Test(groups = { "contexts", "broken" }) + @Test(groups = { "contexts" }) @SpecAssertion(section = "8.1", id = "a") public void testGetReturnsExistingInstance() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -174,10 +174,11 @@ }.run(); } - @Test(groups = { "contexts", "underInvestigation" }, expectedExceptions = ContextNotActiveException.class) + @Test(groups = { "contexts", "ri-broken" }, expectedExceptions = ContextNotActiveException.class) @SpecAssertion(section = "8.3", id = "g") public void testContextIsInactive() { + // The RI test harness is broken here, it just enables the dependent context blindly //getCurrentManager().getContext(Dependent.class); } @@ -288,6 +289,7 @@ @SpecAssertion(section = "8.3.2", id = "a") public void testDestroyingParentDestroysDependents() throws Exception { + // WBRI-147 new RunInDependentContext() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -40,7 +40,7 @@ order.getBindings().iterator().next().annotationType().equals(Production.class); } - @Test(groups = { "annotationDefinition", "underInvestigation" }) + @Test(groups = { "annotationDefinition", "stub" }) @SpecAssertion(section = "2.3.2", id = "aa") public void testBindingHasCorrectTarget() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -4,23 +4,27 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** * * Spec version: PRD2 */ -@Test +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)ExpectedDeploymentException(DeploymentException.class) public class BrokenDeploymentTypeTest extends AbstractDeclarativeTest { @SuppressWarnings("unchecked") - @Test(expectedExceptions=DeploymentException.class, groups="broken") + @Test @SpecAssertion(section="2.5.6", id = "c") public void testStandardMustBeDeclared() { - - //manager = configuration().getContainers().deploy(Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class), Dog.class); + assert false; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -76,7 +76,7 @@ assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class); } - @Test( groups = "broken" ) + @Test( groups = "stub" ) @SpecAssertion(section = "2.7.1.2", id = "a") public void testStereotypeWithoutInterceptors() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -15,7 +15,7 @@ public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractDeclarativeTest { - @Test(groups="underInvestigation") + @Test(groups="stub") @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.7.4", id = "c") }) public void testMultipleStereotypesWithMultipleDeploymentTypes() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -17,7 +17,7 @@ { - @Test(groups = { "enterpriseBeans", "incontainer-underInvestigation" }) + @Test(groups = { "enterpriseBeans", "stub" }) @SpecAssertion(section = "3.3", id = "d") public void testSingletonWithRequestScopeFails() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -16,7 +16,7 @@ public class SingletonWithSessionScopeTest extends AbstractDeclarativeTest { - @Test(groups = { "enterpriseBeans", "incontainer-underInvestigation" }) + @Test(groups = { "enterpriseBeans", "stub" }) @SpecAssertion(section = "3.3", id = "d") public void testSingletonWithSessionScopeFails() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -49,25 +49,6 @@ assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } - /* - * @Test(groups="producerField", - * expectedExceptions=DefinitionException.class) - * - * @SpecAssertion(section="3.5") public void testStaticField() throws - * Exception { SimpleBean<BeanWithStaticProducerField> bean = - * createSimpleBean(BeanWithStaticProducerField.class); - * manager.addBean(bean); Field field = - * BeanWithStaticProducerField.class.getField("getString"); - * createProducerFieldBean(String.class, field, bean); } - */ - - @Test(groups = { "broken", "producerField", "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "outdated", id = "outdated") - public void testProducerFieldIsNotBusinessField() throws Exception - { - deployBeans(VibratingSpiderImpl_Broken.class); - } - @Test(groups = "producerField") @SpecAssertion(section = "3.5", id = "f") public void testParameterizedReturnType() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -6,11 +6,5 @@ @AnotherDeploymentType class AndalusianChicken extends Chicken { - private static Egg egg = new Egg(); - @Override - public Egg getEgg() - { - return egg; - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -4,16 +4,11 @@ class Chicken { - private static Egg egg = new Egg(); @Produces @Yummy public Egg produceEgg() { - return getEgg(); + return new Egg(this); } - public Egg getEgg() - { - return egg; - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -2,5 +2,17 @@ class Egg { + + private final Chicken mother; + public Egg(Chicken mother) + { + this.mother = mother; + } + + public Chicken getMother() + { + return mother; + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -191,11 +191,12 @@ assert wolfSpider.getScopeType().equals(RequestScoped.class); } - @Test(groups="underInvestigation") + @Test(groups="ri-broken") @SpecAssertion(section = "4.2", id = "d") public void testNonStaticProducerMethodNotInherited() { - assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 0; + assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; + System.out.println(getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass()); + assert getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(Chicken.class); } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -13,7 +13,7 @@ public class ConstructorHasDisposesParameterTest extends AbstractDeclarativeTest { - @Test(groups = { "disposalMethod", "underInvestigation" }) + @Test(groups = { "disposalMethod", "stub" }) @SpecAssertion(section = "3.2.6.1", id = "d") public void testConstructorHasDisposesParameter() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -13,7 +13,7 @@ public class ConstructorHasObservesParameterTest extends AbstractDeclarativeTest { - @Test(groups = { "underInvestigation", "observerMethod" }) + @Test(groups = { "stub", "observerMethod" }) @SpecAssertion(section = "3.2.6.1", id = "e") public void testConstructorHasObservesParameter() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -100,14 +100,10 @@ assert false; } - @Test(groups = { "new", "underInvestigation" }) + @Test(groups = { "new", "stub" }) @SpecAssertion(section = "3.2.5", id = "l") public void testNewBeanHasNoDisposalMethods() { - // Class<?> type = - // TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass(); - // assert manager.resolveDisposalMethods(type, - // newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty(); assert false; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -34,7 +34,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasSameScope() { - // deployBeans(Cow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -43,7 +42,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasDeploymentTypeOfRealizingClass() { - // deployBeans(Cow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @@ -52,7 +50,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasSameBindings() { - // deployBeans(Cow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); @@ -63,17 +60,16 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasBindingsOfMethodAndRealizingType() { - // deployBeans(TameCow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; assert annotationSetMatches(getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); } - @Test(groups = "broken") + @Test(groups = "ri-broken") @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasSameStereotypes() { - // deployBeans(LabradorKennel.class); + // WBRI-148 assert getCurrentManager().resolveByType(Dog.class).size() == 1; assert getCurrentManager().resolveByType(Dog.class).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -89,7 +85,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasSameScope() { - // deployBeans(Horse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -98,7 +93,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasDeploymentTypeOfRealizingClass() { - // deployBeans(Horse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @@ -107,7 +101,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasSameBindings() { - // deployBeans(Horse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); @@ -118,17 +111,16 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasBindingsOfMethodAndRealizingType() { - // deployBeans(TameHorse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; assert annotationSetMatches(getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); } - @Test(groups = "broken") + @Test(groups = "ri-broken") @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasSameStereotypes() { - // deployBeans(Stable.class); + // WBRI-148 assert getCurrentManager().resolveByType(Horse.class).size() == 1; assert getCurrentManager().resolveByType(Horse.class).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -158,7 +150,6 @@ @SpecAssertion(section = "4.4.1", id = "d") public void testObserverMethodInheritedAndHasSameBindings() { - // deployBeans(FarmHouse.class); assert getCurrentManager().resolveObservers(new Cow(), new AnnotationLiteral<Tame>() { }).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -74,6 +74,7 @@ }) public void testSpecializedBeanNotInstantiated() throws Exception { + // TODO Needs integration env deployBeans(LazyFarmer.class, Farmer.class); new RunInDependentContext() { @@ -99,6 +100,8 @@ @SpecAssertion(section="4.3.1", id = "g") public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { + + // TODO needs integration env! deployBeans(Office.class, Building.class); new RunInDependentContext() { @@ -141,14 +144,14 @@ deployBeans(Donkey_Broken.class); } - @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) + @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7", id = "a") public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() { assert false; } - @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) + @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7", id = "a") public void testSpecializingBeanDoesNotSupportLocalInterfaceView() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -15,7 +15,7 @@ public class InstantiationByNameTest extends AbstractDeclarativeTest { - @Test(groups={"underInvestigation", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") + @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") //TODO Need to find a way to intercept calls to the manager to verify this condition public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -44,7 +44,7 @@ }.run(); } - @Test(groups="incontainer-underInvestigation") + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "5.4", id = "c") public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException { Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml 2009-02-24 01:38:26 UTC (rev 1673) @@ -0,0 +1,6 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.deployment"> + <Deploy> + <Production /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-24 01:38:26 UTC (rev 1673) @@ -10,35 +10,12 @@ <selector-class name="org.jboss.jsr299.tck.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> </method-selector> </method-selectors> - <groups > + <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" /> - <exclude name="underInvestigation" /> <exclude name="ri-broken" /> + <exclude name="underInvestigation" /> + <exclude name="broken" /> </run> </groups> <packages>