From a0939c533d87774de064d515cb7f0c83efd6679c Mon Sep 17 00:00:00 2001
From: Maxime Dagnicourt <maxime.dagnicourt@gmail.com>
Date: Mon, 14 Jan 2008 11:47:08 +0000
Subject: [PATCH]

---
 YACOSTest/src/jndi.properties                 |  3 ++
 .../tests/core/ConferenceManagerTest.java     | 39 ++++++++++++++++++-
 .../src/org/yacos/tests/core/UserTest.java    | 26 +++++++++++--
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 YACOSTest/src/jndi.properties

diff --git a/YACOSTest/src/jndi.properties b/YACOSTest/src/jndi.properties
new file mode 100644
index 0000000..a9bd562
--- /dev/null
+++ b/YACOSTest/src/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost:1099
\ No newline at end of file
diff --git a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
index a4b26e4..af296f2 100644
--- a/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
+++ b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
@@ -18,6 +18,7 @@ import org.yacos.core.conferences.Conference;
 import org.yacos.core.conferences.IConferenceManager;
 import org.yacos.core.users.IUserManager;
 import org.yacos.core.users.Role;
+import org.yacos.core.users.User;
 
 
 public class ConferenceManagerTest {
@@ -70,15 +71,49 @@ public class ConferenceManagerTest {
 	@Test
 	public void getConferencesTest(){
 		conf = manager.addConference("titre2","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
-		List list = manager.getConferences();
+		List<Conference> list = manager.getConferences();
 		assertEquals(1,list.size());
 		
 	}
 	
+	
 	@Test
 	public void addRoleForUserTest(){
-		manager.addRoleForUser(Role.RoleType.AUTHOR, userManager.getUser("toto") , conf);	
+		User user = userManager.getUser("toto");
+		manager.addRole(Role.RoleType.AUTHOR, user , conf);	
 	}
 	
+	@Test
+	public void getRoleTest(){
+		User user = userManager.getUser("toto");
+		manager.getRoles(user, conf);
+	}
+	
+	@Test
+	public void getRolesTest(){
+		User user = userManager.getUser("toto");
+		List<Role> list = manager.getRoles(user, conf);
+		assertEquals(1,list.size());
+		Role role = list.get(0);
+		assertNotNull(role);	
+	}
+	
+	@Test
+	public void getConferencesForUserTest(){
+		User user = userManager.getUser("toto");
+		List<Conference> list = user.getConferences();
+		conf = list.get(0);
+		assertNotNull(conf);
+	}
+
+	@Test
+	public void getRolesForUserConfTest(){
+		User user = userManager.getUser("toto");
+		List<Role> list = manager.getRoles(user, conf);
+		assertEquals(1,list.size());
+		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 480b5f9..3859c98 100644
--- a/YACOSTest/src/org/yacos/tests/core/UserTest.java
+++ b/YACOSTest/src/org/yacos/tests/core/UserTest.java
@@ -2,17 +2,21 @@ package org.yacos.tests.core;
 
 import static org.junit.Assert.*;
 
+import java.util.List;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.yacos.core.conferences.Conference;
 import org.yacos.core.users.IUserManager;
+import org.yacos.core.users.Role;
 import org.yacos.core.users.User;
 
 public class UserTest {
 	private IUserManager manager;
-	
+	User user;
 	@Before
 	public void setUp() throws Exception {
 		Context context = new InitialContext();
@@ -22,6 +26,7 @@ public class UserTest {
 			manager.removeUser(manager.getUser("toto"));
 		}
 		manager.addUser("toto","mp","bruno","dupont","ipint","e@e.fr");
+		user = manager.getUser("toto");
 	}
 	
 	@Test
@@ -42,7 +47,7 @@ public class UserTest {
 	@Test
 	public void testUpdateUser(){
 		
-		User user = manager.getUser("toto");
+		
 		//on change l'email
 		user.setEmail("a@a.fr");
 		manager.UpdateUser(user);
@@ -52,9 +57,24 @@ public class UserTest {
 	
 	@Test
 	public void testRemoveUser(){
-		User user = manager.getUser("toto");
+		
 		manager.removeUser(user);
 		user = manager.getUser("toto");
 		assertNull(user);
 	}
+	
+	@Test
+	public void testAddRole(Role role){
+		
+		int count = user.getRoles().size();
+		user.addRole(role);
+		assertTrue(count+1 == user.getRoles().size());
+	}
+	
+	@Test
+	public void testGetConferences(){
+		List<Conference> list = user.getConferences();
+		assertNotNull(list);
+		
+	}
 }