Changement du filler :
- différent user de créer, 1 admin, 1 chairman, 1 pcmember, 1 referee, 1 author Correction dans les tests suite à changement de SUMMARY à SUBMITED Policy failures: Code warning - failed on resource EvaluationManagerTest.java. Reason: The field EvaluationManagerTest.cm is never read locally, line 32 - failed on resource EvaluationManagerTest.java. Reason: The field EvaluationManagerTest.um is never read locally, line 33 - failed on resource EvaluationManagerTest.java. Reason: The import java.util.Date is never used, line 6 - failed on resource Filler.java. Reason: The import org.yacos.core.article.Preference.PreferenceType is never used, line 12 - failed on resource EvaluationManagerTest.java. Reason: The import org.yacos.core.conferences.Conference is never used, line 19 ... and more. Override reason: yeasss
This commit is contained in:
Frederic Debuire
@@ -36,79 +36,77 @@ public class Filler {
|
||||
IConferenceManager cm;
|
||||
IUserManager um;
|
||||
IEvaluationManager em;
|
||||
//initialisation du context
|
||||
Context context;
|
||||
|
||||
context = new InitialContext();
|
||||
am = (IArticleManager) context.lookup("ArticleManagerBean/remote");
|
||||
um = (IUserManager) context.lookup("UserManagerBean/remote");
|
||||
cm = (IConferenceManager) context.lookup("ConferenceManagerBean/remote");
|
||||
em = (IEvaluationManager) context.lookup("EvaluationManagerBean/remote");
|
||||
Context context = new InitialContext();
|
||||
am = (IArticleManager) context.lookup("ArticleManagerBean/remote");
|
||||
um = (IUserManager) context.lookup("UserManagerBean/remote");
|
||||
cm = (IConferenceManager) context.lookup("ConferenceManagerBean/remote");
|
||||
em = (IEvaluationManager) context.lookup("EvaluationManagerBean/remote");
|
||||
|
||||
// Supprime tout avant de repeupler
|
||||
// for (Conference conf : cm.getConferences()) {
|
||||
// for (Article art : am.getArticles(conf.getId())) {
|
||||
// am.removeArticle(art.getId());
|
||||
// }
|
||||
// cm.remove(conf.getId());
|
||||
// }
|
||||
// for (User util : um.getUsers()) {
|
||||
//um.removeUser(util.getLogin());
|
||||
//}
|
||||
// add two conference
|
||||
Conference conf = cm.addConference("Conf 1","Je suis une conf","J'aime le cafe",new Date(),new Date(),new Date(),new Date(),new Date());
|
||||
cm.addConference("Conf 2","Je suis un schtroumpf","J'aime la salsepareille",new Date(),new Date(),new Date(),new Date(),new Date());
|
||||
|
||||
|
||||
//ajout de 2 conferences
|
||||
Conference conf = cm.addConference("titre conf 1","desc conf","info en plus",
|
||||
new Date(),new Date(),new Date(),new Date(),new Date());
|
||||
cm.addConference("titre conf 2","desc conf","info en plus",
|
||||
new Date(),new Date(),new Date(),new Date(),new Date());
|
||||
|
||||
//ajout de 2 users
|
||||
User author;
|
||||
try {
|
||||
author = um.addUser("max",User.hashPassword("pw"),"maxime","dagn","ipint", "max@e.fr");
|
||||
User author2 = um.addUser("toto",User.hashPassword("pw"),"toto","titu","ipint", "toto@e.fr");
|
||||
User membre1 = um.addUser("login_membre1",User.hashPassword("pw"),"Jean","Bon","ipint", "meme1@e.fr");
|
||||
User membre2 = um.addUser("login_membre2",User.hashPassword("pw"),"Vincent","Tim","ipint", "meme2@e.fr");
|
||||
User membre3 = um.addUser("login_membre3",User.hashPassword("pw"),"Camille","Hon","ipint", "meme3@e.fr");
|
||||
User membre = um.addUser("login_membre",User.hashPassword("pw"),"nom_membre","meme","ipint", "meme4@e.fr");
|
||||
User admin = um.addUser("admin",User.hashPassword("admin"),"maxime","dagnicourt","ipint", "admin@yacos.org");
|
||||
|
||||
//ajout des roles pr les users
|
||||
cm.addRole(RoleType.AUTHOR, author.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.PCMEMBER, membre1.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.PCMEMBER, membre2.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.PCMEMBER, membre3.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.AUTHOR, admin.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.CHAIRMAN, admin.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.PCMEMBER, admin.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.REFEREE, admin.getLogin(), conf.getId());
|
||||
|
||||
//ajout d'un article pr le user "max"
|
||||
Article article = am.addArticle("title article max","topic","url_article",
|
||||
author.getLogin(), new ArrayList<String>(), Article.State.SUMMARY, conf.getId());
|
||||
am.addArticle("title article toto","topic","url_article",
|
||||
author2.getLogin(), new ArrayList<String>(), Article.State.SUMMARY, conf.getId());
|
||||
|
||||
am.assignArticleToPCMember(article.getId(), "login_membre1");
|
||||
am.addPreference(article.getId(), "login_membre1", PreferenceType.LIKE);
|
||||
|
||||
} catch (UserEMailAlreadyExistsException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
// ajout de critere
|
||||
|
||||
Criterion c;
|
||||
|
||||
c = em.addCriterion("testCriterion", 1, 5, 1);
|
||||
c = em.addCriterion("testCriterion2", 2, 5, 1);
|
||||
c = em.addCriterion("testCriterion3", 1, 5, 2);
|
||||
c = em.addCriterion("testCriterion4", 2, 5, 2);
|
||||
try {
|
||||
// Create different users
|
||||
User admin = um.addUser("admin",User.hashPassword("admin"),"Admin","admin","LIFL", "admin@yacos.org");
|
||||
User chairman = um.addUser("chairman",User.hashPassword("chairman"),"Chairman","chairman","LIFL", "chairman@yacos.org");
|
||||
User pcmember = um.addUser("pcmember",User.hashPassword("pcmember"),"PC","member","LIFL", "pcmember@yacos.org");
|
||||
User referee = um.addUser("referee",User.hashPassword("referee"),"Referee","referee","LIFL", "referee@yacos.org");
|
||||
User author = um.addUser("author",User.hashPassword("author"),"Author","author","LIFL", "author@yacos.org");
|
||||
|
||||
|
||||
System.out.println("--> FIN OK");
|
||||
// Add role for users
|
||||
|
||||
// admin
|
||||
|
||||
// chairman
|
||||
cm.addRole(RoleType.CHAIRMAN, chairman.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.PCMEMBER, chairman.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.REFEREE, chairman.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.AUTHOR, chairman.getLogin(), conf.getId());
|
||||
// pcmember
|
||||
cm.addRole(RoleType.PCMEMBER, pcmember.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.REFEREE, pcmember.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.AUTHOR, pcmember.getLogin(), conf.getId());
|
||||
// referee
|
||||
cm.addRole(RoleType.REFEREE, referee.getLogin(), conf.getId());
|
||||
cm.addRole(RoleType.AUTHOR, referee.getLogin(), conf.getId());
|
||||
// author
|
||||
cm.addRole(RoleType.AUTHOR, author.getLogin(), conf.getId());
|
||||
|
||||
|
||||
|
||||
// Add article for user
|
||||
// Of course, url isn't valid
|
||||
|
||||
// chairman
|
||||
am.addArticle("Article chairman","Les schtroumpfs sont fous !!!","url_article",chairman.getLogin(), new ArrayList<String>(), Article.State.SUBMITED, conf.getId());
|
||||
// pcmember
|
||||
am.addArticle("Article pcmember","Sont fous ces gaulois :o)","url_article",pcmember.getLogin(), new ArrayList<String>(), Article.State.SUBMITED, conf.getId());
|
||||
// referee
|
||||
am.addArticle("Article referee","Tappez des nains !!","url_article",referee.getLogin(), new ArrayList<String>(), Article.State.SUBMITED, conf.getId());
|
||||
// author
|
||||
am.addArticle("Article author","Mangez un chien, chiez un chat !","url_article",author.getLogin(), new ArrayList<String>(), Article.State.SUBMITED, conf.getId());
|
||||
|
||||
|
||||
} catch (UserEMailAlreadyExistsException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
// ajout de critere
|
||||
|
||||
Criterion c;
|
||||
|
||||
c = em.addCriterion("Les schtroumpfs sont-ils bons ?", 1, 5, 1);
|
||||
c = em.addCriterion("Les gaulois sont-ils fous ?", 1, 4, 1);
|
||||
c = em.addCriterion("Un nain est-il vraiment petit ?", 1, 5, 2);
|
||||
c = em.addCriterion("Un chien peut-il se transformer en chat ?", 1, 4, 2);
|
||||
|
||||
|
||||
System.out.println("--> FIN OK");
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ public class ArticleManagerTest {
|
||||
"url_article",
|
||||
author.getLogin(),
|
||||
new ArrayList<String>(),
|
||||
Article.State.SUMMARY,
|
||||
Article.State.SUBMITED,
|
||||
conf.getId());
|
||||
articleId = article.getId();
|
||||
}
|
||||
@@ -107,7 +107,7 @@ public class ArticleManagerTest {
|
||||
Integer numberOfArticles = am.getArticles(conf.getId()).size();
|
||||
//ajout d'un article
|
||||
Article article = am.addArticle("title1","topic","url_article",author.getLogin(),new ArrayList<String>(),
|
||||
Article.State.SUMMARY,conf.getId());
|
||||
Article.State.SUBMITED,conf.getId());
|
||||
|
||||
List<Article> list = am.getArticles(conf.getId());
|
||||
assertEquals(numberOfArticles+1, list.size());
|
||||
@@ -124,7 +124,7 @@ public class ArticleManagerTest {
|
||||
Integer numberOfArticles = am.getArticleOfAuthor(conf.getId(),author.getLogin()).size();
|
||||
//ajout d'un article
|
||||
Article article = am.addArticle("title","topic","url_article",author.getLogin(),new ArrayList<String>(),
|
||||
Article.State.SUMMARY,conf.getId());
|
||||
Article.State.SUBMITED,conf.getId());
|
||||
|
||||
List<Article> list = am.getArticles(conf.getId());
|
||||
assertEquals(numberOfArticles+1, list.size());
|
||||
|
||||
@@ -50,7 +50,7 @@ public class EvaluationManagerTest {
|
||||
*/
|
||||
confId = 1;
|
||||
article = am.addArticle("title article max","topic","url_article",
|
||||
"max", new ArrayList<String>(), Article.State.SUMMARY, confId);
|
||||
"max", new ArrayList<String>(), Article.State.SUBMITED, confId);
|
||||
//article = am.getArticle(1);
|
||||
}
|
||||
|
||||
@@ -140,18 +140,18 @@ public class EvaluationManagerTest {
|
||||
|
||||
@Test
|
||||
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");
|
||||
em.addRating(2,criterion,report);
|
||||
em.addRating(2,criterion.getId(),report.getId());
|
||||
assertFalse(em.getRatingForReport(report.getId()).isEmpty());
|
||||
em.removeRating(criterion, report);
|
||||
}
|
||||
|
||||
@Test
|
||||
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");
|
||||
Rating rating = em.addRating(2,criterion,report);
|
||||
Rating rating = em.addRating(2,criterion.getId(),report.getId());
|
||||
rating.setValue(1);
|
||||
em.updateRating(rating);
|
||||
rating = em.getRatingForReport(report.getId()).get(1);
|
||||
|
||||
@@ -79,7 +79,7 @@ public class UserManagerTest {
|
||||
assertFalse(list.isEmpty());
|
||||
Speciality spe = list.get(list.size()-1);
|
||||
assertEquals("xml", spe.getName());
|
||||
//test que l'on ne peut pas ajouter 2 fois la meme specialit<69>
|
||||
//test que l'on ne peut pas ajouter 2 fois la meme specialit<69>
|
||||
int size = list.size();
|
||||
um.addSpeciality("xml");
|
||||
list = um.getSpecialities();
|
||||
@@ -124,7 +124,7 @@ public class UserManagerTest {
|
||||
public void getPCMemberForArticleTest(){
|
||||
cm.addRole(RoleType.PCMEMBER, "truc", conf_id);
|
||||
Article article = am.addArticle("title","topic","url_article","admin",
|
||||
new ArrayList<String>(),Article.State.SUMMARY,conf_id);
|
||||
new ArrayList<String>(),Article.State.SUBMITED,conf_id);
|
||||
am.assignArticleToPCMember(article.getId(), "truc");
|
||||
List <User> list = um.getPCMemberForArticle(article.getId());
|
||||
assertFalse("liste vide",list.isEmpty());
|
||||
@@ -137,7 +137,7 @@ public class UserManagerTest {
|
||||
public void getRefereesForArticleTest(){
|
||||
cm.addRole(RoleType.PCMEMBER, "truc", conf_id);
|
||||
Article article = am.addArticle("title","topic","url_article","truc",
|
||||
new ArrayList<String>(),Article.State.SUMMARY,conf_id);
|
||||
new ArrayList<String>(),Article.State.SUBMITED,conf_id);
|
||||
am.delegateArticleToReferee(article.getId(), "truc", "max");
|
||||
List <User> list = um.getRefereesOFPCMemberForArticle("max",article.getId());
|
||||
assertFalse("liste vide",list.isEmpty());
|
||||
|
||||
Reference in New Issue
Block a user