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 a4269b9 [OPENMEETINGS-1829] tests should be fixed
a4269b9 is described below
commit a4269b9ef348a00b208a0da0f48f20ea0ad90878
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Feb 9 13:29:11 2018 +0700
[OPENMEETINGS-1829] tests should be fixed
---
.../openmeetings/core/remote/MobileService.java | 2 +-
.../core/remote/ScopeApplicationAdapter.java | 30 ++++++++++++++--------
openmeetings-server/src/site/xdoc/JUnitTesting.xml | 2 +-
.../apache/openmeetings/web/app/Application.java | 2 +-
4 files changed, 23 insertions(+), 13 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
index ef36015..caa1026 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
@@ -418,7 +418,7 @@ public class MobileService {
final Long roomId = c.getRoomId();
//Sync to all users of current scope
- new MessageSender(scopeAdapter.getChildScope("" + roomId),
"sendVarsToMessageWithClient", hsm, scopeAdapter) {
+ new MessageSender(scopeAdapter.getChildScope(roomId),
"sendVarsToMessageWithClient", hsm, scopeAdapter) {
@Override
public boolean filter(IConnection conn) {
StreamClient rcl =
sessionManager.get(IClientUtil.getId(conn.getClient()));
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index 8434faf..08ffdd4 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -240,6 +240,21 @@ public class ScopeApplicationAdapter extends
MultiThreadedApplicationAdapter imp
return true;
}
+ @Override
+ public IScope getChildScope(String name) {
+ IScope sc = null;
+ try {
+ sc = super.getChildScope(name);
+ } catch (Exception e) {
+ //no-op, scope doesn't exist while testing
+ }
+ return sc;
+ }
+
+ public IScope getChildScope(Long roomId) {
+ return getChildScope(String.valueOf(roomId));
+ }
+
public Map<String, String> screenSharerAction(Map<String, Object> map) {
Map<String, String> returnMap = new HashMap<>();
try {
@@ -390,12 +405,7 @@ public class ScopeApplicationAdapter extends
MultiThreadedApplicationAdapter imp
}
public void dropSharing(org.apache.openmeetings.db.entity.basic.IClient
c, Long roomId) {
- IScope scope = null;
- try {
- scope = getChildScope(String.valueOf(roomId));
- } catch (Exception e) {
- //no-op, scope doesn't exist while testing
- }
+ IScope scope = getChildScope(roomId);
//Elvis has left the building
new MessageSender(scope, "stopStream", new Object(), this) {
@Override
@@ -410,7 +420,7 @@ public class ScopeApplicationAdapter extends
MultiThreadedApplicationAdapter imp
public void
roomLeaveByScope(org.apache.openmeetings.db.entity.basic.IClient c, Long
roomId) {
StreamClient rcl = sessionManager.get(c.getUid());
- IScope scope = getChildScope(String.valueOf(roomId));
+ IScope scope = getChildScope(roomId);
_log.debug("[roomLeaveByScope] {} {} {} {}", c.getUid(),
roomId, rcl, scope);
if (rcl != null && scope != null) {
roomLeaveByScope(rcl, scope);
@@ -687,7 +697,7 @@ public class ScopeApplicationAdapter extends
MultiThreadedApplicationAdapter imp
}
public void sendToScope(final Long roomId, String method, Object obj) {
- new MessageSender(getChildScope(String.valueOf(roomId)),
method, obj, this) {
+ new MessageSender(getChildScope(roomId), method, obj, this) {
@Override
public boolean filter(IConnection conn) {
StreamClient rcl =
sessionManager.get(IClientUtil.getId(conn.getClient()));
@@ -912,7 +922,7 @@ public class ScopeApplicationAdapter extends
MultiThreadedApplicationAdapter imp
return;
}
-
recordingService.startRecording(getChildScope(String.valueOf(c.getRoom().getId())),
c, true);
+ recordingService.startRecording(getChildScope(c.getRoomId()),
c, true);
}
/**
@@ -922,7 +932,7 @@ public class ScopeApplicationAdapter extends
MultiThreadedApplicationAdapter imp
*/
public void
stopInterviewRecording(org.apache.openmeetings.db.entity.basic.IClient c) {
_log.debug("----------- stopInterviewRecording");
-
recordingService.stopRecording(getChildScope(String.valueOf(c.getRoomId())), c);
+ recordingService.stopRecording(getChildScope(c.getRoomId()), c);
}
public void micActivity(boolean active) {
diff --git a/openmeetings-server/src/site/xdoc/JUnitTesting.xml
b/openmeetings-server/src/site/xdoc/JUnitTesting.xml
index 24027f4..47413e4 100644
--- a/openmeetings-server/src/site/xdoc/JUnitTesting.xml
+++ b/openmeetings-server/src/site/xdoc/JUnitTesting.xml
@@ -65,7 +65,7 @@
<ul>
<li>Select Arguments tab </li>
<li>Add the following code to the VM section
-
<source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/2.4.1/openjpa-2.4.1.jar
-Dom.home=${workspace_loc:openmeetings-web}/src/main/webapp/
-Dbackups.dir=${workspace_loc:openmeetings-web}/target/test-data</source>
+
<source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/2.4.2/openjpa-2.4.2.jar
-Dom.home=${workspace_loc:openmeetings-web}/target/test-root/
-Dbackups.dir=${workspace_loc:openmeetings-web}/target/test-data</source>
</li>
<li>To avoid temporary files being created in
OM root, modify
"Working Directory" as follows
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index d808031..87ab55e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -629,7 +629,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
ScopeApplicationAdapter scApp =
getBean(ScopeApplicationAdapter.class);
scApp.dropSharing(_c, roomId);
Client c = (Client)_c;
- IScope sc =
scApp.getChildScope(String.valueOf(roomId));
+ IScope sc = scApp.getChildScope(roomId);
for (String uid : c.getStreams()) {
scApp.sendMessageById("quit", uid, sc);
}
--
To stop receiving notification emails like this one, please contact
solo...@apache.org.
