Correct encoding of quote and add a unit test

jhove-core/src/main/java/edu/harvard/hul/ois/jhove/HandlerBase.java

@@ -591,7 +591,7 @@ protected static String elementStart (String tag, String [][] attrs)
      *   to entities as necessary and removing control characters disallowed
      *   by XML.  The null string will be converted to an empty string.
      */
-    private static String encodeContent (String content)
+    protected static String encodeContent (String content)
     {
         if (content == null) {
             content = "";
@@ -611,7 +611,7 @@ private static String encodeContent (String content)
 	n = 0;
         while ((n = buffer.indexOf ("&", n)) > -1) {
             buffer.insert (n+1, "amp;");
-            n +=5;
+            n += 5;
         }
         n = 0;
         while ((n = buffer.indexOf ("<", n)) > -1) {
@@ -632,7 +632,7 @@ private static String encodeContent (String content)
      *   converting quote characters to entities and removing control
      *   characters disallowed by XML.
      */
-    private static String encodeValue (String value)
+    protected static String encodeValue (String value)
     {
         StringBuffer buffer = new StringBuffer (value);
 
@@ -650,9 +650,9 @@ private static String encodeValue (String value)
         n = 0;
         while ((n = buffer.indexOf ("&", n)) > -1) {
             buffer.insert (n+1, "amp;");
-            n +=5;
+            n += 5;
         }
-     	n = 0;
+        n = 0;
         while ((n = buffer.indexOf ("<", n)) > -1) {
             buffer.replace (n, n+1, "&lt;");
             n += 4;
@@ -662,11 +662,11 @@ private static String encodeValue (String value)
             buffer.replace (n, n+1, "&gt;");
             n += 4;
         }
-		n = 0;
+        n = 0;
         while ((n = buffer.indexOf ("\"", n)) > -1) {
             // [LP] fix for invalid escaping, "" quotes were accidentally left in place.
             buffer.replace (n, n+1, "&quot;");
-            n +=7;
+            n += 6;
         }
 
         return buffer.toString ();

jhove-core/src/test/java/edu/harvard/hul/ois/jhove/HandlerBaseTest.java

@@ -0,0 +1,54 @@
+package edu.harvard.hul.ois.jhove;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.logging.Logger;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class HandlerBaseTest {
+  private static final Logger LOGGER = Logger.getLogger(HandlerBaseTest.class.getName());
+  private static final String GIVES = " => ";
+  private static final String DUMMY = "dummy";
+
+  @Test
+  public void testEncodeContent() {
+    /* Test values */
+    final String[] VALUES = {
+      DUMMY, "<<>>\"\"''&&"
+    };
+
+    final String[] EXPECTED = {
+      DUMMY, "&lt;&lt;&gt;&gt;\"\"''&amp;&amp;"
+    };
+
+    String encodeValue;
+    for (int i = 0; i < VALUES.length; i++) {
+      encodeValue = HandlerBase.encodeContent(VALUES[i]);
+      LOGGER.info("testEncodeContent: " + VALUES[i] + GIVES + encodeValue);
+      assertEquals(EXPECTED[i], encodeValue);
+    }
+  }
+
+  @Test
+  public void testEncodeValue() {
+    /* Test values */
+    final String[] VALUES = {
+      DUMMY, "<<>>\"'&", "" + (char)0xf + "\"\""
+    };
+    final String[] EXPECTED = {
+      DUMMY, "&lt;&lt;&gt;&gt;&quot;'&amp;", "&quot;&quot;"
+    };
+
+    String encodeValue;
+    for (int i = 0; i < VALUES.length; i++) {
+      encodeValue = HandlerBase.encodeValue(VALUES[i]);
+      LOGGER.info("testEncodeValue: " + VALUES[i] + GIVES + encodeValue);
+      assertEquals(EXPECTED[i], encodeValue);
+    }
+  }
+
+}