[webbeans-commits] Webbeans SVN: r2403 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes and 21 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Apr 14 13:54:36 EDT 2009
Author: vitold
Date: 2009-04-14 13:54:36 -0400 (Tue, 14 Apr 2009)
New Revision: 2403
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java
Removed:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/namespace
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
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/foo/TestBindingType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestInterceptorBindingType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notdeploymenttype/NotDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notjavatype/NotJavaTypeTest.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/namespace/aggregation/NamespaceAggregationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
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/namespace/javaee/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml
Log:
some changes with tests
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -35,7 +35,6 @@
import org.jboss.webbeans.xml.checker.bean.ext.SimpleBeanElementChecker;
import org.jboss.webbeans.xml.checker.beanchildren.ext.NotSimpleBeanChildrenChecker;
import org.jboss.webbeans.xml.checker.beanchildren.ext.SimpleBeanChildrenChecker;
-import org.xml.sax.EntityResolver;
public class XmlParser
{
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-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -10,6 +10,7 @@
import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestNamed;
import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestScopeType;
import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestStereotype;
+import org.jboss.jsr299.tck.tests.xml.metadata.foo.Order;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -29,6 +30,7 @@
{
@Test
@SpecAssertions({
+ @SpecAssertion(section="9", id="b"),
@SpecAssertion(section="9.4", id="a"),
@SpecAssertion(section="9.4", id="b"),
@SpecAssertion(section="9.4", id="c"),
@@ -45,6 +47,7 @@
})
public void testAnnotationTypes()
{
+// assert getCurrentManager().resolveByType(Order.class).size() == 1;
assert true;
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.annotationtypes.foo;
+
+import javax.context.RequestScoped;
+
+ at RequestScoped
+ at TestBindingType
+ at TestInterceptorBindingType
+ at TestStereotype
+public class Order
+{
+ private int val;
+
+ public Order(int val)
+ {
+ this.val = val;
+ }
+
+ public int getVal()
+ {
+ return this.val;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestBindingType.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestBindingType.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.tests.xml.annotationtypes.foo;
+import javax.inject.BindingType;
+
+ at BindingType
public @interface TestBindingType
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestInterceptorBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestInterceptorBindingType.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestInterceptorBindingType.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.tests.xml.annotationtypes.foo;
+import javax.interceptor.InterceptorBindingType;
+
+ at InterceptorBindingType
public @interface TestInterceptorBindingType
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestStereotype.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/TestStereotype.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.tests.xml.annotationtypes.foo;
+import javax.annotation.Stereotype;
+
+ at Stereotype
public @interface TestStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -26,6 +26,6 @@
})
public void testMultipleDeclaration()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -26,6 +26,6 @@
})
public void testMultipleDeclaration()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -27,6 +27,6 @@
})
public void testNotValidType()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -26,6 +26,6 @@
})
public void testMultipleDeclaration()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -27,6 +27,6 @@
})
public void testNotValidType()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/multipledeclaration/MultipleDeclarationTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -24,6 +24,6 @@
})
public void testMultipleDeclaration()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notdeploymenttype/NotDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notdeploymenttype/NotDeploymentTypeTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notdeploymenttype/NotDeploymentTypeTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -24,6 +24,6 @@
})
public void testNotDeploymentType()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notjavatype/NotJavaTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notjavatype/NotJavaTypeTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/notvalid/notjavatype/NotJavaTypeTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -21,6 +21,6 @@
})
public void testNotJavaType()
{
- assert true;
+ assert false;
}
}
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-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -5,6 +5,7 @@
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;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.Resource;
@@ -14,11 +15,11 @@
@Artifact
@Resources({
- @Resource(source="namespace", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/namespace"),
@Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
})
@Classes({
Order.class,
+ AnotherOrder.class,
AnotherDeploymentType.class
})
@BeansXml("beans.xml")
@@ -30,12 +31,15 @@
@SpecAssertion(section="9", id="b"),
@SpecAssertion(section="9", id="c"),
@SpecAssertion(section="9", id="d"),
+ @SpecAssertion(section="9.1", id="a"),
@SpecAssertion(section="9.1", id="b"),
@SpecAssertion(section="9.1", id="c"),
@SpecAssertion(section="9.1", id="d")
})
public void testXmlBasedMetadata()
{
+// assert getCurrentManager().resolveByType(Order.class).size() == 1;
+// assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1;
assert true;
}
}
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-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,9 +1,17 @@
package org.jboss.jsr299.tck.tests.xml.metadata.foo;
+import javax.context.RequestScoped;
+
+ at RequestScoped
public class Order
{
public String str;
+ public Order(String str)
+ {
+ this.str = str;
+ }
+
public String getStr()
{
return str;
Added: 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 (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.xml.metadata.foo.another;
+
+public class AnotherOrder
+{
+ public String str;
+
+ public AnotherOrder(String str)
+ {
+ this.str = str;
+ }
+
+ public String getStr()
+ {
+ return str;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/NamespaceAggregationTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -23,7 +23,6 @@
@Test
@SpecAssertions({
- @SpecAssertion(section="9.1", id="a"),
@SpecAssertion(section="9.2", id="a"),
@SpecAssertion(section="9.2", id="b"),
@SpecAssertion(section="9.2", id="c"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -33,6 +33,7 @@
})
public void testJavaEeNamespace()
{
+// assert getCurrentManager().resolveByType(Order.class).size() == 1;
assert true;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,11 +1,22 @@
package org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo;
+import javax.context.RequestScoped;
+
+ at RequestScoped
+ at AnotherDeploymentType
public class Order
{
- public Integer val;
+ public int val;
- public Order(Integer val)
+ public String[] strArr;
+
+ public Order(int val)
{
this.val = val;
}
+
+ public int getVal()
+ {
+ return this.val;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -4,15 +4,16 @@
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
+ at BeansXml("beans.xml")
@ExpectedDeploymentException(DefinitionException.class)
- at BeansXml("beans.xml")
-public class NotDeclaredNamespaceTest
+public class NotDeclaredNamespaceTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
@@ -20,7 +21,6 @@
})
public void testNotDeclaredNamespace()
{
- assert true;
+ assert false;
}
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java 2009-04-14 17:54:36 UTC (rev 2403)
@@ -4,6 +4,7 @@
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.Resource;
@@ -17,7 +18,7 @@
})
@BeansXml("beans.xml")
@ExpectedDeploymentException(DefinitionException.class)
-public class StandardSchemaLocationTest
+public class StandardSchemaLocationTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
@@ -27,6 +28,6 @@
})
public void testStandardSchemaLocation()
{
- assert true;
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-14 17:54:36 UTC (rev 2403)
@@ -14,4 +14,11 @@
<dd:AnotherTestInterceptorBindingType />
<dd:TestNamed />
</dd:TestStereotype>
+ <dd:Order>
+ <RequestScoped />
+ <dd:TestBindingType />
+ <dd:TestInterceptorBindingType />
+ <dd:TestStereotype />
+ <Integer />
+ </dd:Order>
</Beans>
\ No newline at end of file
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-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,7 +1,6 @@
<Beans xmlns="urn:java:ee"
- xmlns:dd="urn:java:ee urn:java:org.jboss.jsr299.tck.tests.xml.metadata"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:java:org.jboss.jsr299.tck.tests.xml.metadata http://mydomain.com/myapp/schema-1.2.xsd">
+ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.metadata.foo"
+ xmlns:bb="urn:java:org.jboss.jsr299.tck.tests.xml.metadata.foo.another">
<Deploy>
<Standard />
<Production />
@@ -12,4 +11,9 @@
<dd:str>hello</dd:str>
<dd:getStr />
</dd:Order>
+ <bb:AnotherOrder>
+ <RequestScoped />
+ <bb:str>hello one more time</bb:str>
+ <bb:getStr />
+ </bb:AnotherOrder>
</Beans>
\ No newline at end of file
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/namespace
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/namespace 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/namespace 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,2 +0,0 @@
-org.jboss.jsr299.tck.tests.xml.metadata
-org.jboss.jsr299.tck.tests.xml.metadata.foo
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-14 17:54:36 UTC (rev 2403)
@@ -7,11 +7,13 @@
</Deploy>
<test:Order>
<RequestScoped />
+ <test:AnotherDeploymentType />
<Integer />
<Array>
<String />
</Array>
<test:val/>
+ <test:getVal />
</test:Order>
<Decorators>
<test:TestDecorator />
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml 2009-04-14 15:40:23 UTC (rev 2402)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml 2009-04-14 17:54:36 UTC (rev 2403)
@@ -1,6 +1,6 @@
<Beans xmlns="urn:java:ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:java:org.jboss.jsr299.tck.tests.xml.metadata http://mydomain.com/myapp/schema-1.2.xsd">
+ xsi:schemaLocation="urn:java:org.jboss.jsr299.tck.tests.xml.schema http://mydomain.com/myapp/schema-1.2.xsd">
<Deploy>
<Standard />
<Production />
More information about the weld-commits
mailing list