SONAR-4258 Added ampersand escaping in sonar-colorizer

1 files changed, 22 insertions, 7 deletions

diff --git a/sonar-colorizer/src/test/java/org/sonar/colorizer/CodeColorizerTest.java b/sonar-colorizer/src/test/java/org/sonar/colorizer/CodeColorizerTest.java
index ae591b617d1..12a87f1887c 100644
--- a/sonar-colorizer/src/test/java/org/sonar/colorizer/CodeColorizerTest.java
+++ b/sonar-colorizer/src/test/java/org/sonar/colorizer/CodeColorizerTest.java
@@ -19,13 +19,6 @@
  */
 package org.sonar.colorizer;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.number.OrderingComparisons.greaterThan;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
@@ -40,6 +33,13 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.number.OrderingComparisons.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
 public class CodeColorizerTest {
 
   @Test
@@ -122,6 +122,21 @@ public class CodeColorizerTest {
     }
   }
 
+  @Test
+  public void shouldEscapeSpecialCharacters() throws Exception {
+
+    Reader java = readFile("/org/sonar/colorizer/samples/SampleWithComments.java");
+
+    String html = CodeColorizer.javaToHtml(java, HtmlOptions.DEFAULT);
+
+    assertHtml(html);
+    assertContains(html, "<pre>  <span class=\"cppd\">/*</span></pre>",
+                         "<pre><span class=\"cppd\">   * This method does &lt;b&gt;something&lt;/b&gt;</span></pre>",
+                         "<pre><span class=\"cppd\">   *</span></pre>",
+                         "<pre><span class=\"cppd\">   * &amp;lt;p&amp;gt;description&amp;lt;/p&amp;gt;</span></pre>",
+                         "<pre><span class=\"cppd\">   */</span></pre>");
+  }
+
   /**
    * @return Reader for specified file with EOL normalized to specified one.
    */