[jboss-cvs] JBossAS SVN: r66149 - 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 21:13:54 -0400 (Mon, 15 Oct 2007)
New Revision: 66149

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
Correct the merged enterprise beans view from the wrapper

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-16 01:10:31 UTC (rev 66148)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-16 01:13:54 UTC (rev 66149)
@@ -28,6 +28,7 @@
 import org.jboss.metadata.ApplicationMetaData;
 import org.jboss.metadata.BeanMetaData;
 import org.jboss.metadata.ConfigurationMetaData;
+import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
 import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
 import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -38,6 +39,7 @@
 import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.test.metadata.javaee.JBossXBTestDelegate;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 
@@ -66,6 +68,8 @@
       resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+      // Workaround wildard resolution slowness
+      resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
       return resolver;
    }
    
@@ -134,12 +138,15 @@
    }
 
    /**
-    * 
+    * Validate an ejb-jar.xml/jboss.xml/standardjboss.xml set of metadata used to
+    * obtain an ejb container configuration.
     *
     */
    public void testEjb21MergedContainerDefs()
       throws Exception
    {
+      JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
+      xbdelegate.setValidateSchema(false);
       long start = System.currentTimeMillis();
       EjbJarMetaData specMetaData = unmarshal("EjbJar21Everything_testEverything.xml", EjbJar21MetaData.class, null);
       long end = System.currentTimeMillis();
@@ -153,12 +160,18 @@
       jbossMetaData.setOverridenMetaData(specMetaData);
       JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
 
-      JBossEnterpriseBeansMetaData beans = wrapper.getEnterpriseBeans();
+      // Test the unified metadata
+      JBossEnterpriseBeansMetaData beans = wrapper.getMergedEnterpriseBeans();
       JBossEnterpriseBeanMetaData session1Ejb = beans.get("session1EjbName");
       assertNotNull(session1Ejb);
+      for(JBossEnterpriseBeanMetaData bean : beans)
+      {
+         ContainerConfigurationMetaData beanCfg = bean.determineContainerConfiguration();
+         assertNotNull(beanCfg);
+      }
 
       // Test the legacy wrapper view
-      ApplicationMetaData appMetaData = new ApplicationMetaData(jbossMetaData);
+      ApplicationMetaData appMetaData = new ApplicationMetaData(wrapper);
       Iterator<BeanMetaData> beans2 = appMetaData.getEnterpriseBeans();
       while (beans2.hasNext())
       {