svn commit: r736629 - /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java

[vsiveton]

Author: vsiveton
Date: Thu Jan 22 04:58:34 2009
New Revision: 736629

URL: http://svn.apache.org/viewvc?rev=736629&view=rev
Log:
o code readingness

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java?rev=736629&r1=736628&r2=736629&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
 Thu Jan 22 04:58:34 2009
@@ -39,6 +39,7 @@
  * Test the inheritance assembler.
  *
  * @author <a href="mailto:br...@apache.org";>Brett Porter</a>
+ * @version $Id$
  */
 public class DecorationModelInheritenceAssemblerTest
     extends TestCase
@@ -55,8 +56,8 @@
 
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia";,
                                             "http://maven.apache.org"; );
-
         DecorationModel mergedModel = readModel( "merged.xml" );
+
         assertEquals( "Check result", mergedModel, childModel );
     }
 
@@ -66,10 +67,11 @@
         // Test an empty model avoids NPEs
         DecorationModel childModel = readModel( "empty.xml" );
         DecorationModel parentModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia";,
                                             "http://maven.apache.org"; );
-
         DecorationModel mergedModel = readModel( "empty.xml" );
+
         assertEquals( "Check result", mergedModel, childModel );
     }
 
@@ -78,6 +80,7 @@
     {
         DecorationModel parentModel = readModel( "external-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia";,
                                             "http://maven.apache.org"; );
 
@@ -110,6 +113,7 @@
     {
         DecorationModel parentModel = readModel( "relative-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia/";,
                                             "http://maven.apache.org"; );
 
@@ -139,6 +143,7 @@
     {
         DecorationModel parentModel = readModel( "subsite-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia/";,
                                             "http://maven.apache.org"; );
 
@@ -168,6 +173,7 @@
     {
         DecorationModel parentModel = readModel( "relative-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia/core";,
                                             "http://maven.apache.org"; );
 
@@ -198,6 +204,7 @@
     {
         DecorationModel parentModel = readModel( "relative-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/";,
                                             "http://maven.apache.org/doxia/"; );
 
@@ -228,6 +235,7 @@
     {
         DecorationModel parentModel = readModel( "relative-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/";,
                                             
"http://maven.apache.org/doxia/core/"; );
 
@@ -259,6 +267,7 @@
     {
         DecorationModel parentModel = readModel( "relative-urls.xml" );
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org";,
                                             "http://jakarta.apache.org"; );
 
@@ -291,10 +300,11 @@
         throws IOException, XmlPullParserException
     {
         DecorationModel childModel = readModel( "empty.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, null, 
"http://maven.apache.org/doxia";,
                                             "http://maven.apache.org"; );
-
         DecorationModel mergedModel = readModel( "empty.xml" );
+
         assertEquals( "Check result", mergedModel, childModel );
     }
 
@@ -303,11 +313,12 @@
     {
         DecorationModel childModel = readModel( "fully-populated-child.xml" );
         DecorationModel parentModel = readModel( "fully-populated-child.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://foo.apache.org/doxia";,
                                             "http://foo.apache.org"; );
-
         DecorationModel mergedModel = readModel( "fully-populated-child.xml" );
-        assertEquals( "Check result", mergedModel.toString(), 
childModel.toString() );
+
+        assertEquals( "Check result", mergedModel, childModel );
     }
 
     public void testFullyPopulatedParentAndEmptyChild()
@@ -315,10 +326,11 @@
     {
         DecorationModel childModel = readModel( "empty.xml" );
         DecorationModel parentModel = readModel( "fully-populated-child.xml" );
+
         assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia";,
                                             "http://maven.apache.org"; );
-
         DecorationModel mergedModel = readModel( "fully-populated-merged.xml" 
);
+
         assertEquals( "Check result", mergedModel, childModel );
     }
 
@@ -328,9 +340,9 @@
         DecorationModel model = readModel( "external-urls.xml" );
 
         assembler.resolvePaths( model, "http://foo.com/"; );
+        DecorationModel mergedModel = readModel( "external-urls.xml" );
 
-        DecorationModel resolvedModel = readModel( "external-urls.xml" );
-        assertEquals( "Check result", resolvedModel, model );
+        assertEquals( "Check result", mergedModel, model );
     }
 
     public void testResolvingAllRelativeUrls()
@@ -341,6 +353,7 @@
         assembler.resolvePaths( model, "http://foo.com/"; );
 
         DecorationModel resolvedModel = readModel( 
"relative-urls-resolved.xml" );
+
         assertEquals( "Check result", resolvedModel, model );
     }
 
@@ -396,9 +409,9 @@
     {
         DecorationModel model = readModel( "empty.xml" );
         assembler.resolvePaths( model, "http://maven.apache.org"; );
+        DecorationModel mergedModel = readModel( "empty.xml" );
 
-        DecorationModel resolvedModel = readModel( "empty.xml" );
-        assertEquals( "Check result", resolvedModel, model );
+        assertEquals( "Check result", mergedModel, model );
     }
 
     public void testDuplicateParentElements()