Repository: openmeetings Updated Branches: refs/heads/master 60ca69cbb -> bae47d532
[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/bae47d53 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bae47d53 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bae47d53 Branch: refs/heads/master Commit: bae47d532a872b9d12df62cd6c91e0c13ca4f3d7 Parents: 60ca69c Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 2 10:52:54 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 2 10:52:54 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/db/util/ApplicationHelper.java | 26 -------------- .../openmeetings/AbstractWicketTester.java | 36 +++++++++++++++++++- .../apache/openmeetings/web/TestMainAreas.java | 9 ----- .../webservice/AbstractWebServiceTest.java | 2 +- 4 files changed, 36 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bae47d53/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java index 21f536d..57a7ef5 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java @@ -20,7 +20,6 @@ package org.apache.openmeetings.db.util; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; -import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete; import static org.red5.logging.Red5LoggerFactory.getLogger; import static org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext; @@ -44,7 +43,6 @@ import org.apache.wicket.protocol.http.mock.MockServletContext; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.cycle.RequestCycleContext; -import org.apache.wicket.util.tester.WicketTester; import org.slf4j.Logger; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.XmlWebApplicationContext; @@ -55,30 +53,6 @@ public class ApplicationHelper { private ApplicationHelper() {} - public static WicketTester getWicketTester() { - return getWicketTester(-1); - } - - public static WicketTester getWicketTester(long langId) { - WebApplication app = (WebApplication)ensureApplication(langId); - - WicketTester tester = new WicketTester(app, app.getServletContext()); - setInitComplete(true); - return tester; - } - - public static void destroy(WicketTester tester) { - if (tester != null) { - ServletContext sc = tester.getServletContext(); - try { - ((XmlWebApplicationContext)sc.getAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).close(); - } catch (Exception e) { - log.error("Unexpected error while destroying XmlWebApplicationContext", e); - } - tester.destroy(); - } - } - public static IApplication ensureApplication() { return ensureApplication(-1L); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bae47d53/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 bad76ac..b460857 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -18,26 +18,60 @@ */ package org.apache.openmeetings; -import static org.apache.openmeetings.db.util.ApplicationHelper.getWicketTester; +import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.red5.logging.Red5LoggerFactory.getLogger; +import static org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; import java.io.Serializable; import java.util.List; +import javax.servlet.ServletContext; + import org.apache.openmeetings.db.entity.user.User.Type; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.web.app.WebSession; +import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.tester.WicketTester; +import org.slf4j.Logger; +import org.springframework.web.context.support.XmlWebApplicationContext; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; import com.googlecode.wicket.jquery.ui.widget.dialog.ButtonAjaxBehavior; public class AbstractWicketTester extends AbstractJUnitDefaults { + private static final Logger log = getLogger(AbstractWicketTester.class, getWebAppRootKey()); protected WicketTester tester; + public static WicketTester getWicketTester() { + return getWicketTester(-1); + } + + public static WicketTester getWicketTester(long langId) { + WebApplication app = (WebApplication)ensureApplication(langId); + + WicketTester tester = new WicketTester(app, app.getServletContext()); + setInitComplete(true); + return tester; + } + + public static void destroy(WicketTester tester) { + if (tester != null) { + ServletContext sc = tester.getServletContext(); + try { + ((XmlWebApplicationContext)sc.getAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).close(); + } catch (Exception e) { + log.error("Unexpected error while destroying XmlWebApplicationContext", e); + } + tester.destroy(); + } + } + @Override public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bae47d53/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 d96869f..53ac08e 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 @@ -23,7 +23,6 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.pages.MainPage; -import org.apache.openmeetings.web.pages.auth.SignInPage; import org.apache.openmeetings.web.user.dashboard.OmDashboardPanel; import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.protocol.ws.util.tester.WebSocketTester; @@ -32,12 +31,6 @@ import org.junit.Test; public class TestMainAreas extends AbstractWicketTester { @Test - public void testSigninIsDisplayed() { - tester.startPage(MainPage.class); - tester.assertRenderedPage(SignInPage.class); - } - - @Test public void testDashboard() throws OmException { Assert.assertTrue(((WebSession)tester.getSession()).signIn(adminUsername, userpass, User.Type.user, null));; MainPage page = tester.startPage(MainPage.class); @@ -47,8 +40,6 @@ public class TestMainAreas extends AbstractWicketTester { WebSocketTester webSocketTester = new WebSocketTester(tester, page); webSocketTester.sendMessage("socketConnected"); - //tester.assertComponentOnAjaxResponse("main-container:main:contents:child") tester.assertComponent("main-container:main:contents:child", OmDashboardPanel.class); //main-container:main:contents:child:dashboard - //tester.getLastRenderedPage(). visitChildren(OmDashboardPanel.class, visitor) find(OmDashboardPanel.class) } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bae47d53/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java index 8bdaa2f..423ba86 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.webservice; import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; -import static org.apache.openmeetings.db.util.ApplicationHelper.getWicketTester; +import static org.apache.openmeetings.AbstractWicketTester.getWicketTester; import static org.apache.openmeetings.util.OmFileHelper.getOmHome; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull;
