From f1a8e35e585e16302637b90bd751bd914968b8bb Mon Sep 17 00:00:00 2001 From: Christian Corsano Date: Thu, 14 Feb 2008 12:16:43 +0000 Subject: [PATCH] Corrections de UserManagerTest : tout en vert --- .../org/yacos/tests/core/UserManagerTest.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java index 0045413..3f8ed29 100644 --- a/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java +++ b/YACOSTest/src/org/yacos/tests/core/UserManagerTest.java @@ -54,7 +54,10 @@ public class UserManagerTest { @Before public void setup()throws PKAlreadyUsedException, UserEMailAlreadyExistsException{ if(!um.exists("truc")){ - um.addUser("truc",User.hashPassword("pw"),"maxime","dagn","ipint", "e@e.fr"); + um.addUser("truc",User.hashPassword("pw"),"maxime","dagn","ipint", "e@ee.fr"); + } + if(!um.exists("admin")){ + um.addUser("admin",User.hashPassword("pw"),"Admin","Admin","ipint", "admin@ee.fr"); } } @@ -79,7 +82,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� + //test que l'on ne peut pas ajouter 2 fois la meme specialité int size = list.size(); um.addSpeciality("xml"); list = um.getSpecialities(); @@ -105,7 +108,7 @@ public class UserManagerTest { Speciality spe = list.get(list.size()-1); um.addSpecialityToUser(spe.getId(), "truc"); um.removeSpecialityFromUser(spe.getId(), "truc"); - assertTrue(list.isEmpty()); + assertTrue(um.getSpecialities().isEmpty()); } @Test @@ -139,10 +142,13 @@ public class UserManagerTest { cm.addRole(RoleType.PCMEMBER, "truc", conf_id); Article article = am.addArticle("title","topic","url_article","truc", new ArrayList(),Article.State.SUBMITED,conf_id); - am.delegateArticleToReferee(article.getId(), "truc", "max"); - List list = um.getRefereesOFPCMemberForArticle("max",article.getId()); + am.delegateArticleToReferee(article.getId(), "truc", "admin"); + List list = um.getRefereesOfPcMemberForArticle("admin",article.getId()); assertFalse("liste vide",list.isEmpty()); assertEquals("truc",list.get(list.size()-1).getLogin()); + am.undelegateArticleToReferee(article.getId(), "truc", "admin"); + list = um.getRefereesOfPcMemberForArticle("admin",article.getId()); + assertTrue("liste non vide",list.isEmpty()); } @@ -151,6 +157,9 @@ public class UserManagerTest { if(um.exists("truc")){ um.removeUser("truc"); } + if(um.exists("admin")){ + um.removeUser("admin"); + } }