From 31b707615b531c343e0e04f52e552f8dc38a8191 Mon Sep 17 00:00:00 2001
From: Christian Corsano <christian.corsano@conceptoire.com>
Date: Wed, 30 Jan 2008 23:12:43 +0000
Subject: [PATCH] Modification des tests pour prendre en compte lest
 modifications de la revision 240

---
 YACOSTest/.classpath                                        | 2 +-
 .../src/org/yacos/tests/core/ConferenceManagerTest.java     | 6 ++----
 YACOSTest/src/org/yacos/tests/core/UserTest.java            | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/YACOSTest/.classpath b/YACOSTest/.classpath
index 50ad62b..0e39d5a 100644
--- a/YACOSTest/.classpath
+++ b/YACOSTest/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/usr/local/debuire/bin/junit-4.4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/YACOSCore"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
index 9de0089..ce7d299 100644
--- a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
+++ b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
@@ -89,8 +89,7 @@ public class ConferenceManagerTest {
 		
 	@Test
 	public void getRolesForConfTest(){
-		User user = um.getUser("max");
-		List<Role> list = cm.getRoles(user,conf);
+		List<Role> list = cm.getRoles("max",conf.getId());
 		assertTrue("liste vide",list.isEmpty());
 		cm.addRole(Role.RoleType.AUTHOR, "max" , id);
 	}
@@ -108,8 +107,7 @@ public class ConferenceManagerTest {
 
 	@Test
 	public void getRolesForUserAndConfTest(){
-		User user = um.getUser("max");
-		List<Role> list = cm.getRoles(user, conf);
+		List<Role> list = cm.getRoles("max", conf.getId());
 		assertFalse("liste vide",list.isEmpty());
 		Role role = list.get(0);
 		assertNotNull(role);	
diff --git a/YACOSTest/src/org/yacos/tests/core/UserTest.java b/YACOSTest/src/org/yacos/tests/core/UserTest.java
index cc69aa2..1692d09 100644
--- a/YACOSTest/src/org/yacos/tests/core/UserTest.java
+++ b/YACOSTest/src/org/yacos/tests/core/UserTest.java
@@ -12,6 +12,7 @@ import org.yacos.core.conferences.Conference;
 import org.yacos.core.conferences.IConferenceManager;
 import org.yacos.core.exceptions.PKAlreadyUsedException;
 import org.yacos.core.users.IUserManager;
+import org.yacos.core.users.Role;
 import org.yacos.core.users.User;
 import org.yacos.core.users.Role.RoleType;
 
@@ -113,6 +114,9 @@ public class UserTest {
 	public void cleanup(){
 		user = manager.getUser("testUser1");
 		if(user != null){
+			for(Role role : user.getRoles()){
+				manager.removeRole(user.getLogin(), role.getType(), role.getConference().getId());
+			}
 			manager.removeUser("testUser1");
 		}