Repository: openmeetings Updated Branches: refs/heads/master 49cc87b96 -> 42843c0e7
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/42843c0e Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/42843c0e Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/42843c0e Branch: refs/heads/master Commit: 42843c0e749cd03da172be07f1fcd2bf0ea0f955 Parents: 49cc87b Author: Maxim Solodovnik <[email protected]> Authored: Tue Oct 10 23:53:58 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Oct 10 23:53:58 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/AbstractWicketTester.java | 20 ++++ .../apache/openmeetings/web/TestMainAreas.java | 18 ---- .../apache/openmeetings/web/TestMainMenu.java | 98 ++++++++++++++++++++ 3 files changed, 118 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42843c0e/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java index d68cbe6..4fbf3da 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -32,18 +32,24 @@ import static org.springframework.web.context.WebApplicationContext.ROOT_WEB_APP import java.io.Serializable; import java.util.List; import java.util.Locale; +import java.util.function.Consumer; import javax.servlet.ServletContext; +import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.app.WebSession; +import org.apache.openmeetings.web.pages.MainPage; +import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.feedback.ExactLevelFeedbackMessageFilter; import org.apache.wicket.feedback.FeedbackMessage; import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.protocol.ws.util.tester.WebSocketTester; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.tester.WicketTester; +import org.junit.Assert; import org.slf4j.Logger; import org.springframework.web.context.support.XmlWebApplicationContext; @@ -128,6 +134,20 @@ public class AbstractWicketTester extends AbstractJUnitDefaults { return null; } + protected void testArea(String user, Consumer<MainPage> consumer) throws OmException { + Assert.assertTrue(((WebSession)tester.getSession()).signIn(user, userpass, User.Type.user, null));; + MainPage page = tester.startPage(MainPage.class); + tester.assertRenderedPage(MainPage.class); + tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0)); + tester.executeBehavior((AbstractAjaxBehavior)page.get("main-container").getBehaviorById(0)); + WebSocketTester webSocketTester = new WebSocketTester(tester, page); + webSocketTester.sendMessage("socketConnected"); + + consumer.accept(page); + tester.getSession().invalidateNow(); + webSocketTester.destroy(); + } + public void checkErrors(int count) { checkErrors(tester, count); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42843c0e/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java ---------------------------------------------------------------------- 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 f0b4e19..a075730 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 @@ -42,7 +42,6 @@ import static org.red5.logging.Red5LoggerFactory.getLogger; import java.util.function.Consumer; import org.apache.openmeetings.AbstractWicketTester; -import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.web.admin.backup.BackupPanel; import org.apache.openmeetings.web.admin.configurations.ConfigsPanel; @@ -54,7 +53,6 @@ import org.apache.openmeetings.web.admin.ldaps.LdapsPanel; import org.apache.openmeetings.web.admin.oauth.OAuthPanel; import org.apache.openmeetings.web.admin.rooms.RoomsPanel; import org.apache.openmeetings.web.admin.users.UsersPanel; -import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.pages.MainPage; import org.apache.openmeetings.web.pages.NotInitedPage; @@ -70,8 +68,6 @@ 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.protocol.ws.util.tester.WebSocketTester; -import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -80,20 +76,6 @@ import com.googlecode.wicket.jquery.ui.widget.tabs.TabbedPanel; public class TestMainAreas extends AbstractWicketTester { private static final Logger log = getLogger(TestMainAreas.class, getWebAppRootKey()); - private void testArea(String user, Consumer<MainPage> consumer) throws OmException { - Assert.assertTrue(((WebSession)tester.getSession()).signIn(user, userpass, User.Type.user, null));; - MainPage page = tester.startPage(MainPage.class); - tester.assertRenderedPage(MainPage.class); - tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0)); - tester.executeBehavior((AbstractAjaxBehavior)page.get("main-container").getBehaviorById(0)); - WebSocketTester webSocketTester = new WebSocketTester(tester, page); - webSocketTester.sendMessage("socketConnected"); - - consumer.accept(page); - tester.getSession().invalidateNow(); - webSocketTester.destroy(); - } - @Test public void testDashboard() throws OmException { testArea(regularUsername, p -> { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42843c0e/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..7b57cec --- /dev/null +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java @@ -0,0 +1,98 @@ +/* + * 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 org.apache.openmeetings.AbstractWicketTester; +import org.apache.openmeetings.util.OmException; +import org.apache.openmeetings.web.admin.connection.ConnectionsPanel; +import org.apache.openmeetings.web.admin.groups.GroupsPanel; +import org.apache.openmeetings.web.admin.rooms.RoomsPanel; +import org.apache.openmeetings.web.admin.users.UsersPanel; +import org.apache.openmeetings.web.common.BasePanel; +import org.apache.openmeetings.web.user.calendar.CalendarPanel; +import org.apache.openmeetings.web.user.record.RecordingsPanel; +import org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel; +import org.apache.wicket.behavior.AbstractAjaxBehavior; +import org.junit.Assert; +import org.junit.Test; + +import com.googlecode.wicket.jquery.ui.widget.menu.Menu; + +public class TestMainMenu extends AbstractWicketTester { + private void checkMenuItem(int idx1, int idx2, Class<? extends BasePanel> clazz) throws OmException { + testArea(regularUsername, p -> { + Menu menu = (Menu)p.get("main-container:main:topControls:menu:menu"); + Assert.assertNotNull(menu); + tester.getRequest().setParameter("hash", menu.getItemList().get(idx1).getItems().get(idx2).getId()); + tester.executeBehavior((AbstractAjaxBehavior)menu.getBehaviorById(0)); + + tester.assertComponent("main-container:main:contents:child", clazz); + }); + } + + @Test + public void testDahboard() throws OmException { + checkMenuItem(0, 0, CalendarPanel.class); + } + + @Test + public void testCalendar() throws OmException { + checkMenuItem(0, 1, CalendarPanel.class); + } + + @Test + public void testRoomPublic() throws OmException { + checkMenuItem(1, 0, RoomsSelectorPanel.class); + } + + @Test + public void testRoomGroup() throws OmException { + checkMenuItem(1, 1, RoomsSelectorPanel.class); + } + + @Test + public void testRoomMy() throws OmException { + checkMenuItem(1, 2, RoomsSelectorPanel.class); + } + + @Test + public void testRecordings() throws OmException { + checkMenuItem(2, 0, RecordingsPanel.class); + } + + @Test + public void testAdminUsers() throws OmException { + checkMenuItem(3, 0, UsersPanel.class); + } + + @Test + public void testAdminConnections() throws OmException { + checkMenuItem(3, 1, ConnectionsPanel.class); + } + + @Test + public void testAdminGroups() throws OmException { + checkMenuItem(3, 2, GroupsPanel.class); + } + + @Test + public void testAdminRooms() throws OmException { + checkMenuItem(3, 3, RoomsPanel.class); + } +}
