svn commit: r1604551 - in /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src: main/java/org/apache/maven/doxia/site/decoration/inheritance/ test/java/org/apache/maven/doxia/site/decoration/inheritance/ test/resources/

[hb...@apache.org]

Author: hboutemy
Date: Sun Jun 22 08:52:58 2014
New Revision: 1604551

URL: http://svn.apache.org/r1604551
Log:
[DOXIASITETOOLS-90] inherit combine.self

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child-no-inheritance.xml

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=1604551&r1=1604550&r2=1604551&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java Sun Jun 22 08:52:58 2014
@@ -53,6 +53,8 @@ public class DefaultDecorationModelInher
             return;
         }
 
+        child.setCombineSelf( parent.getCombineSelf() );
+
         URLContainer urlContainer = new URLContainer( parentBaseUrl, childBaseUrl );
 
         if ( child.getBannerLeft() == null && parent.getBannerLeft() != null )

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=1604551&r1=1604550&r2=1604551&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 Sun Jun 22 08:52:58 2014
@@ -88,8 +88,18 @@ public class DecorationModelInheritenceA
         DecorationModel childModel = readModel( "child-no-inheritance.xml" );
         DecorationModel parentModel = readModel( "parent.xml" );
         assembler.assembleModelInheritance( NAME, childModel, parentModel, "http://maven.apache.org/doxia",
-                "http://maven.apache.org" );
+                                            "http://maven.apache.org" );
         assertEquals( "Check result", unassembledChildModel, childModel );
+
+        // 2 levels of inheritance
+        DecorationModel childOfchildModel = new DecorationModel();
+        assembler.assembleModelInheritance( "Child of Child", childOfchildModel, childModel,
+                                            "http://maven.apache.org/doxia/child", "http://maven.apache.org/doxia" );
+        assembler.assembleModelInheritance( NAME, childOfchildModel, parentModel, "http://maven.apache.org/doxia",
+                                            "http://maven.apache.org" );
+        // check that the 3 breadcrumb items from parent.xml are not inherited
+        assertEquals( "child of child no inheritance: breadcrumbs count", 0,
+                      childOfchildModel.getBody().getBreadcrumbs().size() );
     }
 
     /**

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child-no-inheritance.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child-no-inheritance.xml?rev=1604551&r1=1604550&r2=1604551&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child-no-inheritance.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child-no-inheritance.xml Sun Jun 22 08:52:58 2014
@@ -22,7 +22,7 @@ under the License.
 <project xmlns="http://maven.apache.org/DECORATION/1.6.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 file:../../../target/generated-site/xsd/decoration-1.6.0.xsd"
-  name="Child"
+  name="Child No Inheritance"
   combine.self="override">
   <body>
     <links>