Only use XML character entities in Utils.escapeXml(). Closes #6

This commit is contained in:
Erik C. Thauvin 2022-03-25 12:05:07 -07:00
parent 1ab96e5b3a
commit 6344d7a68b
2 changed files with 5 additions and 5 deletions

View file

@ -76,10 +76,10 @@ public final class Utils {
escaped.append("&"); escaped.append("&");
break; break;
case '\'': case '\'':
escaped.append("'"); escaped.append("'");
break; break;
case '"': case '"':
escaped.append("""); escaped.append(""");
break; break;
default: default:
escaped.append(c); escaped.append(c);

View file

@ -53,8 +53,8 @@ public class UtilsTest {
assertEquals(Utils.escapeXml( assertEquals(Utils.escapeXml(
"This is a test. We wan't to make sure that everything is <encoded> according the \"encoding\" " "This is a test. We wan't to make sure that everything is <encoded> according the \"encoding\" "
+ "parameter & value."), + "parameter & value."),
"This is a test. We wan&#039;t to make sure that everything is &lt;encoded&gt; according the " "This is a test. We wan&apos;t to make sure that everything is &lt;encoded&gt; according the "
+ "&#034;encoding&#034; parameter &amp; value."); + "&quot;encoding&quot; parameter &amp; value.");
} }
@SuppressWarnings("PMD.AvoidDuplicateLiterals") @SuppressWarnings("PMD.AvoidDuplicateLiterals")
@ -79,7 +79,7 @@ public class UtilsTest {
sw.getBuffer().setLength(0); sw.getBuffer().setLength(0);
Utils.outWrite(sw, "wan't", "default", true); Utils.outWrite(sw, "wan't", "default", true);
assertEquals(sw.toString(), "wan&#039;t", "outWrite(wan't)"); assertEquals(sw.toString(), "wan&apos;t", "outWrite(wan't)");
sw.getBuffer().setLength(0); sw.getBuffer().setLength(0);
Utils.outWrite(sw, null, "1 & 1", true); Utils.outWrite(sw, null, "1 & 1", true);