Skip to content

Commit 9b34837

Browse files
authored
Merge pull request eugenp#8290 from kertpjatkin/master
BAEL-3302: Fix package name & get rid of 3-letter time zone
2 parents 05ab180 + 8d2d6d8 commit 9b34837

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java renamed to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyDefaultTimezoneUnitTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package com.baeldung.timezone;
1+
package com.baeldung.jvmtimezone;
22

33
import org.junit.Test;
44

55
import java.util.Calendar;
6-
import java.util.Date;
76
import java.util.TimeZone;
87

98
import static org.junit.Assert.assertEquals;
@@ -13,9 +12,7 @@ public class ModifyDefaultTimezoneUnitTest {
1312
@Test
1413
public void givenDefaultTimezoneSet_thenDateTimezoneIsCorrect() {
1514
TimeZone.setDefault(TimeZone.getTimeZone("Portugal"));
16-
Date date = new Date();
1715
Calendar calendar = Calendar.getInstance();
18-
calendar.setTime(date);
1916
assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Portugal"));
2017
}
2118

core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java renamed to core-java-modules/core-java-date-operations/src/test/java/com/baeldung/jvmtimezone/ModifyTimezonePropertyUnitTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.timezone;
1+
package com.baeldung.jvmtimezone;
22

33
import org.junit.After;
44
import org.junit.Before;
@@ -14,7 +14,7 @@ public class ModifyTimezonePropertyUnitTest {
1414

1515
@Before
1616
public void setup() {
17-
System.setProperty("user.timezone", "IST");
17+
System.setProperty("user.timezone", "Asia/Kolkata");
1818
TimeZone.setDefault(null);
1919
}
2020

@@ -25,10 +25,8 @@ public void teardown() {
2525

2626
@Test
2727
public void givenTimezonePropertySet_thenDateTimezoneIsCorrect() {
28-
Date date = new Date();
2928
Calendar calendar = Calendar.getInstance();
30-
calendar.setTime(date);
31-
assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("IST"));
29+
assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Asia/Kolkata"));
3230
}
3331

3432
}

0 commit comments

Comments
 (0)