svn commit: r751515 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src: main/java/org/apache/maven/doxia/module/apt/AptParser.java test/java/org/apache/maven/doxia/module/apt/AptParserTest.java

[ltheussl]

Author: ltheussl
Date: Sun Mar  8 20:42:30 2009
New Revision: 751515

URL: http://svn.apache.org/viewvc?rev=751515&view=rev
Log:
[DOXIA-294] Apt verbatim box not correct

Modified:
    
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/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=751515&r1=751514&r2=751515&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
 Sun Mar  8 20:42:30 2009
@@ -2219,8 +2219,7 @@
         public void traverse()
             throws AptParseException
         {
-            AptParser.this.sink.verbatim( SinkEventAttributeSet.BOXED );
-            // TODO: filter out lineBreak
+            AptParser.this.sink.verbatim( boxed ? SinkEventAttributeSet.BOXED 
: null );
             AptParser.this.sink.text( text );
             AptParser.this.sink.verbatim_();
         }

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=751515&r1=751514&r2=751515&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
 Sun Mar  8 20:42:30 2009
@@ -30,6 +30,7 @@
 import org.apache.maven.doxia.parser.ParseException;
 
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
 import org.apache.maven.doxia.sink.SinkEventElement;
 import org.apache.maven.doxia.sink.SinkEventTestingSink;
 
@@ -209,6 +210,43 @@
         }
     }
 
+    /** @throws Exception  */
+    public void testBoxedVerbatim()
+        throws Exception
+    {
+        String text = "+--" + EOL + "boxed verbatim" + EOL + "+--" + EOL
+                + "---" + EOL + "un-boxed verbatim" + EOL + "---" + EOL;
+
+        SinkEventTestingSink sink = new SinkEventTestingSink();
+
+        parser.parse( text, sink );
+
+        Iterator it = sink.getEventList().iterator();
+
+        assertEquals( "head", ( (SinkEventElement) it.next() ).getName() );
+        assertEquals( "head_", ( (SinkEventElement) it.next() ).getName() );
+        assertEquals( "body", ( (SinkEventElement) it.next() ).getName() );
+
+        SinkEventElement element = (SinkEventElement) it.next();
+        assertEquals( "verbatim", element.getName() );
+        Object[] args = element.getArgs();
+        assertEquals( SinkEventAttributeSet.BOXED, args[0] );
+
+        assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+        assertEquals( "verbatim_", ( (SinkEventElement) it.next() ).getName() 
);
+
+        element = (SinkEventElement) it.next();
+        assertEquals( "verbatim", element.getName() );
+        args = element.getArgs();
+        assertNull( args[0] );
+
+        assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+        assertEquals( "verbatim_", ( (SinkEventElement) it.next() ).getName() 
);
+        assertEquals( "body_", ( (SinkEventElement) it.next() ).getName() );
+
+        assertFalse( it.hasNext() );
+    }
+
     /** {...@inheritdoc} */
     protected String outputExtension()
     {