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 35ed7e9ef [OPENMEETINGS-2733] more Sonar issues are fixed
35ed7e9ef is described below
commit 35ed7e9ef624f7312013376ed5fdfb68693973df
Author: Maxim Solodovnik
AuthorDate: Fri May 20 10:46:34 2022 +0700
[OPENMEETINGS-2733] more Sonar issues are fixed
---
.../core/remote/TestNotConnectedMocked.java| 7 +++--
.../core/remote/TestRoomFlowMocked.java| 10
.../core/remote/TestSetupFlowMocked.java | 12 +
.../java/org/apache/openmeetings/gui/TestGui.java | 30 --
.../web/room/activities/ActivitiesPanel.java | 1 +
.../web/user/calendar/CalendarDialog.java | 1 +
.../org/apache/openmeetings/backup/TestExport.java | 6 -
7 files changed, 34 insertions(+), 33 deletions(-)
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 e0eba9350..a951ed136 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
@@ -22,8 +22,10 @@ package org.apache.openmeetings.core.remote;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import static org.mockito.internal.util.collections.Sets.newMockSafeHashSet;
import java.util.Set;
@@ -32,7 +34,6 @@ import java.util.function.Consumer;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
-import org.mockito.Mockito;
import org.mockito.internal.configuration.injection.scanner.MockScanner;
import com.github.openjson.JSONObject;
@@ -53,7 +54,7 @@ class TestNotConnectedMocked extends BaseMockedTest {
wrapWs(wsHelperMock -> {
handler.onMessage(null, getBaseMsg());
wsHelperMock.verify(
- () ->
WebSocketHelper.sendClient(Mockito.isNull(), any(JSONObject.class))
+ () ->
WebSocketHelper.sendClient(isNull(), any(JSONObject.class))
, times(1));
});
}
@@ -66,11 +67,13 @@ class TestNotConnectedMocked extends BaseMockedTest {
@Test
void testStartRecording() {
streamProcessor.startRecording(null);
+ verify(handler, times(0)).getRoom(any());
}
@Test
void testStopRecording() {
streamProcessor.stopRecording(null);
+ verify(handler, times(0)).getRoom(any());
}
@Test
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 005bbe419..422905684 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
@@ -25,6 +25,8 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.db.dao.record.RecordingDao;
@@ -78,6 +80,8 @@ class TestRoomFlowMocked extends BaseMockedTest {
void testNoClient() {
runWrapped(() -> {
handler.onMessage(null, getBaseMsg().put("id", "aa"));
+
+ verify(streamProcessor, times(0)).onMessage(any(),
any(), any());
});
}
@@ -89,6 +93,8 @@ class TestRoomFlowMocked extends BaseMockedTest {
void testNoRoom() {
runWrapped(() -> {
handler.onMessage(getClient(), getBaseMsg().put("id",
"aa"));
+
+ verify(streamProcessor, times(0)).onMessage(any(),
any(), any());
});
}
@@ -119,6 +125,8 @@ class TestRoomFlowMocked extends BaseMockedTest {
void testWannaRecord1() throws Exception {
JSONObject msg = getBaseMsg().put("id", "wannaRecord");