From doxia-commits-return-905-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org Fri May 02 20:59:58 2008 Return-Path: Delivered-To: apmail-maven-doxia-commits-archive@www.apache.org Received: (qmail 14347 invoked from network); 2 May 2008 20:59:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2008 20:59:58 -0000 Received: (qmail 50599 invoked by uid 500); 2 May 2008 21:00:00 -0000 Delivered-To: apmail-maven-doxia-commits-archive@maven.apache.org Received: (qmail 50590 invoked by uid 500); 2 May 2008 21:00:00 -0000 Mailing-List: contact doxia-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: doxia-dev@maven.apache.org Delivered-To: mailing list doxia-commits@maven.apache.org Received: (qmail 50576 invoked by uid 99); 2 May 2008 21:00:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 14:00:00 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 20:59:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B49C62388A2A; Fri, 2 May 2008 13:59:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652908 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test: java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java site/apt/apt.apt site/xdoc/attributes.xml site/xdoc/entityTest.xml Date: Fri, 02 May 2008 20:59:37 -0000 To: doxia-commits@maven.apache.org From: ltheussl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080502205937.B49C62388A2A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ltheussl Date: Fri May 2 13:59:37 2008 New Revision: 652908 URL: http://svn.apache.org/viewvc?rev=652908&view=rev Log: Add some tests for link / anchors in apt and xdoc Added: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt (with props) Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/attributes.xml maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/entityTest.xml Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=652908&r1=652907&r2=652908&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java Fri May 2 13:59:37 2008 @@ -136,6 +136,7 @@ verifyAttributes(); verifyMisc(); verifyDocbookPageExists(); + verifyApt(); } /** @@ -581,8 +582,7 @@ HtmlParagraph p = (HtmlParagraph) elementIterator.next(); assertNotNull( p ); - // TODO: space is not correct? - //assertEquals( p.asText().trim(), "'&' '<' '>' '\"' ''' ' '" ); + assertEquals( p.asText().trim(), "'&' '<' '>' '\"' ''' ' ' ' '" ); div = (HtmlDivision) elementIterator.next(); assertNotNull( div ); @@ -928,7 +928,7 @@ p = (HtmlParagraph) elementIterator.next(); assertNotNull( p ); - + UnknownHtmlElement unk = (UnknownHtmlElement) elementIterator.next(); assertEquals( "u", unk.getTagName()); unk = (UnknownHtmlElement) elementIterator.next(); @@ -937,6 +937,45 @@ assertEquals( "sub", unk.getTagName()); unk = (UnknownHtmlElement) elementIterator.next(); assertEquals( "sup", unk.getTagName()); + + p = (HtmlParagraph) elementIterator.next(); + assertNotNull( p ); + + unk = (UnknownHtmlElement) elementIterator.next(); + assertEquals( "b", unk.getTagName()); + unk = (UnknownHtmlElement) elementIterator.next(); + assertEquals( "i", unk.getTagName()); + unk = (UnknownHtmlElement) elementIterator.next(); + assertEquals( "i", unk.getTagName()); + unk = (UnknownHtmlElement) elementIterator.next(); + assertEquals( "b", unk.getTagName()); + + p = (HtmlParagraph) elementIterator.next(); + assertNotNull( p ); + assertEquals( "color: red; margin-left: 20px", p.getAttributeValue( "style" ) ); + + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "Anchor", a.getAttributeValue( "name" ) ); + + p = (HtmlParagraph) elementIterator.next(); + assertNotNull( p ); + + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "#Anchor", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "#Anchor", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "http://maven.apache.org/", a.getAttributeValue( "href" ) ); + assertEquals( "externalLink", a.getAttributeValue( "class" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "./cdc.html", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "cdc.html", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + // TODO: + //assertEquals( "cdc.pdf", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "./cdc.txt", a.getAttributeValue( "href" ) ); } /** @@ -985,5 +1024,66 @@ assertNotNull( nestedItems ); assertTrue( nestedItems.exists() ); } - + + /** + * @throws Exception + */ + public void verifyApt() + throws Exception + { + File attributes = getTestFile( "target/output/apt.html" ); + assertNotNull( attributes ); + assertTrue( attributes.exists() ); + + // HtmlUnit + WebClient webClient = new WebClient(); + HtmlPage page = (HtmlPage) webClient.getPage( attributes.toURI().toURL() ); + assertNotNull( page ); + + HtmlElement element = page.getHtmlElementById( "contentBox" ); + assertNotNull( element ); + HtmlDivision division = (HtmlDivision) element; + assertNotNull( division ); + + Iterator elementIterator = division.getAllHtmlChildElements(); + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + HtmlDivision div = (HtmlDivision) elementIterator.next(); + assertEquals( "section", div.getAttributeValue( "class" ) ); + + HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next(); + assertNotNull( h2 ); + assertEquals( "Links", h2.asText().trim() ); + + HtmlAnchor a = (HtmlAnchor) elementIterator.next(); + assertEquals( "Links", a.getAttributeValue( "name" ) ); + + HtmlParagraph p = (HtmlParagraph) elementIterator.next(); + assertNotNull( p ); + + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "Anchor", a.getAttributeValue( "name" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "cdc.html", a.getAttributeValue( "name" ) ); + + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "#Anchor", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "#Anchor", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "http://maven.apache.org/", a.getAttributeValue( "href" ) ); + assertEquals( "externalLink", a.getAttributeValue( "class" ) ); + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "http://maven.apache.org/", a.getAttributeValue( "href" ) ); + assertEquals( "externalLink", a.getAttributeValue( "class" ) ); + + a = (HtmlAnchor) elementIterator.next(); + assertEquals( "./cdc.html", a.getAttributeValue( "href" ) ); + a = (HtmlAnchor) elementIterator.next(); + // TODO: + //assertEquals( "#cdc.html", a.getAttributeValue( "href" ) ); + } } Added: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt?rev=652908&view=auto ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt (added) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt Fri May 2 13:59:37 2008 @@ -0,0 +1,17 @@ + ----- + Anchors / Links in APT + ----- + Lukas Theussl + ----- + May 2008 + ----- + +Links + + {Anchor} + {cdc.html} + Link to {{Anchor}}. + Link to anchor {{{Anchor}showing alternate text}}. + Link to {{http://maven.apache.org/}}. + Link to {{{http://maven.apache.org/}Maven home page}}. + Link to {{{./cdc.html}other document}} and within {{{cdc.html}same document}}. Propchange: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/apt/apt.apt ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/attributes.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/attributes.xml?rev=652908&r1=652907&r2=652908&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/attributes.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/attributes.xml Fri May 2 13:59:37 2008 @@ -27,6 +27,25 @@ underline strike-through subscript superscript

+

+ + bold-italic italic-bold +

+ +

+ + + +

+ Link to anchor. + Link to anchor showing alternate text. + Link to Maven home page. + Link to other document. + Link to other document. + Link to other document. + Link to other document. +

+ Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/entityTest.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/entityTest.xml?rev=652908&r1=652907&r2=652908&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/entityTest.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/xdoc/entityTest.xml Fri May 2 13:59:37 2008 @@ -29,7 +29,7 @@

Entities

-

'&' '<' '>' '"' ''' ' '

+

'&' '<' '>' '"' ''' ' ' ' '

Comment