[openmeetings] branch master updated: [OPENMEETINGS-2299] changes are reverted

[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 67a772e  [OPENMEETINGS-2299] changes are reverted
67a772e is described below

commit 67a772eb41f164b6fe8023fd834a9fe4967f6b03
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun May 3 09:47:39 2020 +0700

    [OPENMEETINGS-2299] changes are reverted
---
 .../org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java    | 2 --
 .../java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java    | 2 --
 .../java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java   | 2 --
 3 files changed, 6 deletions(-)

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 46839ad..da50102 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
@@ -44,7 +44,6 @@ import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.manager.IClientManager;
 import org.junit.Test;
 import org.kurento.client.MediaPipeline;
-import org.kurento.client.ServerManager;
 import org.kurento.client.Transaction;
 import org.mockito.BDDMockito;
 import org.mockito.Mock;
@@ -75,7 +74,6 @@ public class TestRecordingFlowMocked extends BaseMockedTest {
        @Override
        public void setup() {
                super.setup();
-               
when(client.getServerManager()).thenReturn(mock(ServerManager.class));
                
when(client.createMediaPipeline(any(Transaction.class))).thenReturn(mock(MediaPipeline.class));
                User u = new User();
                u.setId(USER_ID);
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 484af03..5f5061d 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
@@ -40,7 +40,6 @@ import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.manager.IClientManager;
 import org.junit.Test;
 import org.kurento.client.MediaPipeline;
-import org.kurento.client.ServerManager;
 import org.kurento.client.Transaction;
 import org.mockito.BDDMockito;
 import org.mockito.Mock;
@@ -65,7 +64,6 @@ public class TestRoomFlowMocked extends BaseMockedTest {
        @Override
        public void setup() {
                super.setup();
-               
when(client.getServerManager()).thenReturn(mock(ServerManager.class));
                
when(client.createMediaPipeline(any(Transaction.class))).thenReturn(mock(MediaPipeline.class));
                User u = new User();
                u.setId(USER_ID);
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 7c61f5c..26956f4 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,7 +35,6 @@ import org.kurento.client.MediaPipeline;
 import org.kurento.client.MediaProfileSpecType;
 import org.kurento.client.PlayerEndpoint;
 import org.kurento.client.RecorderEndpoint;
-import org.kurento.client.ServerManager;
 import org.kurento.client.Transaction;
 import org.kurento.client.WebRtcEndpoint;
 
@@ -58,7 +57,6 @@ public class TestSetupFlowMocked extends BaseMockedTest {
 
        @Test
        public void testMsgTestRecord1() throws Exception {
-               
when(client.getServerManager()).thenReturn(mock(ServerManager.class));
                
when(client.createMediaPipeline(any(Transaction.class))).thenReturn(mock(MediaPipeline.class));
                WebRtcEndpoint.Builder builder = 
mock(WebRtcEndpoint.Builder.class);
                
whenNew(WebRtcEndpoint.Builder.class).withArguments(any(MediaPipeline.class)).thenReturn(builder);