[webbeans-commits] Webbeans SVN: r2366 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml: annotationtypes/notvalidxml/bindingtype/notannotationtype and 4 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-09 12:48:39 -0400 (Thu, 09 Apr 2009)
New Revision: 2366

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/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java
   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/foo/NotAnnotationType.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/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java
Log:
Fix tests to run incontainer

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-09 15:52:54 UTC (rev 2365)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java	2009-04-09 16:48:39 UTC (rev 2366)
@@ -3,8 +3,12 @@
 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.annotationtypes.foo.AnotherTestInterceptorBindingType;
 import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestBindingType;
+import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestDeploymentType;
 import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestInterceptorBindingType;
+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.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.Classes;
@@ -12,7 +16,14 @@
 import org.testng.annotations.Test;
 
 @Artifact
- at Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class})
+ at Classes({
+   TestBindingType.class, 
+   TestInterceptorBindingType.class, 
+   TestStereotype.class, 
+   AnotherTestInterceptorBindingType.class, 
+   TestScopeType.class,
+   TestDeploymentType.class,
+   TestNamed.class})
 @BeansXml("beans.xml")
 public class AnnotationTypesTest extends AbstractJSR299Test
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java	2009-04-09 15:52:54 UTC (rev 2365)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java	2009-04-09 16:48:39 UTC (rev 2366)
@@ -21,7 +21,7 @@
 @ExpectedDeploymentException(DefinitionException.class)
 public class NotAnnotationTypeTest extends AbstractJSR299Test 
 {	
-	@Test
+	@Test(groups="ri-broken")
 	   @SpecAssertions({
 	      @SpecAssertion(section="9.4", id="d")
 	   })

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-04-09 15:52:54 UTC (rev 2365)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java	2009-04-09 16:48:39 UTC (rev 2366)
@@ -20,7 +20,7 @@
 @ExpectedDeploymentException(DefinitionException.class)
 public class NotJavaTypeTest extends AbstractJSR299Test 
 {	
-	@Test
+   @Test(groups="ri-broken")
 	   @SpecAssertions({
 	      @SpecAssertion(section="9.4", id="d")
 	   })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/foo/NotAnnotationType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/foo/NotAnnotationType.java	2009-04-09 15:52:54 UTC (rev 2365)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/foo/NotAnnotationType.java	2009-04-09 16:48:39 UTC (rev 2366)
@@ -1,5 +1,6 @@
 package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo;
 
-public class NotAnnotationType {
+public class NotAnnotationType 
+{
 
 }

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-09 15:52:54 UTC (rev 2365)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java	2009-04-09 16:48:39 UTC (rev 2366)
@@ -3,6 +3,7 @@
 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.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.Classes;
@@ -16,7 +17,10 @@
    @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")
 })
- at Classes({Order.class})
+ at Classes({
+   Order.class,
+   AnotherDeploymentType.class
+})
 @BeansXml("beans.xml")
 public class XmlBasedMetadataTest extends AbstractJSR299Test
 {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java	2009-04-09 15:52:54 UTC (rev 2365)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java	2009-04-09 16:48:39 UTC (rev 2366)
@@ -20,7 +20,7 @@
 @Resources({
    @Resource(source="namespace", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/namespace")
 })
- at Classes({AnotherDeploymentType.class, TestDeploymentType.class})
+ at Classes({AnotherDeploymentType.class, TestDeploymentType.class, org.jboss.jsr299.tck.tests.xml.namespace.aggregation.foo.copy.AnotherDeploymentType.class})
 @BeansXml("beans.xml")
 @ExpectedDeploymentException(DefinitionException.class)
 public class MultipleTypesInAggregatedNamespacesTest extends AbstractJSR299Test