fixed failing test

Author: Raphael Gachuhi

src/main/java/edu/cmu/oli/content/resource/builders/Json2Xml.java

@@ -6,8 +6,6 @@
 import edu.cmu.oli.content.AppUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.jdom2.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,8 +17,6 @@
  */
 public class Json2Xml {
 
-    private Logger log = LoggerFactory.getLogger(Json2Xml.class);
-
     public Document jsonToXml(JsonObject json, Map<String, Namespace> namespaceMap) {
         Document document = new Document();
 

src/test/java/edu/cmu/oli/content/resource/builders/Xml2JsonTest.java

@@ -27,15 +27,17 @@ public String afterDocToString(final String str) {
         assertTrue(str.contains("<p>1 2 3</p>"));
         assertTrue(str.contains("<p>4 5 6</p>"));
 
+          System.out.println(str);
         // check newlines retained in preformatted codeblocks
         Matcher regex = Pattern.compile(
-          "<codeblock syntax\\=\"xml\">7$\\s+8$\\s+9</codeblock>",
+          "<codeblock syntax\\=\"xml\"><\\!\\[CDATA\\[7$\\s+8$\\s+9\\]\\]></codeblock>",
           Pattern.DOTALL | Pattern.MULTILINE
         ).matcher(str);
         assertTrue("XML contains 7\\n        8\\n        9", regex.find());
 
+
         regex = Pattern.compile(
-          "<codeblock syntax\\=\"xml\">$\\s+10$\\s+11$\\s+12</codeblock>",
+          "<codeblock syntax\\=\"xml\"><\\!\\[CDATA\\[$\\s+10$\\s+11$\\s+12\\]\\]></codeblock>",
           Pattern.DOTALL | Pattern.MULTILINE
         ).matcher(str);
         assertTrue("XML contains \\n        10\\n        11\\n        12", regex.find());