From 068a21f32ad75396a27f7e6181f28ad8aa302f36 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Sat, 24 Mar 2018 10:17:26 +0200 Subject: [PATCH] formatting, dst error --- .../dst/DaylightSavingTimeExamplesTest.java | 81 +++++++++---------- ...aylightSavingTimeJavaTimeExamplesTest.java | 67 ++++++++------- 2 files changed, 73 insertions(+), 75 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesTest.java b/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesTest.java index 544f120b55..46f0af6fcd 100644 --- a/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesTest.java +++ b/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesTest.java @@ -14,47 +14,46 @@ import org.junit.Test; public class DaylightSavingTimeExamplesTest { - @Test - public void givenItalianTimeZone_WhenDSTHappens_ThenCorrectlyShiftTimeZone() throws ParseException { - TimeZone tz = TimeZone.getTimeZone("Europe/Rome"); - Calendar cal = Calendar.getInstance(tz, Locale.ITALIAN); - DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ITALIAN); - Date dateBeforeDST = df.parse("2018-03-25 01:55"); - prettyPrint(cal.getTimeZone()); - - cal.setTime(dateBeforeDST); - System.out.println("Before DST (00:55 UTC - 01:55 GMT+1) = " + dateBeforeDST); - System.out.println("With this Calendar " + (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / (60 * 1000) + " minutes must be added to UTC (GMT TimeZone) to get a correct date for this TimeZone\n"); - assertThat(cal.get(Calendar.ZONE_OFFSET)).isEqualTo(3600000); - assertThat(cal.get(Calendar.DST_OFFSET)).isEqualTo(0); + @Test + public void givenItalianTimeZone_WhenDSTHappens_ThenCorrectlyShiftTimeZone() throws ParseException { + TimeZone tz = TimeZone.getTimeZone("Europe/Rome"); + Calendar cal = Calendar.getInstance(tz, Locale.ITALIAN); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ITALIAN); + df.setTimeZone(tz); + Date dateBeforeDST = df.parse("2018-03-25 01:55"); + prettyPrint(cal.getTimeZone()); - cal.add(Calendar.MINUTE, 10); - - Date dateAfterDST = cal.getTime(); - System.out.println(" After DST (01:05 UTC - 03:05 GMT+2) = " + dateAfterDST); - System.out.println("With this Calendar " + (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / (60 * 1000) + " minutes must be added to UTC (GMT TimeZone) to get a correct date for this TimeZone\n"); - assertThat(cal.get(Calendar.DST_OFFSET)).isEqualTo(3600000); - assertThat(dateAfterDST).isEqualTo(df.parse("2018-03-25 03:05")); - - Long deltaBetweenDatesInMillis = dateAfterDST.getTime() - dateBeforeDST.getTime(); - Long tenMinutesInMillis = (1000L * 60 * 10); - assertThat(deltaBetweenDatesInMillis).isEqualTo(tenMinutesInMillis); - } + cal.setTime(dateBeforeDST); + System.out.println("Before DST (00:55 UTC - 01:55 GMT+1) = " + dateBeforeDST); + + System.out.println("With this Calendar " + (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / (60 * 1000) + " minutes must be added to UTC (GMT TimeZone) to get a correct date for this TimeZone\n"); + assertThat(cal.get(Calendar.ZONE_OFFSET)).isEqualTo(3600000); + assertThat(cal.get(Calendar.DST_OFFSET)).isEqualTo(0); - private void prettyPrint(TimeZone tz) { - System.out.println(String.format( - " Zone ID = %s (%s)\n" - + " RawOffset = %s minutes\n" - + " DST = %s minutes\n" - + " -----------------------------------------", - tz.getID(), tz.getDisplayName(), tz.getRawOffset()/60000, tz.getDSTSavings()/60000)); - } - - @Test - public void whenIterating_ThenPrintAllTimeZones() { - for (String id : TimeZone.getAvailableIDs()) { - TimeZone tz = TimeZone.getTimeZone(id); - prettyPrint(tz); - } - } + cal.add(Calendar.MINUTE, 10); + + Date dateAfterDST = cal.getTime(); + + System.out.println(" After DST (01:05 UTC - 03:05 GMT+2) = " + dateAfterDST); + System.out.println("With this Calendar " + (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / (60 * 1000) + " minutes must be added to UTC (GMT TimeZone) to get a correct date for this TimeZone\n"); + assertThat(cal.get(Calendar.DST_OFFSET)).isEqualTo(3600000); + assertThat(dateAfterDST).isEqualTo(df.parse("2018-03-25 03:05")); + + Long deltaBetweenDatesInMillis = dateAfterDST.getTime() - dateBeforeDST.getTime(); + Long tenMinutesInMillis = (1000L * 60 * 10); + assertThat(deltaBetweenDatesInMillis).isEqualTo(tenMinutesInMillis); + } + + private void prettyPrint(TimeZone tz) { + System.out.println( + String.format(" Zone ID = %s (%s)\n" + " RawOffset = %s minutes\n" + " DST = %s minutes\n" + " -----------------------------------------", tz.getID(), tz.getDisplayName(), tz.getRawOffset() / 60000, tz.getDSTSavings() / 60000)); + } + + @Test + public void whenIterating_ThenPrintAllTimeZones() { + for (String id : TimeZone.getAvailableIDs()) { + TimeZone tz = TimeZone.getTimeZone(id); + prettyPrint(tz); + } + } } diff --git a/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesTest.java b/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesTest.java index 9d68f928be..292267639f 100644 --- a/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesTest.java +++ b/core-java/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesTest.java @@ -13,40 +13,39 @@ import org.junit.Test; public class DaylightSavingTimeJavaTimeExamplesTest { - @Test - public void givenItalianTimeZone_WhenDSTHappens_ThenCorrectlyShiftTimeZone() throws ParseException { - ZoneId italianZoneId = ZoneId.of("Europe/Rome"); - - LocalDateTime localDateTimeBeforeDST = LocalDateTime.of(2018, 3, 25, 1, 55); - System.out.println(localDateTimeBeforeDST); - assertThat(localDateTimeBeforeDST.toString()).isEqualTo("2018-03-25T01:55"); - - ZonedDateTime zonedDateTimeBeforeDST = localDateTimeBeforeDST.atZone(italianZoneId); - prettyPrint(zonedDateTimeBeforeDST); - assertThat(zonedDateTimeBeforeDST.toString()).isEqualTo("2018-03-25T01:55+01:00[Europe/Rome]"); - - ZonedDateTime zonedDateTimeAfterDST = zonedDateTimeBeforeDST.plus(10, ChronoUnit.MINUTES); - prettyPrint(zonedDateTimeAfterDST); - assertThat(zonedDateTimeAfterDST.toString()).isEqualTo("2018-03-25T03:05+02:00[Europe/Rome]"); - - Long deltaBetweenDatesInMinutes = ChronoUnit.MINUTES.between(zonedDateTimeBeforeDST,zonedDateTimeAfterDST); - assertThat(deltaBetweenDatesInMinutes).isEqualTo(10); - - } + @Test + public void givenItalianTimeZone_WhenDSTHappens_ThenCorrectlyShiftTimeZone() throws ParseException { + ZoneId italianZoneId = ZoneId.of("Europe/Rome"); - private void prettyPrint(ZonedDateTime zdt) { - System.out.println(String.format( - " ZonedDateTime = %s\n" - + " Zone ID = %s (%s)\n" - + " RawOffset = %s minutes\n" - + " -----------------------------------------", - zdt, zdt.getZone(), zdt.getZone().getId(), zdt.getOffset().getTotalSeconds()/60)); - } - - @Test - public void whenCounting_ThenPrintDifferencesBetweenAPIs() { - System.out.println("Total java.time.ZoneId count : " + ZoneId.getAvailableZoneIds().size()); - System.out.println("Total java.util.TimeZone Id count : " + TimeZone.getAvailableIDs().length); - } + LocalDateTime localDateTimeBeforeDST = LocalDateTime.of(2018, 3, 25, 1, 55); + System.out.println(localDateTimeBeforeDST); + assertThat(localDateTimeBeforeDST.toString()).isEqualTo("2018-03-25T01:55"); + + ZonedDateTime zonedDateTimeBeforeDST = localDateTimeBeforeDST.atZone(italianZoneId); + prettyPrint(zonedDateTimeBeforeDST); + assertThat(zonedDateTimeBeforeDST.toString()).isEqualTo("2018-03-25T01:55+01:00[Europe/Rome]"); + + ZonedDateTime zonedDateTimeAfterDST = zonedDateTimeBeforeDST.plus(10, ChronoUnit.MINUTES); + prettyPrint(zonedDateTimeAfterDST); + assertThat(zonedDateTimeAfterDST.toString()).isEqualTo("2018-03-25T03:05+02:00[Europe/Rome]"); + + Long deltaBetweenDatesInMinutes = ChronoUnit.MINUTES.between(zonedDateTimeBeforeDST, zonedDateTimeAfterDST); + assertThat(deltaBetweenDatesInMinutes).isEqualTo(10); + + } + + private void prettyPrint(ZonedDateTime zdt) { + System.out.println(String.format(" ZonedDateTime = %s\n" + " Zone ID = %s (%s)\n" + " RawOffset = %s minutes\n" + " -----------------------------------------", zdt, zdt.getZone(), zdt.getZone() + .getId(), + zdt.getOffset() + .getTotalSeconds() / 60)); + } + + @Test + public void whenCounting_ThenPrintDifferencesBetweenAPIs() { + System.out.println("Total java.time.ZoneId count : " + ZoneId.getAvailableZoneIds() + .size()); + System.out.println("Total java.util.TimeZone Id count : " + TimeZone.getAvailableIDs().length); + } }