svn commit: r1778494 - in /openmeetings/application: branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/ branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/ branches/3.2.x/openmeetings-web/src/...

solomax Thu, 12 Jan 2017 21:32:23 -0800

Author: solomax
Date: Fri Jan 13 05:31:19 2017
New Revision: 1778494

URL: http://svn.apache.org/viewvc?rev=1778494&view=rev
Log:
no-jira: failing tests are fixed


Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
    
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
    
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1778494&r1=1778493&r2=1778494&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 Fri Jan 13 05:31:19 2017
@@ -27,12 +27,10 @@ import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.user.GroupDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.installation.ImportInitvalues;
 import org.apache.openmeetings.installation.InstallationConfig;
@@ -56,8 +54,6 @@ public abstract class AbstractJUnitDefau
        @Autowired
        private UserDao userDao;
        @Autowired
-       private GroupDao groupDao;
-       @Autowired
        private ImportInitvalues importInitvalues;
        @Autowired
        protected ConfigurationDao cfgDao;
@@ -153,7 +149,6 @@ public abstract class AbstractJUnitDefau
                u.getAddress().setEmail(String.format("email%s@local", uuid));
                u.setRights(UserDao.getDefaultRights());
                u.setTimeZoneId("Asia/Bangkok");
-               u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
                u.updatePassword(cfgDao, getRandomPass(uuid));
                u.setLanguageId(1L);
                return u;
@@ -164,7 +159,10 @@ public abstract class AbstractJUnitDefau
        }
 
        public User createUser(String uuid) throws Exception {
-               User u = getUser(uuid);
+               return createUser(getUser(uuid));
+       }
+
+       public User createUser(User u) throws Exception {
                u = userDao.update(u, null);
                assertNotNull("Can't add user", u);
                return u;

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java?rev=1778494&r1=1778493&r2=1778494&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
 Fri Jan 13 05:31:19 2017
@@ -24,10 +24,12 @@ import java.util.Date;
 import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
 import org.apache.openmeetings.db.dto.basic.ServiceResult;
 import org.apache.openmeetings.db.dto.calendar.AppointmentDTO;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,11 +37,15 @@ import org.springframework.beans.factory
 public class TestCalendarService extends AbstractWebServiceTest {
        public final static String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + 
"/calendar";
        @Autowired
+       private GroupDao groupDao;
+       @Autowired
        private RoomDao roomDao;
 
        private void actualTest(Room r) throws Exception {
                String uuid = UUID.randomUUID().toString();
-               User u = createUser(uuid);
+               User u = getUser(uuid);
+               u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
+               u = createUser(u);
                ServiceResult sr = login(u.getLogin(), getRandomPass(uuid));
 
                Date start = new Date();

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1778494&r1=1778493&r2=1778494&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 Fri Jan 13 05:31:19 2017
@@ -27,12 +27,10 @@ import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.user.GroupDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.installation.ImportInitvalues;
 import org.apache.openmeetings.installation.InstallationConfig;
@@ -56,8 +54,6 @@ public abstract class AbstractJUnitDefau
        @Autowired
        private UserDao userDao;
        @Autowired
-       private GroupDao groupDao;
-       @Autowired
        private ImportInitvalues importInitvalues;
        @Autowired
        protected ConfigurationDao cfgDao;
@@ -153,7 +149,6 @@ public abstract class AbstractJUnitDefau
                u.getAddress().setEmail(String.format("email%s@local", uuid));
                u.setRights(UserDao.getDefaultRights());
                u.setTimeZoneId("Asia/Bangkok");
-               u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
                u.updatePassword(cfgDao, getRandomPass(uuid));
                u.setLanguageId(1L);
                return u;
@@ -164,7 +159,10 @@ public abstract class AbstractJUnitDefau
        }
 
        public User createUser(String uuid) throws Exception {
-               User u = getUser(uuid);
+               return createUser(getUser(uuid));
+       }
+
+       public User createUser(User u) throws Exception {
                u = userDao.update(u, null);
                assertNotNull("Can't add user", u);
                return u;

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java?rev=1778494&r1=1778493&r2=1778494&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
 Fri Jan 13 05:31:19 2017
@@ -24,10 +24,12 @@ import java.util.Date;
 import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
 import org.apache.openmeetings.db.dto.basic.ServiceResult;
 import org.apache.openmeetings.db.dto.calendar.AppointmentDTO;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,11 +37,15 @@ import org.springframework.beans.factory
 public class TestCalendarService extends AbstractWebServiceTest {
        public final static String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + 
"/calendar";
        @Autowired
+       private GroupDao groupDao;
+       @Autowired
        private RoomDao roomDao;
 
        private void actualTest(Room r) throws Exception {
                String uuid = UUID.randomUUID().toString();
-               User u = createUser(uuid);
+               User u = getUser(uuid);
+               u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
+               u = createUser(u);
                ServiceResult sr = login(u.getLogin(), getRandomPass(uuid));
 
                Date start = new Date();

Modified: 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1778494&r1=1778493&r2=1778494&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
 Fri Jan 13 05:31:19 2017
@@ -27,12 +27,10 @@ import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.user.GroupDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.Address;
-import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.installation.ImportInitvalues;
 import org.apache.openmeetings.installation.InstallationConfig;
@@ -56,8 +54,6 @@ public abstract class AbstractJUnitDefau
        @Autowired
        private UserDao userDao;
        @Autowired
-       private GroupDao groupDao;
-       @Autowired
        private ImportInitvalues importInitvalues;
        @Autowired
        protected ConfigurationDao cfgDao;
@@ -153,7 +149,6 @@ public abstract class AbstractJUnitDefau
                u.getAddress().setEmail(String.format("email%s@local", uuid));
                u.setRights(UserDao.getDefaultRights());
                u.setTimeZoneId("Asia/Bangkok");
-               u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
                u.updatePassword(cfgDao, getRandomPass(uuid));
                u.setLanguageId(1L);
                return u;
@@ -164,7 +159,10 @@ public abstract class AbstractJUnitDefau
        }
 
        public User createUser(String uuid) throws Exception {
-               User u = getUser(uuid);
+               return createUser(getUser(uuid));
+       }
+
+       public User createUser(User u) throws Exception {
                u = userDao.update(u, null);
                assertNotNull("Can't add user", u);
                return u;

Modified: 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java?rev=1778494&r1=1778493&r2=1778494&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
 Fri Jan 13 05:31:19 2017
@@ -24,10 +24,12 @@ import java.util.Date;
 import java.util.UUID;
 
 import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
 import org.apache.openmeetings.db.dto.basic.ServiceResult;
 import org.apache.openmeetings.db.dto.calendar.AppointmentDTO;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,11 +37,15 @@ import org.springframework.beans.factory
 public class TestCalendarService extends AbstractWebServiceTest {
        public final static String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + 
"/calendar";
        @Autowired
+       private GroupDao groupDao;
+       @Autowired
        private RoomDao roomDao;
 
        private void actualTest(Room r) throws Exception {
                String uuid = UUID.randomUUID().toString();
-               User u = createUser(uuid);
+               User u = getUser(uuid);
+               u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
+               u = createUser(u);
                ServiceResult sr = login(u.getLogin(), getRandomPass(uuid));
 
                Date start = new Date();

svn commit: r1778494 - in /openmeetings/application: branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/ branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/ branches/3.2.x/openmeetings-web/src/...

Reply via email to