This commit is contained in:
3
YACOSTest/src/jndi.properties
Normal file
3
YACOSTest/src/jndi.properties
Normal file
@@ -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
|
||||||
@@ -18,6 +18,7 @@ import org.yacos.core.conferences.Conference;
|
|||||||
import org.yacos.core.conferences.IConferenceManager;
|
import org.yacos.core.conferences.IConferenceManager;
|
||||||
import org.yacos.core.users.IUserManager;
|
import org.yacos.core.users.IUserManager;
|
||||||
import org.yacos.core.users.Role;
|
import org.yacos.core.users.Role;
|
||||||
|
import org.yacos.core.users.User;
|
||||||
|
|
||||||
|
|
||||||
public class ConferenceManagerTest {
|
public class ConferenceManagerTest {
|
||||||
@@ -70,15 +71,49 @@ public class ConferenceManagerTest {
|
|||||||
@Test
|
@Test
|
||||||
public void getConferencesTest(){
|
public void getConferencesTest(){
|
||||||
conf = manager.addConference("titre2","desc conf","info en plus",new Date(),new Date(),new Date(),new Date(),new Date());
|
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());
|
assertEquals(1,list.size());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void addRoleForUserTest(){
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,17 +2,21 @@ package org.yacos.tests.core;
|
|||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import javax.naming.Context;
|
import javax.naming.Context;
|
||||||
import javax.naming.InitialContext;
|
import javax.naming.InitialContext;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.yacos.core.conferences.Conference;
|
||||||
import org.yacos.core.users.IUserManager;
|
import org.yacos.core.users.IUserManager;
|
||||||
|
import org.yacos.core.users.Role;
|
||||||
import org.yacos.core.users.User;
|
import org.yacos.core.users.User;
|
||||||
|
|
||||||
public class UserTest {
|
public class UserTest {
|
||||||
private IUserManager manager;
|
private IUserManager manager;
|
||||||
|
User user;
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
Context context = new InitialContext();
|
Context context = new InitialContext();
|
||||||
@@ -22,6 +26,7 @@ public class UserTest {
|
|||||||
manager.removeUser(manager.getUser("toto"));
|
manager.removeUser(manager.getUser("toto"));
|
||||||
}
|
}
|
||||||
manager.addUser("toto","mp","bruno","dupont","ipint","e@e.fr");
|
manager.addUser("toto","mp","bruno","dupont","ipint","e@e.fr");
|
||||||
|
user = manager.getUser("toto");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -42,7 +47,7 @@ public class UserTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testUpdateUser(){
|
public void testUpdateUser(){
|
||||||
|
|
||||||
User user = manager.getUser("toto");
|
|
||||||
//on change l'email
|
//on change l'email
|
||||||
user.setEmail("a@a.fr");
|
user.setEmail("a@a.fr");
|
||||||
manager.UpdateUser(user);
|
manager.UpdateUser(user);
|
||||||
@@ -52,9 +57,24 @@ public class UserTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testRemoveUser(){
|
public void testRemoveUser(){
|
||||||
User user = manager.getUser("toto");
|
|
||||||
manager.removeUser(user);
|
manager.removeUser(user);
|
||||||
user = manager.getUser("toto");
|
user = manager.getUser("toto");
|
||||||
assertNull(user);
|
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);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user