This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new efd2444 [OPENMEETINGS-1840] add room to group is fixed
efd2444 is described below
commit efd244453b68950a18c2e1baf3a32685809332ab
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Mar 8 19:05:50 2018 +0700
[OPENMEETINGS-1840] add room to group is fixed
---
.../apache/openmeetings/AbstractJUnitDefaults.java | 2 +-
.../webservice/AbstractWebServiceTest.java | 34 ++++++++++++++++++
.../webservice/TestCalendarService.java | 3 --
.../openmeetings/webservice/TestGroupService.java | 42 ++++++++++++++++------
.../openmeetings/webservice/TestRoomService.java | 36 -------------------
.../openmeetings/webservice/GroupWebService.java | 2 +-
6 files changed, 67 insertions(+), 52 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
index 29f5d20..f898a8b 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
@@ -60,7 +60,7 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
@Autowired
protected UserDao userDao;
@Autowired
- private GroupDao groupDao;
+ protected GroupDao groupDao;
@Autowired
private ImportInitvalues importInitvalues;
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
index 94dcac3..6490105 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
@@ -48,6 +48,7 @@ import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
import org.apache.openmeetings.db.dto.file.FileItemDTO;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.user.UserDTO;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.user.User;
@@ -65,6 +66,7 @@ public class AbstractWebServiceTest extends
AbstractJUnitDefaults {
private static final String CONTEXT = "/openmeetings";
private static int port = 8080;
private static final String USER_SERVICE_MOUNT = "user";
+ private static final String ROOM_SERVICE_MOUNT = "room";
private static final String FILE_SERVICE_MOUNT = "file";
public static final String UNIT_TEST_EXT_TYPE = "om_unit_tests";
public static final long TIMEOUT = 5 * 60 * 1000;
@@ -139,6 +141,34 @@ public class AbstractWebServiceTest extends
AbstractJUnitDefaults {
}
}
+ protected static CallResult<RoomDTO> createAndValidate(RoomDTO r) {
+ return createAndValidate(null, r);
+ }
+
+ protected static CallResult<RoomDTO> createAndValidate(String sid,
RoomDTO r) {
+ if (sid == null) {
+ ServiceResult sr = login();
+ sid = sr.getMessage();
+ }
+ RoomDTO room = getClient(getRoomUrl())
+ .query("sid", sid)
+ .type(APPLICATION_FORM_URLENCODED)
+ .post(new Form().param("room", r.toString()),
RoomDTO.class);
+ assertNotNull("Valid room should be returned", room);
+ assertNotNull("Room ID should be not empty", room.getId());
+
+ RoomDTO room1 =
getClient(getRoomUrl()).path(String.format("/%s", room.getId()))
+ .query("sid", sid)
+ .get(RoomDTO.class);
+ assertNotNull("Valid room should be returned", room1);
+ assertEquals("Room with same ID should be returned",
room.getId(), room1.getId());
+ assertEquals("Room with same Name should be returned",
r.getName(), room1.getName());
+ assertEquals("Room with same ExternalType should be returned",
r.getExternalType(), room1.getExternalType());
+ assertEquals("Room with same ExternalId should be returned",
r.getExternalId(), room1.getExternalId());
+ //TODO check other fields
+ return new CallResult<>(sid, room1);
+ }
+
public void webCreateUser(User u) {
ServiceResult r = login();
UserDTO dto = new UserDTO(u);
@@ -182,6 +212,10 @@ public class AbstractWebServiceTest extends
AbstractJUnitDefaults {
return getServiceUrl(USER_SERVICE_MOUNT);
}
+ protected static String getRoomUrl() {
+ return getServiceUrl(ROOM_SERVICE_MOUNT);
+ }
+
protected static String getFileUrl() {
return getServiceUrl(FILE_SERVICE_MOUNT);
}
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 dd68fdf..1ff6684 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
@@ -35,7 +35,6 @@ import javax.ws.rs.core.Response;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
import org.apache.openmeetings.db.dao.room.InvitationDao;
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.dto.calendar.MeetingMemberDTO;
@@ -54,8 +53,6 @@ import com.github.openjson.JSONObject;
public class TestCalendarService extends AbstractWebServiceTest {
public static final String CALENDAR_SERVICE_MOUNT = "calendar";
@Autowired
- private GroupDao groupDao;
- @Autowired
private RoomDao roomDao;
@Autowired
private MeetingMemberDao mmDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
index 619dd69..8b9164d 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.Response;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
+import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.dto.user.GroupDTO;
import org.junit.Test;
@@ -53,20 +54,21 @@ public class TestGroupService extends
AbstractWebServiceTest {
assertEquals("Call should NOT be successful",
Response.Status.METHOD_NOT_ALLOWED.getStatusCode(), resp.getStatus());
}
+ private static Long createGroup(String sid, String name) {
+ Response resp = getClient(getGroupUrl())
+ .path("/")
+ .query("sid", sid).query("name", name).post("");
+ assertNotNull("Valid ServiceResult should be returned", resp);
+ assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
+ ServiceResult r1 = resp.readEntity(ServiceResult.class);
+ assertEquals("OM Call should be successful", r1.getType(),
Type.SUCCESS.name());
+ return Long.valueOf(r1.getMessage());
+ }
+
@Test
public void addRemoveTest() {
ServiceResult r = login();
- Long groupId = -1L;
- {
- Response resp = getClient(getGroupUrl())
- .path("/")
- .query("sid",
r.getMessage()).query("name", "Test Group").post("");
- assertNotNull("Valid ServiceResult should be returned",
resp);
- assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
- ServiceResult r1 = resp.readEntity(ServiceResult.class);
- assertEquals("OM Call should be successful",
r1.getType(), Type.SUCCESS.name());
- groupId = Long.valueOf(r1.getMessage());
- }
+ Long groupId = createGroup(r.getMessage(), "Test Group");
//delete group created
{
Response resp = getClient(getGroupUrl())
@@ -79,6 +81,24 @@ public class TestGroupService extends AbstractWebServiceTest
{
}
}
+ @Test
+ public void addRoomTest() {
+ //create new group
+ ServiceResult sr = login();
+ Long groupId = createGroup(sr.getMessage(), "Group WS");
+ RoomDTO rdto = new RoomDTO();
+ rdto.setName("Group WS Room");
+ CallResult<RoomDTO> room = createAndValidate(sr.getMessage(),
rdto);
+
+ Response resp = getClient(getGroupUrl())
+ .path(String.format("/%s/rooms/add/%s",
groupId, room.getObj().getId()))
+ .query("sid", sr.getMessage()).query("name",
"Test Group").post("");
+ assertNotNull("Valid ServiceResult should be returned", resp);
+ assertEquals("Call should be successful",
Response.Status.OK.getStatusCode(), resp.getStatus());
+ ServiceResult sr1 = resp.readEntity(ServiceResult.class);
+ assertEquals("OM Call should be successful", sr1.getType(),
Type.SUCCESS.name());
+ }
+
protected static String getGroupUrl() {
return getServiceUrl(GROUP_SERVICE_MOUNT);
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
index 2e67338..128470a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.webservice;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static
org.apache.openmeetings.util.OmFileHelper.getDefaultProfilePicture;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -28,8 +27,6 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.UUID;
-import javax.ws.rs.core.Form;
-
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.file.FileItemDTO;
import org.apache.openmeetings.db.dto.room.RoomDTO;
@@ -39,7 +36,6 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.junit.Test;
public class TestRoomService extends AbstractWebServiceTest {
- public static final String ROOM_SERVICE_MOUNT = "room";
private static final long CAPACITY = 666L;
@Test
@@ -68,34 +64,6 @@ public class TestRoomService extends AbstractWebServiceTest {
assertEquals("Same Room should be returned", room.getId(),
room1.getId());
}
- private static CallResult<RoomDTO> createAndValidate(RoomDTO r) {
- return createAndValidate(null, r);
- }
-
- private static CallResult<RoomDTO> createAndValidate(String sid,
RoomDTO r) {
- if (sid == null) {
- ServiceResult sr = login();
- sid = sr.getMessage();
- }
- RoomDTO room = getClient(getRoomUrl())
- .query("sid", sid)
- .type(APPLICATION_FORM_URLENCODED)
- .post(new Form().param("room", r.toString()),
RoomDTO.class);
- assertNotNull("Valid room should be returned", room);
- assertNotNull("Room ID should be not empty", room.getId());
-
- RoomDTO room1 =
getClient(getRoomUrl()).path(String.format("/%s", room.getId()))
- .query("sid", sid)
- .get(RoomDTO.class);
- assertNotNull("Valid room should be returned", room1);
- assertEquals("Room with same ID should be returned",
room.getId(), room1.getId());
- assertEquals("Room with same Name should be returned",
r.getName(), room1.getName());
- assertEquals("Room with same ExternalType should be returned",
r.getExternalType(), room1.getExternalType());
- assertEquals("Room with same ExternalId should be returned",
r.getExternalId(), room1.getExternalId());
- //TODO check other fields
- return new CallResult<>(sid, room1);
- }
-
@Test
public void testCreate1() {
String extId = UUID.randomUUID().toString();
@@ -166,8 +134,4 @@ public class TestRoomService extends AbstractWebServiceTest
{
CallResult<RoomDTO> res = createAndValidate(fileCall.getSid(),
r);
assertFalse("Room files should NOT be empty",
res.getObj().getFiles().isEmpty());
}
-
- protected static String getRoomUrl() {
- return getServiceUrl(ROOM_SERVICE_MOUNT);
- }
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
index e217509..4994b0f 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
@@ -187,7 +187,7 @@ public class GroupWebService extends BaseWebService {
* @return {@link ServiceResult} with result type
*/
@POST
- @Path("/{id}/rooms/add/{roomId}")
+ @Path("/{id}/rooms/add/{roomid}")
public ServiceResult addRoom(
@QueryParam("sid") @WebParam(name="sid") String sid
, @PathParam("id") @WebParam(name="id") Long id
--
To stop receiving notification emails like this one, please contact
[email protected].
