This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 837e1bc174868f890a2849d7b1c6865f07bef60c Author: Gary Gregory <[email protected]> AuthorDate: Mon Dec 2 09:06:06 2024 -0500 Add Checkstyle ParenPad and fix --- .../org/apache/commons/lang3/BooleanUtils.java | 12 +-- .../apache/commons/lang3/StringEscapeUtils.java | 6 +- .../java/org/apache/commons/lang3/StringUtils.java | 4 +- .../lang3/concurrent/BackgroundInitializer.java | 2 +- .../org/apache/commons/lang3/math/Fraction.java | 2 +- .../text/translate/NumericEntityUnescaper.java | 4 +- .../lang3/text/translate/OctalUnescaper.java | 4 +- .../apache/commons/lang3/time/FastDatePrinter.java | 2 +- src/site/resources/checkstyle/checkstyle.xml | 1 + .../java/org/apache/commons/lang3/CharSetTest.java | 2 +- .../org/apache/commons/lang3/ObjectUtilsTest.java | 8 +- .../lang3/StringUtilsEqualsIndexOfTest.java | 24 +++--- .../commons/lang3/StringUtilsSubstringTest.java | 2 +- .../commons/lang3/math/IEEE754rUtilsTest.java | 8 +- .../commons/lang3/mutable/MutableByteTest.java | 10 +-- .../commons/lang3/mutable/MutableDoubleTest.java | 8 +- .../commons/lang3/mutable/MutableFloatTest.java | 12 +-- .../commons/lang3/mutable/MutableIntTest.java | 6 +- .../commons/lang3/mutable/MutableLongTest.java | 8 +- .../commons/lang3/mutable/MutableShortTest.java | 10 +-- .../commons/lang3/reflect/FieldUtilsTest.java | 2 +- .../lang3/text/StrBuilderAppendInsertTest.java | 2 +- .../apache/commons/lang3/text/StrBuilderTest.java | 4 +- .../apache/commons/lang3/text/WordUtilsTest.java | 96 +++++++++++----------- .../commons/lang3/time/FastDateParserSDFTest.java | 92 ++++++++++----------- .../lang3/time/FastDateParser_MoreOrLessTest.java | 4 +- .../apache/commons/lang3/time/WeekYearTest.java | 34 ++++---- 27 files changed, 186 insertions(+), 183 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/BooleanUtils.java b/src/main/java/org/apache/commons/lang3/BooleanUtils.java index dc5d142fc..79036f2cf 100644 --- a/src/main/java/org/apache/commons/lang3/BooleanUtils.java +++ b/src/main/java/org/apache/commons/lang3/BooleanUtils.java @@ -763,11 +763,11 @@ public class BooleanUtils { final char ch0 = str.charAt(0); final char ch1 = str.charAt(1); if ((ch0 == 'o' || ch0 == 'O') && - (ch1 == 'n' || ch1 == 'N') ) { + (ch1 == 'n' || ch1 == 'N')) { return Boolean.TRUE; } if ((ch0 == 'n' || ch0 == 'N') && - (ch1 == 'o' || ch1 == 'O') ) { + (ch1 == 'o' || ch1 == 'O')) { return Boolean.FALSE; } break; @@ -778,12 +778,12 @@ public class BooleanUtils { final char ch2 = str.charAt(2); if ((ch0 == 'y' || ch0 == 'Y') && (ch1 == 'e' || ch1 == 'E') && - (ch2 == 's' || ch2 == 'S') ) { + (ch2 == 's' || ch2 == 'S')) { return Boolean.TRUE; } if ((ch0 == 'o' || ch0 == 'O') && (ch1 == 'f' || ch1 == 'F') && - (ch2 == 'f' || ch2 == 'F') ) { + (ch2 == 'f' || ch2 == 'F')) { return Boolean.FALSE; } break; @@ -796,7 +796,7 @@ public class BooleanUtils { if ((ch0 == 't' || ch0 == 'T') && (ch1 == 'r' || ch1 == 'R') && (ch2 == 'u' || ch2 == 'U') && - (ch3 == 'e' || ch3 == 'E') ) { + (ch3 == 'e' || ch3 == 'E')) { return Boolean.TRUE; } break; @@ -811,7 +811,7 @@ public class BooleanUtils { (ch1 == 'a' || ch1 == 'A') && (ch2 == 'l' || ch2 == 'L') && (ch3 == 's' || ch3 == 'S') && - (ch4 == 'e' || ch4 == 'E') ) { + (ch4 == 'e' || ch4 == 'E')) { return Boolean.FALSE; } break; diff --git a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java index dc1254f9b..a7828687e 100644 --- a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java @@ -84,7 +84,7 @@ public class StringEscapeUtils { throw new IllegalStateException("CsvUnescaper should never reach the [1] index"); } - if ( input.charAt(0) != CSV_QUOTE || input.charAt(input.length() - 1) != CSV_QUOTE ) { + if (input.charAt(0) != CSV_QUOTE || input.charAt(input.length() - 1) != CSV_QUOTE) { out.write(input.toString()); return Character.codePointCount(input, 0, input.length()); } @@ -92,7 +92,7 @@ public class StringEscapeUtils { // strip quotes final String quoteless = input.subSequence(1, input.length() - 1).toString(); - if ( StringUtils.containsAny(quoteless, CSV_SEARCH_CHARS) ) { + if (StringUtils.containsAny(quoteless, CSV_SEARCH_CHARS)) { // deal with escaped quotes; ie) "" out.write(Strings.CS.replace(quoteless, CSV_QUOTE_STR + CSV_QUOTE_STR, CSV_QUOTE_STR)); } else { @@ -570,7 +570,7 @@ public class StringEscapeUtils { * <p>Note that Unicode characters greater than 0x7f are as of 3.0, no longer * escaped. If you still wish this functionality, you can achieve it * via the following: - * {@code StringEscapeUtils.ESCAPE_XML.with( NumericEntityEscaper.between(0x7f, Integer.MAX_VALUE) );}</p> + * {@code StringEscapeUtils.ESCAPE_XML.with( NumericEntityEscaper.between(0x7f, Integer.MAX_VALUE));}</p> * * @param input the {@link String} to escape, may be null * @return a new escaped {@link String}, {@code null} if null string input diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index 9716cd3fb..e78a13307 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -3339,7 +3339,7 @@ public class StringUtils { final int sz = cs.length(); for (int i = 0; i < sz; i++) { final char nowChar = cs.charAt(i); - if (nowChar != ' ' && !Character.isLetterOrDigit(nowChar) ) { + if (nowChar != ' ' && !Character.isLetterOrDigit(nowChar)) { return false; } } @@ -7338,7 +7338,7 @@ public class StringUtils { * array. A zero or negative value implies no limit. * @return an array of parsed Strings, {@code null} if null String was input */ - public static String[] splitByWholeSeparator( final String str, final String separator, final int max) { + public static String[] splitByWholeSeparator(final String str, final String separator, final int max) { return splitByWholeSeparatorWorker(str, separator, max, false); } diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java index 69a5229b1..63927a440 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java @@ -339,7 +339,7 @@ public class BackgroundInitializer<T> extends AbstractConcurrentInitializer<T, E */ @Override public synchronized boolean isInitialized() { - if (future == null || ! future.isDone() ) { + if (future == null || ! future.isDone()) { return false; } diff --git a/src/main/java/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java index 2eef89893..414069e9e 100644 --- a/src/main/java/org/apache/commons/lang3/math/Fraction.java +++ b/src/main/java/org/apache/commons/lang3/math/Fraction.java @@ -530,7 +530,7 @@ public final class Fraction extends Number implements Comparable<Fraction> { // of the time. final int d1 = greatestCommonDivisor(denominator, fraction.denominator); if (d1 == 1) { - // result is ( (u*v' +/- u'v) / u'v') + // result is ((u*v' +/- u'v) / u'v') final int uvp = mulAndCheck(numerator, fraction.denominator); final int upv = mulAndCheck(fraction.numerator, denominator); return new Fraction(isAdd ? addAndCheck(uvp, upv) : subAndCheck(uvp, upv), mulPosAndCheck(denominator, diff --git a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java index 59fb0de96..5201032f5 100644 --- a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java +++ b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java @@ -116,9 +116,9 @@ public class NumericEntityUnescaper extends CharSequenceTranslator { int end = start; // Note that this supports character codes without a ; on the end - while (end < seqEnd && ( input.charAt(end) >= '0' && input.charAt(end) <= '9' || + while (end < seqEnd && (input.charAt(end) >= '0' && input.charAt(end) <= '9' || input.charAt(end) >= 'a' && input.charAt(end) <= 'f' || - input.charAt(end) >= 'A' && input.charAt(end) <= 'F' ) ) { + input.charAt(end) >= 'A' && input.charAt(end) <= 'F')) { end++; } diff --git a/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java index 2b4e848ce..28e7f196e 100644 --- a/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java +++ b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java @@ -67,7 +67,7 @@ public class OctalUnescaper extends CharSequenceTranslator { public int translate(final CharSequence input, final int index, final Writer out) throws IOException { final int remaining = input.length() - index - 1; // how many characters left, ignoring the first \ final StringBuilder builder = new StringBuilder(); - if (input.charAt(index) == '\\' && remaining > 0 && isOctalDigit(input.charAt(index + 1)) ) { + if (input.charAt(index) == '\\' && remaining > 0 && isOctalDigit(input.charAt(index + 1))) { final int next = index + 1; final int next2 = index + 2; final int next3 = index + 3; @@ -82,7 +82,7 @@ public class OctalUnescaper extends CharSequenceTranslator { } } - out.write( Integer.parseInt(builder.toString(), 8) ); + out.write(Integer.parseInt(builder.toString(), 8)); return 1 + builder.length(); } return 0; diff --git a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java index a922088fe..1132e5d79 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java @@ -445,7 +445,7 @@ public class FastDatePrinter implements DatePrinter, Serializable { */ @Override public int hashCode() { - return (style * 31 + locale.hashCode() ) * 31 + timeZone.hashCode(); + return (style * 31 + locale.hashCode()) * 31 + timeZone.hashCode(); } } /** diff --git a/src/site/resources/checkstyle/checkstyle.xml b/src/site/resources/checkstyle/checkstyle.xml index a60659413..f2f3f9d32 100644 --- a/src/site/resources/checkstyle/checkstyle.xml +++ b/src/site/resources/checkstyle/checkstyle.xml @@ -62,5 +62,6 @@ limitations under the License. </module> <module name="MissingOverride"/> <module name="ArrayTypeStyle"/> + <module name="ParenPad"/> </module> </module> diff --git a/src/test/java/org/apache/commons/lang3/CharSetTest.java b/src/test/java/org/apache/commons/lang3/CharSetTest.java index e9c0d1fd7..89a26c2d3 100644 --- a/src/test/java/org/apache/commons/lang3/CharSetTest.java +++ b/src/test/java/org/apache/commons/lang3/CharSetTest.java @@ -389,7 +389,7 @@ public class CharSetTest extends AbstractLangTest { @Test public void testGetInstance() { - assertSame(CharSet.EMPTY, CharSet.getInstance( (String) null)); + assertSame(CharSet.EMPTY, CharSet.getInstance((String) null)); assertSame(CharSet.EMPTY, CharSet.getInstance("")); assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("a-zA-Z")); assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("A-Za-z")); diff --git a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java index 96a20133a..28b3fa79e 100644 --- a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java @@ -842,14 +842,14 @@ public class ObjectUtilsTest extends AbstractLangTest { @Test public void testToString_Object() { - assertEquals("", ObjectUtils.toString(null) ); - assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE) ); + assertEquals("", ObjectUtils.toString(null)); + assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE)); } @Test public void testToString_Object_String() { - assertEquals(BAR, ObjectUtils.toString(null, BAR) ); - assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE, BAR) ); + assertEquals(BAR, ObjectUtils.toString(null, BAR)); + assertEquals(Boolean.TRUE.toString(), ObjectUtils.toString(Boolean.TRUE, BAR)); } @Test diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java index d027e48aa..532199485 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java @@ -580,7 +580,7 @@ public class StringUtilsEqualsIndexOfTest extends AbstractLangTest { assertEquals(-1, StringUtils.lastIndexOf(builder, CODE_POINT, 0)); builder.appendCodePoint(CODE_POINT); assertEquals(-1, StringUtils.lastIndexOf(builder, CODE_POINT, 0)); - assertEquals(1, StringUtils.lastIndexOf(builder, CODE_POINT, 1 )); + assertEquals(1, StringUtils.lastIndexOf(builder, CODE_POINT, 1)); assertEquals(-1, StringUtils.lastIndexOf(builder.toString(), CODE_POINT, 0)); assertEquals(1, StringUtils.lastIndexOf(builder.toString(), CODE_POINT, 1)); assertEquals(StringUtils.INDEX_NOT_FOUND, StringUtils.lastIndexOf(CharBuffer.wrap("[%{.c.0rro"), -1738, 982)); @@ -705,17 +705,17 @@ public class StringUtilsEqualsIndexOfTest extends AbstractLangTest { @Test public void testLastOrdinalIndexOf() { - assertEquals(-1, StringUtils.lastOrdinalIndexOf(null, "*", 42) ); - assertEquals(-1, StringUtils.lastOrdinalIndexOf("*", null, 42) ); - assertEquals(0, StringUtils.lastOrdinalIndexOf("", "", 42) ); - assertEquals(7, StringUtils.lastOrdinalIndexOf("aabaabaa", "a", 1) ); - assertEquals(6, StringUtils.lastOrdinalIndexOf("aabaabaa", "a", 2) ); - assertEquals(5, StringUtils.lastOrdinalIndexOf("aabaabaa", "b", 1) ); - assertEquals(2, StringUtils.lastOrdinalIndexOf("aabaabaa", "b", 2) ); - assertEquals(4, StringUtils.lastOrdinalIndexOf("aabaabaa", "ab", 1) ); - assertEquals(1, StringUtils.lastOrdinalIndexOf("aabaabaa", "ab", 2) ); - assertEquals(8, StringUtils.lastOrdinalIndexOf("aabaabaa", "", 1) ); - assertEquals(8, StringUtils.lastOrdinalIndexOf("aabaabaa", "", 2) ); + assertEquals(-1, StringUtils.lastOrdinalIndexOf(null, "*", 42)); + assertEquals(-1, StringUtils.lastOrdinalIndexOf("*", null, 42)); + assertEquals(0, StringUtils.lastOrdinalIndexOf("", "", 42)); + assertEquals(7, StringUtils.lastOrdinalIndexOf("aabaabaa", "a", 1)); + assertEquals(6, StringUtils.lastOrdinalIndexOf("aabaabaa", "a", 2)); + assertEquals(5, StringUtils.lastOrdinalIndexOf("aabaabaa", "b", 1)); + assertEquals(2, StringUtils.lastOrdinalIndexOf("aabaabaa", "b", 2)); + assertEquals(4, StringUtils.lastOrdinalIndexOf("aabaabaa", "ab", 1)); + assertEquals(1, StringUtils.lastOrdinalIndexOf("aabaabaa", "ab", 2)); + assertEquals(8, StringUtils.lastOrdinalIndexOf("aabaabaa", "", 1)); + assertEquals(8, StringUtils.lastOrdinalIndexOf("aabaabaa", "", 2)); } @Test diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java index 476893c2f..812454ef7 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java @@ -317,7 +317,7 @@ public void testSubstringBetween_StringString() { assertNull(StringUtils.substringBetween("foo", "", "]")); assertNull(StringUtils.substringBetween("foo", "[", "]")); assertEquals("", StringUtils.substringBetween(" ", " ", " ")); - assertEquals("bar", StringUtils.substringBetween("<foo>bar</foo>", "<foo>", "</foo>") ); + assertEquals("bar", StringUtils.substringBetween("<foo>bar</foo>", "<foo>", "</foo>")); assertEquals("abc", StringUtils.substringBetween("yabczyabcz", "y", "z")); } diff --git a/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java index d274766bb..c522465cb 100644 --- a/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java @@ -37,7 +37,7 @@ public class IEEE754rUtilsTest extends AbstractLangTest { public void testEnforceExceptions() { assertThrows( NullPointerException.class, - () -> IEEE754rUtils.min( (float[]) null), + () -> IEEE754rUtils.min((float[]) null), "IllegalArgumentException expected for null input"); assertThrows( @@ -47,7 +47,7 @@ public class IEEE754rUtilsTest extends AbstractLangTest { assertThrows( NullPointerException.class, - () -> IEEE754rUtils.max( (float[]) null), + () -> IEEE754rUtils.max((float[]) null), "IllegalArgumentException expected for null input"); assertThrows( @@ -57,7 +57,7 @@ public class IEEE754rUtilsTest extends AbstractLangTest { assertThrows( NullPointerException.class, - () -> IEEE754rUtils.min( (double[]) null), + () -> IEEE754rUtils.min((double[]) null), "IllegalArgumentException expected for null input"); assertThrows( @@ -67,7 +67,7 @@ public class IEEE754rUtilsTest extends AbstractLangTest { assertThrows( NullPointerException.class, - () -> IEEE754rUtils.max( (double[]) null), + () -> IEEE754rUtils.max((double[]) null), "IllegalArgumentException expected for null input"); assertThrows( diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java index 5ba7aefe6..5695f1677 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java @@ -224,13 +224,13 @@ public class MutableByteTest extends AbstractLangTest { @Test public void testPrimitiveValues() { - final MutableByte mutNum = new MutableByte( (byte) 1 ); + final MutableByte mutNum = new MutableByte((byte) 1); assertEquals(1.0F, mutNum.floatValue()); assertEquals(1.0, mutNum.doubleValue()); - assertEquals( (byte) 1, mutNum.byteValue() ); - assertEquals( (short) 1, mutNum.shortValue() ); - assertEquals( 1, mutNum.intValue() ); - assertEquals( 1L, mutNum.longValue() ); + assertEquals((byte) 1, mutNum.byteValue()); + assertEquals((short) 1, mutNum.shortValue()); + assertEquals(1, mutNum.intValue()); + assertEquals(1L, mutNum.longValue()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java index 982d3884b..de9b18d86 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java @@ -240,10 +240,10 @@ public class MutableDoubleTest extends AbstractLangTest { final MutableDouble mutNum = new MutableDouble(1.7); assertEquals(1.7F, mutNum.floatValue()); assertEquals(1.7, mutNum.doubleValue()); - assertEquals( (byte) 1, mutNum.byteValue() ); - assertEquals( (short) 1, mutNum.shortValue() ); - assertEquals( 1, mutNum.intValue() ); - assertEquals( 1L, mutNum.longValue() ); + assertEquals((byte) 1, mutNum.byteValue()); + assertEquals((short) 1, mutNum.shortValue()); + assertEquals(1, mutNum.intValue()); + assertEquals(1L, mutNum.longValue()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java index a7312f2e1..ddd06b84a 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java @@ -239,12 +239,12 @@ public class MutableFloatTest extends AbstractLangTest { public void testPrimitiveValues() { final MutableFloat mutNum = new MutableFloat(1.7F); - assertEquals( 1, mutNum.intValue() ); - assertEquals( 1.7, mutNum.doubleValue(), 0.00001 ); - assertEquals( (byte) 1, mutNum.byteValue() ); - assertEquals( (short) 1, mutNum.shortValue() ); - assertEquals( 1, mutNum.intValue() ); - assertEquals( 1L, mutNum.longValue() ); + assertEquals(1, mutNum.intValue()); + assertEquals(1.7, mutNum.doubleValue(), 0.00001); + assertEquals((byte) 1, mutNum.byteValue()); + assertEquals((short) 1, mutNum.shortValue()); + assertEquals(1, mutNum.intValue()); + assertEquals(1L, mutNum.longValue()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java index dcae63245..17bf44a72 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java @@ -234,11 +234,11 @@ public class MutableIntTest extends AbstractLangTest { @Test public void testPrimitiveValues() { final MutableInt mutNum = new MutableInt(1); - assertEquals( (byte) 1, mutNum.byteValue() ); - assertEquals( (short) 1, mutNum.shortValue() ); + assertEquals((byte) 1, mutNum.byteValue()); + assertEquals((short) 1, mutNum.shortValue()); assertEquals(1.0F, mutNum.floatValue()); assertEquals(1.0, mutNum.doubleValue()); - assertEquals( 1L, mutNum.longValue() ); + assertEquals(1L, mutNum.longValue()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java index 32ee0d803..f48254ad9 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java @@ -229,10 +229,10 @@ public class MutableLongTest extends AbstractLangTest { final MutableLong mutNum = new MutableLong(1L); assertEquals(1.0F, mutNum.floatValue()); assertEquals(1.0, mutNum.doubleValue()); - assertEquals( (byte) 1, mutNum.byteValue() ); - assertEquals( (short) 1, mutNum.shortValue() ); - assertEquals( 1, mutNum.intValue() ); - assertEquals( 1L, mutNum.longValue() ); + assertEquals((byte) 1, mutNum.byteValue()); + assertEquals((short) 1, mutNum.shortValue()); + assertEquals(1, mutNum.intValue()); + assertEquals(1L, mutNum.longValue()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java index 8b6a4a139..de3423f77 100644 --- a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java +++ b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java @@ -216,13 +216,13 @@ public class MutableShortTest extends AbstractLangTest { @Test public void testPrimitiveValues() { - final MutableShort mutNum = new MutableShort( (short) 1 ); + final MutableShort mutNum = new MutableShort((short) 1); assertEquals(1.0F, mutNum.floatValue()); assertEquals(1.0, mutNum.doubleValue()); - assertEquals( (byte) 1, mutNum.byteValue() ); - assertEquals( (short) 1, mutNum.shortValue() ); - assertEquals( 1, mutNum.intValue() ); - assertEquals( 1L, mutNum.longValue() ); + assertEquals((byte) 1, mutNum.byteValue()); + assertEquals((short) 1, mutNum.shortValue()); + assertEquals(1, mutNum.intValue()); + assertEquals(1L, mutNum.longValue()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java index f20b0534c..a8de9b8a4 100644 --- a/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java @@ -578,7 +578,7 @@ public class FieldUtilsTest extends AbstractLangTest { assertThrows(IllegalArgumentException.class, () -> FieldUtils.readField(publicChild, "b")); assertEquals(Boolean.TRUE, FieldUtils.readField(publiclyShadowedChild, "b")); - assertThrows( IllegalArgumentException.class, () -> FieldUtils.readField(privatelyShadowedChild, "b")); + assertThrows(IllegalArgumentException.class, () -> FieldUtils.readField(privatelyShadowedChild, "b")); assertThrows(IllegalArgumentException.class, () -> FieldUtils.readField(publicChild, "i")); assertEquals(I1, FieldUtils.readField(publiclyShadowedChild, "i")); assertThrows(IllegalArgumentException.class, () -> FieldUtils.readField(privatelyShadowedChild, "i")); diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java index 4182b27ff..b93ce6685 100644 --- a/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java +++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java @@ -451,7 +451,7 @@ public class StrBuilderAppendInsertTest extends AbstractLangTest { sb.append(new StringBuilder("abcbardef"), 3, 3); assertEquals("foobar", sb.toString()); - sb.append( new StringBuilder("abcbardef"), 4, 3); + sb.append(new StringBuilder("abcbardef"), 4, 3); assertEquals("foobarard", sb.toString()); } diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java index 2d7cddb05..e963e7ad1 100644 --- a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java +++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java @@ -708,7 +708,7 @@ public class StrBuilderTest extends AbstractLangTest { } @Test - public void testGetChars ( ) { + public void testGetChars () { final StrBuilder sb = new StrBuilder(); char[] input = new char[10]; @@ -736,7 +736,7 @@ public class StrBuilderTest extends AbstractLangTest { } @Test - public void testGetCharsIntIntCharArrayInt( ) { + public void testGetCharsIntIntCharArrayInt() { final StrBuilder sb = new StrBuilder(); sb.append("junit"); diff --git a/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java b/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java index 0c509efb8..a31f70078 100644 --- a/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java @@ -40,12 +40,12 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals("", WordUtils.capitalize("")); assertEquals(" ", WordUtils.capitalize(" ")); - assertEquals("I", WordUtils.capitalize("I") ); - assertEquals("I", WordUtils.capitalize("i") ); - assertEquals("I Am Here 123", WordUtils.capitalize("i am here 123") ); - assertEquals("I Am Here 123", WordUtils.capitalize("I Am Here 123") ); - assertEquals("I Am HERE 123", WordUtils.capitalize("i am HERE 123") ); - assertEquals("I AM HERE 123", WordUtils.capitalize("I AM HERE 123") ); + assertEquals("I", WordUtils.capitalize("I")); + assertEquals("I", WordUtils.capitalize("i")); + assertEquals("I Am Here 123", WordUtils.capitalize("i am here 123")); + assertEquals("I Am Here 123", WordUtils.capitalize("I Am Here 123")); + assertEquals("I Am HERE 123", WordUtils.capitalize("i am HERE 123")); + assertEquals("I AM HERE 123", WordUtils.capitalize("I AM HERE 123")); } @Test @@ -54,12 +54,12 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals("", WordUtils.capitalizeFully("")); assertEquals(" ", WordUtils.capitalizeFully(" ")); - assertEquals("I", WordUtils.capitalizeFully("I") ); - assertEquals("I", WordUtils.capitalizeFully("i") ); - assertEquals("I Am Here 123", WordUtils.capitalizeFully("i am here 123") ); - assertEquals("I Am Here 123", WordUtils.capitalizeFully("I Am Here 123") ); - assertEquals("I Am Here 123", WordUtils.capitalizeFully("i am HERE 123") ); - assertEquals("I Am Here 123", WordUtils.capitalizeFully("I AM HERE 123") ); + assertEquals("I", WordUtils.capitalizeFully("I")); + assertEquals("I", WordUtils.capitalizeFully("i")); + assertEquals("I Am Here 123", WordUtils.capitalizeFully("i am here 123")); + assertEquals("I Am Here 123", WordUtils.capitalizeFully("I Am Here 123")); + assertEquals("I Am Here 123", WordUtils.capitalizeFully("i am HERE 123")); + assertEquals("I Am Here 123", WordUtils.capitalizeFully("I AM HERE 123")); } @Test @@ -69,15 +69,15 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals(" ", WordUtils.capitalizeFully(" ")); char[] chars = { '-', '+', ' ', '@' }; - assertEquals("I", WordUtils.capitalizeFully("I", chars) ); - assertEquals("I", WordUtils.capitalizeFully("i", chars) ); - assertEquals("I-Am Here+123", WordUtils.capitalizeFully("i-am here+123", chars) ); - assertEquals("I Am+Here-123", WordUtils.capitalizeFully("I Am+Here-123", chars) ); - assertEquals("I+Am-Here 123", WordUtils.capitalizeFully("i+am-HERE 123", chars) ); - assertEquals("I-Am Here+123", WordUtils.capitalizeFully("I-AM HERE+123", chars) ); + assertEquals("I", WordUtils.capitalizeFully("I", chars)); + assertEquals("I", WordUtils.capitalizeFully("i", chars)); + assertEquals("I-Am Here+123", WordUtils.capitalizeFully("i-am here+123", chars)); + assertEquals("I Am+Here-123", WordUtils.capitalizeFully("I Am+Here-123", chars)); + assertEquals("I+Am-Here 123", WordUtils.capitalizeFully("i+am-HERE 123", chars)); + assertEquals("I-Am Here+123", WordUtils.capitalizeFully("I-AM HERE+123", chars)); chars = new char[] {'.'}; - assertEquals("I am.Fine", WordUtils.capitalizeFully("i aM.fine", chars) ); - assertEquals("I Am.fine", WordUtils.capitalizeFully("i am.fine", null) ); + assertEquals("I am.Fine", WordUtils.capitalizeFully("i aM.fine", chars)); + assertEquals("I Am.fine", WordUtils.capitalizeFully("i am.fine", null)); } @Test @@ -87,15 +87,15 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals(" ", WordUtils.capitalize(" ")); char[] chars = { '-', '+', ' ', '@' }; - assertEquals("I", WordUtils.capitalize("I", chars) ); - assertEquals("I", WordUtils.capitalize("i", chars) ); - assertEquals("I-Am Here+123", WordUtils.capitalize("i-am here+123", chars) ); - assertEquals("I Am+Here-123", WordUtils.capitalize("I Am+Here-123", chars) ); - assertEquals("I+Am-HERE 123", WordUtils.capitalize("i+am-HERE 123", chars) ); - assertEquals("I-AM HERE+123", WordUtils.capitalize("I-AM HERE+123", chars) ); + assertEquals("I", WordUtils.capitalize("I", chars)); + assertEquals("I", WordUtils.capitalize("i", chars)); + assertEquals("I-Am Here+123", WordUtils.capitalize("i-am here+123", chars)); + assertEquals("I Am+Here-123", WordUtils.capitalize("I Am+Here-123", chars)); + assertEquals("I+Am-HERE 123", WordUtils.capitalize("i+am-HERE 123", chars)); + assertEquals("I-AM HERE+123", WordUtils.capitalize("I-AM HERE+123", chars)); chars = new char[] {'.'}; - assertEquals("I aM.Fine", WordUtils.capitalize("i aM.fine", chars) ); - assertEquals("I Am.fine", WordUtils.capitalize("i am.fine", null) ); + assertEquals("I aM.Fine", WordUtils.capitalize("i aM.fine", chars)); + assertEquals("I Am.fine", WordUtils.capitalize("i am.fine", null)); } @Test @@ -249,12 +249,12 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals("", WordUtils.swapCase("")); assertEquals(" ", WordUtils.swapCase(" ")); - assertEquals("i", WordUtils.swapCase("I") ); - assertEquals("I", WordUtils.swapCase("i") ); - assertEquals("I AM HERE 123", WordUtils.swapCase("i am here 123") ); - assertEquals("i aM hERE 123", WordUtils.swapCase("I Am Here 123") ); - assertEquals("I AM here 123", WordUtils.swapCase("i am HERE 123") ); - assertEquals("i am here 123", WordUtils.swapCase("I AM HERE 123") ); + assertEquals("i", WordUtils.swapCase("I")); + assertEquals("I", WordUtils.swapCase("i")); + assertEquals("I AM HERE 123", WordUtils.swapCase("i am here 123")); + assertEquals("i aM hERE 123", WordUtils.swapCase("I Am Here 123")); + assertEquals("I AM here 123", WordUtils.swapCase("i am HERE 123")); + assertEquals("i am here 123", WordUtils.swapCase("I AM HERE 123")); final String test = "This String contains a TitleCase character: \u01C8"; final String expect = "tHIS sTRING CONTAINS A tITLEcASE CHARACTER: \u01C9"; @@ -267,12 +267,12 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals("", WordUtils.uncapitalize("")); assertEquals(" ", WordUtils.uncapitalize(" ")); - assertEquals("i", WordUtils.uncapitalize("I") ); - assertEquals("i", WordUtils.uncapitalize("i") ); - assertEquals("i am here 123", WordUtils.uncapitalize("i am here 123") ); - assertEquals("i am here 123", WordUtils.uncapitalize("I Am Here 123") ); - assertEquals("i am hERE 123", WordUtils.uncapitalize("i am HERE 123") ); - assertEquals("i aM hERE 123", WordUtils.uncapitalize("I AM HERE 123") ); + assertEquals("i", WordUtils.uncapitalize("I")); + assertEquals("i", WordUtils.uncapitalize("i")); + assertEquals("i am here 123", WordUtils.uncapitalize("i am here 123")); + assertEquals("i am here 123", WordUtils.uncapitalize("I Am Here 123")); + assertEquals("i am hERE 123", WordUtils.uncapitalize("i am HERE 123")); + assertEquals("i aM hERE 123", WordUtils.uncapitalize("I AM HERE 123")); } @Test @@ -282,15 +282,15 @@ public class WordUtilsTest extends AbstractLangTest { assertEquals(" ", WordUtils.uncapitalize(" ")); char[] chars = { '-', '+', ' ', '@' }; - assertEquals("i", WordUtils.uncapitalize("I", chars) ); - assertEquals("i", WordUtils.uncapitalize("i", chars) ); - assertEquals("i am-here+123", WordUtils.uncapitalize("i am-here+123", chars) ); - assertEquals("i+am here-123", WordUtils.uncapitalize("I+Am Here-123", chars) ); - assertEquals("i-am+hERE 123", WordUtils.uncapitalize("i-am+HERE 123", chars) ); - assertEquals("i aM-hERE+123", WordUtils.uncapitalize("I AM-HERE+123", chars) ); + assertEquals("i", WordUtils.uncapitalize("I", chars)); + assertEquals("i", WordUtils.uncapitalize("i", chars)); + assertEquals("i am-here+123", WordUtils.uncapitalize("i am-here+123", chars)); + assertEquals("i+am here-123", WordUtils.uncapitalize("I+Am Here-123", chars)); + assertEquals("i-am+hERE 123", WordUtils.uncapitalize("i-am+HERE 123", chars)); + assertEquals("i aM-hERE+123", WordUtils.uncapitalize("I AM-HERE+123", chars)); chars = new char[] {'.'}; - assertEquals("i AM.fINE", WordUtils.uncapitalize("I AM.FINE", chars) ); - assertEquals("i aM.FINE", WordUtils.uncapitalize("I AM.FINE", null) ); + assertEquals("i AM.fINE", WordUtils.uncapitalize("I AM.FINE", chars)); + assertEquals("i aM.FINE", WordUtils.uncapitalize("I AM.FINE", null)); } @Test diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java index 31bf1db26..a627844cd 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java @@ -55,54 +55,54 @@ public class FastDateParserSDFTest extends AbstractLangTest { Arguments.of("z yyyy", "-12:34 2010", Locale.UK, false), Arguments.of("z yyyy", "-123 2010", Locale.UK, false), // year tests - Arguments.of( "MM/dd/yyyy", "01/11/12", Locale.UK, true), - Arguments.of( "MM/dd/yy", "01/11/12", Locale.UK, true), + Arguments.of("MM/dd/yyyy", "01/11/12", Locale.UK, true), + Arguments.of("MM/dd/yy", "01/11/12", Locale.UK, true), // LANG-1089 - Arguments.of( "HH", "00", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "00", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "00", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "00", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "01", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "01", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "01", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "01", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "11", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "11", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "11", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "11", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "12", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "12", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "12", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "12", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "13", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "13", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "13", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "13", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "23", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "23", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "23", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "23", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "24", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "24", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "24", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "24", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "25", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "25", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "25", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "25", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 - - Arguments.of( "HH", "48", Locale.UK, true), // Hour in day (0-23) - Arguments.of( "KK", "48", Locale.UK, true), // Hour in am/pm (0-11) - Arguments.of( "hh", "48", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 - Arguments.of( "kk", "48", Locale.UK, true) // Hour in day (1-24), i.e. midnight is 24, not 0 + Arguments.of("HH", "00", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "00", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "00", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "00", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "01", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "01", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "01", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "01", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "11", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "11", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "11", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "11", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "12", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "12", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "12", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "12", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "13", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "13", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "13", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "13", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "23", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "23", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "23", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "23", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "24", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "24", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "24", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "24", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "25", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "25", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "25", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "25", Locale.UK, true), // Hour in day (1-24), i.e. midnight is 24, not 0 + + Arguments.of("HH", "48", Locale.UK, true), // Hour in day (0-23) + Arguments.of("KK", "48", Locale.UK, true), // Hour in am/pm (0-11) + Arguments.of("hh", "48", Locale.UK, true), // Hour in am/pm (1-12), i.e. midday/midnight is 12, not 0 + Arguments.of("kk", "48", Locale.UK, true) // Hour in day (1-24), i.e. midnight is 24, not 0 ); // @formatter:on } diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParser_MoreOrLessTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParser_MoreOrLessTest.java index 6895de0ed..8cd9061d9 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParser_MoreOrLessTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParser_MoreOrLessTest.java @@ -96,7 +96,7 @@ public class FastDateParser_MoreOrLessTest extends AbstractLangTest { assertEquals(input.length(), parsePosition.getIndex()); parsePosition.setIndex(0); - assertNull(parser.parse( "Thorsday, 03/23/61", parsePosition)); + assertNull(parser.parse("Thorsday, 03/23/61", parsePosition)); assertEquals(0, parsePosition.getErrorIndex()); } @@ -110,7 +110,7 @@ public class FastDateParser_MoreOrLessTest extends AbstractLangTest { assertEquals(input.length(), parsePosition.getIndex()); parsePosition.setIndex(0); - assertNull(parser.parse( "11:23 Pacific Standard ", parsePosition)); + assertNull(parser.parse("11:23 Pacific Standard ", parsePosition)); assertEquals(6, parsePosition.getErrorIndex()); } } diff --git a/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java b/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java index 5f7cabc21..1bbb9c361 100644 --- a/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java +++ b/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java @@ -33,24 +33,26 @@ import org.junit.jupiter.params.provider.MethodSource; public class WeekYearTest extends AbstractLangTest { public static Stream<Arguments> data() { + // @formatter:off return Stream.of( - Arguments.of(new GregorianCalendar( 2005, Calendar.JANUARY, 1), "2004-W53-6"), - Arguments.of(new GregorianCalendar( 2005, Calendar.JANUARY, 2), "2004-W53-7"), - Arguments.of(new GregorianCalendar( 2005, Calendar.DECEMBER, 31), "2005-W52-6"), - Arguments.of(new GregorianCalendar( 2007, Calendar.JANUARY, 1), "2007-W01-1"), - Arguments.of(new GregorianCalendar( 2007, Calendar.DECEMBER, 30), "2007-W52-7"), - Arguments.of(new GregorianCalendar( 2007, Calendar.DECEMBER, 31), "2008-W01-1"), - Arguments.of(new GregorianCalendar( 2008, Calendar.JANUARY, 1), "2008-W01-2"), - Arguments.of(new GregorianCalendar( 2008, Calendar.DECEMBER, 28), "2008-W52-7"), - Arguments.of(new GregorianCalendar( 2008, Calendar.DECEMBER, 29), "2009-W01-1"), - Arguments.of(new GregorianCalendar( 2008, Calendar.DECEMBER, 30), "2009-W01-2"), - Arguments.of(new GregorianCalendar( 2008, Calendar.DECEMBER, 31), "2009-W01-3"), - Arguments.of(new GregorianCalendar( 2009, Calendar.JANUARY, 1), "2009-W01-4"), - Arguments.of(new GregorianCalendar( 2009, Calendar.DECEMBER, 31), "2009-W53-4"), - Arguments.of(new GregorianCalendar( 2010, Calendar.JANUARY, 1), "2009-W53-5"), - Arguments.of(new GregorianCalendar( 2010, Calendar.JANUARY, 2), "2009-W53-6"), - Arguments.of(new GregorianCalendar( 2010, Calendar.JANUARY, 3), "2009-W53-7") + Arguments.of(new GregorianCalendar(2005, Calendar.JANUARY, 1), "2004-W53-6"), + Arguments.of(new GregorianCalendar(2005, Calendar.JANUARY, 2), "2004-W53-7"), + Arguments.of(new GregorianCalendar(2005, Calendar.DECEMBER, 31), "2005-W52-6"), + Arguments.of(new GregorianCalendar(2007, Calendar.JANUARY, 1), "2007-W01-1"), + Arguments.of(new GregorianCalendar(2007, Calendar.DECEMBER, 30), "2007-W52-7"), + Arguments.of(new GregorianCalendar(2007, Calendar.DECEMBER, 31), "2008-W01-1"), + Arguments.of(new GregorianCalendar(2008, Calendar.JANUARY, 1), "2008-W01-2"), + Arguments.of(new GregorianCalendar(2008, Calendar.DECEMBER, 28), "2008-W52-7"), + Arguments.of(new GregorianCalendar(2008, Calendar.DECEMBER, 29), "2009-W01-1"), + Arguments.of(new GregorianCalendar(2008, Calendar.DECEMBER, 30), "2009-W01-2"), + Arguments.of(new GregorianCalendar(2008, Calendar.DECEMBER, 31), "2009-W01-3"), + Arguments.of(new GregorianCalendar(2009, Calendar.JANUARY, 1), "2009-W01-4"), + Arguments.of(new GregorianCalendar(2009, Calendar.DECEMBER, 31), "2009-W53-4"), + Arguments.of(new GregorianCalendar(2010, Calendar.JANUARY, 1), "2009-W53-5"), + Arguments.of(new GregorianCalendar(2010, Calendar.JANUARY, 2), "2009-W53-6"), + Arguments.of(new GregorianCalendar(2010, Calendar.JANUARY, 3), "2009-W53-7") ); + // @formatter:on } @ParameterizedTest
