Skip to content

Commit 5cef4ad

Browse files
committed
Remove unused import
Sort members
1 parent 6cb563d commit 5cef4ad

3 files changed

Lines changed: 37 additions & 38 deletions

File tree

src/test/java/org/apache/commons/lang3/StringUtilsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import java.util.Iterator;
4040
import java.util.List;
4141
import java.util.Locale;
42-
import java.util.Objects;
4342
import java.util.function.Supplier;
4443
import java.util.regex.PatternSyntaxException;
4544

src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,24 +1308,6 @@ void testLang381() {
13081308
assertTrue(Float.isNaN(NumberUtils.max(bF)));
13091309
}
13101310

1311-
@Test
1312-
void testMinMaxSignedZero() {
1313-
// The varargs overloads must agree with Math.min/Math.max (and the three-argument
1314-
// overloads, which delegate to them) on the sign of zero. -0.0 is distinct from 0.0,
1315-
// e.g. 1 / -0.0 is -Infinity, so the raw bits are asserted here.
1316-
assertEquals(Double.doubleToRawLongBits(0.0d), Double.doubleToRawLongBits(NumberUtils.max(-0.0d, 0.0d)));
1317-
assertEquals(Double.doubleToRawLongBits(0.0d), Double.doubleToRawLongBits(NumberUtils.max(0.0d, -0.0d)));
1318-
assertEquals(Double.doubleToRawLongBits(-0.0d), Double.doubleToRawLongBits(NumberUtils.min(-0.0d, 0.0d)));
1319-
assertEquals(Double.doubleToRawLongBits(-0.0d), Double.doubleToRawLongBits(NumberUtils.min(0.0d, -0.0d)));
1320-
assertEquals(Float.floatToRawIntBits(0.0f), Float.floatToRawIntBits(NumberUtils.max(-0.0f, 0.0f)));
1321-
assertEquals(Float.floatToRawIntBits(0.0f), Float.floatToRawIntBits(NumberUtils.max(0.0f, -0.0f)));
1322-
assertEquals(Float.floatToRawIntBits(-0.0f), Float.floatToRawIntBits(NumberUtils.min(-0.0f, 0.0f)));
1323-
assertEquals(Float.floatToRawIntBits(-0.0f), Float.floatToRawIntBits(NumberUtils.min(0.0f, -0.0f)));
1324-
// the varargs result matches the three-argument overload
1325-
assertEquals(Double.doubleToRawLongBits(NumberUtils.max(-0.0d, 0.0d, 0.0d)), Double.doubleToRawLongBits(NumberUtils.max(-0.0d, 0.0d)));
1326-
assertEquals(Double.doubleToRawLongBits(NumberUtils.min(0.0d, -0.0d, 0.0d)), Double.doubleToRawLongBits(NumberUtils.min(0.0d, -0.0d)));
1327-
}
1328-
13291311
@Test
13301312
void testLang747() {
13311313
assertEquals(Integer.valueOf(0x8000), NumberUtils.createNumber("0x8000"));
@@ -1718,6 +1700,24 @@ void testMinLong_nullArray() {
17181700
assertNullPointerException(() -> NumberUtils.min((long[]) null));
17191701
}
17201702

1703+
@Test
1704+
void testMinMaxSignedZero() {
1705+
// The varargs overloads must agree with Math.min/Math.max (and the three-argument
1706+
// overloads, which delegate to them) on the sign of zero. -0.0 is distinct from 0.0,
1707+
// e.g. 1 / -0.0 is -Infinity, so the raw bits are asserted here.
1708+
assertEquals(Double.doubleToRawLongBits(0.0d), Double.doubleToRawLongBits(NumberUtils.max(-0.0d, 0.0d)));
1709+
assertEquals(Double.doubleToRawLongBits(0.0d), Double.doubleToRawLongBits(NumberUtils.max(0.0d, -0.0d)));
1710+
assertEquals(Double.doubleToRawLongBits(-0.0d), Double.doubleToRawLongBits(NumberUtils.min(-0.0d, 0.0d)));
1711+
assertEquals(Double.doubleToRawLongBits(-0.0d), Double.doubleToRawLongBits(NumberUtils.min(0.0d, -0.0d)));
1712+
assertEquals(Float.floatToRawIntBits(0.0f), Float.floatToRawIntBits(NumberUtils.max(-0.0f, 0.0f)));
1713+
assertEquals(Float.floatToRawIntBits(0.0f), Float.floatToRawIntBits(NumberUtils.max(0.0f, -0.0f)));
1714+
assertEquals(Float.floatToRawIntBits(-0.0f), Float.floatToRawIntBits(NumberUtils.min(-0.0f, 0.0f)));
1715+
assertEquals(Float.floatToRawIntBits(-0.0f), Float.floatToRawIntBits(NumberUtils.min(0.0f, -0.0f)));
1716+
// the varargs result matches the three-argument overload
1717+
assertEquals(Double.doubleToRawLongBits(NumberUtils.max(-0.0d, 0.0d, 0.0d)), Double.doubleToRawLongBits(NumberUtils.max(-0.0d, 0.0d)));
1718+
assertEquals(Double.doubleToRawLongBits(NumberUtils.min(0.0d, -0.0d, 0.0d)), Double.doubleToRawLongBits(NumberUtils.min(0.0d, -0.0d)));
1719+
}
1720+
17211721
@Test
17221722
void testMinShort() {
17231723
assertEquals((short) 5, NumberUtils.min((short) 5), "min(short[]) failed for array length 1");

src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,25 @@ void testCapitalizeWithDelimiters_String() {
140140
assertEquals("I Am.fine", WordUtils.capitalize("i am.fine", null));
141141
}
142142

143+
@Test
144+
void testCase_SupplementaryCodePoint() {
145+
// Deseret long-i: capital U+10400, small U+10428 (each a surrogate pair)
146+
final String cap = new String(Character.toChars(0x10400));
147+
final String small = new String(Character.toChars(0x10428));
148+
149+
assertEquals(cap + "bc", WordUtils.capitalize(small + "bc"));
150+
assertEquals("Ben " + cap + "ee", WordUtils.capitalize("ben " + small + "ee"));
151+
assertEquals("Ben." + cap + "ee", WordUtils.capitalize("ben." + small + "ee", '.'));
152+
assertEquals(cap + "bc", WordUtils.capitalizeFully(cap + "BC"));
153+
154+
assertEquals(small + "BC", WordUtils.uncapitalize(cap + "BC"));
155+
assertEquals("a." + small + "BC", WordUtils.uncapitalize("a." + cap + "BC", '.'));
156+
157+
assertEquals(small, WordUtils.swapCase(cap));
158+
assertEquals(cap, WordUtils.swapCase(small));
159+
assertEquals("A" + small, WordUtils.swapCase("a" + cap));
160+
}
161+
143162
@Test
144163
void testConstructor() {
145164
assertNotNull(new WordUtils());
@@ -285,25 +304,6 @@ void testInitials_SupplementaryCodePoint() {
285304
assertEquals("B" + emoji + "L", WordUtils.initials("Ben." + emoji + "mile.Lee", '.'));
286305
}
287306

288-
@Test
289-
void testCase_SupplementaryCodePoint() {
290-
// Deseret long-i: capital U+10400, small U+10428 (each a surrogate pair)
291-
final String cap = new String(Character.toChars(0x10400));
292-
final String small = new String(Character.toChars(0x10428));
293-
294-
assertEquals(cap + "bc", WordUtils.capitalize(small + "bc"));
295-
assertEquals("Ben " + cap + "ee", WordUtils.capitalize("ben " + small + "ee"));
296-
assertEquals("Ben." + cap + "ee", WordUtils.capitalize("ben." + small + "ee", '.'));
297-
assertEquals(cap + "bc", WordUtils.capitalizeFully(cap + "BC"));
298-
299-
assertEquals(small + "BC", WordUtils.uncapitalize(cap + "BC"));
300-
assertEquals("a." + small + "BC", WordUtils.uncapitalize("a." + cap + "BC", '.'));
301-
302-
assertEquals(small, WordUtils.swapCase(cap));
303-
assertEquals(cap, WordUtils.swapCase(small));
304-
assertEquals("A" + small, WordUtils.swapCase("a" + cap));
305-
}
306-
307307
@Test
308308
void testLANG1292() {
309309
// Prior to fix, this was throwing StringIndexOutOfBoundsException

0 commit comments

Comments
 (0)