Merge branch 'peer_reviewdate_feature' into develop

* peer_reviewdate_feature:
  Added unit test for findLatestReviewers
This commit is contained in:
Emil Siverhall 2011-07-21 09:13:42 +02:00
commit 6076b779e7
3 changed files with 49 additions and 1 deletions
src
main/java/se/su/dsv/scipro/peer/data/dao
test/java/se/su/dsv/scipro/dao/jpa

@ -49,6 +49,8 @@ public interface PeerReviewDao extends LazyDeleteDao<PeerReview> {
public List<PeerReview> findReviewsSortedByDate(final int firstResult, final Integer limit);
public List<PeerReview> findReviewsSortedByDate();
/**
* Find given peer reviews for a given project and student
*

@ -414,8 +414,13 @@ public class PeerReviewDaoJPAImp extends LazyDeleteAbstractDaoJPAImp<PeerReview>
}
});
}
@Transactional
public List<PeerReview> findReviewsSortedByDate() {
return findReviewsSortedByDate(0, 3);
}
@Override
@Transactional
public int countSubmittedReviews() {
return getJpaTemplate().execute(new JpaCallback<Integer>() {
public Integer doInJpa(EntityManager em)

@ -491,5 +491,46 @@ public class TestPeerReviewDaoJPA {
list.add(review1);
Assert.assertEquals(list, peerReviewDao.findPeerReviewsByStudentAndProject(reviewerRole, reviewerProject));
}
@Test
@Transactional
@Rollback
public void testFindLatestReviewers(){
PeerRequest request1 = new PeerRequest();
request1.setComment("plz b gentle!");
request1.setRequester(requesterRole);
request1.setProject(requesterProject);
request1 = peerRequestDao.save(request1);
PeerReview review1 = new PeerReview();
review1.setReviewer(reviewerRole);
review1.setProject(reviewerProject);
review1.setComment("Overall ok!");
review1.setPeerRequest(request1);
request1.setStatus(RequestStatus.FINISHED);
request1 = peerRequestDao.save(request1);
review1.setSubmitted(true);
review1 = peerReviewDao.save(review1);
PeerRequest request2 = new PeerRequest();
request2.setComment("plz b gentle!");
request2.setRequester(requesterRole);
request2.setProject(requesterProject);
request2 = peerRequestDao.save(request2);
PeerReview review2 = new PeerReview();
review2.setReviewer(reviewerRole);
review2.setProject(reviewerProject);
review2.setComment("Overall ok!");
review2.setPeerRequest(request2);
request2.setStatus(RequestStatus.FINISHED);
request2 = peerRequestDao.save(request2);
review2.setSubmitted(true);
review2 = peerReviewDao.save(review2);
List<PeerReview> sortedByDate = peerReviewDao.findReviewsSortedByDate();
Assert.assertEquals(review2, sortedByDate.get(0));
Assert.assertEquals(2, peerReviewDao.countSubmittedReviews());
}
}