The test objects were not saved correctly.
This commit is contained in:
parent
018f721045
commit
4a03a2400d
@ -15,9 +15,12 @@ import org.springframework.util.Assert;
|
||||
|
||||
import se.su.dsv.scipro.data.dao.interfaces.LanguageDao;
|
||||
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
|
||||
import se.su.dsv.scipro.data.dao.interfaces.RoleDao;
|
||||
import se.su.dsv.scipro.data.dao.interfaces.UserDao;
|
||||
import se.su.dsv.scipro.data.dataobjects.Employee;
|
||||
import se.su.dsv.scipro.data.dataobjects.Language;
|
||||
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
|
||||
import se.su.dsv.scipro.data.dataobjects.User;
|
||||
import se.su.dsv.scipro.match.Matcher.Result;
|
||||
import se.su.dsv.scipro.match.dao.interfaces.ProjectIdeaDao;
|
||||
import se.su.dsv.scipro.match.dataobject.Availability;
|
||||
@ -40,6 +43,12 @@ public class TestGreedyMatchingAlgorithm {
|
||||
@Autowired
|
||||
private LanguageDao languageDao;
|
||||
|
||||
@Autowired
|
||||
private RoleDao roleDao;
|
||||
|
||||
@Autowired
|
||||
private UserDao userDao;
|
||||
|
||||
private List<ProjectIdea> unmatchedProjectIdeas;
|
||||
private List<Availability> supervisorAvailability;
|
||||
private Weights weights;
|
||||
@ -62,11 +71,21 @@ public class TestGreedyMatchingAlgorithm {
|
||||
languages.add(language);
|
||||
|
||||
bachelorSupervisor = new Employee();
|
||||
bachelorSupervisor.getCapabilities().setLanguages(languages);
|
||||
User user1 = new User();
|
||||
user1.setFirstName("User 1");
|
||||
user1 = userDao.save(user1);
|
||||
bachelorSupervisor.getCapabilities().setLanguages(languages);
|
||||
bachelorSupervisor.setUser(user1);
|
||||
bachelorSupervisor = (Employee) roleDao.save(bachelorSupervisor);
|
||||
|
||||
masterSupervisor = new Employee();
|
||||
User user2 = new User();
|
||||
user2.setFirstName("User 2");
|
||||
user2 = userDao.save(user2);
|
||||
masterSupervisor.getCapabilities().setLanguages(languages);
|
||||
|
||||
masterSupervisor.setUser(user2);
|
||||
masterSupervisor = (Employee) roleDao.save(masterSupervisor);
|
||||
|
||||
bachelorProjectClass = new ProjectClass(ProjectClass.BACHELOR, "Bachelor", "Bachelor project class");
|
||||
bachelorProjectClass = projectClassDao.save(bachelorProjectClass);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user