You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/03/27 09:59:17 UTC
svn commit: r1736724 - in
/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test:
java/org/apache/maven/doxia/site/decoration/inheritance/ resources/
Author: hboutemy
Date: Sun Mar 27 07:59:17 2016
New Revision: 1736724
URL: http://svn.apache.org/viewvc?rev=1736724&view=rev
Log:
clarified unit tests
Added:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java
- copied, changed from r1736722, 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/inheritance-child-no-inheritance.xml
- copied unchanged from r1736722, maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child-no-inheritance.xml
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/inheritance-child.xml
- copied unchanged from r1736722, maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child.xml
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/inheritance-expected.xml
- copied unchanged from r1736722, maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/inheritance-parent.xml
- copied unchanged from r1736722, maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
Removed:
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
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/child.xml
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
Copied: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java (from r1736722, 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/DecorationModelInheritanceAssemblerTest.java?p2=maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java&p1=maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java&r1=1736722&r2=1736724&rev=1736724&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/DecorationModelInheritanceAssemblerTest.java Sun Mar 27 07:59:17 2016
@@ -43,7 +43,7 @@ import org.codehaus.plexus.util.xml.pull
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
-public class DecorationModelInheritenceAssemblerTest
+public class DecorationModelInheritanceAssemblerTest
extends TestCase
{
private DecorationModelInheritanceAssembler assembler = new DefaultDecorationModelInheritanceAssembler();
@@ -55,25 +55,25 @@ public class DecorationModelInheritenceA
* @throws IOException
* @throws XmlPullParserException
*/
- public void testInheritence()
+ public void testInheritance()
throws IOException, XmlPullParserException
{
- DecorationModel childModel = readModel( "child.xml" );
- DecorationModel parentModel = readModel( "parent.xml" );
+ DecorationModel childModel = readModel( "inheritance-child.xml" );
+ DecorationModel parentModel = readModel( "inheritance-parent.xml" );
assembler.assembleModelInheritance( NAME, childModel, parentModel, "http://maven.apache.org/doxia",
"http://maven.apache.org" );
- DecorationModel mergedModel = readModel( "merged.xml" );
+ DecorationModel expectedModel = readModel( "inheritance-expected.xml" );
- assertEquals( "Check result", mergedModel, childModel );
+ assertEquals( "Check result", expectedModel, childModel );
// same with scp url, DOXIASITETOOLS-47
- childModel = readModel( "child.xml" );
+ childModel = readModel( "inheritance-child.xml" );
assembler.assembleModelInheritance( NAME, childModel, parentModel, "scp://people.apache.org/doxia",
"scp://people.apache.org" );
- assertEquals( "Check scp result", mergedModel, childModel );
+ assertEquals( "Check scp result", expectedModel, childModel );
- assertEquals( "Modified parent!", readModel( "parent.xml" ), parentModel );
+ assertEquals( "Modified parent!", readModel( "inheritance-parent.xml" ), parentModel );
}
/**
@@ -81,12 +81,12 @@ public class DecorationModelInheritenceA
* @throws IOException
* @throws XmlPullParserException
*/
- public void testSuppressedInheritence()
+ public void testSuppressedInheritance()
throws IOException, XmlPullParserException
{
- DecorationModel unassembledChildModel = readModel( "child-no-inheritance.xml" );
- DecorationModel childModel = readModel( "child-no-inheritance.xml" );
- DecorationModel parentModel = readModel( "parent.xml" );
+ DecorationModel unassembledChildModel = readModel( "inheritance-child-no-inheritance.xml" );
+ DecorationModel childModel = readModel( "inheritance-child-no-inheritance.xml" );
+ DecorationModel parentModel = readModel( "inheritance-parent.xml" );
assembler.assembleModelInheritance( NAME, childModel, parentModel, "http://maven.apache.org/doxia",
"http://maven.apache.org" );
assertEquals( "Check result", unassembledChildModel, childModel );