From 484b2652da00d4a3bbd9111e00a330d729cbeeab Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 21 Sep 2011 09:09:20 +0200 Subject: [PATCH] Load required data in MaterialAssignmentDAOTest Test was failing when it was executed isolated from the rest of tests. Thanks to Dmytro Melanchenko for reporting. FEA: ItEr75S04BugFixing --- .../daos/MaterialAssignmentDAOTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java index 6a0a5e6b9..f611389c4 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java @@ -28,8 +28,12 @@ import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING import java.util.UUID; +import javax.annotation.Resource; + +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.navalplanner.business.IDataBootstrap; import org.navalplanner.business.materials.daos.IMaterialAssignmentDAO; import org.navalplanner.business.materials.daos.IMaterialCategoryDAO; import org.navalplanner.business.materials.daos.IMaterialDAO; @@ -67,6 +71,12 @@ public class MaterialAssignmentDAOTest { @Autowired IMaterialAssignmentDAO materialAssignmentDAO; + @Resource + private IDataBootstrap configurationBootstrap; + + @Resource + private IDataBootstrap unitTypeBootstrap; + private Material createValidMaterial() { MaterialCategory materialCategory = MaterialCategory.create(UUID.randomUUID().toString()); materialCategoryDAO.save(materialCategory); @@ -86,6 +96,12 @@ public class MaterialAssignmentDAOTest { return assignment; } + @Before + public void loadRequiredaData() { + configurationBootstrap.loadRequiredData(); + unitTypeBootstrap.loadRequiredData(); + } + @Test public void testGetByMaterial() { MaterialAssignment assignment1 = createValidMaterialAssignment();