[openmeetings] branch master updated: [OPENMEETINGS-2492] tests should be fixed

[so...@apache.org]

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 80ade3f  [OPENMEETINGS-2492] tests should be fixed
80ade3f is described below

commit 80ade3f3becc59543c4ed7f93e18ffac7c800bfe
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Oct 23 16:54:56 2020 +0700

    [OPENMEETINGS-2492] tests should be fixed
---
 .../openmeetings/core/remote/TestRecordingFlowMocked.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 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 c5d5b1e..428ecf8 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
@@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -42,9 +41,10 @@ import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.manager.IClientManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.kurento.client.MediaPipeline;
-import org.kurento.client.Transaction;
 import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import com.github.openjson.JSONObject;
 
@@ -72,7 +72,6 @@ class TestRecordingFlowMocked extends BaseMockedTest {
 	@BeforeEach
 	public void setup() {
 		super.setup();
-		doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
 		User u = new User();
 		u.setId(USER_ID);
 		u.setFirstname("firstname");
@@ -91,7 +90,13 @@ class TestRecordingFlowMocked extends BaseMockedTest {
 		doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
 
 		// Mock out the methods that do webRTC
-		doReturn(null).when(streamProcessor).startBroadcast(any(), any(), any(), any());
+		Mockito.doAnswer(new Answer<Void>() {
+			@Override
+			public Void answer(InvocationOnMock invocation) throws Throwable {
+				invocation.getArgument(3, Runnable.class).run();
+				return null;
+			}
+		}).when(streamProcessor).startBroadcast(any(), any(), any(), any());
 
 	}