fix(res): unescape new line symbol in string resources (#1030)

This commit is contained in:
Skylot
2020-11-23 16:35:05 +00:00
parent f642e11a7a
commit edbe6015f6
2 changed files with 13 additions and 2 deletions
@@ -217,9 +217,9 @@ public class StringUtils {
}
private static void commonEscapeAndAppend(StringBuilder sb, char c) {
String replace = escapeXmlChar(c);
String replace = escapeWhiteSpaceChar(c);
if (replace == null) {
replace = escapeWhiteSpaceChar(c);
replace = escapeXmlChar(c);
}
if (replace != null) {
sb.append(replace);
@@ -51,4 +51,15 @@ class StringUtilsTest {
private void checkCharUnescape(char input, String result) {
assertThat(stringUtils.unescapeChar(input), is('\'' + result + '\''));
}
@Test
public void testResStrValueEscape() {
checkResStrValueEscape("line\nnew line", "line\\nnew line");
checkResStrValueEscape("can't", "can\\'t");
checkResStrValueEscape("quote\"end", "quote\\\"end");
}
private void checkResStrValueEscape(String input, String result) {
assertThat(StringUtils.escapeResStrValue(input), is(result));
}
}