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 <solomax...@gmail.com>
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");
handler.onMessage(getClientWithRoom(), msg);
+
+ verify(streamProcessor, times(1)).onMessage(any(), any(),
any());
}
private Client getClientFull() {
@@ -136,6 +144,8 @@ class TestRoomFlowMocked extends BaseMockedTest {
c.getRoom().setType(Room.Type.INTERVIEW);
doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
handler.onMessage(c, msg);
+
+ verify(streamProcessor, times(1)).onMessage(any(),
any(), any());
});
}
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 693e72472..bf355a5c2 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
@@ -25,6 +25,8 @@ import static
org.apache.openmeetings.core.remote.KurentoHandler.TAG_MODE;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import org.apache.openmeetings.db.entity.basic.WsClient;
import org.junit.jupiter.api.BeforeEach;
@@ -51,6 +53,8 @@ class TestSetupFlowMocked extends BaseMockedTest {
JSONObject msg = getBaseMsg().put("id", "wannaRecord");
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
+
+ verify(testProcessor, times(1)).onMessage(any(), any(),
any());
});
}
@@ -81,6 +85,8 @@ class TestSetupFlowMocked extends BaseMockedTest {
.put("id", "play")
.put("sdpOffer", "sdpOffer"));
testProcessor.destroy();
+
+ verify(testProcessor, times(6)).onMessage(any(), any(),
any());
});
}
@@ -92,6 +98,8 @@ class TestSetupFlowMocked extends BaseMockedTest {
.put(KurentoHandler.PARAM_CANDIDATE,
new JSONObject());
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
+
+ verify(testProcessor, times(1)).onMessage(any(), any(),
any());
});
}
@@ -101,6 +109,8 @@ class TestSetupFlowMocked extends BaseMockedTest {
JSONObject msg = getBaseMsg().put("id", "wannaPlay");
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
+
+ verify(testProcessor, times(1)).onMessage(any(), any(),
any());
});
}
@@ -110,6 +120,8 @@ class TestSetupFlowMocked extends BaseMockedTest {
JSONObject msg = getBaseMsg().put("id", "play");
WsClient c = new WsClient("sessionId", 0);
handler.onMessage(c, msg);
+
+ verify(testProcessor, times(1)).onMessage(any(), any(),
any());
});
}
}
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
deleted file mode 100644
index 6ba96538e..000000000
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.gui;
-
-import org.junit.jupiter.api.Test;
-
-
-class TestGui {
-
- @Test
- void testNoop() {
- // no-op
- }
-}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index a631f0c9a..86ac8a69b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -273,6 +273,7 @@ public class ActivitiesPanel extends Panel {
break;
case ROOM_ENTER, ROOM_EXIT:
cls.append("bg-white auto-clean");
+ break;
default:
break;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 83715ecb9..01ac049d0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -358,6 +358,7 @@ public class CalendarDialog extends Modal<OmCalendar> {
target.add(delete.setVisible(isOwner(c)));
}
target.add(save.setVisible(isOwner(c)));
+ break;
default:
break;
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
index cacd23809..6a22356d3 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
@@ -22,12 +22,14 @@ import static java.util.UUID.randomUUID;
import static org.apache.openmeetings.db.bind.Constants.FILE_LIST_NODE;
import static org.apache.openmeetings.db.bind.Constants.USER_LIST_NODE;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.file.Paths;
import java.time.LocalDate;
import javax.xml.bind.JAXBContext;
@@ -51,7 +53,9 @@ class TestExport extends AbstractOmServerTest {
@Test
void exportMain() throws Exception {
- BackupExport.main(new String[] {File.createTempFile("gereral",
"cfg").getCanonicalPath()});
+ String backupPath = File.createTempFile("gereral",
"cfg").getCanonicalPath();
+ BackupExport.main(new String[] {backupPath});
+ assertTrue(Paths.get(backupPath).toFile().exists(), "Backup
should be created");
}
@Test
