diff --git a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java index e5cca44..e85c545 100644 --- a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java @@ -70,11 +70,11 @@ public class ArticleManagerTest { @After public void cleanup() throws ConferenceDoesntExistException{ - List
list = am.getArticles(conf.getId()); + /* List
list = am.getArticles(conf.getId()); for (Article article : list) { am.removeArticle(article.getId()); } - cm.remove(conf.getId()); + cm.remove(conf.getId());*/ } @Test @@ -85,7 +85,7 @@ public class ArticleManagerTest { @Test public void updateArticleTest(){ - Article article = am.getArticle(1); + Article article = am.getArticle(articleId); article.setTitle("titre2"); am.updateArticle(article); article = am.getArticle(articleId); @@ -134,17 +134,18 @@ public class ArticleManagerTest { } @Test - public void delegateArticleToMemberTest(){ + public void delegateArticleToRefereeTest(){ - User member = um.getUser("login_membre1"); - am.assignArticleToPCMember(articleId,member.getLogin()); } @Test public void assignArticleToPCMemberTest(){ - //TODO + User member = um.getUser("max"); + am.assignArticleToPCMember(articleId,member.getLogin()); + List list = um.getPCMemberForArticle(articleId); + assertFalse(list.isEmpty()); } @Test @@ -159,7 +160,7 @@ public class ArticleManagerTest { public void addAndGetPreferenceTest(){ am.addPreference(articleId, "max", Preference.PreferenceType.LIKE); Preference pref = am.getPreferenceForUserAndArticle(articleId, "max"); - assertEquals(Preference.PreferenceType.LIKE, pref.getPreference()); + assertEquals(Preference.PreferenceType.LIKE, pref.getPreferenceType()); } @Test @@ -168,7 +169,7 @@ public class ArticleManagerTest { preference.setPreferenceType(Preference.PreferenceType.INDIFFERENT); am.updatePreference(preference); preference = am.getPreferenceForUserAndArticle(articleId, "max"); - assertEquals(Preference.PreferenceType.INDIFFERENT, preference.getPreference()); + assertEquals(Preference.PreferenceType.INDIFFERENT, preference.getPreferenceType()); } @Test diff --git a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java index 8bbe83f..57b82bf 100644 --- a/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/EvaluationManagerTest.java @@ -138,8 +138,24 @@ public class EvaluationManagerTest { } @Test - public void getRatingsFromReport(){ - assertTrue(false); + public void getRatingsFromReportTest(){ + Criterion criterion = em.addCriterion("critère1", 0, 3, confId); + Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList(), "max"); + em.addRating(2,criterion,report); + assertFalse(em.getRatingForReport(report.getId()).isEmpty()); + em.removeRating(criterion, report); + } + + @Test + public void updateRatingTest(){ + Criterion criterion = em.addCriterion("critère1", 0, 3, confId); + Report report = em.addReport(article.getId(), "report a virer", "commentAuthor", new ArrayList(), "max"); + Rating rating = em.addRating(2,criterion,report); + rating.setValue(1); + em.updateRating(rating); + rating = em.getRatingForReport(report.getId()).get(1); + assertEquals(1, rating.getValue()); + em.removeRating(criterion, report); } } diff --git a/YACOSTest/src/org/yacos/tests/core/QueryTester.java b/YACOSTest/src/org/yacos/tests/core/QueryTester.java new file mode 100644 index 0000000..b7a95ef --- /dev/null +++ b/YACOSTest/src/org/yacos/tests/core/QueryTester.java @@ -0,0 +1,5 @@ +package org.yacos.tests.core; + +public class QueryTester { + +}