Repository: openmeetings Updated Branches: refs/heads/master 4970c0ddf -> bb3c15583
[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/bb3c1558 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bb3c1558 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bb3c1558 Branch: refs/heads/master Commit: bb3c15583a7b9bd215884bcd407b9a2001c348d5 Parents: 4970c0d Author: Maxim Solodovnik <[email protected]> Authored: Sun Oct 8 13:09:47 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Oct 8 13:09:47 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/db/dao/IDataProviderDao.java | 2 -- .../openmeetings/db/dao/label/LabelDao.java | 1 + .../openmeetings/db/dao/user/GroupUserDao.java | 2 ++ .../db/dao/user/PrivateMessageDao.java | 1 + .../db/dao/user/PrivateMessageFolderDao.java | 1 + .../org/apache/openmeetings/util/DaoHelper.java | 2 ++ .../apache/openmeetings/web/TestMainAreas.java | 19 ++++++++++++++++++- 7 files changed, 25 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java index 3263652..d58f6be 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java @@ -30,8 +30,6 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity; * @param <T> */ public interface IDataProviderDao<T extends IDataProviderEntity> { - static final UnsupportedOperationException UNSUPPORTED = new UnsupportedOperationException("Should not be used"); - /** * Get an instance of an {@link T} * http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index 6b4d78b..afbd6fb 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.db.dao.label; import static org.apache.openmeetings.db.util.ApplicationHelper._ensureApplication; +import static org.apache.openmeetings.util.DaoHelper.UNSUPPORTED; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.File; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java index 1b195ce..fa9a938 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.db.dao.user; +import static org.apache.openmeetings.util.DaoHelper.UNSUPPORTED; + import java.util.List; import javax.persistence.EntityManager; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java index 9422c59..0af3fe4 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.db.dao.user; import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID; +import static org.apache.openmeetings.util.DaoHelper.UNSUPPORTED; import static org.apache.openmeetings.util.DaoHelper.getStringParam; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java index 32228da..cabcf53 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.db.dao.user; +import static org.apache.openmeetings.util.DaoHelper.UNSUPPORTED; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.Date; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java index bc7e766..0197dd5 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java @@ -22,6 +22,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.wicket.util.string.Strings; public class DaoHelper { + public static final UnsupportedOperationException UNSUPPORTED = new UnsupportedOperationException("Should not be used"); + private DaoHelper() {} public static String getSearchQuery(String table, String alias, String search, boolean filterDeleted, boolean count, String sort, String... fields) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bb3c1558/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 c4788d3..9dc11b7 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 @@ -74,6 +74,8 @@ import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; +import com.googlecode.wicket.jquery.ui.widget.tabs.TabbedPanel; + public class TestMainAreas extends AbstractWicketTester { private static final Logger log = getLogger(TestMainAreas.class, getWebAppRootKey()); @@ -99,12 +101,19 @@ public class TestMainAreas extends AbstractWicketTester { } private void checkArea(AreaKeys area, String type, Class<? extends BasePanel> clazz, String... users) throws OmException { + checkArea(area, type, clazz, null, users); + } + + private void checkArea(AreaKeys area, String type, Class<? extends BasePanel> clazz, Consumer<MainPage> consumer, String... users) throws OmException { for (String user : users) { 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.assertComponent("main-container:main:contents:child", clazz); + if (consumer != null) { + consumer.accept(p); + } }); } } @@ -151,7 +160,15 @@ public class TestMainAreas extends AbstractWicketTester { @Test public void testRoomsProfileMessages() throws OmException { - checkArea(AreaKeys.profile, TYPE_MESSAGES, SettingsPanel.class, regularUsername); + 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 + //add visibility check + } + }, regularUsername); } @Test
