CVS: jcontainer/loom/engine/src/test/org/jcontainer/loom/components/configuration/merger ConfigurationMergerTestCase.java,1.4,1.5

Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/configuration/merger
In directory hogshead.codehaus.org:/tmp/cvs-serv16736/engine/src/test/org/jcontainer/loom/components/configuration/merger

Modified Files:
	ConfigurationMergerTestCase.java 
Log Message:
Use equals implementation in ConfigurationUtil and remove unsed version in ConfigUtil


Index: ConfigurationMergerTestCase.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/configuration/merger/ConfigurationMergerTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ConfigurationMergerTestCase.java	3 Dec 2003 03:37:57 -0000	1.4
+++ ConfigurationMergerTestCase.java	3 Dec 2003 09:11:23 -0000	1.5
@@ -92,6 +92,7 @@
 import org.jcontainer.loom.components.configuration.merger.ConfigurationSplitter;
 import org.jcontainer.loom.components.util.ConfigUtil;
 import org.jcontainer.dna.impl.DefaultConfiguration;
+import org.jcontainer.dna.impl.ConfigurationUtil;
 
 /**
  * @author Peter Royal
@@ -120,8 +121,8 @@
         DefaultConfiguration layer = new DefaultConfiguration( "a", "", "" );
         layer.setAttribute( "a", "1" );
 
-        assertTrue( ConfigUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
-        assertTrue( ConfigUtil.equals( layer, ConfigurationSplitter.split( result, base ) ));
+        assertTrue( ConfigurationUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
+        assertTrue( ConfigurationUtil.equals( layer, ConfigurationSplitter.split( result, base ) ));
     }
 
     public void testAddChild() throws Exception
@@ -136,8 +137,8 @@
         DefaultConfiguration layer = new DefaultConfiguration( "a", "", "" );
         layer.addChild( new DefaultConfiguration( "kid2", "", "" ) );
 
-        assertTrue( ConfigUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
-        assertTrue( ConfigUtil.equals( layer, ConfigurationSplitter.split( result, base ) ));
+        assertTrue( ConfigurationUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
+        assertTrue( ConfigurationUtil.equals( layer, ConfigurationSplitter.split( result, base ) ));
     }
 
     public void testOverrideChild() throws Exception
@@ -157,11 +158,11 @@
         lkid1.setAttribute( "test", "1" );
         layer.addChild( lkid1 );
 
-        assertTrue( !ConfigUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
+        assertTrue( !ConfigurationUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
 
         lkid1.setAttribute( "excalibur-configuration:merge", "true" );
 
-        assertTrue( ConfigUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
-        assertTrue( ConfigUtil.equals( layer, ConfigurationSplitter.split( result, base ) ) );
+        assertTrue( ConfigurationUtil.equals( result, ConfigurationMerger.merge( layer, base ) ) );
+        assertTrue( ConfigurationUtil.equals( layer, ConfigurationSplitter.split( result, base ) ) );
     }
 }