7:18 a.m.
Author: dallen6
Date: 2009-05-03 08:18:01 -0400 (Sun, 03 May 2009)
New Revision: 2643
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
Log:
Simplified directory tree and marked test broken since parser's own bean validation
does not locate the constructor on the bean.
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-05-02
06:04:03 UTC (rev 2642)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-05-03
12:18:01 UTC (rev 2643)
@@ -13,14 +13,12 @@
import javax.inject.manager.Manager;
import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
-import javax.sql.CommonDataSource;
+import javax.sql.DataSource;
import javax.xml.ws.Binding;
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.namespace.javaee.pkg.foo.Order;
-import org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo.TestBindingType;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -35,7 +33,7 @@
private static final Annotation[] bindings = {TEST_BINDING_TYPE};
- @Test
+ @Test(groups = { "broken", "xml" })
@SpecAssertions({
@SpecAssertion(section="9.2.1", id="a")
})
@@ -64,7 +62,7 @@
Class<?> clazz = Order.class;
try
{
- assert clazz.getDeclaredConstructor(Integer.class, Date.class,
CommonDataSource.class, InvocationContext.class, Event.class,
+ assert clazz.getDeclaredConstructor(Integer.class, Date.class,
DataSource.class, InvocationContext.class, Event.class,
TimerHandle.class, EntityManager.class, Binding.class) != null;
}
catch (SecurityException e)
Copied:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java
(from rev 2642,
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/Order.java 2009-05-03
12:18:01 UTC (rev 2643)
@@ -0,0 +1,42 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg;
+
+import java.util.Date;
+
+import javax.context.RequestScoped;
+import javax.ejb.TimerHandle;
+import javax.event.Event;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import javax.xml.ws.Binding;
+
+@RequestScoped
+@TestBindingType
+class Order
+{
+ private final Integer integer;
+
+ private final Date date;
+
+ public Order()
+ {
+ this(0, new Date(), null, null, null, null, null, null);
+ }
+
+ public Order(Integer integer, Date date, DataSource source, InvocationContext
invocation, Event<String> e, TimerHandle schedule,
+ EntityManager entityManager, Binding binding)
+ {
+ this.integer = integer;
+ this.date = date;
+ }
+
+ public Integer getInteger()
+ {
+ return integer;
+ }
+
+ public Date getDate()
+ {
+ return date;
+ }
+}
Copied:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java
(from rev 2642,
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/TestBindingType.java 2009-05-03
12:18:01 UTC (rev 2643)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+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.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface TestBindingType
+{
+
+}
Modified:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
===================================================================
---
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-05-02
06:04:03 UTC (rev 2642)
+++
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-05-03
12:18:01 UTC (rev 2643)
@@ -1,5 +1,5 @@
<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo">
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg">
<test:TestBindingType>
<BindingType />