Author: dallen6 Date: 2009-05-05 09:44:17 -0400 (Tue, 05 May 2009) New Revision: 2652 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml Log: Fixed some tests and added missing ones for XML, section 9 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java 2009-05-05 08:43:05 UTC (rev 2651) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -15,7 +15,7 @@ @ExpectedDeploymentException(DefinitionException.class) public class NotJavaTypeTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test(groups = "xml") @SpecAssertions( { @SpecAssertion(section = "9.4", id = "d") }) Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.interceptorbindingtype.childnotannotation; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)ExpectedDeploymentException(DefinitionException.class) +public class NotAnnotationTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { + @SpecAssertion(section = "9.4.2", id = "c") + }) + public void testChildNotAnnotationType() + { + assert false; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.interceptorbindingtype.childnotjavatype; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)ExpectedDeploymentException(DefinitionException.class) +public class ChildNotJavaTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { + @SpecAssertion(section = "9.4.2", id = "b") + }) + public void testChildNotJavaType() + { + assert false; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java 2009-05-05 08:43:05 UTC (rev 2651) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -15,7 +15,7 @@ @ExpectedDeploymentException(DefinitionException.class) public class NotJavaTypeTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test(groups = "xml") @SpecAssertions( { @SpecAssertion(section = "9.4", id = "d") }) Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.stereotype.childnotannotation; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)ExpectedDeploymentException(DefinitionException.class) +public class NotAnnotationTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { + @SpecAssertion(section = "9.4.1", id = "c") + }) + public void testChildNotAnnotationType() + { + assert false; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.stereotype.childnotjavatype; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +(a)ExpectedDeploymentException(DefinitionException.class) +public class NotJavaTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { + @SpecAssertion(section = "9.4.1", id = "b") + }) + public void testChildNotJavaType() + { + assert false; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java 2009-05-05 08:43:05 UTC (rev 2651) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652) @@ -15,7 +15,7 @@ @ExpectedDeploymentException(DefinitionException.class) public class NotJavaTypeTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test(groups = "xml") @SpecAssertions( { @SpecAssertion(section = "9.4", id = "d") }) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml 2009-05-05 08:43:05 UTC (rev 2651) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> + <dd:NotJavaType> <BindingType /> - </dd:TestBindingType> + </dd:NotJavaType> </Beans> \ No newline at end of file Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> + <dd:TestInterceptorBindingType> + <InterceptorBindingType /> + <dd:NotAnnotationType /> + </dd:TestInterceptorBindingType> +</Beans> \ No newline at end of file Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> + <dd:TestInterceptorBindingType> + <InterceptorBindingType /> + <dd:NotJavaType /> + </dd:TestInterceptorBindingType> +</Beans> \ No newline at end of file Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml 2009-05-05 08:43:05 UTC (rev 2651) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestInterceptorBindingType> + <dd:NotJavaType> <InterceptorBindingType /> - </dd:TestInterceptorBindingType> + </dd:NotJavaType> </Beans> \ No newline at end of file Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> + <dd:TestStereotype> + <Stereotype /> + <dd:NotAnnotationType /> + </dd:TestStereotype> +</Beans> \ No newline at end of file Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee" + xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> + <dd:TestStereotype> + <Stereotype /> + <dd:NotJavaType /> + </dd:TestStereotype> +</Beans> \ No newline at end of file Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml 2009-05-05 08:43:05 UTC (rev 2651) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652) @@ -1,6 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestStereotype> + <dd:NotJavaType> <Stereotype /> - </dd:TestStereotype> + </dd:NotJavaType> </Beans> \ No newline at end of file