[jboss-cvs] JBossAS SVN: r66348 - 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-23 02:07:40 -0400 (Tue, 23 Oct 2007)
New Revision: 66348

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
Update to create the merge view

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java	2007-10-23 06:07:16 UTC (rev 66347)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java	2007-10-23 06:07:40 UTC (rev 66348)
@@ -130,14 +130,6 @@
       assertEquals("javax.jms.Queue", strictlyPooledMDMD.getDestinationType());
    }
 
-   public void testMergedMDB()
-      throws Exception
-   {
-      EjbJar2xMetaData result = unmarshal();
-      assertEquals("2.0", result.getVersion());
-      
-   }
-
    public void testResourceRefs()
       throws Exception
    {

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java	2007-10-23 06:07:16 UTC (rev 66347)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java	2007-10-23 06:07:40 UTC (rev 66348)
@@ -89,7 +89,7 @@
    {
       EjbJar2xMetaData result = unmarshal();
       JBossMetaData jbossMetaData = new JBossMetaData();
-      jbossMetaData.setOverridenMetaData(result);
+      jbossMetaData.merge(null, result);
       ApplicationMetaData appData = new ApplicationMetaData(jbossMetaData);
 
       // Validate the assembly descriptor permissions

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-23 06:07:16 UTC (rev 66347)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-23 06:07:40 UTC (rev 66348)
@@ -353,13 +353,17 @@
       JBossMetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBossMetaData.class, null);
       long end2 = System.currentTimeMillis();
       getLog().info("JBoss5xEverything_testStandard.xml parse time = "+(end2 - end));
-      JBossMetaData jbossMetaData = unmarshal("JBoss50_testCtsJBoss32.xml", JBossMetaData.class, null);
+      JBossMetaData jbossXmlMetaData = unmarshal("JBoss50_testCtsJBoss32.xml", JBossMetaData.class, null);
       long end3 = System.currentTimeMillis();
       getLog().info("JBoss5xEverything_testEverything.xml parse time = "+(end3 - end2));
-      jbossMetaData.setOverridenMetaData(specMetaData);
+      //jbossMetaData.setOverridenMetaData(specMetaData);
+      // Merge the jboss.xml, ejb-jar.xml
+      JBossMetaData jbossMetaData = new JBossMetaData();
+      jbossMetaData.merge(jbossXmlMetaData, specMetaData);
+      // Add the standardjboss.xml wrapper for defaults
       JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
 
-      // Test the unified metadata
+      // Test the unified metadata view using the wrapper
       InvokerProxyBindingsMetaData bindings = wrapper.getInvokerProxyBindings();
       IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> beans = wrapper.getEnterpriseBeans();
       IEnterpriseBeanMetaData sessionBean = beans.get("StatelessSessionBean");
@@ -431,8 +435,28 @@
    }
 
    /**
+    * Test the merged resource-ref view of the EjbJar20_testResourceRefs.xml
+    * + JBoss50_testResourceRefs.xml with the merged JBossMetaData coming
+    * from merging the JBoss50_testResourceRefs.xml parsed object with the
+    * EjbJar20_testResourceRefs.xml EjbJar2xMetaData
+    * @throws Exception
+    */
+   public void testResourceRefsMergeSelf()
+      throws Exception
+   {
+      JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
+      EjbJar2xMetaData specData = unmarshal("EjbJar20_testResourceRefs.xml", EjbJar2xMetaData.class, null);
+      xbdelegate.setValidateSchema(false);
+      JBossMetaData jbossMetaData = unmarshal("JBoss50_testResourceRefs.xml", JBossMetaData.class, null);
+      jbossMetaData.merge(null, specData);
+      validateResourceRefs(jbossMetaData);
+   }
+   /**
     * Test the merged resource-ref view of the EjbJar20_testREsourceRefs.xml
-    * + JBoss50_testResourceRefs.xml
+    * + JBoss50_testResourceRefs.xml with the merged JBossMetaData coming
+    * from merging the JBoss50_testResourceRefs.xml parsed object with the
+    * EjbJar20_testResourceRefs.xml EjbJar2xMetaData into a new empty
+    * JBossMetaData instance.
     * @throws Exception
     */
    public void testResourceRefs()
@@ -441,9 +465,14 @@
       JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
       EjbJar2xMetaData specData = unmarshal("EjbJar20_testResourceRefs.xml", EjbJar2xMetaData.class, null);
       xbdelegate.setValidateSchema(false);
-      JBossMetaData jbossMetaData = unmarshal();
-      jbossMetaData.setOverridenMetaData(specData);
-
+      JBossMetaData jbossXmlMetaData = unmarshal();
+      JBossMetaData jbossMetaData = new JBossMetaData();
+      jbossMetaData.merge(jbossXmlMetaData, specData);
+      validateResourceRefs(jbossMetaData);
+   }
+   
+   protected void validateResourceRefs(JBossMetaData jbossMetaData)
+   {
       // Validate the resource managers
       ResourceManagersMetaData resourceMgrs = jbossMetaData.getResourceManagers();
       assertEquals(5, resourceMgrs.size());