Author: vitold Date: 2009-04-17 07:44:06 -0400 (Fri, 17 Apr 2009) New Revision: 2459 Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java Removed: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace Log: fix BeansXmlParserTest Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java 2009-04-17 11:44:06 UTC (rev 2459) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.unit.xml.beans; - -import javax.annotation.Resource; - -@Resource -public class PaymentResource -{ - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java 2009-04-17 11:44:06 UTC (rev 2459) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.unit.xml.beans; - -import javax.xml.ws.WebServiceRef; - -@WebServiceRef -public class PaymentService -{ - -} Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-17 11:44:06 UTC (rev 2459) @@ -1,13 +1,18 @@ package org.jboss.webbeans.test.unit.xml.parser; +import java.lang.annotation.Annotation; import java.net.URL; import java.util.HashSet; +import java.util.List; import java.util.Set; +import javax.inject.manager.Bean; + import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.Resource; import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedItem; @@ -16,6 +21,7 @@ import org.jboss.webbeans.test.unit.xml.beans.Order; import org.jboss.webbeans.xml.XmlEnvironment; import org.jboss.webbeans.xml.XmlParser; +import org.testng.annotations.Test; @Artifact @Resources({ @@ -47,21 +53,21 @@ assert parserEnv.getClasses().size() == 1; } -// @Test + @Test public void testDd() { XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("user-defined-beans.xml"), new EjbDescriptorCache()); XmlParser parser = new XmlParser(parserEnv); parser.parse(); -// ManagerImpl manager = parserEnv.getManager(); -// -// Set<Bean<Order>> beansSet = manager.resolveByType(Order.class); -// List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes(); -// for(Bean<Order> bean : beansSet) -// { -// Class<? extends Annotation> deploymentType = bean.getDeploymentType(); -// System.out.println("after parsing: " + deploymentType); -// } + ManagerImpl manager = parserEnv.getManager(); + + Set<Bean<Order>> beansSet = manager.resolveByType(Order.class); + List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes(); + for(Bean<Order> bean : beansSet) + { + Class<? extends Annotation> deploymentType = bean.getDeploymentType(); + System.out.println("after parsing: " + deploymentType); + } } } \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 11:44:06 UTC (rev 2459) @@ -9,7 +9,7 @@ import org.jboss.webbeans.ejb.EjbDescriptorCache; import org.jboss.webbeans.mock.MockXmlEnvironment; import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.jboss.webbeans.test.unit.xml.beans.Order; +import org.jboss.webbeans.test.unit.xml.parser.schema.foo.Order; import org.jboss.webbeans.xml.XmlEnvironment; import org.jboss.webbeans.xml.XmlParser; import org.testng.annotations.Test; Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-04-17 11:44:06 UTC (rev 2459) @@ -0,0 +1,42 @@ +package org.jboss.webbeans.test.unit.xml.parser.schema.foo; + +import javax.context.RequestScoped; +import javax.inject.Initializer; + +import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestBindingType; +import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestDeploymentType; +import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestInterceptorBindingType; +import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestStereotype; + +@RequestScoped +@TestBindingType +@TestInterceptorBindingType +@TestStereotype +@TestDeploymentType +public class Order +{ + private int val; + + private String[] strArr; + + @Initializer + public Order() + { + this.val = 0; + } + + public Order(int val) + { + this.val = val; + } + + public int getVal() + { + return this.val; + } + + public String[] getStrArr() + { + return this.strArr; + } +} Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java 2009-04-17 11:44:06 UTC (rev 2459) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.unit.xml.parser.schema.foo; + +import javax.annotation.Resource; + +@Resource +public class PaymentResource +{ + +} Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml 2009-04-17 11:44:06 UTC (rev 2459) @@ -5,12 +5,4 @@ <Production /> <test:AnotherDeploymentType /> </Deploy> - <myapp:Order> - <ConversationScoped /> - <myapp:PaymentProcessor> - <myapp:Asynchronous /> - </myapp:PaymentProcessor> - <myapp:User /> - </myapp:Order> - </Beans> \ No newline at end of file Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace 2009-04-17 11:44:06 UTC (rev 2459) @@ -1,2 +1,2 @@ -org.jboss.webbeans.test.unit.xml.beans -org.jboss.webbeans.test.unit.xml.beans.annotationtype \ No newline at end of file +org.jboss.webbeans.test.unit.xml.beans.annotationtype +org.jboss.webbeans.test.unit.xml.parser.schema.foo \ No newline at end of file Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace 2009-04-17 10:54:49 UTC (rev 2458) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace 2009-04-17 11:44:06 UTC (rev 2459) @@ -1,2 +1,2 @@ -org.jboss.webbeans.test.unit.xml.beans -org.jboss.webbeans.test.unit.xml.beans.annotationtype \ No newline at end of file +org.jboss.webbeans.test.unit.xml.beans.annotationtype +org.jboss.webbeans.test.unit.xml.parser.schema.foo \ No newline at end of file