svn commit: r589375 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src: main/java/org/apache/maven/doxia/module/confluence/parser/ test/java/org/apache/maven/doxia/module/confluence/ test/resources/

[ltheussl]

Author: ltheussl
Date: Sun Oct 28 09:25:59 2007
New Revision: 589375

URL: http://svn.apache.org/viewvc?rev=589375&view=rev
Log:
[DOXIA-175] Confluence module does not recognise backslash as escape character
Submitted by: Dave Syer

Added:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/escapes.confluence
Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java?rev=589375&r1=589374&r2=589375&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
 Sun Oct 28 09:25:59 2007
@@ -155,7 +155,8 @@
                     }
                     else
                     {
-                        text.append( input.charAt( i + 1 ) );
+                        i++;
+                        text.append( input.charAt( i ) );
                     }
 
                     break;

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java?rev=589375&r1=589374&r2=589375&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
 Sun Oct 28 09:25:59 2007
@@ -113,6 +113,19 @@
     }
 
     /** @throws Exception */
+    public void testEscapes()
+        throws Exception
+    {
+        String result = locateAndParseTestSourceFile( "escapes" );
+
+        assertContainsLines( result, "asterisk *" );
+        assertContainsLines( result, "underline _" );
+        assertContainsLines( result, "asterisk *not bold*" );
+        assertContainsLines( result, "underline _not italic_" );
+        assertContainsLines( result, "normal character" );
+    }
+
+    /** @throws Exception */
     public void testSectionTitles()
         throws Exception
     {

Added: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/escapes.confluence
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/escapes.confluence?rev=589375&view=auto
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/escapes.confluence
 (added)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/resources/escapes.confluence
 Sun Oct 28 09:25:59 2007
@@ -0,0 +1,6 @@
+Simple paragraph with asterisk \* and underline \_.
+
+Simple paragraph with asterisk \*not bold\* and underline \_not italic\_.
+
+Simple paragraph with normal \character escaped.
+