Repository: openmeetings Updated Branches: refs/heads/master eda06ea32 -> 4393fb1d8
[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/4393fb1d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4393fb1d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4393fb1d Branch: refs/heads/master Commit: 4393fb1d8e305e29d6a7e3c177b072fc12dbff53 Parents: eda06ea Author: Maxim Solodovnik <[email protected]> Authored: Thu Oct 5 08:12:00 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Oct 5 08:12:00 2017 +0700 ---------------------------------------------------------------------- .../web/pages/install/InstallWizard.java | 3 ++ .../apache/openmeetings/AbstractSpringTest.java | 2 +- .../apache/openmeetings/web/TestInstall.java | 41 ++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4393fb1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java index cde71f8..72969a1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java @@ -323,6 +323,9 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { ConnectionProperties props = new ConnectionProperties(); try { File conf = OmFileHelper.getPersistence(type); + if (!conf.exists() && type == null) { + return props; // initial select + } props = ConnectionPropertiesPatcher.getConnectionProperties(conf); if (DbType.derby != props.getDbType()) { // resetting default login/password http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4393fb1d/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java index d3d974c..f5b83b1 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractSpringTest.java @@ -45,7 +45,7 @@ public abstract class AbstractSpringTest extends AbstractJUnit4SpringContextTest } } - protected static void setOmHome() { + public static void setOmHome() { String webappsDir = System.getProperty("om.home", "."); OmFileHelper.setOmHome(webappsDir); if (!OmFileHelper.getOmHome().exists() || !OmFileHelper.getOmHome().isDirectory()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4393fb1d/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestInstall.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestInstall.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestInstall.java index 1d53993..b2e86ec 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestInstall.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestInstall.java @@ -18,6 +18,47 @@ */ package org.apache.openmeetings.web; +import static org.apache.openmeetings.AbstractWicketTester.getWicketTester; +import static org.apache.openmeetings.util.OmFileHelper.getOmHome; +import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName; +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import java.util.Locale; +import java.util.Random; + +import org.apache.openmeetings.AbstractSpringTest; +import org.apache.openmeetings.web.app.WebSession; +import org.apache.openmeetings.web.pages.install.InstallWizardPage; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class TestInstall { + private static final String DERBY_HOME = "derby.system.home"; + protected WicketTester tester; + protected Random rnd = new Random(); + + @Before + public void setUp() throws IOException { + AbstractSpringTest.setOmHome(); + setWicketApplicationName("openmeetings"); + System.setProperty(DERBY_HOME, getOmHome().getCanonicalPath()); + tester = getWicketTester(); + assertNotNull("Web session should not be null", WebSession.get()); + Locale[] locales = Locale.getAvailableLocales(); + tester.getSession().setLocale(locales[rnd.nextInt(locales.length)]); + } + + @After + public void tearDown() { + System.getProperties().remove(DERBY_HOME); + } + @Test + public void testInstall() { + tester.startPage(InstallWizardPage.class); + tester.assertRenderedPage(InstallWizardPage.class); + } }
