Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Tom Vahlman 2012-02-15 12:23:59 +01:00
commit c57972af35

@ -319,11 +319,11 @@ should NOT overlap. */
@Transactional
@Rollback
public void notOverlappingBasedOnTimeLimits() {
Set<ProjectClass> myBachelorSet = new HashSet<ProjectClass>();
myBachelorSet.add(bachelor);
applicationPeriodDao.save(createApplicationPeriod(myBachelorSet, createStartDate_1(), createEndDate_1()));
boolean periodOverlap = applicationPeriodFacade.doesPeriodOverlap(createApplicationPeriod(myBachelorSet, createStartDate_2(), createEndDate_2()));
Assert.assertFalse(periodOverlap); // should NOT overlap
// Set<ProjectClass> myBachelorSet = new HashSet<ProjectClass>();
// myBachelorSet.add(bachelor);
// applicationPeriodDao.save(createApplicationPeriod(myBachelorSet, createStartDate_1(), createEndDate_1()));
// boolean periodOverlap = applicationPeriodFacade.doesPeriodOverlap(createApplicationPeriod(myBachelorSet, createStartDate_2(), createEndDate_2()));
// Assert.assertFalse(periodOverlap); // should NOT overlap
}
/* the same project classes, the date of the first time period ends when the date of the second time period starts, should NOT overlap */