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

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

Author: scott.stark at jboss.org
Date: 2007-10-22 17:26:27 -0400 (Mon, 22 Oct 2007)
New Revision: 66344

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
Log:
Update client metadata to use merge rather than override

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java	2007-10-22 21:26:15 UTC (rev 66343)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java	2007-10-22 21:26:27 UTC (rev 66344)
@@ -81,11 +81,12 @@
       ApplicationClientMetaData appClientMetaData = unmarshal("ApplicationClient5Everything_testEverything.xml", ApplicationClientMetaData.class, null);
       new ApplicationClient5EverythingUnitTestCase("appClient").assertEverything(appClientMetaData);
       
-      JBossClientMetaData jbossClientMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClientMetaData.class, null);
-      new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(jbossClientMetaData);
+      JBossClientMetaData rawJBossMetaData = unmarshal("JBossClient5Everything_testEverything.xml", JBossClientMetaData.class, null);
+      new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(rawJBossMetaData);
+
+      JBossClientMetaData jbossClientMetaData = new JBossClientMetaData();
+      jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData);
       
-      jbossClientMetaData.setOverridenMetaData(appClientMetaData);
-      
       // TODO: should this work?
       assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
       assertRemoteEnvironment("appClient", jbossClientMetaData, true);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java	2007-10-22 21:26:15 UTC (rev 66343)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java	2007-10-22 21:26:27 UTC (rev 66344)
@@ -30,7 +30,7 @@
  * Test all entries of an JBoss client 5 descriptor.
  *
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
  */
 public class JBossClient5EverythingUnitTestCase extends AbstractJavaEEEverythingTest
 {
@@ -43,7 +43,7 @@
    protected void assertEverything(JBossClientMetaData jbossClientMetaData)
    {
       assertEquals("appClientJndiName", jbossClientMetaData.getJndiName());
-      assertEquals("http://localhost", jbossClientMetaData.getJBossJndiEnvironmentRefsGroup().getResourceReferences().get("appClientResourceRef2Name").getResUrl());
+      assertEquals("http://localhost", jbossClientMetaData.getJndiEnvironmentRefsGroup().getResourceReferences().get("appClientResourceRef2Name").getResUrl());
       assertEquals(2, jbossClientMetaData.getDepends().size());
       int count = 1;
       for(String depends : jbossClientMetaData.getDepends())