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/10/12 16:06:19 UTC
openmeetings git commit: [OPENMEETINGS-1714] tests are fixed
Repository: openmeetings
Updated Branches:
refs/heads/OPENMEETINGS-1714-sonar-issues a54e5b7d5 -> 84a5c2f7f
[OPENMEETINGS-1714] 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/84a5c2f7
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/84a5c2f7
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/84a5c2f7
Branch: refs/heads/OPENMEETINGS-1714-sonar-issues
Commit: 84a5c2f7f984366073d12e002ff1d4d9eb6c1e02
Parents: a54e5b7
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Oct 12 23:06:10 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Oct 12 23:06:10 2017 +0700
----------------------------------------------------------------------
.../openmeetings/db/dao/calendar/AppointmentDao.java | 2 +-
.../openmeetings/calendar/TestGetAppointment.java | 13 +++++++++++++
.../openmeetings/webservice/TestCalendarService.java | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/84a5c2f7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index f12b351..240f621 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -91,7 +91,7 @@ public class AppointmentDao {
r.setName(a.getTitle());
r.setCapacity(cfgDao.getLong(CONFIG_CALENDAR_ROOM_CAPACITY, 50L));
}
- roomDao.update(r, userId);
+ a.setRoom(roomDao.update(r, userId));
if (sendmails) {
Set<Long> mmIds = a.getId() == null ? new HashSet<>()
: meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/84a5c2f7/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
index 027996e..40e7955 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
@@ -23,9 +23,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Calendar;
+import java.util.Date;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
@@ -37,6 +39,8 @@ public class TestGetAppointment extends AbstractJUnitDefaults {
@Autowired
private AppointmentDao appointmentDao;
+ @Autowired
+ private RoomDao roomDao;
@Test
public void getAppoinment() {
@@ -56,4 +60,13 @@ public class TestGetAppointment extends AbstractJUnitDefaults {
assertNotNull("Failed to get Appointment By id", a);
assertEquals("Inapropriate MeetingMembers count", 0, a.getMeetingMembers() == null ? 0 : a.getMeetingMembers().size());
}
+
+ @Test
+ public void testGetByRoom() {
+ Date start = new Date();
+ Appointment a = createAppointment(getAppointment(userDao.get(1L), roomDao.get(5L), start, new Date(start.getTime() + ONE_HOUR)));
+ Appointment a1 = appointmentDao.getByRoom(1L, 5L);
+ assertNotNull("Created appointment should be found", a1);
+ assertEquals(a.getId(), a1.getId());
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/84a5c2f7/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
index f7c780e..ac6bcc6 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
@@ -68,6 +68,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
u.getGroupUsers().add(new GroupUser(groupDao.get(1L), u));
webCreateUser(u);
ServiceResult sr = login(u.getLogin(), createPass());
+ u = userDao.get(u.getId());
Date start = new Date();
Appointment a = createAppointment(getAppointment(u, r, start, new Date(start.getTime() + ONE_HOUR)));