Repository: openmeetings Updated Branches: refs/heads/4.0.x 509b975d6 -> 37c723b21
[OPENMEETINGS-1738] tomcat start code is refactored Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/37c723b2 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/37c723b2 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/37c723b2 Branch: refs/heads/4.0.x Commit: 37c723b21212c88edf4d7e3776dc06264a7a7ad0 Parents: 509b975 Author: Maxim Solodovnik <[email protected]> Authored: Wed Nov 8 20:46:36 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Nov 8 20:46:36 2017 +0700 ---------------------------------------------------------------------- .../webservice/AbstractWebServiceTest.java | 42 ++++++++++++++------ .../webservice/TestCalendarService.java | 24 ++++++----- .../webservice/TestErrorService.java | 20 ++++++---- .../webservice/TestFileService.java | 2 +- .../webservice/TestGroupService.java | 12 ++++-- .../webservice/TestInfoService.java | 8 +++- .../webservice/TestRecordingService.java | 8 +++- .../webservice/TestRoomService.java | 14 ++++--- .../webservice/TestUserService.java | 4 +- 9 files changed, 89 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java ---------------------------------------------------------------------- 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 c6d3e42..94dcac3 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 @@ -28,6 +28,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.net.InetAddress; import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; @@ -38,6 +39,7 @@ import javax.ws.rs.core.Form; import javax.ws.rs.core.MediaType; import org.apache.catalina.LifecycleState; +import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; @@ -59,12 +61,11 @@ import org.junit.BeforeClass; public class AbstractWebServiceTest extends AbstractJUnitDefaults { private static Tomcat tomcat; - public static final String CONTEXT = "/openmeetings"; - public static final int PORT = 8080; - public static final String BASE_SERVICES_URL = String.format("http://localhost:%s%s/services";, PORT, CONTEXT); - public static final String USER_SERVICE_URL = BASE_SERVICES_URL + "/user"; - public static final String INFO_SERVICE_URL = BASE_SERVICES_URL + "/info"; - public static final String FILE_SERVICE_URL = BASE_SERVICES_URL + "/file"; + private static final String HOST = "localhost"; + private static final String CONTEXT = "/openmeetings"; + private static int port = 8080; + private static final String USER_SERVICE_MOUNT = "user"; + 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; protected WicketTester tester; @@ -83,7 +84,7 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { } public static ServiceResult loginNoCheck(String user, String pass) { - ServiceResult sr = getClient(USER_SERVICE_URL).path("/login").query("user", user).query("pass", pass) + ServiceResult sr = getClient(getUserUrl()).path("/login").query("user", user).query("pass", pass) .get(ServiceResult.class); return sr; } @@ -97,15 +98,20 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { @BeforeClass public static void initialize() throws Exception { tomcat = new Tomcat(); - tomcat.setPort(PORT); + Connector connector = new Connector("HTTP/1.1"); + connector.setAttribute("address", InetAddress.getByName(HOST).getHostAddress()); + connector.setPort(0); + tomcat.getService().addConnector(connector); + tomcat.setConnector(connector); File wd = Files.createTempDirectory("om" + UUID.randomUUID().toString()).toFile(); tomcat.setBaseDir(wd.getCanonicalPath()); tomcat.getHost().setAppBase(wd.getCanonicalPath()); - tomcat.getHost().setAutoDeploy(true); - tomcat.getHost().setDeployOnStartup(true); + tomcat.getHost().setAutoDeploy(false); + tomcat.getHost().setDeployOnStartup(false); tomcat.addWebapp(CONTEXT, getOmHome().getAbsolutePath()); tomcat.getConnector(); // to init the connector tomcat.start(); + port = tomcat.getConnector().getLocalPort(); } @Override @@ -137,7 +143,7 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { ServiceResult r = login(); UserDTO dto = new UserDTO(u); dto.setPassword(createPass()); - UserDTO user = getClient(USER_SERVICE_URL) + UserDTO user = getClient(getUserUrl()) .path("/") .query("sid", r.getMessage()) .type(APPLICATION_FORM_URLENCODED) @@ -158,7 +164,7 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { List<Attachment> atts = new ArrayList<>(); atts.add(new Attachment("file", MediaType.APPLICATION_JSON, file)); atts.add(new Attachment("stream", MediaType.APPLICATION_OCTET_STREAM, is)); - f1 = getClient(FILE_SERVICE_URL) + f1 = getClient(getFileUrl()) .path("/") .query("sid", r.getMessage()) .type(MediaType.MULTIPART_FORM_DATA_TYPE).postCollection(atts, Attachment.class, FileItemDTO.class); @@ -168,6 +174,18 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { return new CallResult<>(r.getMessage(), f1); } + protected static String getServiceUrl(String mount) { + return String.format("http://%s:%s%s/services/%s";, HOST, port, CONTEXT, mount); + } + + protected static String getUserUrl() { + return getServiceUrl(USER_SERVICE_MOUNT); + } + + protected static String getFileUrl() { + return getServiceUrl(FILE_SERVICE_MOUNT); + } + public static class CallResult<T> { private final String sid; private final T obj; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/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 ac6bcc6..dd68fdf 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 @@ -52,7 +52,7 @@ import com.github.openjson.JSONArray; import com.github.openjson.JSONObject; public class TestCalendarService extends AbstractWebServiceTest { - public static final String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + "/calendar"; + public static final String CALENDAR_SERVICE_MOUNT = "calendar"; @Autowired private GroupDao groupDao; @Autowired @@ -73,7 +73,7 @@ public class TestCalendarService extends AbstractWebServiceTest { Date start = new Date(); Appointment a = createAppointment(getAppointment(u, r, start, new Date(start.getTime() + ONE_HOUR))); - AppointmentDTO app = getClient(CALENDAR_SERVICE_URL).path("/room/" + a.getRoom().getId()).query("sid", sr.getMessage()) + AppointmentDTO app = getClient(getCalendarUrl()).path("/room/" + a.getRoom().getId()).query("sid", sr.getMessage()) .get(AppointmentDTO.class); assertNotNull("Valid DTO should be returned", app); } @@ -139,7 +139,7 @@ public class TestCalendarService extends AbstractWebServiceTest { String sid = loginNewUser(); - Response resp = getClient(CALENDAR_SERVICE_URL) + Response resp = getClient(getCalendarUrl()) .path("/") .query("sid", sid) .form(new Form().param("appointment", o.toString())); @@ -161,7 +161,7 @@ public class TestCalendarService extends AbstractWebServiceTest { @Test public void testDelete() { ServiceResult sr = login(); - Response resp = getClient(CALENDAR_SERVICE_URL) + Response resp = getClient(getCalendarUrl()) .path("/" + Long.MAX_VALUE) //non-existent ID .query("sid", sr.getMessage()) .delete(); @@ -182,7 +182,7 @@ public class TestCalendarService extends AbstractWebServiceTest { u = createUser(u); ServiceResult sr = login(u.getLogin(), createPass()); - Response resp = getClient(CALENDAR_SERVICE_URL) + Response resp = getClient(getCalendarUrl()) .path("/") .query("sid", sr.getMessage()) .form(new Form().param("appointment", o.toString())); @@ -209,7 +209,7 @@ public class TestCalendarService extends AbstractWebServiceTest { )) ); - Response resp = getClient(CALENDAR_SERVICE_URL) + Response resp = getClient(getCalendarUrl()) .path("/") .query("sid", sid) .form(new Form().param("appointment", o.toString())); @@ -238,7 +238,7 @@ public class TestCalendarService extends AbstractWebServiceTest { .put(new JSONObject().put("user", new JSONObject() .put("id", 1)))); - Response resp = getClient(CALENDAR_SERVICE_URL) + Response resp = getClient(getCalendarUrl()) .path("/") .query("sid", sid) .form(new Form().param("appointment", o1.toString())); @@ -263,7 +263,7 @@ public class TestCalendarService extends AbstractWebServiceTest { //try to change MM list JSONObject o = AppointmentParamConverter.json(dto); - Response resp = getClient(CALENDAR_SERVICE_URL) + Response resp = getClient(getCalendarUrl()) .path("/") .query("sid", sid) .form(new Form().param("appointment", o.toString())); @@ -287,7 +287,7 @@ public class TestCalendarService extends AbstractWebServiceTest { String title = "title" + UUID.randomUUID().toString(); String sid = createApp(title); @SuppressWarnings("unchecked") - List<AppointmentDTO> list = (List<AppointmentDTO>)getClient(CALENDAR_SERVICE_URL) + List<AppointmentDTO> list = (List<AppointmentDTO>)getClient(getCalendarUrl()) .path(String.format("/title/%s", title)) .query("sid", sid) .getCollection(AppointmentDTO.class); @@ -297,10 +297,14 @@ public class TestCalendarService extends AbstractWebServiceTest { title = UUID.randomUUID().toString(); @SuppressWarnings("unchecked") - List<AppointmentDTO> list1 = (List<AppointmentDTO>)getClient(CALENDAR_SERVICE_URL) + List<AppointmentDTO> list1 = (List<AppointmentDTO>)getClient(getCalendarUrl()) .path(String.format("/title/%s", title)) .query("sid", sid) .getCollection(AppointmentDTO.class); assertEquals("None items should be returned", 0, list1.size()); } + + protected static String getCalendarUrl() { + return getServiceUrl(CALENDAR_SERVICE_MOUNT); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java index fae741c..4dc1ca0 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java @@ -32,12 +32,12 @@ import org.junit.Test; public class TestErrorService extends AbstractWebServiceTest { - public static final String ERROR_SERVICE_URL = BASE_SERVICES_URL + "/error"; + public static final String ERROR_SERVICE_MOUNT = "error"; @Test public void getTestBadKey() { Locale[] locales = Locale.getAvailableLocales(); - ServiceResult sr = getClient(ERROR_SERVICE_URL) + ServiceResult sr = getClient(getErrorUrl()) .path(String.format("/%s/%s", UUID.randomUUID().toString(), LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L))) .get(ServiceResult.class); assertNotNull("Valid Result should be returned", sr); @@ -47,7 +47,7 @@ public class TestErrorService extends AbstractWebServiceTest { @Test public void getTest() { Locale[] locales = Locale.getAvailableLocales(); - ServiceResult sr = getClient(ERROR_SERVICE_URL) + ServiceResult sr = getClient(getErrorUrl()) .path(String.format("/%s/%s", "error.unknown", LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L))) .get(ServiceResult.class); assertNotNull("Valid Result should be returned", sr); @@ -57,14 +57,14 @@ public class TestErrorService extends AbstractWebServiceTest { @Test public void reportTest() { // null report - Response resp = getClient(ERROR_SERVICE_URL) + Response resp = getClient(getErrorUrl()) .path("/report") .post(""); assertNotNull("Not null Response should be returned", resp); assertEquals("SUCCESS result should be returned", Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus()); // report with message - resp = getClient(ERROR_SERVICE_URL) + resp = getClient(getErrorUrl()) .path("/report") .query("message", "Dummy test") .post(""); @@ -72,7 +72,7 @@ public class TestErrorService extends AbstractWebServiceTest { assertEquals("SUCCESS result should be returned", Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus()); // report with invalid sid and message - resp = getClient(ERROR_SERVICE_URL) + resp = getClient(getErrorUrl()) .path("/report") .query("message", "Dummy test") .query("sid", "n/a") @@ -82,7 +82,7 @@ public class TestErrorService extends AbstractWebServiceTest { // report with valid sid and no message ServiceResult r = login(); - resp = getClient(ERROR_SERVICE_URL) + resp = getClient(getErrorUrl()) .path("/report") .query("sid", r.getMessage()) .post(""); @@ -90,7 +90,7 @@ public class TestErrorService extends AbstractWebServiceTest { assertEquals("SUCCESS result should be returned", Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus()); // report with valid sid and message - resp = getClient(ERROR_SERVICE_URL) + resp = getClient(getErrorUrl()) .path("/report") .query("sid", r.getMessage()) .query("message", "Dummy test") @@ -98,4 +98,8 @@ public class TestErrorService extends AbstractWebServiceTest { assertNotNull("Not null Response should be returned", resp); assertEquals("SUCCESS result should be returned", Response.Status.NO_CONTENT.getStatusCode(), resp.getStatus()); } + + protected static String getErrorUrl() { + return getServiceUrl(ERROR_SERVICE_MOUNT); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java index 0e10173..51da43b 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java @@ -64,7 +64,7 @@ public class TestFileService extends AbstractWebServiceTest { @Test public void testGetRoom() { ServiceResult r = login(); - FileExplorerObject fo = getClient(FILE_SERVICE_URL) + FileExplorerObject fo = getClient(getFileUrl()) .path("/room/5") .query("sid", r.getMessage()) .get(FileExplorerObject.class); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java ---------------------------------------------------------------------- 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 c93bcd4..e3873ed 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,12 +28,12 @@ import org.apache.openmeetings.db.dto.basic.ServiceResult.Type; import org.junit.Test; public class TestGroupService extends AbstractWebServiceTest { - public static final String GROUP_SERVICE_URL = BASE_SERVICES_URL + "/group"; + public static final String GROUP_SERVICE_MOUNT = "group"; @Test public void putTest() { ServiceResult r = login(); - Response resp = getClient(GROUP_SERVICE_URL) + Response resp = getClient(getGroupUrl()) .path("/") .query("sid", r.getMessage()).put(""); assertEquals("Call should NOT be successful", Response.Status.METHOD_NOT_ALLOWED.getStatusCode(), resp.getStatus()); @@ -44,7 +44,7 @@ public class TestGroupService extends AbstractWebServiceTest { ServiceResult r = login(); Long groupId = -1L; { - Response resp = getClient(GROUP_SERVICE_URL) + Response resp = getClient(getGroupUrl()) .path("/") .query("sid", r.getMessage()).query("name", "Test Group").post(""); assertNotNull("Valid ServiceResult should be returned", resp); @@ -55,7 +55,7 @@ public class TestGroupService extends AbstractWebServiceTest { } //delete group created { - Response resp = getClient(GROUP_SERVICE_URL) + Response resp = getClient(getGroupUrl()) .path("/" + groupId) .query("sid", r.getMessage()).delete(); assertNotNull("Valid ServiceResult should be returned", resp); @@ -64,4 +64,8 @@ public class TestGroupService extends AbstractWebServiceTest { assertEquals("OM Call should be successful", r1.getType(), Type.SUCCESS.name()); } } + + protected static String getGroupUrl() { + return getServiceUrl(GROUP_SERVICE_MOUNT); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java index e975e76..51fe409 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java @@ -24,12 +24,18 @@ import org.apache.openmeetings.db.dto.basic.Info; import org.junit.Test; public class TestInfoService extends AbstractWebServiceTest { + private static final String INFO_SERVICE_MOUNT = "info"; + @Test public void infoTest() { - Info info = getClient(INFO_SERVICE_URL).path("/version").get(Info.class); + Info info = getClient(getInfoUrl()).path("/version").get(Info.class); assertNotNull("Valid info should be returned", info); assertNotNull("Valid BuildDate should be returned", info.getBuildDate()); assertNotNull("Valid Revision should be returned", info.getRevision()); assertNotNull("Valid Version should be returned", info.getVersion()); } + + protected static String getInfoUrl() { + return getServiceUrl(INFO_SERVICE_MOUNT); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java index a87a722..b2d3230 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; public class TestRecordingService extends AbstractWebServiceTest { - public static final String RECORD_SERVICE_URL = BASE_SERVICES_URL + "/record"; + public static final String RECORD_SERVICE_MOUNT = "record"; @Autowired private RecordingDao recordingDao; @@ -56,7 +56,7 @@ public class TestRecordingService extends AbstractWebServiceTest { r.setRoomId(5L); r = recordingDao.update(r); ServiceResult sr = login(); - Collection<? extends RecordingDTO> recs = getClient(RECORD_SERVICE_URL).path("/" + UNIT_TEST_EXT_TYPE).query("sid", sr.getMessage()) + Collection<? extends RecordingDTO> recs = getClient(getRecordUrl()).path("/" + UNIT_TEST_EXT_TYPE).query("sid", sr.getMessage()) .getCollection(RecordingDTO.class); assertNotNull("Valid collection should be returned", recs); assertFalse("Collection of the recordings should not be empty", recs.isEmpty()); @@ -70,4 +70,8 @@ public class TestRecordingService extends AbstractWebServiceTest { } assertTrue("Just created recording was not found by the service", found); } + + protected static String getRecordUrl() { + return getServiceUrl(RECORD_SERVICE_MOUNT); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java ---------------------------------------------------------------------- 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 0f2e68b..2e67338 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 @@ -39,7 +39,7 @@ import org.apache.openmeetings.db.entity.room.Room; import org.junit.Test; public class TestRoomService extends AbstractWebServiceTest { - public static final String ROOM_SERVICE_URL = BASE_SERVICES_URL + "/room"; + public static final String ROOM_SERVICE_MOUNT = "room"; private static final long CAPACITY = 666L; @Test @@ -54,14 +54,14 @@ public class TestRoomService extends AbstractWebServiceTest { r.setName(name); r.setComment(comment); r.setCapacity(CAPACITY); - RoomDTO room = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", type, UNIT_TEST_EXT_TYPE, extId)) + RoomDTO room = getClient(getRoomUrl()).path(String.format("/%s/%s/%s", type, UNIT_TEST_EXT_TYPE, extId)) .query("sid", sr.getMessage()) .query("room", r.toString()) .get(RoomDTO.class); assertNotNull("Valid room should be returned", room); assertNotNull("Room ID should be not empty", room.getId()); - RoomDTO room1 = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", Room.Type.presentation, UNIT_TEST_EXT_TYPE, extId)) + RoomDTO room1 = getClient(getRoomUrl()).path(String.format("/%s/%s/%s", Room.Type.presentation, UNIT_TEST_EXT_TYPE, extId)) .query("sid", sr.getMessage()) .get(RoomDTO.class); assertNotNull("Valid room should be returned", room1); @@ -77,14 +77,14 @@ public class TestRoomService extends AbstractWebServiceTest { ServiceResult sr = login(); sid = sr.getMessage(); } - RoomDTO room = getClient(ROOM_SERVICE_URL) + 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(ROOM_SERVICE_URL).path(String.format("/%s", 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); @@ -166,4 +166,8 @@ 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); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/37c723b2/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java index f908f12..5e22f23 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java @@ -68,7 +68,7 @@ public class TestUserService extends AbstractWebServiceTest { RoomOptionsDTO options = new RoomOptionsDTO() .setRoomId(5L) .setModerator(true); - try (Response resp = getClient(USER_SERVICE_URL) + try (Response resp = getClient(getUserUrl()) .path("/hash") .query("sid", sid) .form(new Form().param("user", user.toString()).param("options", options.toString()))) @@ -121,7 +121,7 @@ public class TestUserService extends AbstractWebServiceTest { u.setTimeZoneId(tz); u.setExternalId(uuid); u.setExternalType(UNIT_TEST_EXT_TYPE); - UserDTO user = getClient(USER_SERVICE_URL) + UserDTO user = getClient(getUserUrl()) .path("/") .query("sid", r.getMessage()) .type(APPLICATION_FORM_URLENCODED)
