[jboss-cvs] JBossAS SVN: r66138 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb.

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

Author: scott.stark at jboss.org
Date: 2007-10-15 15:05:03 -0400 (Mon, 15 Oct 2007)
New Revision: 66138

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
Add a ejb-jar.xml/jboss.xml/standardjboss.xml test for container configurations

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-15 18:25:19 UTC (rev 66137)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-15 19:05:03 UTC (rev 66138)
@@ -21,13 +21,22 @@
 */
 package org.jboss.test.metadata.ejb;
 
+import java.util.Iterator;
+
 import junit.framework.Test;
 
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.ConfigurationMetaData;
 import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
 import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -36,8 +45,10 @@
  * Miscellaneous tests with a JBoss 5 xml.
  * 
  * @author <a href="carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
+ at SuppressWarnings("deprecation")
 public class JBoss50UnitTestCase extends AbstractJavaEEMetaDataTest
 {
    public static Test suite()
@@ -48,6 +59,7 @@
    public static SchemaBindingResolver initResolver()
    {
       DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
       resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
@@ -121,4 +133,38 @@
       assertEquals("3.0", result.getVersion());
    }
 
+   /**
+    * 
+    *
+    */
+   public void testEjb21MergedContainerDefs()
+      throws Exception
+   {
+      long start = System.currentTimeMillis();
+      EjbJarMetaData specMetaData = unmarshal("EjbJar21Everything_testEverything.xml", EjbJar21MetaData.class, null);
+      long end = System.currentTimeMillis();
+      getLog().info("EjbJar21Everything_testEverything.xml parse time = "+(end - start));
+      JBoss50MetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBoss50MetaData.class, null);
+      long end2 = System.currentTimeMillis();
+      getLog().info("JBoss5xEverything_testStandard.xml parse time = "+(end2 - end));
+      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      long end3 = System.currentTimeMillis();
+      getLog().info("JBoss5xEverything_testEverything.xml parse time = "+(end3 - end2));
+      jbossMetaData.setOverridenMetaData(specMetaData);
+      JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
+
+      JBossEnterpriseBeansMetaData beans = wrapper.getEnterpriseBeans();
+      JBossEnterpriseBeanMetaData session1Ejb = beans.get("session1EjbName");
+      assertNotNull(session1Ejb);
+
+      // Test the legacy wrapper view
+      ApplicationMetaData appMetaData = new ApplicationMetaData(jbossMetaData);
+      Iterator<BeanMetaData> beans2 = appMetaData.getEnterpriseBeans();
+      while (beans2.hasNext())
+      {
+         BeanMetaData bean = (BeanMetaData) beans2.next();
+         ConfigurationMetaData beanCfg = bean.getContainerConfiguration();
+         assertNotNull(beanCfg);
+      } 
+   }
 }