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

ItEr22S08CUAltaCalendarioLaboralItEr21S10: Making public the method to create a copy of a calendar.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-08-21 11:21:03 +02:00 • committed by Óscar González Fernández
parent 89eef4534a
commit 54a99fce3c
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -440,7 +440,7 @@ public class BaseCalendar extends BaseEntity implements IValidable {
nextCalendar.newVersion(date);
}
BaseCalendar nextCalendar = copy();
BaseCalendar nextCalendar = newCopy();
this.expiringDate = date;
@ -450,15 +450,16 @@ public class BaseCalendar extends BaseEntity implements IValidable {
return nextCalendar;
}
private BaseCalendar copy() {
public BaseCalendar newCopy() {
if (nextCalendar != null) {
nextCalendar.newCopy();
}
BaseCalendar copy = create();
copy.name = this.name;
copy.hoursPerDay = new HashMap<Integer, Integer>(this.hoursPerDay);
copy.exceptions = new HashSet<ExceptionDay>(this.exceptions);
copy.parent = this.parent;
return copy;

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

@ -503,11 +503,25 @@ public class BaseCalendarTest {
@Test
public void testSetParentInACalendarWithoutParent() {
BaseCalendar calendar = createBasicCalendar();
BaseCalendar parent = createBasicCalendar();
BaseCalendar parent = createChristmasCalendar();
calendar.setParent(parent);
assertThat(calendar.getParent(), equalTo(parent));
assertThat(calendar.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE),
equalTo(0));
}
@Test
public void testNewCopy() {
BaseCalendar calendar = createChristmasCalendar();
BaseCalendar derived = calendar.newDerivedCalendar();
BaseCalendar copy = derived.newCopy();
assertThat(copy.getWorkableHours(CHRISTMAS_DAY_LOCAL_DATE), equalTo(0));
assertThat(copy.getParent(), equalTo(calendar));
assertThat(copy.getNextCalendar(), nullValue());
assertThat(copy.getPreviousCalendar(), nullValue());
}
}