DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

Changed in getBoardMessageList because new structure for

Browse Source 
messageBoards in dataobjects

Change-Id: I286d127d05a157e3be8712fefd04b27288575361
This commit is contained in:
joha-asc 2011-07-12 13:47:16 +02:00
parent 41f4ef02cb
commit 5a2b8d8de0
3 changed files with 61 additions and 8 deletions

12
src/test/java/se/su/dsv/scipro/dao/jpa/TestBoardMessageDaoJPA-context.xml

@ -32,5 +32,17 @@
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
<bean id="projectDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectDaoJPAImp">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
<bean id="roleDao" class="se.su.dsv.scipro.data.dao.jpa.RoleDaoJPAImp">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
<bean id="projectClassDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectClassDaoJPAImp">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
</beans>

49
src/test/java/se/su/dsv/scipro/dao/jpa/TestBoardMessageDaoJPA.java

@ -4,6 +4,7 @@
package se.su.dsv.scipro.dao.jpa;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
@ -19,10 +20,19 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
import se.su.dsv.scipro.data.dao.interfaces.BoardMessageDao;
import se.su.dsv.scipro.data.dao.interfaces.FinalSeminarDao;
import se.su.dsv.scipro.data.dao.interfaces.MessageBoardDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
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.BoardMessage;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.FinalSeminar;
import se.su.dsv.scipro.data.dataobjects.MessageBoard;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.User;
/**
@ -42,6 +52,16 @@ public class TestBoardMessageDaoJPA {
@Autowired
private MessageBoardDao messageBoardDao;
@Autowired
private ProjectClassDao projectClassDao;
@Autowired
private RoleDao roleDao;
@Autowired
private ProjectDao projectDao;
private User user;
private BoardMessage boardMessage;
private MessageBoard messageBoard;
@ -55,18 +75,41 @@ public class TestBoardMessageDaoJPA {
user.setFirstName("Test");
user.setLastName("Person");
user = userDao.save(user);
ProjectClass projectClass = new ProjectClass();
projectClass.setName("Master");
projectClass.setCode(ProjectClass.MASTER);
projectClass = projectClassDao.save(projectClass);
User presenter = new User();
presenter.setFirstName("Presenter");
presenter = userDao.save(presenter);
Student presenterRole = roleDao.makeStudent(presenter);
Employee opponentProjectSupervisorRole = roleDao.makeEmployee(presenter);
Project presenterProject = new Project();
presenterProject.setTitle("Presenter Project");
presenterProject.setHeadSupervisor(opponentProjectSupervisorRole);
presenterProject.setProjectClass(projectClass);
presenterProject.addProjectParticipant(presenterRole);
presenterProject = projectDao.save(presenterProject);
messageBoard = new MessageBoard();
messageBoard = new MessageBoard(presenterProject);
messageBoard.setTitle("test");
messageBoard = messageBoardDao.save(messageBoard);
boardMessage = new BoardMessage();
boardMessage.setFromUser(user);
boardMessage.setMessage("Test");
boardMessage.setMessageBoard(messageBoard);
boardMessage = boardMessageDao.save(boardMessage);
}

8
src/test/java/se/su/dsv/scipro/dao/jpa/TestRoleDaoJPA.java

@ -1,9 +1,6 @@
package se.su.dsv.scipro.dao.jpa;
import java.util.ArrayList;
import java.util.List;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@ -17,8 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
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.Admin;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.*;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.SysAdmin;
import se.su.dsv.scipro.data.dataobjects.User;
/**
*