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 2019/03/07 16:52:18 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1859] mockito
updated, test is fixed
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 ec07f2c [OPENMEETINGS-1859] mockito updated, test is fixed
ec07f2c is described below
commit ec07f2ca4a9926b562805ea27dd15741d63c2e55
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 7 23:52:05 2019 +0700
[OPENMEETINGS-1859] mockito updated, test is fixed
---
.../apache/openmeetings/core/remote/TestRoomFlowMocked.java | 10 ++++++++++
pom.xml | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
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 c589bf4..08a4685 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
@@ -26,10 +26,14 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.Locale;
+
+import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
+import org.apache.openmeetings.db.entity.label.OmLanguage;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
@@ -37,12 +41,16 @@ import org.apache.openmeetings.db.manager.IClientManager;
import org.junit.Test;
import org.kurento.client.MediaPipeline;
import org.kurento.client.Transaction;
+import org.mockito.BDDMockito;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
import com.github.openjson.JSONObject;
+@PrepareForTest(LabelDao.class)
public class TestRoomFlowMocked extends BaseMockedTest {
private static final Long USER_ID = 1L;
private static final Long ROOM_ID = 5L;
@@ -135,6 +143,8 @@ public class TestRoomFlowMocked extends BaseMockedTest {
@Test
public void testRecordRecord() throws Exception {
+ PowerMockito.mockStatic(LabelDao.class);
+ BDDMockito.given(LabelDao.getLanguage(any(Long.class))).willReturn(new OmLanguage(Locale.ENGLISH));
JSONObject msg = new JSONObject(MSG_BASE.toString())
.put("id", "wannaRecord")
.put("width", 640)
diff --git a/pom.xml b/pom.xml
index 7208460..66588a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<jetty.version>9.4.15.v20190215</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.61</bcprov-jdk15on.version>
- <mockito.version>2.24.5</mockito.version>
+ <mockito.version>2.25.0</mockito.version>
<powermock.version>2.0.0</powermock.version>
<!-- URL of the ASF SonarQube server -->
<sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>