From a3eabf82a8da3edbb490161f5805103e7211e42d Mon Sep 17 00:00:00 2001 From: Kert Pjatkin Date: Mon, 2 Dec 2019 01:58:50 +0200 Subject: [PATCH] BAEL-3302: Fix package name & get rid of 3-letter time zone --- .../ModifyDefaultTimezoneUnitTest.java | 5 +---- .../ModifyTimezonePropertyUnitTest.java | 8 +++----- 2 files changed, 4 insertions(+), 9 deletions(-) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{timezone => jvmtimezone}/ModifyDefaultTimezoneUnitTest.java (79%) rename core-java-modules/core-java-date-operations/src/test/java/com/baeldung/{timezone => jvmtimezone}/ModifyTimezonePropertyUnitTest.java (79%) diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java similarity index 79% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java index 05d36d2c6c..7a266b46c3 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java @@ -1,9 +1,8 @@ -package com.baeldung.timezone; +package com.baeldung.jvmtimezone; import org.junit.Test; import java.util.Calendar; -import java.util.Date; import java.util.TimeZone; import static org.junit.Assert.assertEquals; @@ -13,9 +12,7 @@ public class ModifyDefaultTimezoneUnitTest { @Test public void givenDefaultTimezoneSet_thenDateTimezoneIsCorrect() { TimeZone.setDefault(TimeZone.getTimeZone("Portugal")); - Date date = new Date(); Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Portugal")); } diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java similarity index 79% rename from core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java rename to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java index 8f65f520f8..ec0d183e78 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.timezone; +package com.baeldung.jvmtimezone; import org.junit.After; import org.junit.Before; @@ -14,7 +14,7 @@ public class ModifyTimezonePropertyUnitTest { @Before public void setup() { - System.setProperty("user.timezone", "IST"); + System.setProperty("user.timezone", "Asia/Kolkata"); TimeZone.setDefault(null); } @@ -25,10 +25,8 @@ public class ModifyTimezonePropertyUnitTest { @Test public void givenTimezonePropertySet_thenDateTimezoneIsCorrect() { - Date date = new Date(); Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("IST")); + assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Asia/Kolkata")); } } \ No newline at end of file