[openmeetings] branch master updated: [OPENMEETINGS-2177] menu ui tests

[solomax]

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 914bbe3  [OPENMEETINGS-2177] menu ui tests
914bbe3 is described below

commit 914bbe3ed6f73ea49e110ca74572806e73e18d24
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 6 00:12:51 2020 +0700

    [OPENMEETINGS-2177] menu ui tests
---
 .../src/test/java/org/apache/openmeetings/web/TestCalendar.java    | 2 --
 .../src/test/java/org/apache/openmeetings/web/TestMainMenu.java    | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
index a3b95ae..7d21da0 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
@@ -48,8 +48,6 @@ public class TestCalendar extends AbstractWicketTester {
                        Navbar menu = (Navbar)p.get(PATH_MENU);
                        assertNotNull(menu);
                        
tester.executeBehavior((AbstractAjaxBehavior)menu.get("collapse:navLeftListEnclosure:navLeftList:0:component:dropdown-menu:buttons:1:button").getBehaviorById(0));
-                       //tester.getRequest().setParameter("hash", 
menu.getItemList().get(0).getItems().get(1).getId());
-                       
//tester.executeBehavior((AbstractAjaxBehavior)menu.getBehaviorById(0));
 
                        tester.assertComponent(PATH_CHILD, CalendarPanel.class);
                        CalendarPanel cal = (CalendarPanel)p.get(PATH_CHILD);
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 eb8a222..4540c06 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
@@ -40,15 +40,14 @@ import 
org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel;
 import org.apache.wicket.behavior.AbstractAjaxBehavior;
 import org.junit.jupiter.api.Test;
 
-import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
+import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
 
 public class TestMainMenu extends AbstractWicketTester {
        private void checkMenuItem(int idx1, int idx2, Class<? extends 
BasePanel> clazz) throws OmException {
                testArea(adminUsername, p -> {
-                       Menu menu = (Menu)p.get(PATH_MENU);
+                       Navbar menu = (Navbar)p.get(PATH_MENU);
                        assertNotNull(menu);
-                       tester.getRequest().setParameter("hash", 
menu.getItemList().get(idx1).getItems().get(idx2).getId());
-                       
tester.executeBehavior((AbstractAjaxBehavior)menu.getBehaviorById(0));
+                       
tester.executeBehavior((AbstractAjaxBehavior)menu.get("collapse:navLeftListEnclosure:navLeftList:"
 + idx1 + ":component:dropdown-menu:buttons:" + idx2 + 
":button").getBehaviorById(0));
 
                        tester.assertComponent(PATH_CHILD, clazz);
                });