clarified unit tests
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1736724 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java b/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java
similarity index 97%
rename from doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
rename to doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java
index 1bfd47f..a342a32 100644
--- a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
+++ b/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java
@@ -43,7 +43,7 @@
* @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 @@
* @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 @@
* @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 );
diff --git a/doxia-decoration-model/src/test/resources/child-no-inheritance.xml b/doxia-decoration-model/src/test/resources/inheritance-child-no-inheritance.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/child-no-inheritance.xml
rename to doxia-decoration-model/src/test/resources/inheritance-child-no-inheritance.xml
diff --git a/doxia-decoration-model/src/test/resources/child.xml b/doxia-decoration-model/src/test/resources/inheritance-child.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/child.xml
rename to doxia-decoration-model/src/test/resources/inheritance-child.xml
diff --git a/doxia-decoration-model/src/test/resources/merged.xml b/doxia-decoration-model/src/test/resources/inheritance-expected.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/merged.xml
rename to doxia-decoration-model/src/test/resources/inheritance-expected.xml
diff --git a/doxia-decoration-model/src/test/resources/parent.xml b/doxia-decoration-model/src/test/resources/inheritance-parent.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/parent.xml
rename to doxia-decoration-model/src/test/resources/inheritance-parent.xml
