some changes with tests

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2445 1c488680-804c-0410-94cd-c6b725194a0e

impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java

@@ -210,10 +210,19 @@ private void checkFieldOrMethodChild(Element beanChildElement, AnnotatedClass<?>
                "> matches the name of both a method and a field of the bean class '" + beanClass.getName() + "'");
 
       if(isField)
+      {
          checkFieldChild(beanChildElement, beanClass);
+         return;
+      }
 
       if(isMethod)
+      {
          checkMethodChild(beanChildElement, beanClass);
+         return;
+      }
+
+      throw new DefinitionException("The name of the child element <" + beanChildElement.getName() + 
+            "> not matches the name of a method or a field of the bean class '" + beanClass.getName() + "'");
    }
 
    private void checkFieldChild(Element beanChildElement, AnnotatedClass<?> beanClass)

impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java

@@ -142,7 +142,7 @@ private void checkProduces(Element beanElement, AnnotatedClass<?> beanClass)
 
          if(beanMethod != null)
          {
-            Iterator<?> beanChildIt = producesElement.elementIterator();
+            Iterator<?> beanChildIt = beanChild.elementIterator();
             while(beanChildIt.hasNext())
             {
                Element element = (Element)beanChildIt.next();

tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java

@@ -1,34 +1,42 @@
 package org.jboss.webbeans.test.unit.xml.beans;
 
-import javax.context.Dependent;
-import javax.inject.Current;
+import javax.context.RequestScoped;
 import javax.inject.Initializer;
-import javax.inject.manager.Manager;
 
 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 boolean active;
+{   
+   private int val;
+
+   private String[] strArr;
 
    @Initializer
-   public Order(@Current Manager manager)
+   public Order()
+   {
+      this.val = 0;
+   }
+
+   public Order(int val)
+   {
+      this.val = val;
+   }
+
+   public int getVal()
    {
-      if (manager.getContext(Dependent.class).isActive())
-      {
-         active = true;
-      }
+      return this.val;
    }
 
-   public boolean isActive()
+   public String[] getStrArr()
    {
-      return active;
+      return this.strArr;
    }
 }

tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java

@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.xml.beans;
+
+import javax.annotation.Resource;
+
+@Resource
+public class PaymentResource
+{
+
+}

tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java

@@ -0,0 +1,20 @@
+package org.jboss.webbeans.test.unit.xml.javaeepkg;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.webbeans.test.unit.xml.javaeepkg.foo.Order;
+import org.testng.annotations.Test;
+
+@Artifact
+@Classes({Order.class})
+@BeansXml("beans.xml")
+public class JavaEePkgTest extends AbstractWebBeansTest
+{
+   @Test
+   public void testJavaEePkg()
+   {      
+      assert getCurrentManager().resolveByType(Order.class).size() == 2;
+   }
+}

tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java

@@ -0,0 +1,53 @@
+package org.jboss.webbeans.test.unit.xml.javaeepkg.foo;
+
+import java.util.Date;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.ejb.ScheduleExpression;
+import javax.event.Event;
+import javax.inject.Initializer;
+import javax.inject.Produces;
+import javax.interceptor.InvocationContext;
+import javax.jms.Connection;
+import javax.persistence.EntityManager;
+import javax.sql.CommonDataSource;
+import javax.xml.ws.Binding;
+
+@Named("orderBean")
+@RequestScoped
+public class Order
+{
+   private Integer integer; 
+
+   private Date date;
+
+   @Initializer
+   public Order()
+   {
+      this(0, new Date(), null, null, null, null, null, null, null);
+   }
+
+   public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule, 
+         EntityManager entityManager, Binding binding, Connection conn)
+   {
+      this.integer = integer;
+      this.date = date;
+   }
+
+   @Produces
+   public Order getOrder()
+   {
+      return new Order();
+   }
+
+   public Integer getInteger()
+   {
+      return integer;
+   }
+
+   public Date getDate()
+   {
+      return date;
+   }
+}

tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java

@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.xml.javaeepkg.foo;
+
+import javax.annotation.Resource;
+
+@Resource
+public class PaymentResource
+{
+
+}

tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java

@@ -59,6 +59,7 @@ public void testDd()
       XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("user-defined-beans.xml"), new EjbDescriptorCache());
       XmlParser parser = new XmlParser(parserEnv);
 
+      Set<Bean<Order>> beansSet1 = parserEnv.getManager().resolveByType(Order.class);
       List<Class<? extends Annotation>> dTypes1 = parserEnv.getManager().getEnabledDeploymentTypes();
 
       parser.parse();

tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml

@@ -0,0 +1,43 @@
+<Beans xmlns="urn:java:ee" 
+		xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml.javaeepkg.foo">
+
+	<test:Order>
+		<RequestScoped />
+		<Integer />
+		<Date />
+		<CommonDataSource />
+		<InvocationContext />
+		<Event />
+		<ScheduleExpression />
+		<EntityManager />
+		<Binding />
+		<Connection />
+		<test:getOrder>
+			<Produces>
+				<test:Order />
+			</Produces>
+		</test:getOrder>
+	</test:Order>
+
+	<test:PaymentResource>
+		<Resource>
+			<name>java:app/service/PaymentService</name>
+		</Resource>
+	</test:PaymentResource>
+</Beans>
+
+
+<!--
+   javax.context.RequestScoped;
+   java.lang.Integer;
+   java.util.Date;
+   javax.sql.CommonDataSource;
+   javax.interceptor.InvocationContext;
+   javax.event.Event;
+   javax.ejb.ScheduleExpression;
+   javax.persistence.EntityManager;
+   javax.xml.ws.Binding;
+   javax.jms.Connection;
+   javax.inject.Produces;
+   javax.annotation.Resource;         
+-->

tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml

@@ -30,10 +30,14 @@
 		<myapp:TestInterceptorBindingType />
 		<myapp:TestStereotype />
 		<myapp:TestDeploymentType />
-		<myapp:isActive />
-		<manager:Manager />
+		<Array>
+			<String />
+		</Array>
+		<myapp:getVal />
+		<myapp:val />
+		<Integer />
 	</myapp:Order>
-	<myapp:PaymentService>
+	<myapp:PaymentResource>
 		<RequestScoped />
 		<myapp:TestBindingType />
 		<myapp:TestInterceptorBindingType />
@@ -42,7 +46,7 @@
 		<Resource>
 			<name>java:app/service/PaymentService</name>
 		</Resource>
-	</myapp:PaymentService>
+	</myapp:PaymentResource>
 
 	<Decorators>
 		<myapp:TestDecorator />