You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2009/02/19 09:25:25 UTC
svn commit: r745777 - in
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt: pom.xml
src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
src/test/resources/test/snippet.apt
Author: ltheussl
Date: Thu Feb 19 08:25:25 2009
New Revision: 745777
URL: http://svn.apache.org/viewvc?rev=745777&view=rev
Log:
[DOXIA-259] Snippet macro within lists does not indent the source.
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt (with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml?rev=745777&r1=745776&r2=745777&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml Thu Feb 19 08:25:25 2009
@@ -34,6 +34,10 @@
<name>Doxia :: APT Module</name>
<description>A Doxia module for Almost Plain Text source documents.</description>
+<!-- START SNIPPET: test -->
+ <!-- test snippet -->
+<!-- END SNIPPET: test -->
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=745777&r1=745776&r2=745777&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java Thu Feb 19 08:25:25 2009
@@ -878,6 +878,7 @@
}
/*FALLTHROUGH*/
case VERBATIM:
+ case MACRO:
case FIGURE:
case TABLE:
case HORIZONTAL_RULE:
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java?rev=745777&r1=745776&r2=745777&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java Thu Feb 19 08:25:25 2009
@@ -23,12 +23,16 @@
import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
+import java.util.Iterator;
import org.apache.maven.doxia.parser.AbstractParserTest;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventElement;
+import org.apache.maven.doxia.sink.SinkEventTestingSink;
+
import org.codehaus.plexus.util.IOUtil;
/**
@@ -103,6 +107,56 @@
}
/** @throws Exception */
+ public void testSnippet()
+ throws Exception
+ {
+ // DOXIA-259
+
+ Reader reader = null;
+ SinkEventTestingSink sink = new SinkEventTestingSink();
+
+ try
+ {
+ reader = getTestReader( "test/snippet", "apt" );
+
+ createParser().parse( reader, sink );
+ }
+ finally
+ {
+ IOUtil.close( reader );
+ }
+
+ Iterator it = sink.getEventList().iterator();
+
+ assertEquals( "head", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "head_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "body", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "list", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "listItem", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "verbatim", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "verbatim_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "listItem_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "listItem", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "verbatim", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "verbatim_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "listItem_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "list_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "body_", ( (SinkEventElement) it.next() ).getName() );
+
+ assertFalse( it.hasNext() );
+ }
+
+ /** @throws Exception */
public void testTocMacro()
throws Exception
{
Added: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt?rev=745777&view=auto
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt (added)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt Thu Feb 19 08:25:25 2009
@@ -0,0 +1,14 @@
+
+ * list item 1
+
+%{snippet|id=test|file=pom.xml}
+
+ list paragraph text
+
+ * list item 2
+
++--
+Verbatim text
++--
+
+ list paragraph text
Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/snippet.apt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"