RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr21S10CUAltaCalendarioLaboral: Adding new test determining it must return zero just after being defined.

Browse source 
The default initialized value it's now null instead of -1.
This commit is contained in:
Óscar González Fernández 2009-08-13 18:16:17 +02:00
parent add2e68494
commit cc7ab2561d
2 changed files with 80 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -24,6 +24,8 @@ import org.navalplanner.business.common.exceptions.ValidationException;
*/
public class BaseCalendar extends BaseEntity implements IValidable {
private static final Integer DEFAULT_VALUE = 0;
public static BaseCalendar create() {
BaseCalendar baseCalendar = new BaseCalendar();
baseCalendar.setNewObject(true);
@ -32,13 +34,13 @@ public class BaseCalendar extends BaseEntity implements IValidable {
private String name;
private Integer monday = -1;
private Integer tuesday = -1;
private Integer wednesday = -1;
private Integer thursday = -1;
private Integer friday = -1;
private Integer saturday = -1;
private Integer sunday = -1;
private Integer monday = null;
private Integer tuesday = null;
private Integer wednesday = null;
private Integer thursday = null;
private Integer friday = null;
private Integer saturday = null;
private Integer sunday = null;
private BaseCalendar parent;
@ -70,22 +72,29 @@ public class BaseCalendar extends BaseEntity implements IValidable {
}
public Integer getMonday() {
if ((monday == -1) && (parent != null)) {
if ((monday == null) && (parent != null)) {
return parent.getMonday();
} else {
return monday;
return valueIfNotNullElseDefaultValue(monday);
}
}
private Integer valueIfNotNullElseDefaultValue(Integer hours) {
if (hours == null) {
return DEFAULT_VALUE;
}
return hours;
}
public void setTuesday(Integer tuesday) {
this.tuesday = tuesday;
}
public Integer getTuesday() {
if ((tuesday == -1) && (parent != null)) {
if ((tuesday == null) && (parent != null)) {
return parent.getTuesday();
} else {
return tuesday;
return valueIfNotNullElseDefaultValue(tuesday);
}
}
@ -94,10 +103,10 @@ public class BaseCalendar extends BaseEntity implements IValidable {
}
public Integer getWednesday() {
if ((wednesday == -1) && (parent != null)) {
if ((wednesday == null) && (parent != null)) {
return parent.getWednesday();
} else {
return wednesday;
return valueIfNotNullElseDefaultValue(wednesday);
}
}
@ -106,10 +115,10 @@ public class BaseCalendar extends BaseEntity implements IValidable {
}
public Integer getThursday() {
if ((thursday == -1) && (parent != null)) {
if ((thursday == null) && (parent != null)) {
return parent.getThursday();
} else {
return thursday;
return valueIfNotNullElseDefaultValue(thursday);
}
}
@ -118,10 +127,10 @@ public class BaseCalendar extends BaseEntity implements IValidable {
}
public Integer getFriday() {
if ((friday == -1) && (parent != null)) {
if ((friday == null) && (parent != null)) {
return parent.getFriday();
} else {
return friday;
return valueIfNotNullElseDefaultValue(friday);
}
}
@ -130,10 +139,10 @@ public class BaseCalendar extends BaseEntity implements IValidable {
}
public Integer getSaturday() {
if ((saturday == -1) && (parent != null)) {
if ((saturday == null) && (parent != null)) {
return parent.getSaturday();
} else {
return saturday;
return valueIfNotNullElseDefaultValue(saturday);
}
}
@ -142,10 +151,10 @@ public class BaseCalendar extends BaseEntity implements IValidable {
}
public Integer getSunday() {
if ((sunday == -1) && (parent != null)) {
if ((sunday == null) && (parent != null)) {
return parent.getSunday();
} else {
return sunday;
return valueIfNotNullElseDefaultValue(sunday);
}
}
@ -365,9 +374,9 @@ public class BaseCalendar extends BaseEntity implements IValidable {
@Override
public void checkValid() throws ValidationException {
if (parent == null) {
if ((monday == -1) || (thursday == -1) || (wednesday == -1)
|| (tuesday == -1) || (friday == -1) || (saturday == -1)
|| (sunday == -1)) {
if ((monday == null) || (thursday == null) || (wednesday == null)
|| (tuesday == null) || (friday == null) || (saturday == null)
|| (sunday == null)) {
throw new ValidationException(
"Daily hours could not have the default value "
+ "if the calendar is not derivated");

75
navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java
View file

@ -12,21 +12,29 @@ import org.navalplanner.business.common.exceptions.ValidationException;
/**
* Tests for {@link BaseCalendar}.
*
* @author Manuel Rego Casasnovas <mrego@igalia.com>
*/
public class BaseCalendarTest {
public static final LocalDate MONDAY_LOCAL_DATE = new LocalDate(2009, 8, 10);
public static final LocalDate TUESDAY_LOCAL_DATE = new LocalDate(2009, 8, 11);
public static final LocalDate WEDNESDAY_LOCAL_DATE = new LocalDate(2009, 8, 12);
public static final LocalDate THURSDAY_LOCAL_DATE = new LocalDate(2009, 8, 13);
public static final LocalDate TUESDAY_LOCAL_DATE = new LocalDate(2009, 8,
11);
public static final LocalDate WEDNESDAY_LOCAL_DATE = new LocalDate(2009, 8,
12);
public static final LocalDate THURSDAY_LOCAL_DATE = new LocalDate(2009, 8,
13);
public static final LocalDate FRIDAY_LOCAL_DATE = new LocalDate(2009, 8, 14);
public static final LocalDate SATURDAY_LOCAL_DATE = new LocalDate(2009, 8, 15);
public static final LocalDate SATURDAY_LOCAL_DATE = new LocalDate(2009, 8,
15);
public static final LocalDate SUNDAY_LOCAL_DATE = new LocalDate(2009, 8, 16);
public static final LocalDate CHRISTMAS_DAY_LOCAL_DATE = new LocalDate(2009, 12,
25);
private static final LocalDate[] DAYS_OF_A_WEEK_EXAMPLE = {
MONDAY_LOCAL_DATE, TUESDAY_LOCAL_DATE, WEDNESDAY_LOCAL_DATE,
THURSDAY_LOCAL_DATE, FRIDAY_LOCAL_DATE, SATURDAY_LOCAL_DATE,
SUNDAY_LOCAL_DATE };
public static final LocalDate CHRISTMAS_DAY_LOCAL_DATE = new LocalDate(
2009, 12, 25);
public static BaseCalendar createBasicCalendar() {
BaseCalendar calendar = BaseCalendar.create();
@ -44,8 +52,15 @@ public class BaseCalendarTest {
return calendar;
}
private BaseCalendar calendarFixture;
private void givenUnitializedCalendar() {
calendarFixture = BaseCalendar.create();
}
public static void addChristmasAsExceptionDay(BaseCalendar calendar) {
ExceptionDay christmasDay = ExceptionDay.create(CHRISTMAS_DAY_LOCAL_DATE, 0);
ExceptionDay christmasDay = ExceptionDay.create(
CHRISTMAS_DAY_LOCAL_DATE, 0);
calendar.addExceptionDay(christmasDay);
}
@ -150,8 +165,8 @@ public class BaseCalendarTest {
public void testGettWorkableHoursInterval() {
BaseCalendar calendar = createBasicCalendar();
int mondayToWednesdayHours = calendar.getWorkableHours(MONDAY_LOCAL_DATE,
WEDNESDAY_LOCAL_DATE);
int mondayToWednesdayHours = calendar.getWorkableHours(
MONDAY_LOCAL_DATE, WEDNESDAY_LOCAL_DATE);
assertThat(mondayToWednesdayHours, equalTo(24));
}
@ -186,14 +201,12 @@ public class BaseCalendarTest {
@Test
public void testGettWorkableHoursNewVersion() {
BaseCalendar origCalendar = createBasicCalendar();
BaseCalendar newCalendar = origCalendar.newVersion(
MONDAY_LOCAL_DATE);
BaseCalendar newCalendar = origCalendar.newVersion(MONDAY_LOCAL_DATE);
newCalendar.setWednesday(4);
newCalendar.setSunday(4);
int wednesdayHours = newCalendar
.getWorkableHours(WEDNESDAY_LOCAL_DATE);
int wednesdayHours = newCalendar.getWorkableHours(WEDNESDAY_LOCAL_DATE);
assertThat(wednesdayHours, equalTo(4));
assertThat(wednesdayHours, equalTo(origCalendar
.getWorkableHours(WEDNESDAY_LOCAL_DATE)));
@ -210,8 +223,7 @@ public class BaseCalendarTest {
.getWorkableHours(SUNDAY_LOCAL_DATE)));
int sundayHoursPastWeek = newCalendar
.getWorkableHours(SUNDAY_LOCAL_DATE
.minusWeeks(1));
.getWorkableHours(SUNDAY_LOCAL_DATE.minusWeeks(1));
assertThat(sundayHoursPastWeek, equalTo(0));
assertThat(sundayHoursPastWeek, equalTo(origCalendar
.getWorkableHours(SUNDAY_LOCAL_DATE.minusWeeks(1))));
@ -220,8 +232,7 @@ public class BaseCalendarTest {
@Test
public void testGettWorkableHoursNewVersionCheckingLimits() {
BaseCalendar origCalendar = createBasicCalendar();
BaseCalendar newCalendar = origCalendar.newVersion(
MONDAY_LOCAL_DATE);
BaseCalendar newCalendar = origCalendar.newVersion(MONDAY_LOCAL_DATE);
newCalendar.setMonday(1);
newCalendar.setSunday(2);
@ -236,8 +247,8 @@ public class BaseCalendarTest {
assertThat(sundayHours, equalTo(origCalendar
.getWorkableHours(SUNDAY_LOCAL_DATE)));
int mondayHoursPastWeek = newCalendar.getWorkableHours(MONDAY_LOCAL_DATE
.minusWeeks(1));
int mondayHoursPastWeek = newCalendar
.getWorkableHours(MONDAY_LOCAL_DATE.minusWeeks(1));
assertThat(mondayHoursPastWeek, equalTo(8));
assertThat(mondayHoursPastWeek, equalTo(origCalendar
.getWorkableHours(MONDAY_LOCAL_DATE.minusWeeks(1))));
@ -268,8 +279,7 @@ public class BaseCalendarTest {
@Test
public void testRemoveExceptionDayNewVersionCalendar() {
BaseCalendar origCalendar = createChristmasCalendar();
BaseCalendar newCalendar = origCalendar.newVersion(
MONDAY_LOCAL_DATE);
BaseCalendar newCalendar = origCalendar.newVersion(MONDAY_LOCAL_DATE);
newCalendar.removeExceptionDay(CHRISTMAS_DAY_LOCAL_DATE);
@ -285,15 +295,13 @@ public class BaseCalendarTest {
origCalendar.addExceptionDay(day);
BaseCalendar newCalendar = origCalendar
.newVersion(
CHRISTMAS_DAY_LOCAL_DATE.plusDays(1));
.newVersion(CHRISTMAS_DAY_LOCAL_DATE.plusDays(1));
newCalendar
.updateExceptionDay(CHRISTMAS_DAY_LOCAL_DATE.plusYears(1), 8);
int christmasHours = newCalendar
.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE
.plusYears(1));
.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE.plusYears(1));
assertThat(christmasHours, equalTo(8));
int christmasHoursPastYear = newCalendar
@ -319,8 +327,7 @@ public class BaseCalendarTest {
BaseCalendar calendar2 = calendar.newVersion(TUESDAY_LOCAL_DATE);
setHoursForAllDays(calendar2, 4);
BaseCalendar calendar3 = calendar2.newVersion(
FRIDAY_LOCAL_DATE);
BaseCalendar calendar3 = calendar2.newVersion(FRIDAY_LOCAL_DATE);
setHoursForAllDays(calendar3, 2);
int hoursMonday = calendar.getWorkableHours(MONDAY_LOCAL_DATE);
@ -394,4 +401,16 @@ public class BaseCalendarTest {
equalTo(CHRISTMAS_DAY_LOCAL_DATE));
}
public void anUnitializedCalendarShouldReturnZeroHours() {
givenUnitializedCalendar();
thenForAllDaysReturnsZero();
}
private void thenForAllDaysReturnsZero() {
for (LocalDate localDate : DAYS_OF_A_WEEK_EXAMPLE) {
assertThat(calendarFixture.getWorkableHours(localDate), equalTo(0));
}
}
}