[CVS spice] Completed test coverage for configuration package.

mauro-yCVjj/[email protected] 20 Jun 2004 17:05:21 -0000
Newsgroups gmane.comp.java.spice.cvs
Message-ID <[email protected]>
<html>
<head>
<style><!--
  body {background-color:#ffffff;}
  .file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
  .pathname {font-family:monospace; float:right;}
  .fileheader {margin-bottom:.5em;}
  .diff {margin:0;}
  .tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
  .tasklist ul {margin-top:0;margin-bottom:0;}
  tr.alt {background-color:#eeeeee}
  #added {background-color:#ddffdd;}
  #addedchars {background-color:#99ff99;font-weight:bolder;}
  tr.alt #added {background-color:#ccf7cc;}
  #removed {background-color:#ffdddd;}
  #removedchars {background-color:#ff9999;font-weight:bolder;}
  tr.alt #removed {background-color:#f7cccc;}
  #info {color:#888888;}
  #context {background-color:#eeeeee;}
  td {padding-left:.3em;padding-right:.3em;}
  tr.head {border-bottom-width:1px;border-bottom-style:solid;}
  tr.head td {padding:0;padding-top:.2em;}
  .task {background-color:#ffff00;}
  .comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
  .error {color:red;}
  hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>spice/components/alchemist/src/test/org/codehaus/spice/alchemist/configuration</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">ConfigurationAlchemistTestCase.java</a></tt></td><td align="right" id="added">+78</td><td align="right" id="removed">-10</td><td nowrap="nowrap" align="center">1.1 -&gt; 1.2</td></tr>
</table>
<pre class="comment">
Completed test coverage for configuration package.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/alchemist/src/test/org/codehaus/spice/alchemist/configuration<br /></span>
<div class="fileheader"><big><b>ConfigurationAlchemistTestCase.java</b></big> <small id="info">1.1 -&gt; 1.2</small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- ConfigurationAlchemistTestCase.java	20 Jun 2004 13:38:03 -0000	1.1
+++ ConfigurationAlchemistTestCase.java	20 Jun 2004 17:05:21 -0000	1.2
@@ -43,25 +43,93 @@
</small></pre><pre class="diff" id="context">         }
     }
 
</pre><pre class="diff" id="removed">-    public void testAvalonConfiguration()
</pre><pre class="diff" id="added">+    public void testAvalonConfiguration<span id="addedchars">WithChild</span>()
</pre><pre class="diff" id="context">     	throws Exception
    	{
         org.apache.avalon.framework.configuration.Configuration configuration =
</pre><pre class="diff" id="removed">-            ConfigurationAlchemist.toAvalonConfiguration( new DefaultConfiguration( "name", "location", "") );
-        assertEquals( "configuration name", "name", configuration.getName() );
-        assertEquals( "configuration location", "location", configuration.getLocation() );
-        assertEquals( "configuration namespace", "", configuration.getNamespace() );
</pre><pre class="diff" id="added">+            ConfigurationAlchemist.toAvalonConfiguration( createDNAConfigurationWithChild() );
+        assertEquals( "name", "element", configuration.getName() );
+        assertEquals( "location", "location", configuration.getLocation() );
+        assertEquals( "namespace", "", configuration.getNamespace() );
+        assertEquals( "attribute 1", "value1", configuration.getAttribute( "key1" ) );
+        assertEquals( "attribute 2", "value2", configuration.getAttribute( "key2" ) );
+        assertEquals( "child name", "child", configuration.getChild( "child" ).getName() );        
</pre><pre class="diff" id="context">    	}
</pre><pre class="diff" id="added">+
+    public void testAvalonConfigurationWithValue()
+    	throws Exception
+	{
+	    org.apache.avalon.framework.configuration.Configuration configuration =
+	        ConfigurationAlchemist.toAvalonConfiguration( createDNAConfigurationWithValue() );
+	    assertEquals( "name", "element", configuration.getName() );
+	    assertEquals( "location", "location", configuration.getLocation() );
+	    assertEquals( "namespace", "", configuration.getNamespace() );
+	    assertEquals( "attribute 1", "value1", configuration.getAttribute( "key1" ) );
+	    assertEquals( "attribute 2", "value2", configuration.getAttribute( "key2" ) );
+	    assertEquals( "value", "value", configuration.getValue( null ) );
+	}
+
+    private Configuration createDNAConfigurationWithChild() {
+        final DefaultConfiguration configuration =
+            new DefaultConfiguration( "element", "location", "" );
+        configuration.setAttribute( "key1", "value1" );
+        configuration.setAttribute( "key2", "value2" );
+        configuration.addChild( new DefaultConfiguration( "child", "location", "/element" ) );
+        return configuration;
+    }    
+
+    private Configuration createDNAConfigurationWithValue() {
+        final DefaultConfiguration configuration =
+            new DefaultConfiguration( "element", "location", "" );
+        configuration.setAttribute( "key1", "value1" );
+        configuration.setAttribute( "key2", "value2" );
+        configuration.setValue( "value" );
+        return configuration;
+    }    
</pre><pre class="diff" id="context">     
</pre><pre class="diff" id="removed">-    public void testDNAConfiguration()
</pre><pre class="diff" id="added">+    public void testDNAConfiguration<span id="addedchars">WithChild</span>()
</pre><pre class="diff" id="context">     	throws Exception
 	{
         Configuration configuration = ConfigurationAlchemist.toDNAConfiguration( 
</pre><pre class="diff" id="removed">-                new org.apache.avalon.framework.configuration.DefaultConfiguration( "name", "location") );
-        assertEquals( "configuration name", "name", configuration.getName() );
-        assertEquals( "configuration location", "location", configuration.getLocation() );
-        assertEquals( "configuration path", "", configuration.getPath() );
</pre><pre class="diff" id="added">+                createAvalonConfigurationWithChild() );
+        assertEquals( "name", "element", configuration.getName() );
+        assertEquals( "location", "location", configuration.getLocation() );
+        assertEquals( "path", "", configuration.getPath() );
+        assertEquals( "attribute 1", "value1", configuration.getAttribute( "key1" ) );
+        assertEquals( "attribute 2", "value2", configuration.getAttribute( "key2" ) );
+        assertEquals( "child name", "child", configuration.getChild( "child" ).getName() );        
+	}
+    
+    public void testDNAConfigurationWithValue()
+    	throws Exception
+	{
+	    Configuration configuration = ConfigurationAlchemist.toDNAConfiguration( 
+	            createAvalonConfigurationWithValue() );
+	    assertEquals( "name", "element", configuration.getName() );
+	    assertEquals( "location", "location", configuration.getLocation() );
+	    assertEquals( "path", "", configuration.getPath() );
+	    assertEquals( "attribute 1", "value1", configuration.getAttribute( "key1" ) );
+	    assertEquals( "attribute 2", "value2", configuration.getAttribute( "key2" ) );
+	    assertEquals( "value", "value", configuration.getValue( null ) );
</pre><pre class="diff" id="context"> 	}
</pre><pre class="diff" id="added">+    
+    private org.apache.avalon.framework.configuration.Configuration createAvalonConfigurationWithChild() {
+        final org.apache.avalon.framework.configuration.DefaultConfiguration configuration =
+            new org.apache.avalon.framework.configuration.DefaultConfiguration( "element", "location" );
+        configuration.setAttribute( "key1", "value1" );
+        configuration.setAttribute( "key2", "value2" );
+        configuration.addChild( new org.apache.avalon.framework.configuration.DefaultConfiguration( "child", "location" ) );
+        return configuration;
+    }    
+
+    private org.apache.avalon.framework.configuration.Configuration createAvalonConfigurationWithValue() {
+        final org.apache.avalon.framework.configuration.DefaultConfiguration configuration =
+            new org.apache.avalon.framework.configuration.DefaultConfiguration( "element", "location" );
+        configuration.setAttribute( "key1", "value1" );
+        configuration.setAttribute( "key2", "value2" );
+        configuration.setValue( "value" );
+        return configuration;
+    }    
</pre><pre class="diff" id="context">     
     public void testIsAvalonConfigurable()
     {
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -&gt; email">CVSspam</a> 0.2.8</small></center>
</body></html>