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

ItEr56S13AdaptacionServiciosRESTItEr55S07: Modified calendar model and tests to allow new work week versions in the past.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-04-27 16:44:04 +02:00 • committed by Javier Moran Rua
parent c73d5af641
commit c23f79ca26
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -430,11 +430,6 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours {
* new calendar will be used from that date onwards.
*/
public void newVersion(LocalDate date) throws IllegalArgumentException {
if (date.compareTo(new LocalDate()) <= 0) {
throw new IllegalArgumentException(
"Date for new version must be greater than current date");
}
CalendarData calendarData = getCalendarDataBeforeTheLastIfAny();
if ((calendarData.getExpiringDate() != null)
&& (date.compareTo(calendarData.getExpiringDate()) <= 0)) {

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

@ -660,8 +660,8 @@ public class BaseCalendarTest {
nullValue());
}
@Test(expected = IllegalArgumentException.class)
public void testNotAllowNewVersionOnCurrentDate() {
@Test
public void testAllowNewVersionOnCurrentDate() {
BaseCalendar calendar = createBasicCalendar();
calendar.newVersion(new LocalDate());