From bb417839301421c95154fc4f33dad041571c9ec8 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 22 Aug 2011 11:30:21 +0200 Subject: [PATCH] [Bug #1139] Fix several tests due to new constraint in defaultPrice FEA: ItEr75S04BugFixing --- .../test/costcategories/daos/CostCategoryDAOTest.java | 4 ++++ .../business/test/costcategories/daos/HourCostDAOTest.java | 1 + .../test/costcategories/daos/TypeOfWorkHoursDAOTest.java | 2 ++ .../test/workreports/daos/AbstractWorkReportTest.java | 2 ++ .../web/test/ws/costcategories/CostCategoryServiceTest.java | 1 + .../web/test/ws/workreports/WorkReportServiceTest.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java index d4c7a69a6..8cdc3f7c2 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java @@ -105,6 +105,7 @@ public class CostCategoryDAOTest { CostCategory costCategory = createValidCostCategory(); TypeOfWorkHours type1 = TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); + type1.setDefaultPrice(BigDecimal.TEN); typeOfWorkHoursDAO.save(type1); HourCost hourCost1 = HourCost.create(BigDecimal.ONE, new LocalDate(2009, 11,1)); hourCost1.setType(type1); @@ -130,6 +131,7 @@ public class CostCategoryDAOTest { TypeOfWorkHours type2 = TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); + type2.setDefaultPrice(BigDecimal.TEN); typeOfWorkHoursDAO.save(type2); hourCost2.setType(type2); hourCost2.setInitDate(new LocalDate(2009,10,15)); @@ -179,8 +181,10 @@ public class CostCategoryDAOTest { CostCategory costCategory = createValidCostCategory(); TypeOfWorkHours type1 = TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); + type1.setDefaultPrice(BigDecimal.TEN); TypeOfWorkHours type2 = TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); + type2.setDefaultPrice(BigDecimal.TEN); //types have to be saved before using them //otherwise, the overlapping validation will fail typeOfWorkHoursDAO.save(type1); diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java index 6572932fc..2b491e64b 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java @@ -79,6 +79,7 @@ public class HourCostDAOTest { TypeOfWorkHours type = TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); + type.setDefaultPrice(BigDecimal.TEN); hourCost.setType(type); typeOfWorkHoursDAO.save(type); diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/TypeOfWorkHoursDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/TypeOfWorkHoursDAOTest.java index c05d131ac..6d8caa348 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/TypeOfWorkHoursDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/TypeOfWorkHoursDAOTest.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue; import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE; +import java.math.BigDecimal; import java.util.List; import java.util.UUID; @@ -64,6 +65,7 @@ public class TypeOfWorkHoursDAOTest { private TypeOfWorkHours createValidTypeOfWorkHours() { TypeOfWorkHours typeOfWorkHours = TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString()); + typeOfWorkHours.setDefaultPrice(BigDecimal.TEN); return typeOfWorkHours; } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java index c5488bb97..1f31f72ec 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java @@ -21,6 +21,7 @@ package org.navalplanner.business.test.workreports.daos; +import java.math.BigDecimal; import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -92,6 +93,7 @@ public abstract class AbstractWorkReportTest { private TypeOfWorkHours createValidTypeOfWorkHours() { TypeOfWorkHours typeOfWorkHours = TypeOfWorkHours.create(UUID .randomUUID().toString(), UUID.randomUUID().toString()); + typeOfWorkHours.setDefaultPrice(BigDecimal.TEN); typeOfWorkHoursDAO.save(typeOfWorkHours); return typeOfWorkHours; diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/costcategories/CostCategoryServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/costcategories/CostCategoryServiceTest.java index 4b4c7e1bb..083e23f8b 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/costcategories/CostCategoryServiceTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/costcategories/CostCategoryServiceTest.java @@ -113,6 +113,7 @@ public class CostCategoryServiceTest { typeOfWorkHours.setCode(code); typeOfWorkHours.setName("name" + UUID.randomUUID()); + typeOfWorkHours.setDefaultPrice(BigDecimal.TEN); typeOfWorkHoursDAO.save(typeOfWorkHours); typeOfWorkHoursDAO.flush(); diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java index 277ad35bd..e2983f804 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java @@ -30,6 +30,7 @@ import static org.navalplanner.web.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONF import static org.navalplanner.web.test.WebappGlobalNames.WEBAPP_SPRING_CONFIG_TEST_FILE; import static org.navalplanner.web.test.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONFIG_TEST_FILE; +import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -205,6 +206,7 @@ public class WorkReportServiceTest { TypeOfWorkHours typeOfWorkHours = TypeOfWorkHours.create(); typeOfWorkHours.setCode(typeOfWorkHoursCode); typeOfWorkHours.setName("type-of-work-hours-name-" + UUID.randomUUID()); + typeOfWorkHours.setDefaultPrice(BigDecimal.TEN); typeOfWorkHoursDAO.save(typeOfWorkHours); typeOfWorkHoursDAO.flush();