svn commit: r1522764 - in /openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test: AbstractOpenmeetingsSpringTest.java user/TestUserContact.java

[solomax]

Author: solomax
Date: Fri Sep 13 03:01:00 2013
New Revision: 1522764

URL: http://svn.apache.org/r1522764
Log:
[OPENMEETINGS-777] tests are fixed

Modified:
    
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
    
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java

Modified: 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1522764&r1=1522763&r2=1522764&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
 Fri Sep 13 03:01:00 2013
@@ -112,18 +112,18 @@ public abstract class AbstractOpenmeetin
        }
 
        public User createUser(int rnd) throws Exception {
-               User users = new User();
+               User u = new User();
                // add user
-               users.setFirstname("firstname" + rnd);
-               users.setLastname("lastname" + rnd);
-               users.setLogin("login");
-               users.updatePassword(cryptManager, configurationDao, "pass" + 
rnd);
-               users.setLanguage_id(1L);
-               Long user_id = userManager.addUser(users);
+               u.setFirstname("firstname" + rnd);
+               u.setLastname("lastname" + rnd);
+               u.setLogin("login");
+               u.updatePassword(cryptManager, configurationDao, "pass" + rnd);
+               u.setLanguage_id(1L);
+               Long user_id = userManager.addUser(u);
                assertTrue("Cann't add user", user_id > 0);
-               users = userManager.getUserByIdAndDeleted(user_id);
-               assertNotNull("User should not be null", users);
-               return users;
+               u = userManager.getUserByIdAndDeleted(user_id);
+               assertNotNull("User should not be null", u);
+               return u;
        }
 
        protected void setOmHome() {

Modified: 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1522764&r1=1522763&r2=1522764&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
 Fri Sep 13 03:01:00 2013
@@ -30,7 +30,6 @@ import org.apache.openmeetings.db.dao.us
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.test.AbstractWiketTester;
-import org.apache.openmeetings.web.app.WebSession;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -43,9 +42,7 @@ public class TestUserContact extends Abs
        
        @Test
        public void addContactByOwner() throws Exception {
-
-               
-               login(null, null);
+               login("admin", "12345");
                
                List<User> users = adminUserDao.getAllUsers();
                assertNotNull("Users list should not be null ", users);
@@ -67,12 +64,13 @@ public class TestUserContact extends Abs
                l = adminUserDao.get(email);
                assertTrue("Contacts list should be empty", l.isEmpty());
 
-               contact = createUserContact(random.nextInt(), -1L);             
+               User u = createUser(random.nextInt());
+               contact = createUserContact(random.nextInt(), u.getUser_id());  
        
                // check that contact is not visible for user that is not owner 
of this contact
                l = usersDao.get(contact.getAdresses().getEmail());
-               assertTrue("Contacts list should not be empty for admin ", 
!l.isEmpty());
+               assertTrue("Contacts list should be empty for admin ", 
!l.isEmpty());
                //delete contact
-               adminUserDao.delete(contact, WebSession.getUserId());
+               adminUserDao.delete(contact, getUserId());
                l = adminUserDao.get(email);
                assertTrue("Contacts list should be empty", l.isEmpty());
        }