Repository: openmeetings Updated Branches: refs/heads/master bc652660b -> fcc300c57
[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/fcc300c5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fcc300c5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fcc300c5 Branch: refs/heads/master Commit: fcc300c57ea9b3b700dd12ba6798ebbb5055392f Parents: bc65266 Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 4 13:19:35 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 4 13:19:35 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/AbstractWicketTester.java | 5 +++++ .../org/apache/openmeetings/web/pages/auth/TestLoginUI.java | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fcc300c5/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 de9b502..701842c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -21,6 +21,7 @@ package org.apache.openmeetings; 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.apache.wicket.util.string.Strings.escapeMarkup; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -80,6 +81,10 @@ public class AbstractWicketTester extends AbstractJUnitDefaults { return Application.getString(lbl, tester.getSession().getLocale()); } + public String getEscapedString(String lbl) { + return escapeMarkup(getString(lbl), false, false).toString(); + } + @Override public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fcc300c5/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java index 05ce66e..fd54dac 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java @@ -21,7 +21,6 @@ package org.apache.openmeetings.web.pages.auth; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; -import static org.apache.wicket.util.string.Strings.escapeMarkup; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -176,7 +175,7 @@ public class TestLoginUI extends AbstractWicketTester { formTester.setValue("captcha:captchaText", getCaptcha("register:form:captcha:captcha")); formTester.submit("submit"); checkErrors(0); - tester.assertLabel("register:confirmRegistration:container:message", escapeMarkup(getString(lbl), false, false).toString()); + tester.assertLabel("register:confirmRegistration:container:message", getEscapedString(lbl)); ButtonAjaxBehavior b2 = getButtonBehavior("register:confirmRegistration", "OK"); tester.executeBehavior(b2); } @@ -189,7 +188,7 @@ public class TestLoginUI extends AbstractWicketTester { forgetTester.setValue("captcha:captchaText", getCaptcha("forget:form:captcha:captcha")); forgetTester.submit("submit"); checkErrors(0); - tester.assertLabel("forget:confirmDialog:container:message", getString("321")); + tester.assertLabel("forget:confirmDialog:container:message", getEscapedString("321")); } // complex test @@ -244,7 +243,7 @@ public class TestLoginUI extends AbstractWicketTester { resetTester.setValue("confirmPassword", passwd); resetTester.submit("submit"); checkErrors(0); - tester.assertLabel("resetPassword:confirmReset:container:message", getString("332")); + tester.assertLabel("resetPassword:confirmReset:container:message", getEscapedString("332")); } finally { for (Configuration c : cfgs) { c.setValueB(false);
