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

Merge branch 'skipTuples' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2012-06-15 12:51:26 +02:00
commit bee5fc62ee
1 changed files with 22 additions and 2 deletions

24
src/test/java/se/su/dsv/scipro/springdata/TestPeerReview.java

@ -10,11 +10,11 @@ import java.util.Locale;
import junit.framework.Assert;
import org.joda.time.DateTime;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
@ -56,7 +56,7 @@ public class TestPeerReview {
@Autowired
private PeerRequestService peerRequestService;
private Project reviewerProject, requesterProject;
private Project reviewerProject, requesterProject, bachelorProject;
private User employeeUser, reviewer, requester;
private Student reviewerRole, requesterRole;
private Employee headSupervisor;
@ -89,6 +89,7 @@ public class TestPeerReview {
reviewerProject = newProject(bachelor, reviewerRole, headSupervisor, ProjectStatus.ACTIVE);
requesterProject = newProject(master, requesterRole, headSupervisor, ProjectStatus.ACTIVE);
bachelorProject = newProject(bachelor, requesterRole, headSupervisor, ProjectStatus.ACTIVE);
request1 = newRequest(requesterRole, requesterProject, "Request 1", null);
request2 = newRequest(requesterRole, requesterProject, "Request 2", null);
@ -275,6 +276,25 @@ public class TestPeerReview {
Assert.assertEquals(Arrays.asList(new PeerReview[]{review1,review2,review3}), reviewList);
}
@Test
@Transactional
@Rollback
public void testFindByStatusAndProjectClass() {
Page<PeerRequest> requestPage = peerRequestService.findByStatusAndProjectClass(RequestStatus.WAITING, master, new PageRequest(0,8));
List<PeerRequest> requestList = requestPage.getContent();
Assert.assertEquals(1, requestList.size());
Assert.assertEquals(Arrays.asList(new PeerRequest[]{request4}), requestList);
request3.setStatus(RequestStatus.WAITING);
request4.setProject(bachelorProject);
requestPage = peerRequestService.findByStatusAndProjectClass(RequestStatus.WAITING, master, new PageRequest(0,8));
requestList = requestPage.getContent();
Assert.assertEquals(Arrays.asList(new PeerRequest[]{request3}), requestList);
}
//Helper methods for setting up test objects
private PeerReview newReview(final Student reviewer, final Project project, PeerRequest request, final RequestStatus status, boolean aborted, boolean submitted) {