Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A2A1185A6 for ; Sun, 27 Mar 2016 07:59:22 +0000 (UTC) Received: (qmail 62364 invoked by uid 500); 27 Mar 2016 07:59:22 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 62297 invoked by uid 500); 27 Mar 2016 07:59:22 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 62288 invoked by uid 99); 27 Mar 2016 07:59:22 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Mar 2016 07:59:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B6668C021F for ; Sun, 27 Mar 2016 07:59:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id buiWUWGlUgHn for ; Sun, 27 Mar 2016 07:59:19 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 188BD5F247 for ; Sun, 27 Mar 2016 07:59:19 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 09CAAE0315 for ; Sun, 27 Mar 2016 07:59:18 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DB04F3A0142 for ; Sun, 27 Mar 2016 07:59:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1736724 - in /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test: java/org/apache/maven/doxia/site/decoration/inheritance/ resources/ Date: Sun, 27 Mar 2016 07:59:17 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160327075917.DB04F3A0142@svn01-us-west.apache.org> 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 Brett Porter * @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 );