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 2020/12/30 13:48:01 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2544] tests
should be 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 3ca8fb9 [OPENMEETINGS-2544] tests should be fixed
3ca8fb9 is described below
commit 3ca8fb9f03bb517816328b743d92746f49a83ac6
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Dec 30 20:47:47 2020 +0700
[OPENMEETINGS-2544] tests should be fixed
---
openmeetings-server/src/site/xdoc/JUnitTesting.xml | 6 +++++-
.../test/java/org/apache/openmeetings/web/TestMainMenu.java | 12 +++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/openmeetings-server/src/site/xdoc/JUnitTesting.xml b/openmeetings-server/src/site/xdoc/JUnitTesting.xml
index 2acf629..c59389c 100644
--- a/openmeetings-server/src/site/xdoc/JUnitTesting.xml
+++ b/openmeetings-server/src/site/xdoc/JUnitTesting.xml
@@ -65,12 +65,16 @@
<ul>
<li>Select Arguments tab </li>
<li>Add the following code to the VM section
- <source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/3.0.0/openjpa-3.0.0.jar -Dom.home=${workspace_loc:openmeetings-web}/target/test-root/ -Dbackups.dir=${workspace_loc:openmeetings-web}/target/test-data</source>
+ <source>-javaagent:/home/solomax/.m2/repository/org/apache/openjpa/openjpa/3.1.2/openjpa-3.1.2.jar -Dom.home=${workspace_loc:openmeetings-web}/target/test-root/ -Dbackups.dir=${workspace_loc:openmeetings-web}/target/test-data</source>
</li>
<li>To avoid temporary files being created in OM root, modify
"Working Directory" as follows
<source>${workspace_loc:openmeetings-web/target}</source>
</li>
+ <li>
+ Open Dependencies tab and add folder <tt>/openmeetings-web/target/test-root/WEB-INF/classes</tt>
+ to <tt>CLASSPATH</tt>
+ </li>
</ul>
<p>
<a class="fancybox-buttons" href="images/Arguments.png">
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
index 25fbf09..adfd94c 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
@@ -43,11 +43,17 @@ import org.junit.jupiter.api.Test;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
class TestMainMenu extends AbstractWicketTester {
- private void checkMenuItem(int idx1, int idx2, Class<? extends BasePanel> clazz) throws OmException {
+ private void checkMenuItem(int idx1, Integer idx2, Class<? extends BasePanel> clazz) throws OmException {
testArea(adminUsername, p -> {
Navbar menu = (Navbar)p.get(PATH_MENU);
assertNotNull(menu);
- tester.executeBehavior((AbstractAjaxBehavior)menu.get("collapse:navLeftListEnclosure:navLeftList:" + idx1 + ":component:dropdown-menu:buttons:" + idx2 + ":button").getBehaviorById(0));
+ String path = "collapse:navLeftListEnclosure:navLeftList:" + idx1;
+ if (idx2 == null) {
+ path += ":component";
+ } else {
+ path += ":component:dropdown-menu:buttons:" + idx2 + ":button";
+ }
+ tester.executeBehavior((AbstractAjaxBehavior)menu.get(path).getBehaviorById(0));
tester.assertComponent(PATH_CHILD, clazz);
});
@@ -80,7 +86,7 @@ class TestMainMenu extends AbstractWicketTester {
@Test
void testRecordings() throws OmException {
- checkMenuItem(2, 0, RecordingsPanel.class);
+ checkMenuItem(2, null, RecordingsPanel.class);
}
@Test