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

@@ -1,7 +1,6 @@
 package org.yacos.tests.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.util.Date;
 import java.util.List;
@@ -16,6 +15,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 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;
@@ -32,12 +32,20 @@ public class ConferenceManagerTest {
 		Context context = new InitialContext();
 		manager = (IConferenceManager) context.lookup("ConferenceManagerBean/remote");
 		userManager = (IUserManager) context.lookup("UserManagerBean/remote");
+		
+		
 	}
 	
 	@Before
-	public void setUpConferences() {
+	public void setUpConferences() throws PKAlreadyUsedException {
 		conf = manager.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
@@ -72,8 +80,20 @@ public class ConferenceManagerTest {
 	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();
-		assertEquals(1,list.size());
 		
+		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);
 	}
 	
 	
@@ -98,13 +118,7 @@ public class ConferenceManagerTest {
 		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(){
@@ -115,5 +129,4 @@ public class ConferenceManagerTest {
 		assertNotNull(role);	
 	}
 		
-	
 }