RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problems in MaterialDAOTest and MaterialServiceTest

Browse source 
Tests were not passing in Debian Wheezy

FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-12-20 10:33:22 +01:00
parent 97e2c721d7
commit ed42756949
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libreplan-business/src/test/java/org/libreplan/business/test/materials/daos/MaterialDAOTest.java
View file

@ -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();
}

4
libreplan-webapp/src/test/java/org/libreplan/web/test/ws/materials/MaterialServiceTest.java
View file

@ -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;