diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java index 58d56f74e..b3112df56 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java @@ -121,10 +121,10 @@ public class ResourceTest { Worker worker = Worker.create("firstName", "surName", "2333232"); assertThat(worker.getCurrentCriterionsFor(type).size(), equalTo(0)); worker.addSatisfaction(criterionWithItsType, Interval - .range(year(2000),year(2010))); + .range(year(2000),year(2020))); assertThat(worker.getCurrentCriterionsFor(type).size(), equalTo(1)); worker.addSatisfaction(criterionWithItsType, Interval - .from(year(2010))); + .from(year(2020))); assertThat(worker.getCurrentCriterionsFor(type).size(), equalTo(1)); worker.addSatisfaction(otherCriterionWithItsType, Interval .from(year(2000))); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/DateConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/DateConverter.java index 109878d25..7ab1299e1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/DateConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/DateConverter.java @@ -60,7 +60,8 @@ public class DateConverter { dateAsXMLGregorianCalendar = DatatypeFactory.newInstance().newXMLGregorianCalendarDate( dateAsCalendar.get(Calendar.YEAR), - dateAsCalendar.get(Calendar.MONTH), + convertMonthFieldFromCalendarToXMLGregorianCalendar( + dateAsCalendar.get(Calendar.MONTH)), dateAsCalendar.get(Calendar.DAY_OF_MONTH), DatatypeConstants.FIELD_UNDEFINED); } catch (DatatypeConfigurationException e) { @@ -71,6 +72,19 @@ public class DateConverter { } + /** + * Converts from @{link Calendar} month field format to + * @{link XMLGregorianCalendar} format. + * + * It is needed the conversion because + * @{link XMLGregorianCalendar} months go from 1 to 12 while + * @{link Calendar} months go from 0 to 11 + * + */ + private final static int convertMonthFieldFromCalendarToXMLGregorianCalendar(int month) { + return month+1; + } + /** * It converts a XMLGregorianCalendar representing a * xsd:date XML type to a Date.