From c23f79ca2661e1afcb5bd9f26823d4004ed0d9a4 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 27 Apr 2010 16:44:04 +0200 Subject: [PATCH] ItEr56S13AdaptacionServiciosRESTItEr55S07: Modified calendar model and tests to allow new work week versions in the past. --- .../business/calendars/entities/BaseCalendar.java | 5 ----- .../business/test/calendars/entities/BaseCalendarTest.java | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index d234700f8..2f813cfc2 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -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)) { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java index 217dffd63..851c86314 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java @@ -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());