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 0421988 [OPENMEETINGS-2299] test should be fixed
0421988 is described below
commit 0421988be9a6923b6f365a7094dde7c10e852a6e
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun May 3 10:06:24 2020 +0700
[OPENMEETINGS-2299] test should be fixed
---
.../org/apache/openmeetings/core/remote/BaseMockedTest.java | 5 +++--
.../openmeetings/core/remote/TestRecordingFlowMocked.java | 8 ++++----
.../apache/openmeetings/core/remote/TestRoomFlowMocked.java | 10 +++++-----
.../openmeetings/core/remote/TestSetupFlowMocked.java | 13 ++++++-------
.../apache/openmeetings/web/app/TestUserManagerMocked.java | 5 +++--
5 files changed, 21 insertions(+), 20 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 84487ff..731a95b 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
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.remote;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
@@ -67,9 +68,9 @@ public class BaseMockedTest {
MockitoAnnotations.initMocks(this);
mockStatic(KurentoClient.class);
mockStatic(WebSocketHelper.class);
- when(client.getServerManager()).thenReturn(kServerManager);
+ doReturn(kServerManager).when(client).getServerManager();
when(KurentoClient.create(nullable(String.class),
any(KurentoConnectionListener.class))).thenReturn(client);
- when(client.beginTransaction()).thenReturn(new
TransactionImpl(romManager));
+ doReturn(new
TransactionImpl(romManager)).when(client).beginTransaction();
handler.init();
}
}
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 da50102..5f22af0 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
@@ -74,12 +74,12 @@ public class TestRecordingFlowMocked extends BaseMockedTest
{
@Override
public void setup() {
super.setup();
-
when(client.createMediaPipeline(any(Transaction.class))).thenReturn(mock(MediaPipeline.class));
+
doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
User u = new User();
u.setId(USER_ID);
u.setFirstname("firstname");
u.setLastname("lastname");
- when(userDao.get(USER_ID)).thenReturn(u);
+ doReturn(u).when(userDao).get(USER_ID);
doReturn(true).when(handler).isConnected();
when(recDao.update(any(Recording.class))).thenAnswer((invocation) -> {
Object[] args = invocation.getArguments();
@@ -93,7 +93,7 @@ public class TestRecordingFlowMocked extends BaseMockedTest {
// init client object for this test
c = getClientFull();
- when(roomDao.get(ROOM_ID)).thenReturn(c.getRoom());
+ doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
// Mock out the methods that do webRTC
doReturn(null).when(streamProcessor).startBroadcast(any(),
any(), any());
@@ -193,7 +193,7 @@ public class TestRecordingFlowMocked extends BaseMockedTest
{
// Mock out the methods that would produce the Recording
Recording rec = new Recording();
- when(recDao.get(Long.valueOf(1L))).thenReturn(rec);
+ doReturn(rec).when(recDao).get(Long.valueOf(1L));
// Mock out the method that would start recording
doReturn(true).when(streamProcessor).startConvertion(any(Recording.class));
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 5f5061d..9a1cf0b 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
@@ -64,12 +64,12 @@ public class TestRoomFlowMocked extends BaseMockedTest {
@Override
public void setup() {
super.setup();
-
when(client.createMediaPipeline(any(Transaction.class))).thenReturn(mock(MediaPipeline.class));
+
doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
User u = new User();
u.setId(USER_ID);
u.setFirstname("firstname");
u.setLastname("lastname");
- when(userDao.get(USER_ID)).thenReturn(u);
+ doReturn(u).when(userDao).get(USER_ID);
doReturn(true).when(handler).isConnected();
when(recDao.update(any(Recording.class))).thenAnswer((invocation) -> {
Object[] args = invocation.getArguments();
@@ -103,7 +103,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
c.getRoom().setAllowRecording(true);
assertFalse(streamProcessor.recordingAllowed(c));
c.allow(Room.Right.MODERATOR);
- when(roomDao.get(ROOM_ID)).thenReturn(c.getRoom());
+ doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
assertTrue(streamProcessor.recordingAllowed(c));
}
@@ -132,7 +132,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id",
"wannaRecord");
Client c = getClientFull();
c.getRoom().setType(Room.Type.INTERVIEW);
- when(roomDao.get(ROOM_ID)).thenReturn(c.getRoom());
+ doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
handler.onMessage(c, msg);
}
@@ -148,7 +148,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
.put("fps", "fps")
;
Client c = getClientFull();
- when(roomDao.get(ROOM_ID)).thenReturn(c.getRoom());
+ doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
handler.onMessage(c, msg);
assertTrue(streamProcessor.isSharing(ROOM_ID));
handler.onMessage(c, msg);
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 26956f4..558b394 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
@@ -26,7 +26,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.whenNew;
import org.apache.openmeetings.db.entity.basic.WsClient;
@@ -57,16 +56,16 @@ public class TestSetupFlowMocked extends BaseMockedTest {
@Test
public void testMsgTestRecord1() throws Exception {
-
when(client.createMediaPipeline(any(Transaction.class))).thenReturn(mock(MediaPipeline.class));
+
doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
WebRtcEndpoint.Builder builder =
mock(WebRtcEndpoint.Builder.class);
whenNew(WebRtcEndpoint.Builder.class).withArguments(any(MediaPipeline.class)).thenReturn(builder);
- when(builder.build()).thenReturn(mock(WebRtcEndpoint.class));
+ doReturn(mock(WebRtcEndpoint.class)).when(builder).build();
RecorderEndpoint.Builder recBuilder =
mock(RecorderEndpoint.Builder.class);
whenNew(RecorderEndpoint.Builder.class).withArguments(any(MediaPipeline.class),
anyString()).thenReturn(recBuilder);
- when(recBuilder.stopOnEndOfStream()).thenReturn(recBuilder);
-
when(recBuilder.withMediaProfile(any(MediaProfileSpecType.class))).thenReturn(recBuilder);
-
when(recBuilder.build()).thenReturn(mock(RecorderEndpoint.class));
+ doReturn(recBuilder).when(recBuilder).stopOnEndOfStream();
+
doReturn(recBuilder).when(recBuilder).withMediaProfile(any(MediaProfileSpecType.class));
+ doReturn(mock(RecorderEndpoint.class)).when(recBuilder).build();
WsClient c = new WsClient("sessionId", 0);
for (boolean audio : new boolean[] {true, false}) {
@@ -88,7 +87,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
handler.onMessage(c, iceMsg);
PlayerEndpoint.Builder playBuilder =
mock(PlayerEndpoint.Builder.class);
whenNew(PlayerEndpoint.Builder.class).withArguments(any(MediaPipeline.class),
anyString()).thenReturn(playBuilder);
-
when(playBuilder.build()).thenReturn(mock(PlayerEndpoint.class));
+ doReturn(mock(PlayerEndpoint.class)).when(playBuilder).build();
handler.onMessage(c, new JSONObject(MSG_BASE.toString())
.put("id", "play")
.put("sdpOffer", "sdpOffer"));
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
index 818c1da..ceaa67a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -25,6 +25,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -63,8 +64,8 @@ public class TestUserManagerMocked {
@Test
public void oauthTest() throws NoSuchAlgorithmException, IOException {
setCryptClassName(SCryptImplementation.class.getCanonicalName());
- when(userDao.validLogin(anyString())).thenReturn(true);
- when(userDao.checkEmail(anyString(), eq(Type.OAUTH),
any(Long.class), nullable(Long.class))).thenReturn(true);
+ doReturn(true).when(userDao).validLogin(anyString());
+ doReturn(true).when(userDao).checkEmail(anyString(),
eq(Type.OAUTH), any(Long.class), nullable(Long.class));
when(userDao.update(any(User.class), nullable(String.class),
any(Long.class))).then(new Answer<User>() {
@Override
public User answer(InvocationOnMock invocation) throws
Throwable {
