Removed code duplication in test data.

This commit is contained in:
Tom Vahlman 2012-02-11 18:35:20 +01:00
parent 96a16a4c6a
commit 1e72ba3087

@ -60,50 +60,51 @@ public class TestGreedyMatchingAlgorithm {
private ProjectClass masterProjectClass;
private Set<Language> languages;
@Before
private Employee createSupervisor(final String firstName, final String lastName) {
Employee employee = new Employee();
User user = new User();
user.setFirstName(firstName);
user.setLastName(lastName);
user = userDao.save(user);
employee.getCapabilities().setLanguages(languages);
employee.setUser(user);
return (Employee) roleDao.save(employee);
}
private ProjectIdea createProjectIdea(final ProjectClass projectClass) {
ProjectIdea projectIdea = new ProjectIdea();
projectIdea.setProjectClass(projectClass);
projectIdea.setLanguages(languages);
return projectIdeaDao.save(projectIdea);
}
private ProjectClass createProjectClass(final String projectCode, final String name, final String description) {
ProjectClass projectClass = new ProjectClass(projectCode, name, description);
return projectClassDao.save(projectClass);
}
private void addLanguage(final String name) {
Language language = new Language();
language.setName(name);
language = languageDao.save(language);
languages.add(language);
}
@Before
public void init() throws Exception {
unmatchedProjectIdeas = new ArrayList<ProjectIdea>();
supervisorAvailability = new ArrayList<Availability>();
languages = new HashSet<Language>();
Language language = new Language();
language.setName("Swedish");
language = languageDao.save(language);
languages.add(language);
bachelorSupervisor = new Employee();
User user1 = new User();
user1.setFirstName("Henrik");
user1.setLastName("Hansson");
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("Birger");
user2.setLastName("Andersson");
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);
masterProjectClass = new ProjectClass(ProjectClass.MASTER, "Master", "Master project class");
masterProjectClass = projectClassDao.save(masterProjectClass);
bachelorProjectIdea = new ProjectIdea();
bachelorProjectIdea.setProjectClass(bachelorProjectClass);
bachelorProjectIdea.setLanguages(languages);
bachelorProjectIdea = projectIdeaDao.save(bachelorProjectIdea);
masterProjectIdea = new ProjectIdea();
masterProjectIdea.setProjectClass(masterProjectClass);
masterProjectIdea.setLanguages(languages);
masterProjectIdea = projectIdeaDao.save(masterProjectIdea);
languages = new HashSet<Language>();
addLanguage("Swedish");
bachelorSupervisor = createSupervisor("Henrik", "Hansson");
bachelorProjectClass = createProjectClass(ProjectClass.BACHELOR, "Bachelor", "Bachelor project class");
bachelorProjectIdea = createProjectIdea(bachelorProjectClass);
masterSupervisor = createSupervisor("Birger", "Andersson");
masterProjectClass = createProjectClass(ProjectClass.MASTER, "Master", "Master project class");
masterProjectIdea = createProjectIdea(masterProjectClass);
weights = new Weights();
weights.setKeywordPoints(3);
weights.setResearchAreaPoints(5);