[jboss-cvs] JBossAS SVN: r66918 - in projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation: repository and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-11-09 10:44:11 -0500 (Fri, 09 Nov 2007)
New Revision: 66918

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
Log:
Update @Resource validation

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java	2007-11-09 15:43:20 UTC (rev 66917)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/MyStatelessBean.java	2007-11-09 15:44:11 UTC (rev 66918)
@@ -32,6 +32,8 @@
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.jms.Queue;
+import javax.sql.DataSource;
 
 /**
  * Comment
@@ -43,20 +45,22 @@
 @Stateless
 @TransactionAttribute(TransactionAttributeType.NEVER)
 @Resources({
-   @Resource(name="googleHome", type=java.net.URL.class, mappedName="http://www.google.com"),
-   @Resource(name="jdbc/ds", mappedName="java:/DefaultDS")
+   @Resource(description="url-resource-ref", name="googleHome", type=java.net.URL.class, mappedName="http://www.google.com"),
+   @Resource(description="DataSource-resource-ref", name="jdbc/ds", type=DataSource.class, mappedName="java:/DefaultDS")
 })
 public class MyStatelessBean implements MyStatelessLocal
 {
    @EJB
    private MyStatelessLocal injectedField;
-   @Resource
+   @Resource(description="SessionContext-resource-env-ref")
    private SessionContext context;
 
-   @Resource(description="A string from the env")
+   @Resource(description="string-env-entry")
    private String sfield;
    private URL homePage;
    private URL googleHome;
+   private Queue mailQueue;
+   private double pi;
 
    @EJB(name="overrideName")
    private MyStatelessLocal injectedFieldWithOverridenName;
@@ -71,10 +75,29 @@
    {
       return homePage;
    }
-   @Resource
+   @Resource(description="url-resource-ref2")
    public void setHomePage(URL homePage)
    {
       this.homePage = homePage;
    }
-   
+
+   public Queue getMailQueue()
+   {
+      return mailQueue;
+   }
+   @Resource(description="message-destination-ref")
+   public void setMailQueue(Queue mailQueue)
+   {
+      this.mailQueue = mailQueue;
+   }
+
+   public double getPi()
+   {
+      return pi;
+   }
+   @Resource(description="pi-env-entry", mappedName="3.14159")
+   public void setPi(double pi)
+   {
+      this.pi = pi;
+   }
 }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java	2007-11-09 15:43:20 UTC (rev 66917)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/repository/MetaDataRepositoryUnitTestCase.java	2007-11-09 15:44:11 UTC (rev 66918)
@@ -41,6 +41,12 @@
 import org.jboss.metadata.ejb.spec.SessionType;
 import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
 import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
 import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
 import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
@@ -76,6 +82,7 @@
    public void testMemoryMetaDataLoader()
       throws Exception
    {
+      enableTrace("org.jboss.metadata.annotation.creator");
       Class[] beanClasses = {
             Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean"),
             Class.forName("org.jboss.test.metadata.annotation.ejb3.MyStatefulBean")
@@ -102,16 +109,8 @@
       assertEquals(MyStatelessLocal.class, injectedField.getBeanInterface());
 
       ResourceReferencesMetaData resRefs = sbeanMD.getResourceReferences();
-      // Should be 5 when @Resources processor is added
+      // 
       assertEquals(3, resRefs.size());
-      ResourceReferenceMetaData contextRef = resRefs.get("context");
-      assertNotNull(contextRef);
-      assertEquals("javax.ejb.SessionContext", contextRef.getType());
-      Set<ResourceInjectionTargetMetaData> contextRefTargets = contextRef.getInjectionTargets();
-      assertEquals(1, contextRefTargets.size());
-      ResourceInjectionTargetMetaData contextRefTarget = contextRefTargets.iterator().next();
-      assertEquals("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean", contextRefTarget.getInjectionTargetClass());
-      assertEquals("context", contextRefTarget.getInjectionTargetName());
       ResourceReferenceMetaData homePageRef = resRefs.get("homePage");
       assertNotNull(homePageRef);
       assertEquals("java.net.URL", homePageRef.getType());
@@ -120,6 +119,38 @@
       ResourceInjectionTargetMetaData homePageRefTarget = homePageRefTargets.iterator().next();
       assertEquals("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean", homePageRefTarget.getInjectionTargetClass());
       assertEquals("homePage", homePageRefTarget.getInjectionTargetName());
+      ResourceReferenceMetaData googleHome = resRefs.get("googleHome");
+      assertNotNull(googleHome);
+      assertEquals("java.net.URL", googleHome.getType());
+      assertEquals("http://www.google.com", googleHome.getMappedName());
+      ResourceReferenceMetaData defaultDS = resRefs.get("jdbc/ds");
+      assertNotNull(defaultDS);
+      assertEquals("javax.sql.DataSource", defaultDS.getType());
+      assertEquals("java:/DefaultDS", defaultDS.getMappedName());
+
+      ResourceEnvironmentReferencesMetaData resEnvRefs = sbeanMD.getResourceEnvironmentReferences();
+      assertEquals(1, resEnvRefs.size());
+      ResourceEnvironmentReferenceMetaData contextRef = resEnvRefs.get("context");
+      assertNotNull(contextRef);
+      assertEquals("javax.ejb.SessionContext", contextRef.getType());
+      Set<ResourceInjectionTargetMetaData> contextRefTargets = contextRef.getInjectionTargets();
+      assertEquals(1, contextRefTargets.size());
+      ResourceInjectionTargetMetaData contextRefTarget = contextRefTargets.iterator().next();
+      assertEquals("org.jboss.test.metadata.annotation.ejb3.MyStatelessBean", contextRefTarget.getInjectionTargetClass());
+      assertEquals("context", contextRefTarget.getInjectionTargetName());
+
+      EnvironmentEntriesMetaData envEntries = sbeanMD.getEnvironmentEntries();
+      assertEquals(2, envEntries.size());
+      EnvironmentEntryMetaData pi = envEntries.get("pi");
+      assertEquals("3.14159", pi.getValue());
+      // TODO: should this be java.lang.Double?
+      assertEquals("double", pi.getType());
+
+      MessageDestinationReferencesMetaData msgRefs = sbeanMD.getMessageDestinationReferences();
+      assertEquals(1, msgRefs.size());
+      MessageDestinationReferenceMetaData mailQueue = msgRefs.get("mailQueue");
+      assertNotNull(mailQueue);
+      assertEquals("javax.jms.Queue", mailQueue.getType());
    }
 
    /**