From 5090d681b3cf857cbc06e65475f5711f018fe6ca Mon Sep 17 00:00:00 2001
From: unknown <joshua@interoctiv.io>
Date: Mon, 3 Sep 2018 09:27:25 -0600
Subject: [PATCH] Work towards a highlight.js unit test

---
 pom.xml                                              |  6 ++++++
 .../plugins/confluence/markdown/MarkdownMacro.java   |  3 +--
 .../plugins/confluence/MarkdownUnitTest.java         | 12 +++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c4a771..6805617 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,12 @@
             <version>1.9.0</version>
             <scope>test</scope>
          </dependency>
+         <!-- https://mvnrepository.com/artifact/org.mozilla/rhino -->
+		<dependency>
+		    <groupId>org.mozilla</groupId>
+		    <artifactId>rhino</artifactId>
+		    <version>1.7.10</version>
+		</dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
index 9c69bd7..febab88 100644
--- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
+++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
@@ -96,12 +96,11 @@ public class MarkdownMacro extends BaseMacro implements Macro
                 "    hljs.highlightBlock(block);\n" +
                 "  });\n" +
                 "</script>";
-
         Parser parser = Parser.builder(options).build();
         HtmlRenderer renderer = HtmlRenderer.builder(options).build();
 
         Node document = parser.parse(bodyContent);
-        String html = renderer.render(document ) + highlightjs;
+        String html = renderer.render(document) + highlightjs;
         return html;
     }
 
diff --git a/src/test/java/ut/com/atlassian/plugins/confluence/MarkdownUnitTest.java b/src/test/java/ut/com/atlassian/plugins/confluence/MarkdownUnitTest.java
index 068ef7a..0e49a98 100644
--- a/src/test/java/ut/com/atlassian/plugins/confluence/MarkdownUnitTest.java
+++ b/src/test/java/ut/com/atlassian/plugins/confluence/MarkdownUnitTest.java
@@ -38,6 +38,16 @@ public class MarkdownUnitTest {
 		Mockito.when(requiredResources.requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs")).thenReturn(requiredResources);
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		String output = markdownMacro.execute(new HashMap(), "*Italic*", conversionContext);
-		assertTrue(Pattern.matches("<p><em>Italic</em></p>[\\S\\s]*", output));
+		assertTrue(Pattern.matches("[\\S\\s]*<em>Italic</em>[\\S\\s]*", output));
+	}
+	
+	@Test
+	public void testSyntaxHighlighting() throws MacroExecutionException {
+		Mockito.when(pageBuilderService.assembler()).thenReturn(webResourceAssembler);
+		Mockito.when(webResourceAssembler.resources()).thenReturn(requiredResources);
+		Mockito.when(requiredResources.requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs")).thenReturn(requiredResources);
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		String output = markdownMacro.execute(new HashMap(), "public class JavaClass {}", conversionContext);
+		assertTrue(Pattern.matches("[\\S\\s]*<script>\\sAJS\\.\\$\\('\\[data\\-macro\\-name=\"markdown\"\\] code'\\)\\.each\\(function\\(i, block\\) \\{\\s    hljs\\.highlightBlock\\(block\\);\\s  \\}\\);\\s<\\/script>[\\S\\s]*", output));
 	}
 }
\ No newline at end of file