DMC/scipro
7
0
Fork 0
Code Issues44 Pull Requests6 Actions Projects1 Releases Wiki Activity

updated current.sql and fixed some changed tests

Browse Source
This commit is contained in:
Emil Siverhall 2013-06-18 13:52:43 +02:00
parent b9afae2ad4
commit 766a62bfd8
4 changed files with 23 additions and 6 deletions
resources/db_update_scripts
current.sql
src/test/java/se/su/dsv/scipro
milestones/service/impl
MileStoneActivityServiceImplTest.javaMileStoneServiceImplTest.java
test
ProjectBuilder.java

10
resources/db_update_scripts/current.sql

@ -7,3 +7,13 @@ ALTER TABLE `milestone_activity` ADD UNIQUE KEY `code` (`code`);
UPDATE `scipro`.`milestone_activity` SET `code` = 'CREATE_SEMINAR' WHERE `milestone_activity`.`id` =10;
UPDATE `scipro`.`milestone_activity` SET `code` = 'THESIS_UPLOADED' WHERE `milestone_activity`.`id` =11;
CREATE TABLE `milestone_activity_project_class` (
`milestone_activity_id` bigint(20) NOT NULL,
`projectClasses_id` bigint(20) NOT NULL,
PRIMARY KEY (`milestone_activity_id`,`projectClasses_id`),
KEY `FKFB3FC75157F6B071` (`projectClasses_id`),
KEY `FKFB3FC75180E42A0F` (`milestone_activity_id`),
CONSTRAINT `FKFB3FC75157F6B071` FOREIGN KEY (`projectClasses_id`) REFERENCES `project_class` (`id`),
CONSTRAINT `FKFB3FC75180E42A0F` FOREIGN KEY (`milestone_activity_id`) REFERENCES `milestone_activity` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

1
src/test/java/se/su/dsv/scipro/milestones/service/impl/MileStoneActivityServiceImplTest.java

@ -93,6 +93,7 @@ public class MileStoneActivityServiceImplTest {
assertEquals(captor.getValue().getType(), MileStoneActivity.Type.PROJECT);
}
@Test
public void testGetActivityByCode() throws Exception {
MileStoneActivity createSeminar = createActivity(MileStoneActivity.Type.PROJECT, "Create seminar", "description");
createSeminar.setCode(MileStoneActivity.CREATE_SEMINAR);

4
src/test/java/se/su/dsv/scipro/milestones/service/impl/MileStoneServiceImplTest.java

@ -88,7 +88,7 @@ public class MileStoneServiceImplTest {
@Test
public void testGetUnfinishedActivities() throws Exception {
Project project = new ProjectBuilder().create();
Project project = new ProjectBuilder().addProjectClass(ProjectClass.BACHELOR).create();
MileStoneActivity supervisorApproved = new MileStoneActivity(MileStoneActivity.Type.PROJECT, "Supervisor approved", "Description..");
DomainObjects.injectId(supervisorApproved, 1L);
@ -115,7 +115,7 @@ public class MileStoneServiceImplTest {
@Test
public void testGetUnfinishedStudentActivities() throws Exception {
Project project = new ProjectBuilder().create();
Project project = new ProjectBuilder().addProjectClass(ProjectClass.BACHELOR).create();
Student s = RoleBuilder.asStudent(new UserBuilder().create());
//project.addProjectParticipant(s);

14
src/test/java/se/su/dsv/scipro/test/ProjectBuilder.java

@ -1,9 +1,6 @@
package se.su.dsv.scipro.test;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.data.dataobjects.*;
import java.util.SortedSet;
import java.util.TreeSet;
@ -17,6 +14,7 @@ public class ProjectBuilder {
SortedSet<Student> authors = new TreeSet<Student>();
Employee supervisor;
ProjectClass pc;
public Project create() {
Project project = new Project();
@ -26,6 +24,9 @@ public class ProjectBuilder {
if(supervisor!=null) {
project.setHeadSupervisor(supervisor);
}
if(pc!=null) {
project.setProjectClass(pc);
}
return project;
}
@ -43,4 +44,9 @@ public class ProjectBuilder {
supervisor = emp;
return this;
}
public ProjectBuilder addProjectClass(String code) {
pc = new ProjectClass(code, "name", "description");
return this;
}
}