Repository: openmeetings Updated Branches: refs/heads/master 594ea5fc1 -> 21caf9d88
[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/21caf9d8 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/21caf9d8 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/21caf9d8 Branch: refs/heads/master Commit: 21caf9d88e21785ce73eccc1182ec290746842d1 Parents: 594ea5f Author: Maxim Solodovnik <[email protected]> Authored: Thu Oct 5 18:39:26 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Oct 5 18:39:26 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/AbstractJUnitDefaults.java | 2 + .../openmeetings/AbstractWicketTester.java | 2 - .../web/pages/install/TestInstall.java | 3 +- .../webservice/TestErrorService.java | 43 ++++++++++++++++++++ .../webservice/TestUserService.java | 2 - 5 files changed, 47 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java index 65a58ab..178e556 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplic import static org.junit.Assert.assertNotNull; import java.util.Date; +import java.util.Random; import java.util.UUID; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; @@ -52,6 +53,7 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest { public static final String userpass = "Q!w2e3r4t5"; public static final String group = "smoketest"; public static final String email = "[email protected]"; + public static final Random rnd = new Random(); @Autowired private AppointmentDao appointmentDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/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 6c6c0d5..69a9a50 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -32,7 +32,6 @@ 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.Random; import javax.servlet.ServletContext; @@ -54,7 +53,6 @@ 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; - protected Random rnd = new Random(); public static WicketTester getWicketTester() { return getWicketTester(-1); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/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 06946a0..5ee85a8 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 @@ -91,6 +91,7 @@ public class TestInstall { InstallWizard wiz = (InstallWizard)page.get(WIZARD_PATH); assertNull("Model should be null", wiz.getWizardModel().getActiveStep()); tester.executeBehavior((AbstractAjaxBehavior)page.getBehaviorById(0)); //welcome step + assertNotNull("Model should NOT be null", wiz.getWizardModel().getActiveStep()); ButtonAjaxBehavior prev = getButtonBehavior(tester, WIZARD_PATH, "PREV"); //check enabled log.debug("Prev button enabled ? {}", prev.getButton().isEnabled()); @@ -119,8 +120,8 @@ public class TestInstall { tester.executeBehavior(next); //crypt step // not checking errors if (countErrors(tester) > 0) { - tester.cleanupFeedbackMessages(); tester.executeBehavior(next); //skip errors + tester.cleanupFeedbackMessages(); } wizardTester.setValue("view:cryptClassName", SCryptImplementation.class.getName()); tester.executeBehavior(next); //install step http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java new file mode 100644 index 0000000..681dfeb --- /dev/null +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java @@ -0,0 +1,43 @@ +/* + * 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.webservice; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Locale; + +import org.apache.openmeetings.db.dao.label.LabelDao; +import org.apache.openmeetings.db.dto.basic.ServiceResult; +import org.junit.Test; + + +public class TestErrorService extends AbstractWebServiceTest { + public static final String ERROR_SERVICE_URL = BASE_SERVICES_URL + "/error"; + + @Test + public void getTest() { + Locale[] locales = Locale.getAvailableLocales(); + ServiceResult sr = getClient(ERROR_SERVICE_URL) + .path(String.format("/%s/%s", "error.unknown", LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L))) + .get(ServiceResult.class); + assertNotNull("Valid Result should be returned", sr); + assertEquals("SUCCESS result should be returned", ServiceResult.Type.SUCCESS, sr.getType()); + } +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21caf9d8/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java index 09d12b7..a5fc130 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Locale; -import java.util.Random; import java.util.TimeZone; import java.util.UUID; @@ -101,7 +100,6 @@ public class TestUserService extends AbstractWebServiceTest { @Test public void addUserTest() { - Random rnd = new Random(); String[] tzList = TimeZone.getAvailableIDs(); String tz = TimeZone.getTimeZone(tzList[rnd.nextInt(tzList.length)]).getID(); ServiceResult r = login();
