YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java

@@ -22,111 +22,98 @@ import org.yacos.core.users.User;
 
 
 public class ConferenceManagerTest {
-	static IConferenceManager manager;
-	static IUserManager userManager;
+	static IConferenceManager cm;
+	static IUserManager um;
 	int id;
 	Conference conf;
 	
 	@BeforeClass
-	public static void setUpManager() throws NamingException {
+	public static void setUpManager() throws NamingException, PKAlreadyUsedException {
 		Context context = new InitialContext();
-		manager = (IConferenceManager) context.lookup("ConferenceManagerBean/remote");
-		userManager = (IUserManager) context.lookup("UserManagerBean/remote");
-		
+		cm = (IConferenceManager) context.lookup("ConferenceManagerBean/remote");
+		um = (IUserManager) context.lookup("UserManagerBean/remote");
 		
+		if(!um.exists("max")){
+			um.addUser("max","pw","maxime","dagn","ipint", "e@e.fr");
+		}
 	}
 	
 	@Before
-	public void setUpConferences() throws PKAlreadyUsedException {
-		conf = manager.addConference("titre","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
+	public void setUpConferences() {
+		conf = cm.addConference("titre","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
 		id = conf.getId();
-		if(userManager.exists("toto")){	
-			userManager.removeUser(userManager.getUser("toto"));
-		}
-		User user = userManager.addUser("toto","mp","bruno","dupont","ipint","e@e.fr");
-		manager.addRole(Role.RoleType.AUTHOR, user, conf);
-		
 	}
 	
 	@After
 	public void unSetUpConferences(){
-		conf = manager.getConference(id);
+		conf = cm.getConference(id);
 		if (conf != null){
-			manager.remove(conf);
+			cm.remove(conf);
 		}
 	}
 	
 	@Test
 	public void getConferenceTest(){
-		conf = manager.getConference(id);
+		conf = cm.getConference(id);
 		assertNotNull(conf);
 	}
 	
 	@Test
 	public void updateConferenceTest(){
-		conf = manager.getConference(id);
+		conf = cm.getConference(id);
 		conf.setTitle("autre titre");
-		manager.update(conf);
-		conf = manager.getConference(id);
+		cm.update(conf);
+		conf = cm.getConference(id);
 		assertEquals("autre titre", conf.getTitle());
 	}
 	
 	public void removeConferenceTest(){
-		conf = manager.getConference(id);
-		manager.remove(conf);
+		conf = cm.getConference(id);
+		cm.remove(conf);
 	}
 	
 	@Test
 	public void getConferencesTest(){
-		conf = manager.addConference("titre2","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
-		List<Conference> list = manager.getConferences();
+		conf = cm.addConference("titre2","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
+		List<Conference> list = cm.getConferences();
+		assertFalse("liste vide",list.isEmpty());
 		
-		for (Conference conf : list) {
-			assertNotNull(conf);
-		}
-		conf = list.get(list.size()-1);
-		assertEquals("titre2",conf.getTitle() );
-	}
-	
-	@Test
-	public void getConferencesForUserTest(){
-		User user = userManager.getUser("toto");
-		List<Conference> list = manager.getConferences(user);
-		conf = list.get(0);
-		assertNotNull(conf);
 	}
 	
 	
 	@Test
 	public void addRoleForUserTest(){
-		User user = userManager.getUser("toto");
-		manager.addRole(Role.RoleType.AUTHOR, user , conf);	
+		User user = um.getUser("max");
+		cm.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());
+		User user = um.getUser("max");
+		List<Role> list = cm.getRoles(user,conf);
+		assertFalse("liste vide",list.isEmpty());
 		Role role = list.get(0);
+		System.out.println(role.getType());
 		assertNotNull(role);	
 	}
 	
-	
+	@Test
+	public void getConferencesForUserTest(){
+		User user = um.getUser("max");
+		List<Conference> list = cm.getConferences(user);
+		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());
+		User user = um.getUser("max");
+		List<Role> list = cm.getRoles(user, conf);
+		assertFalse("liste vide",list.isEmpty());
 		Role role = list.get(0);
 		assertNotNull(role);	
 	}
 		
+	
 }