[openmeetings] branch master updated: [OPENMEETINGS-2177] hash page 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 2661aee  [OPENMEETINGS-2177] hash page tests
2661aee is described below

commit 2661aeec76dbd70be0b9acce4b5fc28fb87ba2b4
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 6 13:46:42 2020 +0700

    [OPENMEETINGS-2177] hash page tests
---
 .../apache/openmeetings/web/pages/TestHashPage.java | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
index 53bbb35..19ec9f6 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
@@ -25,8 +25,7 @@ import static 
org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
 import static org.apache.openmeetings.web.pages.HashPage.PANEL_MAIN;
 import static org.apache.openmeetings.web.pages.HashPage.PANEL_RECORDING;
 import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.UUID;
@@ -53,8 +52,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 
 public class TestHashPage extends AbstractWicketTester {
@@ -67,23 +64,23 @@ public class TestHashPage extends AbstractWicketTester {
        @Autowired
        protected InvitationDao inviteDao;
 
+       private void checkAccessDenied(boolean visible) {
+               @SuppressWarnings("unchecked")
+               Modal<String> dlg = 
(Modal<String>)tester.getComponentFromLastRenderedPage("access-denied");
+               assertTrue(tester.getLastResponseAsString().contains("$('#" + 
dlg.getMarkupId() + "').modal({keyboard:true, show:" + visible + "});"));
+       }
+
        private void checkAccessDenied(PageParameters pp) {
                tester.startPage(HashPage.class, pp);
                tester.assertRenderedPage(HashPage.class);
-               @SuppressWarnings("unchecked")
-               Modal<String> dlg = 
(Modal<String>)tester.getComponentFromLastRenderedPage("access-denied");
-               Boolean autoOpen = 
((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen");
-               assertTrue(autoOpen, "Access denied should be displayed");
+               checkAccessDenied(true);
                tester.assertInvisible(PANEL_MAIN);
        }
 
        private HashPage commonCheck(PageParameters pp) {
                HashPage page = tester.startPage(HashPage.class, pp);
                tester.assertRenderedPage(HashPage.class);
-               @SuppressWarnings("unchecked")
-               Modal<String> dlg = 
(Modal<String>)tester.getComponentFromLastRenderedPage("access-denied");
-               Boolean autoOpen = 
((JQueryBehavior)dlg.getBehaviors().get(0)).getOption("autoOpen");
-               assertFalse(autoOpen, "Access denied should NOT be displayed");
+               checkAccessDenied(false);
                return page;
        }