garydgregory commented on code in PR #1813:
URL: https://github.com/apache/commons-lang/pull/1813#discussion_r4283640211
##########
src/test/java/org/apache/commons/lang3/StringUtilsTest.java:
##########
@@ -1359,6 +1395,27 @@ void testLeftPad_StringIntString() {
assertEquals("abc", StringUtils.leftPad("abc", Integer.MIN_VALUE, "
"));
}
+ @Test
+ void testLeftPadSurrogatePair() {
+ final String grin = "\uD83D\uDE00";
+ final String partyPopper = "\uD83C\uDF89";
+ assertEquals("a", StringUtils.leftPad("a", 2, grin));
+ assertEquals(grin + "a", StringUtils.leftPad("a", 3, grin));
+ assertEquals(grin + "a", StringUtils.leftPad("a", 4, grin));
+ assertEquals(grin + grin + "a", StringUtils.leftPad("a", 5, grin));
+
+ final String[] testStrings = {"", "a", "hello", grin, "a" + grin +
"b"};
+ final String[] padStrings = {grin, "a" + grin, grin + "b", "a" + grin
+ "b", grin + partyPopper};
+ for (final String str : testStrings) {
+ for (final String padStr : padStrings) {
+ for (int size = 0; size <= 15; size++) {
+ final String result = StringUtils.leftPad(str, size,
padStr);
Review Comment:
Local is not needed here.
##########
src/test/java/org/apache/commons/lang3/StringUtilsTest.java:
##########
@@ -340,6 +340,42 @@ void testCenter_StringIntString() {
assertEquals(" abc ", StringUtils.center("abc", 7, ""));
}
+ private void assertNoLoneSurrogates(final String result) {
+ for (int i = 0; i < result.length(); i++) {
+ final char ch = result.charAt(i);
+ if (Character.isHighSurrogate(ch)) {
+ assertTrue(i + 1 < result.length() &&
Character.isLowSurrogate(result.charAt(i + 1)),
+ "lone high surrogate in: " + result);
+ i++; // skip the paired low surrogate
+ } else {
+ assertFalse(Character.isLowSurrogate(ch), "lone low surrogate
in: " + result);
+ }
+ }
+ }
+
+ @Test
+ void testCenterSurrogatePair() {
+ final String grin = "\uD83D\uDE00";
+ final String partyPopper = "\uD83C\uDF89";
+ assertEquals("a", StringUtils.center("a", 2, grin));
+ assertEquals("a" + grin, StringUtils.center("a", 3, grin));
+ assertEquals("a" + grin, StringUtils.center("a", 4, grin));
+ assertEquals(grin + "a" + grin, StringUtils.center("a", 5, grin));
+ assertEquals(grin + "a" + grin, StringUtils.center("a", 6, grin));
+ assertEquals(grin + "a" + grin + grin, StringUtils.center("a", 7,
grin));
+
+ final String[] testStrings = {"", "a", "hello", grin, "a" + grin +
"b"};
+ final String[] padStrings = {grin, "a" + grin, grin + "b", "a" + grin
+ "b", grin + partyPopper};
+ for (final String str : testStrings) {
+ for (final String padStr : padStrings) {
+ for (int size = 0; size <= 15; size++) {
+ final String result = StringUtils.center(str, size,
padStr);
Review Comment:
Local is not needed here.
##########
src/test/java/org/apache/commons/lang3/StringUtilsTest.java:
##########
@@ -2268,6 +2325,27 @@ void testRightPad_StringIntString() {
assertEquals("abc", StringUtils.rightPad("abc", Integer.MIN_VALUE, "
"));
}
+ @Test
+ void testRightPadSurrogatePair() {
+ final String grin = "\uD83D\uDE00";
+ final String partyPopper = "\uD83C\uDF89";
+ assertEquals("a", StringUtils.rightPad("a", 2, grin));
+ assertEquals("a" + grin, StringUtils.rightPad("a", 3, grin));
+ assertEquals("a" + grin, StringUtils.rightPad("a", 4, grin));
+ assertEquals("a" + grin + grin, StringUtils.rightPad("a", 5, grin));
+
+ final String[] testStrings = {"", "a", "hello", grin, "a" + grin +
"b"};
+ final String[] padStrings = {grin, "a" + grin, grin + "b", "a" + grin
+ "b", grin + partyPopper};
+ for (final String str : testStrings) {
+ for (final String padStr : padStrings) {
+ for (int size = 0; size <= 15; size++) {
+ final String result = StringUtils.rightPad(str, size,
padStr);
Review Comment:
Local is not needed here.
##########
src/changes/changes.xml:
##########
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="3.21.1" date="YYYY-MM-DD" description="This is a feature
and maintenance release. Java 8 or later is required.">
<!-- FIX -->
+ <action type="fix" dev="ggregory" due-to="gaurav kumar
pandey">Keep StringUtils leftPad, rightPad, and center off surrogate pair
boundaries.</action>
Review Comment:
Please don't edit this file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
