test: test parse multiline html comment

test multiline html comment for identify confluence macro + test publishing #285
bsorrentino · Mar 20, 2023 · 17ba7f4 · 17ba7f4
1 parent 2825387
commit 17ba7f4
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/core/src/main/java/org/bsc/markdown/MarkdownVisitorHelper.java b/core/src/main/java/org/bsc/markdown/MarkdownVisitorHelper.java
@@ -141,9 +141,9 @@ public static String processLinkUrl( String url, MarkdownParserContext parseCont
 //    }
 
     /**
-     *
+     * [Match multiline text using regular expression](https://stackoverflow.com/a/3652392/521197)
      */
-    private static Pattern isConfluenceMacroPattern = Pattern.compile( "^[\\s]*\\{([\\w-]+)(([:][\\w-]+(=(.+))?)([|].+)*)?\\}[\\s]*$" );
+    private static Pattern isConfluenceMacroPattern = Pattern.compile( "^[\\s]*\\{([\\w-]+)(([:][\\w-]+(=(.+))?)([|].+)*)?\\}[\\s]*$", Pattern.DOTALL  );
     private static Pattern isConfluenceVariable = Pattern.compile( "^[\\s]*\\$\\{([\\w-\\.]+)\\}[\\s]*$" );
 
     /**

diff --git a/processor-commonmark/src/test/kotlin/org/bsc/makdown/commonmark/Issue285Test.kt b/processor-commonmark/src/test/kotlin/org/bsc/makdown/commonmark/Issue285Test.kt
@@ -1,6 +1,7 @@
 package org.bsc.makdown.commonmark
 
 import org.bsc.confluence.model.Site
+import org.bsc.markdown.MarkdownVisitorHelper.isConfluenceMacro
 import org.bsc.markdown.commonmark.CommonmarkConfluenceWikiVisitor.parseHTMLComment
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -26,11 +27,14 @@ class Issue285Test {
 
         assertTrue( multiLineMatcher.matches() )
         assertEquals( 2, multiLineMatcher.groupCount() )
+
+        val content = multiLineMatcher.group(2).trimEnd()
         assertEquals( """
             {excerpt:title=MyExcerpt}
             This is the content that I want to use as my excerpt.
             {excerpt}
-            """.trimIndent(), multiLineMatcher.group(2).trimEnd() )
+            """.trimIndent(), content )
+        assertTrue( isConfluenceMacro( content ), "$content\n It is not recognized as confluence macro!" )
 
     }
 

diff --git a/test-publishing/pom.xml b/test-publishing/pom.xml
@@ -448,6 +448,26 @@
 
                         </configuration>
                     </execution>
+                    <!--
+                    mvn confluence-reporting:deploy@issue285
+                    mvn confluence-reporting:delete@issue285
+                    -->
+                    <execution>
+                        <id>issue285</id>
+                        <goals>
+                            <goal>deploy</goal>
+                            <goal>delete</goal>
+                        </goals>
+                        <configuration>
+                            <encoding>UTF-8</encoding>
+                            <failOnError>true</failOnError>
+                            <siteDescriptor>${basedir}/src/site/confluence/issue285/site.yml</siteDescriptor>
+                            <markdownProcessor>
+                                <skipHtml>true</skipHtml>
+                            </markdownProcessor>
+
+                        </configuration>
+                    </execution>
 
                 </executions>
             </plugin>

diff --git a/test-publishing/src/site/confluence/issue285/issue285.md b/test-publishing/src/site/confluence/issue285/issue285.md
@@ -0,0 +1,11 @@
+## TEST ISSUE 285
+
+
+<!-- {excerpt:title=MyExcerpt}
+This is the content that I want to use as my excerpt.
+{excerpt} -->
+
+<!-- {excerpt:title=MyExcerpt} This is the content that I want to use as my excerpt. {excerpt} -->
+
+<h1>TEST ISSUE 285</h1>
+
diff --git a/test-publishing/src/site/confluence/issue285/site.yml b/test-publishing/src/site/confluence/issue285/site.yml
@@ -0,0 +1,4 @@
+home:
+  uri: issue285.md
+  parentPageTitle: "Home"
+  name: "Issue #285"