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 127cc4b [OPENMEETINGS-1856] initial tests for HashPage, code clean-up
127cc4b is described below
commit 127cc4bde43527287151696cbf7451b01811ae47
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Oct 31 23:36:06 2018 +0700
[OPENMEETINGS-1856] initial tests for HashPage, code clean-up
---
.../core/converter/InterviewConverter.java | 2 +-
.../openmeetings/core/ldap/LdapLoginManager.java | 12 ++---
.../openmeetings/core/remote/KTestStream.java | 5 +-
.../openmeetings/core/util/WebSocketHelper.java | 17 +------
.../openmeetings/web/common/tree/FolderPanel.java | 3 +-
.../{TestOldBackups.java => TestBackup.java} | 9 +++-
.../org/apache/openmeetings/web/TestHashPage.java | 54 ++++++++++++++++++++++
.../openmeetings/webservice/FileWebService.java | 4 +-
.../openmeetings/webservice/NetTestWebService.java | 3 +-
9 files changed, 78 insertions(+), 31 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 88772a7..2cd9151 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -86,7 +86,7 @@ public class InterviewConverter extends BaseConverter
implements IRecordingConve
// group by sid first to get all pods
Map<String, List<RecordingChunk>> cunksBySid =
chunks.stream().collect(
Collectors.groupingBy(RecordingChunk::getSid
- , () -> new LinkedHashMap<>()
+ , LinkedHashMap::new
,
Collectors.collectingAndThen(Collectors.toList(), l ->
l.stream().sorted(Comparator.comparing(RecordingChunk::getStart)).collect(Collectors.toList()))));
List<String> pods = new ArrayList<>();
int N = pods.size();
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 83e5f40..962361c 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -298,7 +298,7 @@ public class LdapLoginManager {
}
}
- private void importUsers(LdapWorker w, EntryCursor cursor, Long
domainId, boolean print) throws LdapInvalidAttributeValueException,
LdapException, CursorException, OmException, IOException {
+ private void importUsers(LdapWorker w, EntryCursor cursor, Long
domainId, boolean print) throws LdapException, CursorException, OmException,
IOException {
while (cursor.next()) {
try {
Entry e = cursor.get();
@@ -317,11 +317,11 @@ public class LdapLoginManager {
}
private class LdapWorker implements Closeable {
- LdapConnection conn = null;
- Properties config = new Properties();
- LdapOptions options = null;
- Long domainId = null;
- LdapConfig ldapCfg = null;
+ final LdapConnection conn;
+ final Properties config = new Properties();
+ final LdapOptions options;
+ final Long domainId;
+ final LdapConfig ldapCfg;
public LdapWorker(Long domainId) {
this.domainId = domainId;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
index 7bbe811..eee4184 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
import com.github.openjson.JSONObject;
public class KTestStream implements IKStream {
- private final static Logger log =
LoggerFactory.getLogger(KTestStream.class);
+ private static final Logger log =
LoggerFactory.getLogger(KTestStream.class);
private MediaPipeline pipeline;
private WebRtcEndpoint webRtcEndpoint;
private PlayerEndpoint player;
@@ -178,7 +178,8 @@ public class KTestStream implements IKStream {
}
private static MediaProfileSpecType getProfile(JSONObject msg) {
- boolean a = msg.getBoolean("audio"), v =
msg.getBoolean("video");
+ boolean a = msg.getBoolean("audio")
+ , v = msg.getBoolean("video");
if (a && v) {
return MediaProfileSpecType.WEBM;
} else if (v) {
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index 4f79dd5..17ab72d 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -147,9 +147,7 @@ public class WebSocketHelper {
Executor executor = settings.getWebSocketPushMessageExecutor();
final IWebSocketConnection wc = reg.getConnection(app,
client.getSessionId(), new PageIdKey(client.getPageId()));
if (wc != null && wc.isOpen()) {
- executor.run(() -> {
- wsc.accept(wc);
- });
+ executor.run(() -> wsc.accept(wc));
}
}
@@ -264,9 +262,7 @@ public class WebSocketHelper {
protected static void publish(IClusterWsMessage m) {
IApplication app = getApp();
- new Thread(() -> {
- app.publishWsTopic(m);
- }).start();
+ new Thread(() -> app.publishWsTopic(m)).start();
}
protected static void sendRoom(final Long roomId, final JSONObject m,
Predicate<Client> check, BiFunction<JSONObject, Client, String> func) {
@@ -304,13 +300,4 @@ public class WebSocketHelper {
}
}).start();
}
-
- public static class NewThreadExecutor implements Executor {
- @Override
- public void run(Runnable command) {
- new Thread(() -> {
- command.run();
- }).start();
- }
- }
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index 465b839..74c28a9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -163,7 +163,8 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
private void onClick(AjaxRequestTarget target, BaseFileItem f) {
String mod =
getRequest().getRequestParameters().getParameterValue(PARAM_MOD).toOptionalString();
- boolean shift = false, ctrl = false;
+ boolean shift = false
+ , ctrl = false;
if (!Strings.isEmpty(mod)) {
JSONObject o = new JSONObject(mod);
shift = o.optBoolean(PARAM_SHIFT);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
similarity index 94%
rename from
openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java
rename to
openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
index cfb1faf..3884b6d 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
@@ -43,8 +43,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestOldBackups extends AbstractJUnitDefaults {
- private static final Logger log =
LoggerFactory.getLogger(TestOldBackups.class);
+public class TestBackup extends AbstractJUnitDefaults {
+ private static final Logger log =
LoggerFactory.getLogger(TestBackup.class);
private String cryptClass = null;
@Autowired
@@ -121,4 +121,9 @@ public class TestOldBackups extends AbstractJUnitDefaults {
log.debug("... Done.");
}
}
+
+ @Test
+ public void exportMain() throws Exception {
+ BackupExport.main(new String[] {File.createTempFile("gereral",
"cfg").getCanonicalPath()});
+ }
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestHashPage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestHashPage.java
new file mode 100644
index 0000000..d31cf16
--- /dev/null
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestHashPage.java
@@ -0,0 +1,54 @@
+/*
+ * 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.web;
+
+import static org.junit.Assert.assertTrue;
+
+import org.apache.openmeetings.AbstractWicketTester;
+import org.apache.openmeetings.web.pages.HashPage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+
+public class TestHashPage extends AbstractWicketTester {
+ private static final Logger log =
LoggerFactory.getLogger(TestHashPage.class);
+
+ private void checkAccessDenied(PageParameters pp) {
+ tester.startPage(HashPage.class, pp);
+ tester.assertRenderedPage(HashPage.class);
+ MessageDialog dlg =
(MessageDialog)tester.getComponentFromLastRenderedPage("access-denied");
+ assertTrue("Access denied should be displayed",
((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen"));
+ }
+
+ @Test
+ public void testNoParams() {
+ log.debug("No params");
+ checkAccessDenied(null);
+ }
+
+ @Test
+ public void testBadParam() {
+ log.debug("No params");
+ checkAccessDenied(new PageParameters().add("aaa", "bbb"));
+ }
+}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
index e3e25bc..cad4fe9 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
@@ -189,9 +189,7 @@ public class FileWebService extends BaseWebService {
)
{
log.debug("getAllExternal::externalType {}", externalType);
- return performCall(sid, User.Right.Soap, sd -> {
- return
FileItemDTO.list(fileDao.getExternal(externalType));
- });
+ return performCall(sid, User.Right.Soap, sd ->
FileItemDTO.list(fileDao.getExternal(externalType)));
}
/**
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 0f525d7..5b23efa 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -104,7 +104,8 @@ public class NetTestWebService {
return;
}
byte[] b = new byte[1024];
- int totalCount = 0, count;
+ int totalCount = 0
+ , count;
while ((count = stream.read(b)) > -1) {
totalCount += count;
};
