[webbeans-commits] Webbeans SVN: r2363 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/namespace/javaee and 2 other directories.

[webbeans-commits at lists.jboss.org]

Author: vitold
Date: 2009-04-09 10:45:30 -0400 (Thu, 09 Apr 2009)
New Revision: 2363

Removed:
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/namespace
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/javaee/JavaEeNamespaceTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml
Log:
some changes with tests

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 12:34:25 UTC (rev 2362)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/aggregation/multipleTypes/MultipleTypesInAggregatedNamespacesTest.java	2009-04-09 14:45:30 UTC (rev 2363)
@@ -27,8 +27,7 @@
 {   
    @Test
    @SpecAssertions({
-      @SpecAssertion(section="9.2", id="e"),
-      @SpecAssertion(section="9.2", id="f")
+      @SpecAssertion(section="9.2", id="e")
    })
    public void testNamespaceAggregation()
    {

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-09 12:34:25 UTC (rev 2362)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java	2009-04-09 14:45:30 UTC (rev 2363)
@@ -3,7 +3,8 @@
 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.Order;
+import org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo.AnotherDeploymentType;
+import org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo.Order;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.Classes;
 import org.jboss.testharness.impl.packaging.Resource;
@@ -15,19 +16,20 @@
 @Resources({
    @Resource(source="namespace", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace")
 })
- at Classes({Order.class})
+ at Classes({Order.class, AnotherDeploymentType.class})
 @BeansXml("beans.xml")
 public class JavaEeNamespaceTest extends AbstractJSR299Test
 {
    @Test
    @SpecAssertions({
+	  @SpecAssertion(section="9.1", id="e"),
+	  @SpecAssertion(section="9.1", id="f"),
+	  @SpecAssertion(section="9.2", id="f"),
       @SpecAssertion(section="9.2.1", id="a"),
       @SpecAssertion(section="9.2.1", id="b"),
       @SpecAssertion(section="9.2.1", id="c"),
       @SpecAssertion(section="9.2.1", id="d"),
-      @SpecAssertion(section="9.2.1", id="e"),
-      @SpecAssertion(section="9.1", id="e"),
-      @SpecAssertion(section="9.1", id="f")
+      @SpecAssertion(section="9.2.1", id="e")
    })
    public void testJavaEeNamespace()
    {

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-09 12:34:25 UTC (rev 2362)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/NotDeclaredNamespaceTest.java	2009-04-09 14:45:30 UTC (rev 2363)
@@ -4,20 +4,12 @@
 
 import org.hibernate.tck.annotations.SpecAssertion;
 import org.hibernate.tck.annotations.SpecAssertions;
-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.ExpectedDeploymentException;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
 import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 @Artifact
- at Resources({
-   @Resource(source="namespace", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/namespace")
-})
- at Classes({Order.class})
 @ExpectedDeploymentException(DefinitionException.class)
 @BeansXml("beans.xml")
 public class NotDeclaredNamespaceTest

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml	2009-04-09 12:34:25 UTC (rev 2362)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml	2009-04-09 14:45:30 UTC (rev 2363)
@@ -1,22 +1,8 @@
-<Beans xmlns="urn:java:ee" 
-		xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee">
+<Beans xmlns="urn:java:ee">
 	<Deploy>
 		<Standard />
 		<Production />
 		<test:AnotherDeploymentType />
 	</Deploy>
-	<test:Order>
-		<RequestScoped />
-		<Integer />
-		<Array>
-			<String />
-		</Array>
-	</test:Order>
-	<Decorators>
-		<test:TestDecorator />	
-	</Decorators>
-	<Interceptors>
-		<test:TestInterceptor />
-	</Interceptors>
-	<me:TestElement />
+	<me:NotDeclared />
 </Beans>
\ No newline at end of file

Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/namespace
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/namespace	2009-04-09 12:34:25 UTC (rev 2362)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/namespace	2009-04-09 14:45:30 UTC (rev 2363)
@@ -1,2 +0,0 @@
-org.jboss.jsr299.tck.tests.xml.namespace.javaee
-org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo
\ No newline at end of file