Repository: commons-lang Updated Branches: refs/heads/master aadb9a31e -> eb2b89efb
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java ---------------------------------------------------------------------- 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 bb30e2a..43464ed 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserSDFTest.java @@ -161,7 +161,7 @@ public class FastDateParserSDFTest { // Error in test data throw new RuntimeException("Test data error: expected SDF parse to fail, but got " + expectedTime); } - } catch (ParseException e) { + } catch (final ParseException e) { if (valid) { // Error in test data throw new RuntimeException("Test data error: expected SDF parse to succeed, but got " + e); @@ -176,7 +176,7 @@ public class FastDateParserSDFTest { // failure in test fail("Expected FDP parse to fail, but got " + actualTime); } - } catch (ParseException e) { + } catch (final ParseException e) { if (valid) { // failure in test fail("Expected FDP parse to succeed, but got " + e); @@ -194,8 +194,8 @@ public class FastDateParserSDFTest { sdf.setTimeZone(timeZone); final DateParser fdf = new FastDateParser(format, timeZone, locale); - ParsePosition sdfP = new ParsePosition(0); - Date expectedTime = sdf.parse(formattedDate, sdfP); + final ParsePosition sdfP = new ParsePosition(0); + final Date expectedTime = sdf.parse(formattedDate, sdfP); final int sdferrorIndex = sdfP.getErrorIndex(); if (valid) { assertEquals("Expected SDF error index -1 ", -1, sdferrorIndex); @@ -213,7 +213,7 @@ public class FastDateParserSDFTest { } final ParsePosition fdfP = new ParsePosition(0); - Date actualTime = fdf.parse(formattedDate, fdfP); + final Date actualTime = fdf.parse(formattedDate, fdfP); final int fdferrorIndex = fdfP.getErrorIndex(); if (valid) { assertEquals("Expected FDF error index -1 ", -1, fdferrorIndex); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java index 1c37445..c334f36 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java @@ -612,7 +612,7 @@ public class FastDateParserTest { } private static Calendar initializeCalendar(final TimeZone tz) { - Calendar cal = Calendar.getInstance(tz); + final Calendar cal = Calendar.getInstance(tz); cal.set(Calendar.YEAR, 2001); cal.set(Calendar.MONTH, 1); // not daylight savings cal.set(Calendar.DAY_OF_MONTH, 4); @@ -645,13 +645,13 @@ public class FastDateParserTest { @Test public void test1806() throws ParseException { - String formatStub = "yyyy-MM-dd'T'HH:mm:ss.SSS"; - String dateStub = "2001-02-04T12:08:56.235"; + final String formatStub = "yyyy-MM-dd'T'HH:mm:ss.SSS"; + final String dateStub = "2001-02-04T12:08:56.235"; - for (Expected1806 trial : Expected1806.values()) { - Calendar cal = initializeCalendar(trial.zone); + for (final Expected1806 trial : Expected1806.values()) { + final Calendar cal = initializeCalendar(trial.zone); - String message = trial.zone.getDisplayName()+";"; + final String message = trial.zone.getDisplayName()+";"; DateParser parser = getInstance(formatStub+"X", trial.zone); assertEquals(message+trial.one, cal.getTime().getTime(), parser.parse(dateStub+trial.one).getTime()-trial.offset); @@ -666,13 +666,13 @@ public class FastDateParserTest { @Test public void testLang1121() throws ParseException { - TimeZone kst = TimeZone.getTimeZone("KST"); + final TimeZone kst = TimeZone.getTimeZone("KST"); final DateParser fdp = getInstance("yyyyMMdd", kst, Locale.KOREA); try { fdp.parse("2015"); Assert.fail("expected parse exception"); - } catch (ParseException pe) { + } catch (final ParseException pe) { } // Wed Apr 29 00:00:00 KST 2015 @@ -683,7 +683,7 @@ public class FastDateParserTest { Date expected = cal.getTime(); Assert.assertEquals(expected, actual); - SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd", Locale.KOREA); + final SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd", Locale.KOREA); df.setTimeZone(kst); expected = df.parse("20150429113100"); @@ -694,7 +694,7 @@ public class FastDateParserTest { @Test public void testParseOffset() throws ParseException { - DateParser parser = getInstance(YMD_SLASH); + final DateParser parser = getInstance(YMD_SLASH); final Date date = parser.parse("Today is 2015/07/04", new ParsePosition(9)); final Calendar cal = Calendar.getInstance(); @@ -706,7 +706,7 @@ public class FastDateParserTest { @Test public void testDayNumberOfWeek() throws ParseException { final DateParser parser = getInstance("u"); - Calendar calendar = Calendar.getInstance(); + final Calendar calendar = Calendar.getInstance(); calendar.setTime(parser.parse("1")); Assert.assertEquals(Calendar.MONDAY, calendar.get(Calendar.DAY_OF_WEEK)); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/FastDateParser_MoreOrLessTest.java ---------------------------------------------------------------------- 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 15b8817..2b7c414 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 @@ -32,9 +32,9 @@ public class FastDateParser_MoreOrLessTest { @Test public void testInputHasPrecedingCharacters() throws ParseException { - FastDateParser parser = new FastDateParser("MM/dd", TimeZone.getDefault(), Locale.getDefault()); - ParsePosition parsePosition = new ParsePosition(0); - Date date = parser.parse("A 3/23/61", parsePosition); + final FastDateParser parser = new FastDateParser("MM/dd", TimeZone.getDefault(), Locale.getDefault()); + final ParsePosition parsePosition = new ParsePosition(0); + final Date date = parser.parse("A 3/23/61", parsePosition); Assert.assertNull(date); Assert.assertEquals(0, parsePosition.getIndex()); Assert.assertEquals(0, parsePosition.getErrorIndex()); @@ -42,13 +42,13 @@ public class FastDateParser_MoreOrLessTest { @Test public void testInputHasWhitespace() throws ParseException { - FastDateParser parser = new FastDateParser("M/d/y", TimeZone.getDefault(), Locale.getDefault()); + final FastDateParser parser = new FastDateParser("M/d/y", TimeZone.getDefault(), Locale.getDefault()); //SimpleDateFormat parser = new SimpleDateFormat("M/d/y"); - ParsePosition parsePosition = new ParsePosition(0); - Date date = parser.parse(" 3/ 23/ 1961", parsePosition); + final ParsePosition parsePosition = new ParsePosition(0); + final Date date = parser.parse(" 3/ 23/ 1961", parsePosition); Assert.assertEquals(12, parsePosition.getIndex()); - Calendar calendar = Calendar.getInstance(); + final Calendar calendar = Calendar.getInstance(); calendar.setTime(date); Assert.assertEquals(1961, calendar.get(Calendar.YEAR)); Assert.assertEquals(2, calendar.get(Calendar.MONTH)); @@ -57,12 +57,12 @@ public class FastDateParser_MoreOrLessTest { @Test public void testInputHasMoreCharacters() throws ParseException { - FastDateParser parser = new FastDateParser("MM/dd", TimeZone.getDefault(), Locale.getDefault()); - ParsePosition parsePosition = new ParsePosition(0); - Date date = parser.parse("3/23/61", parsePosition); + final FastDateParser parser = new FastDateParser("MM/dd", TimeZone.getDefault(), Locale.getDefault()); + final ParsePosition parsePosition = new ParsePosition(0); + final Date date = parser.parse("3/23/61", parsePosition); Assert.assertEquals(4, parsePosition.getIndex()); - Calendar calendar = Calendar.getInstance(); + final Calendar calendar = Calendar.getInstance(); calendar.setTime(date); Assert.assertEquals(2, calendar.get(Calendar.MONTH)); Assert.assertEquals(23, calendar.get(Calendar.DATE)); @@ -70,26 +70,26 @@ public class FastDateParser_MoreOrLessTest { @Test public void testInputHasWrongCharacters() { - FastDateParser parser = new FastDateParser("MM-dd-yyy", TimeZone.getDefault(), Locale.getDefault()); - ParsePosition parsePosition = new ParsePosition(0); + final FastDateParser parser = new FastDateParser("MM-dd-yyy", TimeZone.getDefault(), Locale.getDefault()); + final ParsePosition parsePosition = new ParsePosition(0); Assert.assertNull(parser.parse("03/23/1961", parsePosition)); Assert.assertEquals(2, parsePosition.getErrorIndex()); } @Test public void testInputHasLessCharacters() { - FastDateParser parser = new FastDateParser("MM/dd/yyy", TimeZone.getDefault(), Locale.getDefault()); - ParsePosition parsePosition = new ParsePosition(0); + final FastDateParser parser = new FastDateParser("MM/dd/yyy", TimeZone.getDefault(), Locale.getDefault()); + final ParsePosition parsePosition = new ParsePosition(0); Assert.assertNull(parser.parse("03/23", parsePosition)); Assert.assertEquals(5, parsePosition.getErrorIndex()); } @Test public void testInputHasWrongTimeZone() { - FastDateParser parser = new FastDateParser("mm:ss z", NEW_YORK, Locale.US); + final FastDateParser parser = new FastDateParser("mm:ss z", NEW_YORK, Locale.US); - String input = "11:23 Pacific Standard Time"; - ParsePosition parsePosition = new ParsePosition(0); + final String input = "11:23 Pacific Standard Time"; + final ParsePosition parsePosition = new ParsePosition(0); Assert.assertNotNull(parser.parse(input, parsePosition)); Assert.assertEquals(input.length(), parsePosition.getIndex()); @@ -100,9 +100,9 @@ public class FastDateParser_MoreOrLessTest { @Test public void testInputHasWrongDay() throws ParseException { - FastDateParser parser = new FastDateParser("EEEE, MM/dd/yyy", NEW_YORK, Locale.US); - String input = "Thursday, 03/23/61"; - ParsePosition parsePosition = new ParsePosition(0); + final FastDateParser parser = new FastDateParser("EEEE, MM/dd/yyy", NEW_YORK, Locale.US); + final String input = "Thursday, 03/23/61"; + final ParsePosition parsePosition = new ParsePosition(0); Assert.assertNotNull(parser.parse(input, parsePosition)); Assert.assertEquals(input.length(), parsePosition.getIndex()); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java index 2ed0c7f..ecb876b 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java @@ -41,7 +41,7 @@ public class FastDateParser_TimeZoneStrategyTest { try { parser.parse(tzDisplay); } - catch(Exception ex) { + catch(final Exception ex) { Assert.fail("'" + tzDisplay + "'" + " Locale: '" + locale.getDisplayName() + "'" + " TimeZone: " + zone[0] @@ -57,10 +57,10 @@ public class FastDateParser_TimeZoneStrategyTest { @Test public void testLang1219() throws ParseException { - FastDateParser parser = new FastDateParser("dd.MM.yyyy HH:mm:ss z", TimeZone.getDefault(), Locale.GERMAN); + final FastDateParser parser = new FastDateParser("dd.MM.yyyy HH:mm:ss z", TimeZone.getDefault(), Locale.GERMAN); - Date summer = parser.parse("26.10.2014 02:00:00 MESZ"); - Date standard = parser.parse("26.10.2014 02:00:00 MEZ"); + final Date summer = parser.parse("26.10.2014 02:00:00 MESZ"); + final Date standard = parser.parse("26.10.2014 02:00:00 MEZ"); Assert.assertNotEquals(summer.getTime(), standard.getTime()); } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java index e862766..fa8836e 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java @@ -265,19 +265,19 @@ public class FastDatePrinterTest { @SystemDefaults(timezone="UTC") @Test public void testTimeZoneAsZ() throws Exception { - Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - FastDateFormat noColonFormat = FastDateFormat.getInstance("Z"); + final Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + final FastDateFormat noColonFormat = FastDateFormat.getInstance("Z"); assertEquals("+0000", noColonFormat.format(c)); - FastDateFormat isoFormat = FastDateFormat.getInstance("ZZ"); + final FastDateFormat isoFormat = FastDateFormat.getInstance("ZZ"); assertEquals("Z", isoFormat.format(c)); - FastDateFormat colonFormat = FastDateFormat.getInstance("ZZZ"); + final FastDateFormat colonFormat = FastDateFormat.getInstance("ZZZ"); assertEquals("+00:00", colonFormat.format(c)); } private static Calendar initializeCalendar(final TimeZone tz) { - Calendar cal = Calendar.getInstance(tz); + final Calendar cal = Calendar.getInstance(tz); cal.set(Calendar.YEAR, 2001); cal.set(Calendar.MONTH, 1); // not daylight savings cal.set(Calendar.DAY_OF_MONTH, 4); @@ -312,8 +312,8 @@ public class FastDatePrinterTest { @Test public void test1806() throws ParseException { - for (Expected1806 trial : Expected1806.values()) { - Calendar cal = initializeCalendar(trial.zone); + for (final Expected1806 trial : Expected1806.values()) { + final Calendar cal = initializeCalendar(trial.zone); DatePrinter printer = getInstance("X", trial.zone); assertEquals(trial.one, printer.format(cal)); @@ -328,7 +328,7 @@ public class FastDatePrinterTest { @Test public void testLang1103() throws ParseException { - Calendar cal = Calendar.getInstance(SWEDEN); + final Calendar cal = Calendar.getInstance(SWEDEN); cal.set(Calendar.DAY_OF_MONTH, 2); assertEquals("2", getInstance("d", SWEDEN).format(cal)); @@ -347,30 +347,30 @@ public class FastDatePrinterTest { @Test public void testLang916() throws Exception { - Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("Europe/Paris")); + final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("Europe/Paris")); cal.clear(); cal.set(2009, 9, 16, 8, 42, 16); // calendar fast. { - String value = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss Z", TimeZone.getTimeZone("Europe/Paris")).format(cal); + final String value = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss Z", TimeZone.getTimeZone("Europe/Paris")).format(cal); assertEquals("calendar", "2009-10-16T08:42:16 +0200", value); } { - String value = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss Z", TimeZone.getTimeZone("Asia/Kolkata")).format(cal); + final String value = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss Z", TimeZone.getTimeZone("Asia/Kolkata")).format(cal); assertEquals("calendar", "2009-10-16T12:12:16 +0530", value); } { - String value = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss Z", TimeZone.getTimeZone("Europe/London")).format(cal); + final String value = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss Z", TimeZone.getTimeZone("Europe/London")).format(cal); assertEquals("calendar", "2009-10-16T07:42:16 +0100", value); } } @Test public void testHourFormats() { - Calendar calendar = Calendar.getInstance(); + final Calendar calendar = Calendar.getInstance(); calendar.clear(); - DatePrinter printer = getInstance("K k H h"); + final DatePrinter printer = getInstance("K k H h"); calendar.set(Calendar.HOUR_OF_DAY, 0); assertEquals("0 24 0 12", printer.format(calendar)); @@ -386,20 +386,20 @@ public class FastDatePrinterTest { @Test public void testStringBufferOptions() { final DatePrinter format = getInstance("yyyy-MM-dd HH:mm:ss.SSS Z", TimeZone.getTimeZone("GMT")); - Calendar calendar = Calendar.getInstance(); - StringBuffer sb = new StringBuffer(); - String expected = format.format(calendar, sb, new FieldPosition(0)).toString(); + final Calendar calendar = Calendar.getInstance(); + final StringBuffer sb = new StringBuffer(); + final String expected = format.format(calendar, sb, new FieldPosition(0)).toString(); sb.setLength(0); assertEquals(expected, format.format(calendar, sb).toString()); sb.setLength(0); - Date date = calendar.getTime(); + final Date date = calendar.getTime(); assertEquals(expected, format.format(date, sb, new FieldPosition(0)).toString()); sb.setLength(0); assertEquals(expected, format.format(date, sb).toString()); sb.setLength(0); - long epoch = date.getTime(); + final long epoch = date.getTime(); assertEquals(expected, format.format(epoch, sb, new FieldPosition(0)).toString()); sb.setLength(0); assertEquals(expected, format.format(epoch, sb).toString()); @@ -408,23 +408,23 @@ public class FastDatePrinterTest { @Test public void testAppendableOptions() { final DatePrinter format = getInstance("yyyy-MM-dd HH:mm:ss.SSS Z", TimeZone.getTimeZone("GMT")); - Calendar calendar = Calendar.getInstance(); - StringBuilder sb = new StringBuilder(); - String expected = format.format(calendar, sb).toString(); + final Calendar calendar = Calendar.getInstance(); + final StringBuilder sb = new StringBuilder(); + final String expected = format.format(calendar, sb).toString(); sb.setLength(0); - Date date = calendar.getTime(); + final Date date = calendar.getTime(); assertEquals(expected, format.format(date, sb).toString()); sb.setLength(0); - long epoch = date.getTime(); + final long epoch = date.getTime(); assertEquals(expected, format.format(epoch, sb).toString()); } @Test public void testDayNumberOfWeek() { final DatePrinter printer = getInstance("u"); - Calendar calendar = Calendar.getInstance(); + final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); assertEquals("1", printer.format(calendar.getTime())); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTimeZonesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTimeZonesTest.java b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTimeZonesTest.java index bac2556..7898371 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTimeZonesTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTimeZonesTest.java @@ -37,8 +37,8 @@ public class FastDatePrinterTimeZonesTest { @Parameterized.Parameters public static Collection<TimeZone> data() { final String[] zoneIds = TimeZone.getAvailableIDs(); - List<TimeZone> timeZones = new ArrayList<>(); - for (String zoneId : zoneIds) { + final List<TimeZone> timeZones = new ArrayList<>(); + for (final String zoneId : zoneIds) { timeZones.add(TimeZone.getTimeZone(zoneId)); } return timeZones; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java b/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java index b7b4809..eefe2b3 100644 --- a/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java +++ b/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java @@ -295,7 +295,7 @@ public class StopWatchTest { final long currentNanos = System.nanoTime(); FieldUtils.writeField(watch, "startTime", currentNanos - nanos, true); FieldUtils.writeField(watch, "stopTime", currentNanos, true); - } catch (IllegalAccessException e) { + } catch (final IllegalAccessException e) { return null; } return watch; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/eb2b89ef/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java ---------------------------------------------------------------------- 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 de93208..ba7e3f7 100644 --- a/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java +++ b/src/test/java/org/apache/commons/lang3/time/WeekYearTest.java @@ -69,7 +69,7 @@ public class WeekYearTest { public void testParser() throws ParseException { final DateParser parser = new FastDateParser("YYYY-'W'ww-u", TimeZone.getDefault(), Locale.getDefault()); - Calendar cal = Calendar.getInstance(); + final Calendar cal = Calendar.getInstance(); cal.setMinimalDaysInFirstWeek(4); cal.setFirstDayOfWeek(Calendar.MONDAY); cal.clear();
