From 7f3cb29c6a4e4efdb3068ceb3135b8d1c35d354a Mon Sep 17 00:00:00 2001 From: Maxime Dagnicourt Date: Thu, 31 Jan 2008 16:16:21 +0000 Subject: [PATCH] Policy failures: Code warning - failed on resource Filler.java. Reason: The local variable article is never read, line 58 - failed on resource UserManagerTest.java. Reason: The local variable role is never read, line 6 Override reason: g --- YACOSTest/src/dbFiller/Filler.java | 8 ++- .../yacos/tests/core/ArticleManagerTest.java | 65 +++++++++++++------ .../org/yacos/tests/core/UserManagerTest.java | 20 +++++- 3 files changed, 69 insertions(+), 24 deletions(-) diff --git a/YACOSTest/src/dbFiller/Filler.java b/YACOSTest/src/dbFiller/Filler.java index 7542b53..9886696 100644 --- a/YACOSTest/src/dbFiller/Filler.java +++ b/YACOSTest/src/dbFiller/Filler.java @@ -44,11 +44,15 @@ public class Filler { //ajout de 2 users User author = um.addUser("max","pw","maxime","dagn","ipint", "max@e.fr"); User author2 = um.addUser("toto","pw","toto","titu","ipint", "toto@e.fr"); - User membre = um.addUser("login_membre","pw","nom_membre","meme","ipint", "meme@e.fr"); + User membre1 = um.addUser("login_membre1","pw","Jean","Bon","ipint", "meme@e.fr"); + User membre2 = um.addUser("login_membre2","pw","Vincent","Tim","ipint", "meme@e.fr"); + User membre3 = um.addUser("login_membre3","pw","Camille","Hon","ipint", "meme@e.fr"); //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()); //ajout d'un article pr le user "max" Article article = am.addArticle("title article max","topic","url_article", diff --git a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java index 56a2346..176852a 100644 --- a/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/ArticleManagerTest.java @@ -16,6 +16,7 @@ import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; +import org.yacos.core.exceptions.ConferenceDoesntExistException; import org.yacos.core.exceptions.PKAlreadyUsedException; import org.yacos.core.users.IUserManager; import org.yacos.core.users.User; @@ -27,7 +28,6 @@ public class ArticleManagerTest { private static IUserManager um; private User author; private Conference conf; - private Article article; private int articleId; @BeforeClass @@ -51,7 +51,7 @@ public class ArticleManagerTest { assertEquals("titi", cm.getConference(conf.getId()).getTitle());; //ajout d'un article - article = am.addArticle( + Article article = am.addArticle( "title", "topic", "url_article", @@ -62,9 +62,7 @@ public class ArticleManagerTest { articleId = article.getId(); } - - - + @Test public void addArticleTest(){ assertNotNull(am.getArticle(articleId)); @@ -73,7 +71,8 @@ public class ArticleManagerTest { @Test public void updateArticleTest(){ - article.setTitle("titre2"); + Article article = am.getArticle(1); + //article.setTitle("titre2"); am.updateArticle(article); article = am.getArticle(articleId); assertNotNull(article); @@ -90,32 +89,58 @@ public class ArticleManagerTest { @Test public void getArticlesOfConfTest() throws Exception{ - - //ajout d'un article - List secondaryAuthors = new ArrayList(); - + Integer numberOfArticles = am.getArticles(conf.getId()).size(); - - Article newArticle = am.addArticle("newTitle", "newTopic", "url_article", author.getLogin(), secondaryAuthors, Article.State.SUMMARY, conf.getId()); - Integer newArticleId = newArticle.getId(); + //ajout d'un article + Article article = am.addArticle("title1","topic","url_article",author.getLogin(),new ArrayList(), + Article.State.SUMMARY,conf.getId()); List
list = am.getArticles(conf.getId()); assertEquals(numberOfArticles+1, list.size()); assertFalse("list not empty", list.isEmpty()); - //assertTrue(list.contains(article)); - assertEquals("title", article.getTitle()); - am.removeArticle(newArticleId); + + assertEquals(article.getTitle(),list.get(list.size()-1).getTitle()); + + am.removeArticle(article.getId()); } @Test - public void getArticleOfConfAndAuthor(){ + public void getArticleOfConfAndAuthor() throws ConferenceDoesntExistException{ + + 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(), + Article.State.SUMMARY,conf.getId()); + + List
list = am.getArticles(conf.getId()); + assertEquals(numberOfArticles+1, list.size()); + assertFalse("list not empty", list.isEmpty()); + + assertEquals(article.getTitle(),list.get(list.size()-1).getTitle()); + + am.removeArticle(article.getId()); + } + + @Test + public void delegateArticleToMemberTest(){ + + User member = um.getUser("login_membre1"); + + am.assignArticleToPCMember(articleId,member.getLogin()); + List list = am.getArticlePCMembers(articleId); + assertEquals("login_membre1", list.get(list.size()-1).getLogin()); + } + + @Test + public void getArticleOfMemberTest(){ } @After - public void cleanup(){ - if(am.existsArticle(articleId)){ - am.removeArticle(articleId); + public void cleanup() throws ConferenceDoesntExistException{ + List
list = am.getArticles(conf.getId()); + for (Article article : list) { + am.removeArticle(article.getId()); } cm.remove(conf.getId()); } diff --git a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java index 396a04b..a5cfd37 100644 --- a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java @@ -28,7 +28,7 @@ public class UserManagerTest { private static int conf_id; @BeforeClass - public static void setUpManager() throws NamingException { + public static void setUpManager() throws NamingException, PKAlreadyUsedException { Context context = new InitialContext(); um = (IUserManager) context.lookup("UserManagerBean/remote"); @@ -39,6 +39,7 @@ public class UserManagerTest { Conference conf = cm.addConference("titi","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date()); conf_id = conf.getId(); } + } @Before @@ -48,12 +49,27 @@ public class UserManagerTest { } } + @Test + public void addUserTest() throws PKAlreadyUsedException{ + User user = um.addUser("maxmax","pw","maxime","dagn","ipint", "e@e.fr"); + assertEquals("pw", user.getPassword()); + um.removeUser("maxmax"); + } + + @Test + public void getUserTest(){ + User user = um.getUser("truc"); + assertNotNull(user); + assertEquals("truc", user.getLogin()); + } + @Test public void getUserByRoleType(){ Role role = cm.addRole(RoleType.PCMEMBER, "truc", conf_id); List list = um.getUsers(conf_id,RoleType.PCMEMBER); assertFalse(list.isEmpty()); - User user = list.get(0); + //on recupere le dernier user de la liste + User user = list.get(list.size()-1); assertEquals("truc",user.getLogin()); }