Author: vsiveton
Date: Sat May 30 13:38:41 2009
New Revision: 780263
URL: http://svn.apache.org/viewvc?rev=780263&view=rev
Log:
o revert r779976: expected log
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java?rev=780263&r1=780262&r2=780263&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
Sat May 30 13:38:41 2009
@@ -71,10 +71,11 @@
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
+ // Expected log: [APT Parser] Ambiguous link: 'cdc.html'. If this is a
local link, prepend "./"!
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Anchor", a.getAttributeValue( "name" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "cdc.html.internal", a.getAttributeValue( "name" ) );
+ assertEquals( "cdc.html", a.getAttributeValue( "name" ) );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "#Anchor", a.getAttributeValue( "href" ) );
@@ -93,10 +94,11 @@
assertEquals( "http://maven.apache.org/";, a.getAttributeValue( "href"
) );
assertEquals( "externalLink", a.getAttributeValue( "class" ) );
+ // Expected log: [APT Parser] Ambiguous link: 'cdc.html'. If this is a
local link, prepend "./"!
a = (HtmlAnchor) elementIterator.next();
assertEquals( "./cdc.html", a.getAttributeValue( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#cdc.html.internal", a.getAttributeValue( "href" ) );
+ assertEquals( "#cdc.html", a.getAttributeValue( "href" ) );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "/index.html", a.getAttributeValue( "href" ) );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt?rev=780263&r1=780262&r2=780263&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
Sat May 30 13:38:41 2009
@@ -29,13 +29,13 @@
Links
{Anchor}
- {cdc.html.internal}
+ {cdc.html}
Link to {{Anchor}}.
Link to anchor {{{Anchor}showing alternate text}}.
{Anchor with space} and {{{Anchor_with_space}link to it}}.
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.internal}same
document}}.
+ Link to {{{./cdc.html}other document}} and within {{{cdc.html}same
document}}.
Link to {{{/index.html}root document}}.
Section formatting: <italic> <<bold>> <<<mono>>>
