Author: dallen6 Date: 2009-04-27 11:36:11 -0400 (Mon, 27 Apr 2009) New Revision: 2630 Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml Log: Updated test for XML schema validation; currently marked ri-broken till WBRI-254 is fixed. Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-27 15:36:11 UTC (rev 2630) @@ -15,15 +15,6 @@ @BeansXml("beans.xml") public class AnnotationTypesTest extends AbstractJSR299Test { - @Test(groups = { "stub", "xml" }) - @SpecAssertions({ - @SpecAssertion(section="9", id="d")//without schema - }) - public void testXMLSchemaUse() - { - assert false; - } - @Test(groups = { "ri-broken", "xml" }) @SpecAssertions({ @SpecAssertion(section="9.4", id="a") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-27 15:36:11 UTC (rev 2630) @@ -3,7 +3,6 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.tests.xml.metadata.foo.AnotherDeploymentType; import org.jboss.jsr299.tck.tests.xml.metadata.foo.Order; import org.jboss.jsr299.tck.tests.xml.metadata.foo.another.AnotherOrder; import org.jboss.testharness.impl.packaging.Artifact; @@ -15,21 +14,20 @@ @Artifact @Resources({ - @Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd") + @Resource(source="foo/schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd") }) @Classes({ Order.class, - AnotherOrder.class, - AnotherDeploymentType.class + AnotherOrder.class }) @BeansXml("beans.xml") public class XmlBasedMetadataTest extends AbstractJSR299Test { - @Test + @Test(groups = { "ri-broken", "xml" }) @SpecAssertions({ @SpecAssertion(section="9", id="b"), @SpecAssertion(section="9", id="c"), - @SpecAssertion(section="9", id="d"),//with schema + @SpecAssertion(section="9", id="d"), @SpecAssertion(section="9.1", id="a"), @SpecAssertion(section="9.1", id="b"), @SpecAssertion(section="9.1", id="c"), Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/AnotherDeploymentType.java 2009-04-27 15:36:11 UTC (rev 2630) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.tests.xml.metadata.foo; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface AnotherDeploymentType -{ - -} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-27 15:36:11 UTC (rev 2630) @@ -1,9 +1,5 @@ package org.jboss.jsr299.tck.tests.xml.metadata.foo; -import javax.context.Dependent; -import javax.inject.Current; -import javax.inject.Initializer; -import javax.inject.manager.Manager; public class Order { @@ -11,15 +7,6 @@ private boolean active; - @Initializer - public Order(@Current Manager manager) - { - if (manager.getContext(Dependent.class).isActive()) - { - active = true; - } - } - public String getStr() { return str; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-27 15:36:11 UTC (rev 2630) @@ -1,9 +1,5 @@ package org.jboss.jsr299.tck.tests.xml.metadata.foo.another; -import javax.context.Dependent; -import javax.inject.Current; -import javax.inject.Initializer; -import javax.inject.manager.Manager; public class AnotherOrder { @@ -11,15 +7,6 @@ private boolean active; - @Initializer - public AnotherOrder(@Current Manager manager) - { - if (manager.getContext(Dependent.class).isActive()) - { - active = true; - } - } - public String getStr() { return str; Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-27 15:36:11 UTC (rev 2630) @@ -4,7 +4,6 @@ <Deploy> <Standard /> <Production /> - <dd:AnotherDeploymentType /> </Deploy> <dd:Order> <dd:str> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd 2009-04-27 15:36:11 UTC (rev 2630) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.example.org/schema/" targetNamespace="http://www.example.org/schema/"> + <element name="Order" type="tns:OrderType"></element> + <element name="str" type="tns:StrType"></element> + + <complexType name="StrType"> + <sequence> + <element name="value" type="string"></element> + </sequence> + </complexType> + <complexType name="OrderType"> + <sequence> + <element ref="tns:str"></element> + <element name="getStr" /> + </sequence> + </complexType> +</schema> \ No newline at end of file Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/schema.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-27 01:34:55 UTC (rev 2629) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-27 15:36:11 UTC (rev 2630) @@ -1,10 +0,0 @@ -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee"> - <xs:element name="Beans"> - <xs:complexType> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:any namespace="##any" processContents="skip" /> - </xs:sequence> - <xs:anyAttribute namespace="##any" processContents="skip" /> - </xs:complexType> - </xs:element> -</xs:schema> \ No newline at end of file