Refactored the test code, instance variables should be local variables if possible, unused code are removed etc..
This commit is contained in:
parent
0d8b2905f1
commit
856ae14693
src/test/java/se/su/dsv/scipro/match
@ -138,6 +138,16 @@ public class TestGreedyMatchingAlgorithm {
|
||||
masterSupervisor = createSupervisor("Birger", "Andersson");
|
||||
masterProjectClass = createProjectClass(ProjectClass.MASTER, "Master", "Master project class");
|
||||
masterProjectIdea = createProjectIdea(masterProjectClass, applicationPeriod);
|
||||
|
||||
|
||||
KeywordType standard = new KeywordType("standard");
|
||||
standard = keywordTypeDao.save(standard);
|
||||
|
||||
KeywordType other = new KeywordType("other");
|
||||
other = keywordTypeDao.save(other);
|
||||
|
||||
KeywordType unit = new KeywordType("unit");
|
||||
unit = keywordTypeDao.save(unit);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -48,9 +48,6 @@ public class TestMatcher {
|
||||
@Autowired
|
||||
private UserDao userDao;
|
||||
|
||||
@Autowired
|
||||
private UsernameDao userNameDao;
|
||||
|
||||
@Autowired
|
||||
private RoleDao roleDao;
|
||||
|
||||
@ -60,82 +57,19 @@ public class TestMatcher {
|
||||
@Autowired
|
||||
private ProjectClassDao projectClassDao;
|
||||
|
||||
@Autowired
|
||||
private ApplicationPeriodDao applicationPeriodDao;
|
||||
|
||||
@Autowired
|
||||
private ApplicationPeriodFacade applicationPeriodFacade;
|
||||
|
||||
@Autowired
|
||||
private LanguageDao languageDao;
|
||||
|
||||
@Autowired
|
||||
private KeywordTypeDao keywordTypeDao;
|
||||
|
||||
@Autowired
|
||||
private MatchDao matchDao;
|
||||
|
||||
@Autowired
|
||||
private AuthorDao authorDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectIdeaDao projectIdeaDao;
|
||||
|
||||
@Autowired
|
||||
ApplicationContext applicationContext;
|
||||
|
||||
private User user1;
|
||||
|
||||
private KeywordType standard;
|
||||
private KeywordType other;
|
||||
private Keyword key1;
|
||||
private Keyword key2;
|
||||
private KeywordType unit;
|
||||
private Keyword key3;
|
||||
|
||||
private Set<Keyword> keywords;
|
||||
|
||||
private ProjectClass bachelor;
|
||||
|
||||
private ApplicationPeriod applicationPeriod;
|
||||
|
||||
private User user2;
|
||||
|
||||
private ProjectClass master;
|
||||
|
||||
private Language swedish;
|
||||
|
||||
private Language english;
|
||||
|
||||
private HashSet<Language> allLanguages;
|
||||
|
||||
private HashSet<Language> swedishSet;
|
||||
|
||||
private User user3;
|
||||
|
||||
private Username username1;
|
||||
|
||||
private Username username2;
|
||||
|
||||
private Username username3;
|
||||
|
||||
private Employee supervisor1;
|
||||
|
||||
private Employee supervisor2;
|
||||
|
||||
private Employee supervisor3;
|
||||
|
||||
private User user4;
|
||||
|
||||
private User student1;
|
||||
private Role student1Role;
|
||||
|
||||
private ProjectIdea projectIdea1;
|
||||
|
||||
private Student student1Author;
|
||||
|
||||
private ProjectIdea projectIdea2;
|
||||
|
||||
private ProjectIdea projectIdea3;
|
||||
|
||||
private Matcher target;
|
||||
@ -146,104 +80,46 @@ public class TestMatcher {
|
||||
|
||||
private Match match3;
|
||||
|
||||
private Weights weights;
|
||||
|
||||
|
||||
@Before
|
||||
public void startTransaction() {
|
||||
user1 = new User();
|
||||
User user1 = new User();
|
||||
user1.setFirstName("User 1");
|
||||
user1 = userDao.save(user1);
|
||||
|
||||
username1 = new Username();
|
||||
username1.setUser(user1);
|
||||
username1.setUserName("User1");
|
||||
username1.setRealm("dsv");
|
||||
username1 = userNameDao.save(username1);
|
||||
|
||||
user2 = new User();
|
||||
User user2 = new User();
|
||||
user2.setFirstName("User 2");
|
||||
user2 = userDao.save(user2);
|
||||
|
||||
username2 = new Username();
|
||||
username2.setUser(user2);
|
||||
username2.setUserName("User2");
|
||||
username2.setRealm("dsv");
|
||||
username2 = userNameDao.save(username2);
|
||||
|
||||
|
||||
|
||||
user3 = new User();
|
||||
User user3 = new User();
|
||||
user3.setFirstName("Usa 3");
|
||||
user3 = userDao.save(user3);
|
||||
|
||||
user4 = new User();
|
||||
user4.setFirstName("sra 4");
|
||||
user4 = userDao.save(user4);
|
||||
|
||||
username3 = new Username();
|
||||
username3.setUser(user3);
|
||||
username3.setUserName("Usa 3");
|
||||
username3.setRealm("dsv");
|
||||
username3 = userNameDao.save(username3);
|
||||
|
||||
student1 = new User();
|
||||
User student1 = new User();
|
||||
student1.setFirstName("Student 1");
|
||||
student1 = userDao.save(student1);
|
||||
|
||||
student1Role = new Student();
|
||||
Role student1Role = new Student();
|
||||
student1Role.setUser(student1);
|
||||
student1Role = roleDao.save(student1Role);
|
||||
|
||||
student1Author = (Student) student1Role;
|
||||
|
||||
swedish = new Language("Svenska");
|
||||
swedish = languageDao.save(swedish);
|
||||
|
||||
english = new Language("English");
|
||||
english = languageDao.save(english);
|
||||
|
||||
allLanguages = new HashSet<Language>();
|
||||
allLanguages.add(swedish);
|
||||
allLanguages.add(english);
|
||||
|
||||
swedishSet = new HashSet<Language>();
|
||||
swedishSet.add(swedish);
|
||||
|
||||
standard = new KeywordType("standard");
|
||||
standard = keywordTypeDao.save(standard);
|
||||
|
||||
other = new KeywordType("other");
|
||||
other = keywordTypeDao.save(other);
|
||||
|
||||
unit = new KeywordType("unit");
|
||||
unit = keywordTypeDao.save(unit);
|
||||
|
||||
key1 = new Keyword("key 1", standard);
|
||||
key2 = new Keyword("key 2", other);
|
||||
key3 = new Keyword("key 3", unit);
|
||||
|
||||
keywords = new HashSet<Keyword>();
|
||||
keywords.add(key1);
|
||||
keywords.add(key2);
|
||||
Student student1Author = (Student) student1Role;
|
||||
|
||||
bachelor =
|
||||
new ProjectClass(ProjectClass.BACHELOR, "Bachelor",
|
||||
"Bachelor degree thesis project");
|
||||
bachelor = projectClassDao.save(bachelor);
|
||||
|
||||
master =
|
||||
new ProjectClass(ProjectClass.MASTER, "Master",
|
||||
ProjectClass master = new ProjectClass(ProjectClass.MASTER, "Master",
|
||||
"Master degree thesis project");
|
||||
master = projectClassDao.save(master);
|
||||
|
||||
|
||||
supervisor1 = new Employee();
|
||||
Employee supervisor1 = new Employee();
|
||||
supervisor1.setUser(user1);
|
||||
supervisor1.getCapabilities().setMaxProjects(bachelor, 1);
|
||||
supervisor1 = supervisorDao.save(supervisor1);
|
||||
|
||||
supervisor2 = new Employee();
|
||||
Employee supervisor2 = new Employee();
|
||||
supervisor2.setUser(user2);
|
||||
supervisor2.getCapabilities().setMaxProjects(bachelor, 1);
|
||||
supervisor2 = supervisorDao.save(supervisor2);
|
||||
@ -257,15 +133,15 @@ public class TestMatcher {
|
||||
projectClassSet.add(bachelor);
|
||||
projectClassSet.add(master);
|
||||
|
||||
applicationPeriod = applicationPeriodFacade.createApplicationPeriod(projectClassSet, null, null);
|
||||
projectIdea1 = new ProjectIdea();
|
||||
ApplicationPeriod applicationPeriod = applicationPeriodFacade.createApplicationPeriod(projectClassSet, null, null);
|
||||
ProjectIdea projectIdea1 = new ProjectIdea();
|
||||
projectIdea1.setTitle("Project idea 1");
|
||||
projectIdea1.setApplicationPeriod(applicationPeriod);
|
||||
projectIdea1.getAuthors().add(student1Author);
|
||||
projectIdea1.setProjectClass(bachelor);
|
||||
projectIdea1 = projectIdeaDao.save(projectIdea1);
|
||||
|
||||
projectIdea2 = new ProjectIdea();
|
||||
ProjectIdea projectIdea2 = new ProjectIdea();
|
||||
projectIdea2.setTitle("Project idea 2");
|
||||
projectIdea2.getAuthors().add(student1Author);
|
||||
projectIdea2.setProjectClass(bachelor);
|
||||
@ -299,8 +175,8 @@ public class TestMatcher {
|
||||
match3.setStatus(Match.Status.PENDING);
|
||||
match3.setPoints(60);
|
||||
match3.setSupervisor(supervisor3);
|
||||
|
||||
weights = new Weights();
|
||||
|
||||
Weights weights = new Weights();
|
||||
weights.setKeywordPoints(20);
|
||||
weights.setPreferredSupervisorPoints(30);
|
||||
weights.setResearchAreaPoints(10);
|
||||
|
@ -47,48 +47,29 @@ public class TestMatchDao {
|
||||
@Autowired
|
||||
private UserDao userDao;
|
||||
|
||||
@Autowired
|
||||
private AuthorDao authorDao;
|
||||
@Autowired
|
||||
private ProjectScheduleDao projectScheduleDao;
|
||||
@Autowired
|
||||
private ProjectScheduleEventDao projectScheduleEventDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectDao projectDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectClassDao projectClassDao;
|
||||
@Autowired
|
||||
private ProjectScheduleFacade projectScheduleFacade;
|
||||
|
||||
@Autowired
|
||||
private RoleDao roleDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectIdeaDao projectIdeaDao;
|
||||
|
||||
@Autowired
|
||||
private ApplicationPeriodDao applicationPeriodDao;
|
||||
|
||||
@Autowired
|
||||
private MatchDao matchDao;
|
||||
|
||||
@Autowired
|
||||
private KeywordDao keywordDao;
|
||||
|
||||
@Autowired
|
||||
private SupervisorDao supervisorDao;
|
||||
|
||||
@Autowired
|
||||
private ApplicationPeriodFacade applicationPeriodFacade;
|
||||
|
||||
private User student1;
|
||||
private Project project;
|
||||
private ProjectClass projectClass;
|
||||
private Role student1Role;
|
||||
private ProjectSchedule projectSchedule;
|
||||
private ProjectIdea projectIdea1;
|
||||
private ProjectIdea projectIdea2;
|
||||
|
||||
private Student student1Author;
|
||||
|
||||
private User employee1;
|
||||
|
||||
@ -96,17 +77,15 @@ public class TestMatchDao {
|
||||
|
||||
private MatchDao target;
|
||||
|
||||
private Object projectIdea;
|
||||
|
||||
@Before
|
||||
public void startTransaction() {
|
||||
student1 = new User();
|
||||
student1 = userDao.save(student1);
|
||||
|
||||
student1Role = new Student();
|
||||
Role student1Role = new Student();
|
||||
student1Role.setUser(student1);
|
||||
student1Role = roleDao.save(student1Role);
|
||||
student1Author = (Student) student1Role;
|
||||
Student student1Author = (Student) student1Role;
|
||||
|
||||
employee1 = new User();
|
||||
employee1 = userDao.save(employee1);
|
||||
@ -115,18 +94,17 @@ public class TestMatchDao {
|
||||
employee1Role.setUser(employee1);
|
||||
employee1Role = (Employee) roleDao.save(employee1Role);
|
||||
|
||||
projectClass =
|
||||
new ProjectClass(ProjectClass.BACHELOR, "Bachelor",
|
||||
ProjectClass projectClass = new ProjectClass(ProjectClass.BACHELOR, "Bachelor",
|
||||
"Bachelor degree thesis project");
|
||||
projectClass = projectClassDao.save(projectClass);
|
||||
|
||||
project = new Project();
|
||||
Project project = new Project();
|
||||
project.setTitle("SomeProject");
|
||||
project.setProjectClass(projectClass);
|
||||
project.addProjectParticipant((Student) student1Role);
|
||||
project = projectDao.save(project);
|
||||
|
||||
projectSchedule = new ProjectSchedule();
|
||||
ProjectSchedule projectSchedule = new ProjectSchedule();
|
||||
projectSchedule.setProject(project);
|
||||
projectSchedule = projectScheduleDao.save(projectSchedule);
|
||||
|
||||
@ -141,13 +119,6 @@ public class TestMatchDao {
|
||||
projectIdea1.setApplicationPeriod(applicationPeriod);
|
||||
projectIdea1 = projectIdeaDao.save(projectIdea1);
|
||||
|
||||
projectIdea2 = new ProjectIdea();
|
||||
projectIdea2.getAuthors().add(student1Author);
|
||||
projectIdea2.setProjectClass(projectClass);
|
||||
projectIdea2.setApplicationPeriod(applicationPeriod);
|
||||
projectIdea2.setProject(project);
|
||||
projectIdea2 = projectIdeaDao.save(projectIdea2);
|
||||
|
||||
target = matchDao;
|
||||
}
|
||||
|
||||
|
@ -50,31 +50,21 @@ public class TestProjectIdeaDao {
|
||||
@Autowired
|
||||
private UserDao userDao;
|
||||
|
||||
@Autowired
|
||||
private AuthorDao authorDao;
|
||||
|
||||
@Autowired
|
||||
private SupervisorDao supervisorDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectScheduleDao projectScheduleDao;
|
||||
@Autowired
|
||||
private ProjectScheduleEventDao projectScheduleEventDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectDao projectDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectClassDao projectClassDao;
|
||||
@Autowired
|
||||
private ProjectScheduleFacade projectScheduleFacade;
|
||||
|
||||
@Autowired
|
||||
private RoleDao roleDao;
|
||||
|
||||
@Autowired
|
||||
private ProjectIdeaDao projectIdeaDao;
|
||||
|
||||
@Autowired
|
||||
private ApplicationPeriodDao applicationPeriodDao;
|
||||
|
||||
@Autowired
|
||||
private ApplicationPeriodFacade applicationPeriodFacade;
|
||||
|
||||
@ -83,18 +73,11 @@ public class TestProjectIdeaDao {
|
||||
|
||||
private User student1;
|
||||
private Project project;
|
||||
private ProjectClass bachelor;
|
||||
private Role student1Role;
|
||||
private ProjectSchedule projectSchedule;
|
||||
private ProjectIdea projectIdea1;
|
||||
private ProjectIdea projectIdea2;
|
||||
|
||||
private Student student1Author;
|
||||
|
||||
private User student2;
|
||||
|
||||
private Role student2Role;
|
||||
|
||||
private Student student2Author;
|
||||
|
||||
private ProjectIdea projectIdea3;
|
||||
@ -110,8 +93,6 @@ public class TestProjectIdeaDao {
|
||||
private List<Match.Status> rejected;
|
||||
private List<Match.Status> unmatched;
|
||||
private List<Match.Status> published;
|
||||
|
||||
private ProjectClass master;
|
||||
|
||||
private List<ProjectClass> masters;
|
||||
|
||||
@ -125,8 +106,6 @@ public class TestProjectIdeaDao {
|
||||
|
||||
private Date date18Aug2010;
|
||||
|
||||
private User employee2;
|
||||
|
||||
private Employee employee2Role;
|
||||
|
||||
|
||||
@ -135,15 +114,15 @@ public class TestProjectIdeaDao {
|
||||
student1 = new User();
|
||||
student1 = userDao.save(student1);
|
||||
|
||||
student1Role = new Student();
|
||||
Role student1Role = new Student();
|
||||
student1Role.setUser(student1);
|
||||
student1Role = roleDao.save(student1Role);
|
||||
student1Author = (Student) student1Role;
|
||||
|
||||
student2 = new User();
|
||||
|
||||
User student2 = new User();
|
||||
student2 = userDao.save(student2);
|
||||
|
||||
student2Role = new Student();
|
||||
Role student2Role = new Student();
|
||||
student2Role.setUser(student2);
|
||||
student2Role = roleDao.save(student2Role);
|
||||
student2Author = (Student) student2Role;
|
||||
@ -155,20 +134,18 @@ public class TestProjectIdeaDao {
|
||||
employee1Role.setUser(employee1);
|
||||
employee1Role = (Employee) roleDao.save(employee1Role);
|
||||
|
||||
employee2 = new User();
|
||||
User employee2 = new User();
|
||||
employee2 = userDao.save(employee2);
|
||||
|
||||
employee2Role = new Employee();
|
||||
employee2Role.setUser(employee2);
|
||||
employee2Role = (Employee) roleDao.save(employee2Role);
|
||||
|
||||
bachelor =
|
||||
new ProjectClass(ProjectClass.BACHELOR, "Bachelor",
|
||||
ProjectClass bachelor = new ProjectClass(ProjectClass.BACHELOR, "Bachelor",
|
||||
"Bachelor degree thesis project");
|
||||
bachelor = projectClassDao.save(bachelor);
|
||||
|
||||
master =
|
||||
new ProjectClass(ProjectClass.MASTER, "Master",
|
||||
ProjectClass master = new ProjectClass(ProjectClass.MASTER, "Master",
|
||||
"Master degree thesis project");
|
||||
master = projectClassDao.save(master);
|
||||
|
||||
@ -181,7 +158,7 @@ public class TestProjectIdeaDao {
|
||||
project.addProjectParticipant((Student) student1Role);
|
||||
project = projectDao.save(project);
|
||||
|
||||
projectSchedule = new ProjectSchedule();
|
||||
ProjectSchedule projectSchedule = new ProjectSchedule();
|
||||
projectSchedule.setProject(project);
|
||||
projectSchedule = projectScheduleDao.save(projectSchedule);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user