From ed427569493babc3bd0470a63a0a7138fd6d6dc8 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 20 Dec 2011 10:33:22 +0100
Subject: [PATCH] Fix problems in MaterialDAOTest and MaterialServiceTest

Tests were not passing in Debian Wheezy

FEA: ItEr75S04BugFixing
---
 .../test/materials/daos/MaterialDAOTest.java      | 15 +++++++++------
 .../test/ws/materials/MaterialServiceTest.java    |  4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/materials/daos/MaterialDAOTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/materials/daos/MaterialDAOTest.java
index 698ff3991..8c54bcc61 100644
--- a/libreplan-business/src/test/java/org/libreplan/business/test/materials/daos/MaterialDAOTest.java
+++ b/libreplan-business/src/test/java/org/libreplan/business/test/materials/daos/MaterialDAOTest.java
@@ -49,30 +49,32 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE,
-        BUSINESS_SPRING_CONFIG_TEST_FILE })
-
 /**
  * Test for {@MaterialDAO}
  *
  * @author Jacobo Aragunde Perez <jaragunde@igalia.com>
  *
  */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE,
+        BUSINESS_SPRING_CONFIG_TEST_FILE })
 @Transactional
 public class MaterialDAOTest {
 
     @Autowired
-    IMaterialDAO materialDAO;
+    private IMaterialDAO materialDAO;
 
     @Autowired
-    IMaterialCategoryDAO materialCategoryDAO;
+    private IMaterialCategoryDAO materialCategoryDAO;
 
     @Test
     public void testInSpringContainer() {
         assertNotNull(materialDAO);
     }
 
+    @Resource
+    private IDataBootstrap configurationBootstrap;
+
     @Resource
     private IDataBootstrap materialCategoryBootstrap;
 
@@ -81,6 +83,7 @@ public class MaterialDAOTest {
 
     @Before
     public void loadRequiredaData() {
+        configurationBootstrap.loadRequiredData();
         materialCategoryBootstrap.loadRequiredData();
         unitTypeBootstrap.loadRequiredData();
     }
diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/materials/MaterialServiceTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/materials/MaterialServiceTest.java
index 8ba7e8844..92b39f396 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/materials/MaterialServiceTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/materials/MaterialServiceTest.java
@@ -86,6 +86,9 @@ public class MaterialServiceTest {
     @Autowired
     private IUnitTypeDAO unitTypeDAO;
 
+    @Resource
+    private IDataBootstrap configurationBootstrap;
+
     @Resource
     private IDataBootstrap materialCategoryBootstrap;
 
@@ -102,6 +105,7 @@ public class MaterialServiceTest {
 
             @Override
             public Void execute() {
+                configurationBootstrap.loadRequiredData();
                 materialCategoryBootstrap.loadRequiredData();
                 unitTypeBootstrap.loadRequiredData();
                 return null;