Repository: openmeetings Updated Branches: refs/heads/master 50ec59c5c -> 594ea5fc1
[OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/594ea5fc Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/594ea5fc Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/594ea5fc Branch: refs/heads/master Commit: 594ea5fc1fb5086d3e96b31ca90325af8c1174f4 Parents: 50ec59c Author: Maxim Solodovnik <[email protected]> Authored: Thu Oct 5 17:34:52 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Oct 5 17:34:52 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/AbstractWicketTester.java | 10 +++++++++- .../openmeetings/web/pages/install/TestInstall.java | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/594ea5fc/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 4e31990..6c6c0d5 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -134,8 +134,16 @@ public class AbstractWicketTester extends AbstractJUnitDefaults { checkErrors(tester, count); } + public static List<FeedbackMessage> getErrors(WicketTester tester) { + return tester.getFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR)); + } + + public static int countErrors(WicketTester tester) { + return getErrors(tester).size(); + } + public static void checkErrors(WicketTester tester, int count) { - List<FeedbackMessage> errors = tester.getFeedbackMessages(new ExactLevelFeedbackMessageFilter(FeedbackMessage.ERROR)); + List<FeedbackMessage> errors = getErrors(tester); if (count != errors.size()) { for (FeedbackMessage fm : errors) { log.debug("Error {}", fm); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/594ea5fc/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java index 5f0feac..06946a0 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java @@ -25,12 +25,14 @@ import static org.apache.openmeetings.AbstractJUnitDefaults.email; import static org.apache.openmeetings.AbstractJUnitDefaults.group; import static org.apache.openmeetings.AbstractJUnitDefaults.userpass; import static org.apache.openmeetings.AbstractWicketTester.checkErrors; +import static org.apache.openmeetings.AbstractWicketTester.countErrors; import static org.apache.openmeetings.AbstractWicketTester.getButtonBehavior; import static org.apache.openmeetings.AbstractWicketTester.getWicketTester; import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.red5.logging.Red5LoggerFactory.getLogger; import java.io.File; @@ -86,6 +88,8 @@ public class TestInstall { public void testInstall() { InstallWizardPage page = tester.startPage(InstallWizardPage.class); tester.assertRenderedPage(InstallWizardPage.class); + InstallWizard wiz = (InstallWizard)page.get(WIZARD_PATH); + assertNull("Model should be null", wiz.getWizardModel().getActiveStep()); tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0)); //welcome step ButtonAjaxBehavior prev = getButtonBehavior(tester, WIZARD_PATH, "PREV"); //check enabled @@ -114,7 +118,10 @@ public class TestInstall { wizardTester.setValue("view:docQuality", "90"); tester.executeBehavior(next); //crypt step // not checking errors - tester.cleanupFeedbackMessages(); + if (countErrors(tester) > 0) { + tester.cleanupFeedbackMessages(); + tester.executeBehavior(next); //skip errors + } wizardTester.setValue("view:cryptClassName", SCryptImplementation.class.getName()); tester.executeBehavior(next); //install step checkErrors(tester, 0);
