[openmeetings] branch master updated: [OPENMEETINGS-2733] more Sonar issues are 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 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");
[openmeetings] branch master updated: [OPENMEETINGS-2733] more Sonar issues are 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 e6adbd152 [OPENMEETINGS-2733] more Sonar issues are fixed
e6adbd152 is described below
commit e6adbd15294a328c75f5bf477f62f1c8fe646260
Author: Maxim Solodovnik
AuthorDate: Wed May 18 23:47:29 2022 +0700
[OPENMEETINGS-2733] more Sonar issues are fixed
---
.../src/main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +-
.../main/java/org/apache/openmeetings/web/util/OmUrlFragment.java | 6 +++---
.../src/test/java/org/apache/openmeetings/web/TestMainAreas.java| 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index bf83b3ed2..9c590c7cf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -423,7 +423,7 @@ public class MainPanel extends Panel {
}
if (updateFragment) {
UrlFragment uf = new UrlFragment(handler);
- uf.set(f.getArea().area(), f.getType());
+ uf.set(f.getArea().zone(), f.getType());
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 0438b7067..6e4890f33 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -104,7 +104,7 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
protected OmUrlFragment getUrlFragment(IRequestParameters params) {
for (AreaKeys key : AreaKeys.values()) {
- StringValue type = params.getParameterValue(key.area());
+ StringValue type = params.getParameterValue(key.zone());
if (!type.isEmpty()) {
return new OmUrlFragment(key, type.toString());
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
index f7bcf4946..02f8ff709 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
@@ -94,7 +94,7 @@ public class OmUrlFragment implements Serializable {
, ROOM
, ROOMS;
- public String area() {
+ public String zone() {
return name().toLowerCase(Locale.ROOT);
}
@@ -230,7 +230,7 @@ public class OmUrlFragment implements Serializable {
String[] arr =
Application.get().getBean(ConfigurationDao.class).getString(CONFIG_DEFAULT_LANDING_ZONE,
"").split("/");
if (arr != null && arr.length == 2) {
try {
- return new
OmUrlFragment(AreaKeys.valueOf(arr[0]), arr[1]);
+ return new OmUrlFragment(AreaKeys.of(arr[0]),
arr[1]);
} catch (Exception e) {
// no-op
}
@@ -333,7 +333,7 @@ public class OmUrlFragment implements Serializable {
}
public String getLink() {
- return getBaseUrl() + "#" + getArea().area() + "/" + getType();
+ return getBaseUrl() + "#" + getArea().zone() + "/" + getType();
}
private static void moveToServer(Room r) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
index 128d2ec42..09855380c 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
@@ -91,7 +91,7 @@ class TestMainAreas extends AbstractWicketTesterTest {
for (String user : users) {
log.debug("Positive test:: area: {}, type: {} for user:
{}", area, type, user);
testArea(user, p -> {
- tester.getRequest().setParameter(area.name(),
type);
+
