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

Inserted empty conditions for default data

Browse source 
This should be fixed in the future, since it has a workaround for unit tests which bypasses the new behaviour of default data inserting. Those sections to be fixed are in commented lines with //FIXME label.

FEA: ItEr75S29DefaultData
This commit is contained in:
Ignacio Diaz Teijido 2011-11-19 10:03:29 +01:00 • committed by Manuel Rego Casasnovas
parent 514de41fa3
commit c48fd3ddd3
8 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarBootstrap.java
View file

@ -47,11 +47,11 @@ public class CalendarBootstrap implements ICalendarBootstrap {
@Override
@Transactional
public void loadRequiredData() {
for (PredefinedCalendarExceptionTypes type : PredefinedCalendarExceptionTypes
.values()) {
if (calendarExceptionTypeDAO.getAll().size() == 0) {
for (PredefinedCalendarExceptionTypes type : PredefinedCalendarExceptionTypes
.values()) {
CalendarExceptionType calendarExceptionType = type
.getCalendarExceptionType();
if (!calendarExceptionTypeDAO.existsByName(calendarExceptionType)) {
.getCalendarExceptionType();
calendarExceptionType
.setCode(entitySequenceDAO
.getNextEntityCodeWithoutTransaction(EntityNameEnum.CALENDAR_EXCEPTION_TYPE));

10
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java
View file

@ -45,11 +45,11 @@ public class TypeOfWorkHoursBootstrap implements ITypeOfWorkHoursBootstrap {
@Override
@Transactional
public void loadRequiredData() {
for (PredefinedTypeOfWorkHours predefinedTypeOfWorkHours : PredefinedTypeOfWorkHours
.values()) {
TypeOfWorkHours typeOfWorkHours = predefinedTypeOfWorkHours
.getTypeOfWorkHours();
if (!typeOfWorkHoursDAO.existsByName(typeOfWorkHours)) {
if (typeOfWorkHoursDAO.findAll().size() == 0) {
for (PredefinedTypeOfWorkHours predefinedTypeOfWorkHours : PredefinedTypeOfWorkHours
.values()) {
TypeOfWorkHours typeOfWorkHours = predefinedTypeOfWorkHours
.getTypeOfWorkHours();
typeOfWorkHours.setCodeAutogenerated(true);
typeOfWorkHours
.setCode(entitySequenceDAO

2
libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java
View file

@ -46,7 +46,7 @@ public class LabelBootstrap implements ILabelBootstrap {
@Transactional
public void loadRequiredData() {
LabelType priorityType = LabelType.create("Priority");
if (!labelTypeDAO.existsByName(priorityType)) {
if (labelTypeDAO.getAll().size() == 0) {
priorityType.setCodeAutogenerated(true);
priorityType.setCode(entitySequenceDAO
.getNextEntityCodeWithoutTransaction(EntityNameEnum.LABEL));

18
libreplan-business/src/main/java/org/libreplan/business/resources/bootstrap/CriterionsBootstrap.java
View file

@ -64,6 +64,8 @@ public class CriterionsBootstrap implements ICriterionsBootstrap {
@Autowired
private List<ICriterionTypeProvider> providers;
private boolean isTest = false;
public CriterionsBootstrap() {
}
@ -71,18 +73,26 @@ public class CriterionsBootstrap implements ICriterionsBootstrap {
@Transactional
public void loadRequiredData() {
Map<CriterionType, List<String>> typesWithCriterions = getTypesWithCriterions();
// Insert predefined criterions
for (Entry<CriterionType, List<String>> entry : typesWithCriterions
.entrySet()) {
CriterionType criterionType = retrieveOrCreate(entry.getKey());
// Create predefined criterions for criterionType
for (String criterionName : entry.getValue()) {
ensureCriterionExists(criterionName, criterionType);
// FIXME when tests are fixed isTest has no sense
if (isTest || criterionDAO.getAll().size() == 0) {
// Create predefined criterions for criterionType
for (String criterionName : entry.getValue()) {
ensureCriterionExists(criterionName, criterionType);
}
}
}
}
// FIXME this method is not needed when tests are fixed
public void loadRequiredData(boolean test) {
isTest = test;
loadRequiredData();
}
private void ensureCriterionExists(String criterionName,
CriterionType criterionType) {
Criterion criterion = Criterion.createPredefined(criterionName,

2
libreplan-business/src/main/java/org/libreplan/business/resources/bootstrap/ICriterionsBootstrap.java
View file

@ -31,4 +31,6 @@ public interface ICriterionsBootstrap extends IDataBootstrap {
public abstract void loadRequiredData();
public void loadRequiredData(boolean test);
}

11
libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java
View file

@ -45,12 +45,11 @@ public class WorkReportTypeBootstrap implements IWorkReportTypeBootstrap {
@Override
@Transactional
public void loadRequiredData() {
for (PredefinedWorkReportTypes predefinedWorkReportType : PredefinedWorkReportTypes
.values()) {
WorkReportType workReportType = predefinedWorkReportType
.getWorkReportType();
if (!workReportTypeDAO
.existsOtherWorkReportTypeByName(workReportType)) {
if (workReportTypeDAO.getWorkReportTypes().size() == 0) {
for (PredefinedWorkReportTypes predefinedWorkReportType : PredefinedWorkReportTypes
.values()) {
WorkReportType workReportType = predefinedWorkReportType
.getWorkReportType();
workReportType.setCodeAutogenerated(true);
workReportType
.setCode(entitySequenceDAO

2
libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java
View file

@ -68,7 +68,7 @@ public class CriterionsBootstrapTest {
@Test
public void testBootstrap() {
givenNoSomePredefinedCriterionExists();
criterionsBootstrap.loadRequiredData();
criterionsBootstrap.loadRequiredData(true);
thenAllSomePredefinedCriterionsExist();
}

5
libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java
View file

@ -63,6 +63,7 @@ import org.libreplan.business.qualityforms.entities.QualityForm;
import org.libreplan.business.requirements.entities.CriterionRequirement;
import org.libreplan.business.requirements.entities.DirectCriterionRequirement;
import org.libreplan.business.requirements.entities.IndirectCriterionRequirement;
import org.libreplan.business.resources.bootstrap.ICriterionsBootstrap;
import org.libreplan.business.resources.daos.ICriterionDAO;
import org.libreplan.business.resources.entities.Criterion;
import org.libreplan.business.scenarios.bootstrap.PredefinedScenarios;
@ -96,7 +97,7 @@ public class OrderElementTreeModelTest {
private IDataBootstrap scenariosBootstrap;
@Resource
private IDataBootstrap criterionsBootstrap;
private ICriterionsBootstrap criterionsBootstrap;
@Resource
private IDataBootstrap configurationBootstrap;
@ -130,7 +131,7 @@ public class OrderElementTreeModelTest {
configurationBootstrap.loadRequiredData();
defaultAdvanceTypesBootstrapListener.loadRequiredData();
scenariosBootstrap.loadRequiredData();
criterionsBootstrap.loadRequiredData();
criterionsBootstrap.loadRequiredData(true);
givenOrder();
givenModel();