[openmeetings] branch master updated: [OPENMEETINGS-2177] main area 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 dccc4a5  [OPENMEETINGS-2177] main area ui tests
dccc4a5 is described below

commit dccc4a5df19de25630dc2a0c315882515f325e37
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 6 09:38:57 2020 +0700

    [OPENMEETINGS-2177] main area ui tests
---
 .../java/org/apache/openmeetings/web/TestMainAreas.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 107bf55..993ce65 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
@@ -66,11 +66,12 @@ import 
org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel;
 import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys;
 import org.apache.wicket.authorization.UnauthorizedInstantiationException;
 import org.apache.wicket.behavior.AbstractAjaxBehavior;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.googlecode.wicket.jquery.ui.widget.tabs.TabbedPanel;
+import 
de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
 
 public class TestMainAreas extends AbstractWicketTester {
        private static final Logger log = 
LoggerFactory.getLogger(TestMainAreas.class);
@@ -91,7 +92,7 @@ public class TestMainAreas extends AbstractWicketTester {
                        log.debug("Positive test:: area: {}, type: {} for user: 
{}", area, type, user);
                        testArea(user, p -> {
                                tester.getRequest().setParameter(area.name(), 
type);
-                               
tester.executeBehavior((AbstractAjaxBehavior)p.getBehaviorById(1));
+                               
tester.executeBehavior((AbstractAjaxBehavior)p.getBehaviorById(0));
                                tester.assertComponent(PATH_CHILD, clazz);
                                if (consumer != null) {
                                        consumer.accept(p);
@@ -106,7 +107,7 @@ public class TestMainAreas extends AbstractWicketTester {
                        testArea(user, p -> {
                                tester.getRequest().setParameter(area.name(), 
type);
                                try {
-                                       
tester.executeBehavior((AbstractAjaxBehavior)p.getBehaviorById(1));
+                                       
tester.executeBehavior((AbstractAjaxBehavior)p.getBehaviorById(0));
                                        fail("Not authorized");
                                } catch (UnauthorizedInstantiationException e) {
                                        assertTrue(true, "Exception is 
expected");
@@ -143,11 +144,10 @@ public class TestMainAreas extends AbstractWicketTester {
        @Test
        public void testRoomsProfileMessages() throws OmException {
                checkArea(AreaKeys.profile, TYPE_MESSAGES, SettingsPanel.class, 
p -> {
-                       TabbedPanel tp = 
(TabbedPanel)p.get("main-container:main:contents:child:tabs");
-                       
tester.executeBehavior((AbstractAjaxBehavior)tp.getBehaviorById(0)); //create 
behavior
-                       for (int i = 0; i <= tp.getLastTabIndex(); ++i) {
-                               tester.getRequest().setParameter("index", 
String.valueOf(i));
-                               
tester.executeBehavior((AbstractAjaxBehavior)tp.getBehaviorById(1)); // activate
+                       @SuppressWarnings("unchecked")
+                       AjaxBootstrapTabbedPanel<ITab> tp = 
(AjaxBootstrapTabbedPanel<ITab>)p.get("main-container:main:contents:child:tabs");
+                       for (int i = 0; i < tp.getTabs().size(); ++i) {
+                               
tester.executeBehavior((AbstractAjaxBehavior)tp.get("tabs-container:tabs:" + i 
+ ":link").getBehaviorById(0)); // activate
                                //add visibility check
                        }
                }, regularUsername);