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 2021/11/16 16:19:48 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2701] another attempt to fix tests
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 3850b5a [OPENMEETINGS-2701] another attempt to fix tests
3850b5a is described below
commit 3850b5aff3a6d2ff69854562695bef74e34d8f14
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Nov 16 23:15:40 2021 +0700
[OPENMEETINGS-2701] another attempt to fix tests
---
.../openmeetings/core/remote/BaseMockedTest.java | 6 ++++--
.../core/remote/TestNotConnectedMocked.java | 2 +-
.../core/remote/TestRecordingFlowMocked.java | 6 +++---
.../openmeetings/core/remote/TestRoomFlowMocked.java | 10 +++++-----
.../core/remote/TestSetupFlowMocked.java | 20 ++++++++++++--------
5 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
index 999cfb9..ff8549d 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
@@ -89,8 +89,6 @@ public class BaseMockedTest {
@InjectMocks
protected KurentoHandler handler;
- protected final static JSONObject MSG_BASE = new JSONObject();
-
@BeforeEach
public void baseSetup() {
Mockito.reset();
@@ -138,6 +136,10 @@ public class BaseMockedTest {
}
}
+ protected JSONObject getBaseMsg() {
+ return new JSONObject();
+ }
+
private boolean forInjection(Object o) {
return o instanceof KRoom || o instanceof KStream || o instanceof KTestStream;
}
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
index 1a7a0fc..7f5f3c7 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
@@ -29,7 +29,7 @@ import com.github.openjson.JSONObject;
class TestNotConnectedMocked extends BaseMockedTest {
@Test
void testNotConnected() {
- handler.onMessage(null, MSG_BASE);
+ handler.onMessage(null, getBaseMsg());
}
@Test
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
index ea4ee48..b8ddf50 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
@@ -144,7 +144,7 @@ class TestRecordingFlowMocked extends BaseMockedTest {
* @throws Exception
*/
private void testStartRecordWhenSharingWasNot() throws Exception {
- JSONObject msg = new JSONObject(MSG_BASE.toString())
+ JSONObject msg = getBaseMsg()
.put("id", "wannaRecord")
.put("shareType", "shareType")
.put("fps", "fps")
@@ -163,7 +163,7 @@ class TestRecordingFlowMocked extends BaseMockedTest {
//save UID for stopping the stream later
streamDescUID = streamDesc.getUid();
- JSONObject msgBroadcastStarted = new JSONObject(MSG_BASE.toString())
+ JSONObject msgBroadcastStarted = getBaseMsg()
.put("id", "broadcastStarted")
.put("type", "kurento")
.put("uid", streamDescUID)
@@ -204,7 +204,7 @@ class TestRecordingFlowMocked extends BaseMockedTest {
// Needed for stopping, needs to stop by sid
doReturn(c).when(streamProcessor).getBySid(c.getSid());
- JSONObject msg = new JSONObject(MSG_BASE.toString())
+ JSONObject msg = getBaseMsg()
.put("id", "stopRecord")
.put("type", "kurento")
.put("uid", streamDescUID)
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
index b7e1510..005bbe4 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
@@ -77,7 +77,7 @@ class TestRoomFlowMocked extends BaseMockedTest {
@Test
void testNoClient() {
runWrapped(() -> {
- handler.onMessage(null, MSG_BASE.put("id", "aa"));
+ handler.onMessage(null, getBaseMsg().put("id", "aa"));
});
}
@@ -88,7 +88,7 @@ class TestRoomFlowMocked extends BaseMockedTest {
@Test
void testNoRoom() {
runWrapped(() -> {
- handler.onMessage(getClient(), MSG_BASE.put("id", "aa"));
+ handler.onMessage(getClient(), getBaseMsg().put("id", "aa"));
});
}
@@ -117,7 +117,7 @@ class TestRoomFlowMocked extends BaseMockedTest {
@Test
void testWannaRecord1() throws Exception {
- JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaRecord");
+ JSONObject msg = getBaseMsg().put("id", "wannaRecord");
handler.onMessage(getClientWithRoom(), msg);
}
@@ -131,7 +131,7 @@ class TestRoomFlowMocked extends BaseMockedTest {
@Test
void testWannaRecord2() throws Exception {
runWrapped(() -> {
- JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaRecord");
+ JSONObject msg = getBaseMsg().put("id", "wannaRecord");
Client c = getClientFull();
c.getRoom().setType(Room.Type.INTERVIEW);
doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
@@ -142,7 +142,7 @@ class TestRoomFlowMocked extends BaseMockedTest {
@Test
void testRecordRecord() throws Exception {
runWrapped(() -> {
- JSONObject msg = new JSONObject(MSG_BASE.toString())
+ JSONObject msg = getBaseMsg()
.put("id", "wannaRecord")
.put("shareType", "shareType")
.put("fps", "fps")
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
index 70632b6..693e724 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
@@ -35,16 +35,20 @@ import org.kurento.client.Transaction;
import com.github.openjson.JSONObject;
class TestSetupFlowMocked extends BaseMockedTest {
+ @Override
+ protected JSONObject getBaseMsg() {
+ return super.getBaseMsg().put(TAG_MODE, MODE_TEST);
+ }
+
@BeforeEach
public void setup() {
doReturn(true).when(handler).isConnected();
- MSG_BASE.put(TAG_MODE, MODE_TEST);
}
@Test
void testMsgTestWannaRecord() throws Exception {
runWrapped(() -> {
- JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaRecord");
+ JSONObject msg = getBaseMsg().put("id", "wannaRecord");
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
});
@@ -58,7 +62,7 @@ class TestSetupFlowMocked extends BaseMockedTest {
WsClient c = new WsClient("sessionId", 0);
for (boolean audio : new boolean[] {true, false}) {
for (boolean video : new boolean[] {true, false}) {
- JSONObject msg = new JSONObject(MSG_BASE.toString())
+ JSONObject msg = getBaseMsg()
.put("id", "record")
.put("sdpOffer", "")
.put("audio", audio)
@@ -66,14 +70,14 @@ class TestSetupFlowMocked extends BaseMockedTest {
handler.onMessage(c, msg);
}
}
- JSONObject iceMsg = new JSONObject(MSG_BASE.toString())
+ JSONObject iceMsg = getBaseMsg()
.put("id", "iceCandidate")
.put(PARAM_CANDIDATE, new JSONObject()
.put(PARAM_CANDIDATE, "candidate")
.put("sdpMid", "sdpMid")
.put("sdpMLineIndex", 1));
handler.onMessage(c, iceMsg);
- handler.onMessage(c, new JSONObject(MSG_BASE.toString())
+ handler.onMessage(c, getBaseMsg()
.put("id", "play")
.put("sdpOffer", "sdpOffer"));
testProcessor.destroy();
@@ -83,7 +87,7 @@ class TestSetupFlowMocked extends BaseMockedTest {
@Test
void testMsgTestIceCandidate() throws Exception {
runWrapped(() -> {
- JSONObject msg = new JSONObject(MSG_BASE.toString())
+ JSONObject msg = getBaseMsg()
.put("id", "iceCandidate")
.put(KurentoHandler.PARAM_CANDIDATE, new JSONObject());
WsClient c = new WsClient("sessionId", 0);
@@ -94,7 +98,7 @@ class TestSetupFlowMocked extends BaseMockedTest {
@Test
void testMsgTestWannaPlay() throws Exception {
runWrapped(() -> {
- JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaPlay");
+ JSONObject msg = getBaseMsg().put("id", "wannaPlay");
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
});
@@ -103,7 +107,7 @@ class TestSetupFlowMocked extends BaseMockedTest {
@Test
void testMsgTestPlay() throws Exception {
runWrapped(() -> {
- JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "play");
+ JSONObject msg = getBaseMsg().put("id", "play");
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
});