You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/01 06:11:16 UTC
[25/50] [abbrv] openmeetings git commit: no-jira: failing tests are
fixed
no-jira: failing tests are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/7567ff17
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7567ff17
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7567ff17
Branch: refs/heads/3.1.x
Commit: 7567ff17fdb1a526f697c6571b481c04cba22cb2
Parents: 98b9cf9
Author: Maxim Solodovnik <so...@apache.org>
Authored: Fri Jan 13 05:31:19 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Fri Jan 13 05:31:19 2017 +0000
----------------------------------------------------------------------
.../apache/openmeetings/test/AbstractJUnitDefaults.java | 10 ++++------
.../openmeetings/test/webservice/TestCalendarService.java | 8 +++++++-
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7567ff17/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
index 368bd87..4bfa5b7 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
@@ -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 AbstractJUnitDefaults extends AbstractSpringTest {
@Autowired
private UserDao userDao;
@Autowired
- private GroupDao groupDao;
- @Autowired
private ImportInitvalues importInitvalues;
@Autowired
protected ConfigurationDao cfgDao;
@@ -153,7 +149,6 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
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 AbstractJUnitDefaults extends AbstractSpringTest {
}
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;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7567ff17/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
index b593307..c2f2c08 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
@@ -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.annotation.Autowired;
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();