[openmeetings] branch master updated: [OPENMEETINGS-2374] tests are fixed

[solomax]

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 c5c0381  [OPENMEETINGS-2374] tests are fixed
c5c0381 is described below

commit c5c03813ef1131ade6118e4c1fe209e3b90c7515
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat May 30 12:25:01 2020 +0700

    [OPENMEETINGS-2374] tests are fixed
---
 .../openmeetings/webservice/AbstractWebServiceTest.java      | 12 ++++++++----
 .../org/apache/openmeetings/webservice/TestGroupService.java | 12 ++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

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 bf68ded..67cf812 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
@@ -140,15 +140,19 @@ public class AbstractWebServiceTest {
                return createAndValidate(null, r);
        }
 
+       protected static RoomDTO create(String sid, RoomDTO r) {
+               return getClient(getRoomUrl())
+                               .query("sid", sid)
+                               .type(APPLICATION_FORM_URLENCODED)
+                               .post(new Form().param("room", r.toString()), 
RoomDTO.class);
+       }
+
        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);
+               RoomDTO room = create(sid, r);
                assertNotNull(room, "Valid room should be returned");
                assertNotNull(room.getId(), "Room ID should be not empty");
 
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 cbb7789..ea394ec 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
@@ -26,12 +26,15 @@ import static 
org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Collection;
 
+import javax.ws.rs.BadRequestException;
 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.apache.openmeetings.db.entity.room.Room;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestGroupService extends AbstractWebServiceTest {
@@ -84,11 +87,20 @@ public class TestGroupService extends 
AbstractWebServiceTest {
        }
 
        @Test
+       public void addRoomErrTest() {
+               ServiceResult sr = login();
+               RoomDTO rdto = new RoomDTO();
+               rdto.setName("Group WS Room");
+               Assertions.assertThrows(BadRequestException.class, () -> 
create(sr.getMessage(), rdto));
+       }
+
+       @Test
        public void addRoomTest() {
                //create new group
                ServiceResult sr = login();
                Long groupId = createGroup(sr.getMessage(), "Group WS");
                RoomDTO rdto = new RoomDTO();
+               rdto.setType(Room.Type.PRESENTATION);
                rdto.setName("Group WS Room");
                CallResult<RoomDTO> room = createAndValidate(sr.getMessage(), 
rdto);