Author: shane.bryzak(a)jboss.com Date: 2009-09-29 19:28:59 -0400 (Tue, 29 Sep 2009) New Revision: 3815 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java Log: matched remaining unmatched tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -10,13 +10,13 @@ import org.testng.annotations.Test; @Artifact -(a)ExpectedDeploymentException(DefinitionError.class) +//(a)ExpectedDeploymentException(DefinitionError.class) @SpecVersion(spec="cdi", version="PFD2") public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section = "2.7.1", id = "da") + // @Test + //@SpecAssertion(section = "2.7.1.3", id = "b") now untestable public void testStereotypeWithBindingTypes() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -17,7 +17,7 @@ { @Test(groups = "initializerMethod") - @SpecAssertions( { @SpecAssertion(section = "3.8.1", id = "ba"), + @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "ba"), @SpecAssertion(section = "3.3.2", id = "ca") }) public void testInitializerMethodAnnotatedProduces() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -165,7 +165,7 @@ @Test(groups = "injection") @SpecAssertions({ @SpecAssertion(section = "7.3.1", id = "aa"), - @SpecAssertion(section = "3.8.1", id = "a"), + @SpecAssertion(section = "3.8.1", id = "aa"), @SpecAssertion(section="2.3.4", id="a"), @SpecAssertion(section="3.8", id="aa"), @SpecAssertion(section="3.8", id="ab"), Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -55,7 +55,7 @@ @Test @SpecAssertions( { - @SpecAssertion(section = "4.3.2", id = "ab"), + // @SpecAssertion(section = "4.3.2", id = "ab"), removed from spec @SpecAssertion(section="4.3", id="cb") }) public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -183,7 +183,7 @@ } @Test - @SpecAssertion(section = "7.2", id = "hb") + @SpecAssertion(section = "7.2", id = "a1") public void testInitializerMethodsNotIntercepted() { MissileInterceptor.intercepted = false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -31,7 +31,7 @@ { @Test - @SpecAssertion(section = "5.3.5", id = "cb") + @SpecAssertion(section = "5.3.5", id = "b") public void testAnnotationMemberWithoutNonBinding() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -31,7 +31,7 @@ { @Test - @SpecAssertion(section = "5.3.5", id = "ca") + @SpecAssertion(section = "5.3.5", id = "b") public void testArrayMemberWithoutNonBinding() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-09-29 19:57:01 UTC (rev 3814) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-09-29 23:28:59 UTC (rev 3815) @@ -36,7 +36,7 @@ @Test(groups = { "resolution"}) @SpecAssertions({ - @SpecAssertion(section = "5.4.1", id = "c"), + @SpecAssertion(section = "5.4.1", id = "ca"), @SpecAssertion(section = "11.3.5", id = "aa"), @SpecAssertion(section = "11.3.5", id = "b") })