Mise a jour des tests pour EvaluationManager : tout au vert

This commit is contained in:
2008-02-23 18:37:18 +00:00
parent ba63216831
commit 5052da5c73

View File

@@ -38,6 +38,8 @@ public class EvaluationManagerTest {
private static IUserManager um; private static IUserManager um;
private int confId; private int confId;
private Article article; private Article article;
private int articleId;
private int critId;
@BeforeClass @BeforeClass
public static void setUpManager() throws NamingException, PKAlreadyUsedException { public static void setUpManager() throws NamingException, PKAlreadyUsedException {
@@ -50,40 +52,54 @@ public class EvaluationManagerTest {
@Before @Before
public void initDB() throws Exception{ public void initDB() throws Exception{
if(! um.exists("evaluationManagerTest")){
um.addUser("evaluationManagerTest", "pw", "first", "last", "yacos", "evaluationManagerTest@yacos.com"); um.addUser("evaluationManagerTest", "pw", "first", "last", "yacos", "evaluationManagerTest@yacos.com");
}
if(! um.exists("evaluationManagerTest2")){
um.addUser("evaluationManagerTest2", "pw", "first", "last", "yacos", "evaluationManagerTest@yacos.com");
}
cm.addConferenceCreationToken("evaluationManagerTest"); cm.addConferenceCreationToken("evaluationManagerTest");
Conference conf = cm.addConference("titre","evaluationManagerTest","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); Conference conf = cm.addConference("titre","evaluationManagerTest","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
confId = conf.getId(); confId = conf.getId();
Criterion crit = em.addCriterion("name", 0, 4, confId);
critId = crit.getId();
article = am.addArticle("title article max","topic","Abstract", "url_article", article = am.addArticle("title article max","topic","Abstract", "url_article",
"evaluationManagerTest", new ArrayList<String>(), Article.State.SUBMITED, confId); "evaluationManagerTest", new ArrayList<String>(), Article.State.SUBMITED, confId);
//article = am.getArticle(1); articleId = article.getId();
} }
@After @After
public void cleanDB(){ public void cleanDB(){
am.removeArticle(article.getId()); if(am.existsArticle(articleId)){
um.removeUser("evaluationManagerTest"); am.removeArticle(articleId);
}
if(em.getCriterion(critId)!=null){
em.removeCriterion(critId);
}
if(cm.exists(confId)){
cm.remove(confId); cm.remove(confId);
} }
um.removeUser("evaluationManagerTest");
um.removeUser("evaluationManagerTest2");
}
@Test @Test
public void add_et_getCriterionsTest() { public void add_et_getCriterionsTest() {
Criterion crit = em.addCriterion("name", 0, 4, confId); Criterion crit = em.getCriterion(critId);
assertNotNull(crit); assertNotNull(crit);
assertEquals(crit.getName(), em.getCriterion(crit.getId()).getName()); assertEquals(crit.getName(), em.getCriterion(crit.getId()).getName());
} }
@Test @Test
public void getCriterionsTest() throws NamingException{ public void getCriterionsTest() throws NamingException{
em.addCriterion("name", 0, 4, confId);
List<Criterion> list = em.getCriterions(confId); List<Criterion> list = em.getCriterions(confId);
assertFalse("liste vide",list.isEmpty()); assertFalse("liste vide",list.isEmpty());
} }
@Test @Test
public void updateCriterionTest(){ public void updateCriterionTest(){
Criterion crit = em.addCriterion("name", 0, 4, confId); Criterion crit = em.getCriterion(critId);
crit.setName("autre"); crit.setName("autre");
em.updateCriterion(crit); em.updateCriterion(crit);
crit = em.getCriterion(crit.getId()); crit = em.getCriterion(crit.getId());
@@ -92,22 +108,27 @@ public class EvaluationManagerTest {
@Test @Test
public void removeCriterion(){ public void removeCriterion(){
Criterion crit = em.addCriterion("name", 0, 4, confId); Criterion crit = em.getCriterion(critId);
em.removeCriterion(crit.getId()); em.removeCriterion(crit.getId());
} }
@Test @Test
public void AddReportTest(){ public void AddReportTest(){
List<Rating> ratings = new ArrayList<Rating>(); List<Rating> ratings = new ArrayList<Rating>();
Report report = em.addReport(article.getId(), "commentPCMember", "commentAuthor", ratings, "max"); Report report = em.addReport(article.getId(), "commentPCMember", "commentAuthor", ratings, "evaluationManagerTest");
//assertNotNull(em.getReportforArticleAndReferee(article.getId(), "max")); //assertNotNull(em.getReportforArticleAndReferee(article.getId(), "evaluationManagerTest"));
assertEquals(report.getCommentAuthor(), em.getReport(report.getId()).getCommentAuthor());
Report testReport = em.getReport(report.getId());
assertNotNull(testReport);
assertEquals("commentAuthor", testReport.getCommentAuthor());
em.removeReport(testReport.getId());
} }
@Test @Test
public void updateReportTest(){ public void updateReportTest(){
Report report = em.addReport(article.getId(), "commentPCMember", "commentAuthor", new ArrayList<Rating>(), "max"); Report report = em.addReport(article.getId(), "commentPCMember", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
report.setCommentPCMember("autre"); report.setCommentPCMember("autre");
em.updateReport(report); em.updateReport(report);
assertEquals("autre", em.getReport(report.getId()).getCommentPCMember()); assertEquals("autre", em.getReport(report.getId()).getCommentPCMember());
@@ -115,33 +136,34 @@ public class EvaluationManagerTest {
@Test @Test
public void removeReportTest(){ public void removeReportTest(){
Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "max"); Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
int reportId = report.getId();
em.removeReport(report.getId()); em.removeReport(report.getId());
assertNull(em.getReport(report.getId())); assertNull(em.getReport(reportId));
} }
@Test @Test
public void getReportforArticleAndRefereeTest(){ public void getReportforArticleAndRefereeTest(){
Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "max"); Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
Report report2 =em.getReportforArticleAndReferee(article.getId(), "max"); Report report2 =em.getReportforArticleAndReferee(article.getId(), "evaluationManagerTest");
assertEquals(report.getId(), report2.getId()); assertEquals(report.getId(), report2.getId());
} }
@Test @Test
public void getReportsForArticleTest(){ public void getReportsForArticleTest(){
em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "admin"); em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "max"); em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest2");
List <Report> list = em.getReportsForArticle(article.getId()); List <Report> list = em.getReportsForArticle(article.getId());
assertTrue(list.size() == 2); assertTrue(list.size() == 2);
} }
@Test @Test
public void getReportsForRefereeTest(){ public void getReportsForRefereeTest(){
em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "admin"); em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "max"); em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest2");
List <Report> list = em.getReportsForReferee("max"); List <Report> list = em.getReportsForReferee("evaluationManagerTest");
assertFalse(list.isEmpty()); assertFalse(list.isEmpty());
//assertTrue(list.size() == 1); //assertTrue(list.size() == 1);
} }
@@ -149,7 +171,7 @@ public class EvaluationManagerTest {
@Test @Test
public void getRatingsFromReportTest(){ public void getRatingsFromReportTest(){
Criterion criterion = em.addCriterion("crit<EFBFBD>re1", 0, 3, confId); Criterion criterion = em.addCriterion("crit<EFBFBD>re1", 0, 3, confId);
Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "max"); Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
em.addRating(2,criterion.getId(),report.getId()); em.addRating(2,criterion.getId(),report.getId());
assertFalse(em.getRatingForReport(report.getId()).isEmpty()); assertFalse(em.getRatingForReport(report.getId()).isEmpty());
em.removeRating(criterion, report); em.removeRating(criterion, report);
@@ -158,11 +180,12 @@ public class EvaluationManagerTest {
@Test @Test
public void updateRatingTest(){ public void updateRatingTest(){
Criterion criterion = em.addCriterion("crit<EFBFBD>re1", 0, 3, confId); Criterion criterion = em.addCriterion("crit<EFBFBD>re1", 0, 3, confId);
Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "max"); Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList<Rating>(), "evaluationManagerTest");
Rating rating = em.addRating(2,criterion.getId(),report.getId()); Rating rating = em.addRating(2,criterion.getId(),report.getId());
rating.setValue(1); rating.setValue(1);
em.updateRating(rating); em.updateRating(rating);
rating = em.getRatingForReport(report.getId()).get(1); assertEquals(1, em.getRatingForReport(report.getId()).size());
rating = em.getRatingForReport(report.getId()).get(0);
assertEquals(1, rating.getValue()); assertEquals(1, rating.getValue());
em.removeRating(criterion, report); em.removeRating(criterion, report);
} }