这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Fix test - use calendar with correct timezones #193

Merged
merged 1 commit into from
Jul 16, 2015
Merged

Fix test - use calendar with correct timezones #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/test/java/com/netflix/simianarmy/basic/TestBasicCalendar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ public void testHolidays(int month, int dayOfMonth) {
public void testGetBusinessDayWihoutGap() {
// the days from 12/3/2012 to 12/7/2012 are all business days
int hour = 10;
Calendar test = Calendar.getInstance();
Calendar test = now();
test.set(Calendar.YEAR, 2012);
test.set(Calendar.MONTH, Calendar.DECEMBER);
test.set(Calendar.DAY_OF_MONTH, 3);
test.set(Calendar.HOUR_OF_DAY, hour);
int day = test.get(Calendar.DAY_OF_MONTH);
for (int n = 0; n <= 4; n++) {
Calendar businessDay = Calendar.getInstance();
Calendar businessDay = now();
businessDay.setTime(getBusinessDay(test.getTime(), n));
Assert.assertEquals(businessDay.get(Calendar.DAY_OF_MONTH),
day + n);
Expand All @@ -153,14 +153,14 @@ public void testGetBusinessDayWihoutGap() {
public void testGetBusinessDayWihWeekend() {
// 12/7/2012 is Friday
int hour = 10;
Calendar test = Calendar.getInstance();
Calendar test = now();
test.set(Calendar.YEAR, 2012);
test.set(Calendar.MONTH, Calendar.DECEMBER);
test.set(Calendar.DAY_OF_MONTH, 7);
test.set(Calendar.HOUR_OF_DAY, hour);
int day = test.get(Calendar.DAY_OF_MONTH);
for (int n = 1; n <= 5; n++) {
Calendar businessDay = Calendar.getInstance();
Calendar businessDay = now();
businessDay.setTime(getBusinessDay(test.getTime(), n));
Assert.assertEquals(businessDay.get(Calendar.DAY_OF_MONTH),
day + n + 2);
Expand All @@ -173,14 +173,14 @@ public void testGetBusinessDayWihWeekend() {
public void testGetBusinessDayWihHoliday() {
// 12/23/2012 is Monday and 12/24 - 12/26 are holidays
int hour = 10;
Calendar test = Calendar.getInstance();
Calendar test = now();
test.set(Calendar.YEAR, 2012);
test.set(Calendar.MONTH, Calendar.DECEMBER);
test.set(Calendar.DAY_OF_MONTH, 24);
test.set(Calendar.HOUR_OF_DAY, hour);
int day = test.get(Calendar.DAY_OF_MONTH);

Calendar businessDay = Calendar.getInstance();
Calendar businessDay = now();
businessDay.setTime(getBusinessDay(test.getTime(), 1));
Assert.assertEquals(businessDay.get(Calendar.DAY_OF_MONTH),
day + 4);
Expand All @@ -192,13 +192,13 @@ public void testGetBusinessDayWihHoliday() {
public void testGetBusinessDayWihHolidayNextYear() {
// 12/28/2012 is Friday and 12/31 - 1/1 are holidays
int hour = 10;
Calendar test = Calendar.getInstance();
Calendar test = now();
test.set(Calendar.YEAR, 2012);
test.set(Calendar.MONTH, Calendar.DECEMBER);
test.set(Calendar.DAY_OF_MONTH, 28);
test.set(Calendar.HOUR_OF_DAY, hour);

Calendar businessDay = Calendar.getInstance();
Calendar businessDay = now();
businessDay.setTime(getBusinessDay(test.getTime(), 1));
// The next business day should be 1/2/2013
Assert.assertEquals(businessDay.get(Calendar.YEAR), 2013);
Expand Down