You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/06 06:44:20 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1714] coverage is
improved
Repository: openmeetings
Updated Branches:
refs/heads/master 2fcaff5c0 -> df895e041
[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/9dd4d7ee
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9dd4d7ee
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9dd4d7ee
Branch: refs/heads/master
Commit: 9dd4d7ee61c6c27d1be6327f6697d71d37e0ead1
Parents: 2fcaff5
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 6 13:42:45 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 6 13:42:45 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/pages/install/TestInstall.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9dd4d7ee/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 2c91432..cf8683c 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
@@ -31,6 +31,7 @@ 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.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.red5.logging.Red5LoggerFactory.getLogger;
@@ -93,8 +94,9 @@ public class TestInstall {
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());
+ ButtonAjaxBehavior prev = getButtonBehavior(tester, WIZARD_PATH, "PREV");
+ //check enabled, add check for other buttons on other steps
+ assertFalse("Prev button should be disabled", prev.getButton().isEnabled());
ButtonAjaxBehavior next = getButtonBehavior(tester, WIZARD_PATH, "NEXT");
ButtonAjaxBehavior finish = getButtonBehavior(tester, WIZARD_PATH, SUBMIT);
tester.executeBehavior(next); //DB step
[2/2] openmeetings git commit: [OPENMEETINGS-1716] initial commit
Posted by so...@apache.org.
[OPENMEETINGS-1716] initial commit
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/df895e04
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/df895e04
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/df895e04
Branch: refs/heads/master
Commit: df895e041d92e88ad1a70c2a6d773d2636a5993d
Parents: 9dd4d7e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 6 13:44:11 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 6 13:44:11 2017 +0700
----------------------------------------------------------------------
pom.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/df895e04/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c119f0..eacb42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
<wicket.mode>DEPLOYMENT</wicket.mode>
<om.quick.build>false</om.quick.build>
<db>derby</db>
+ <jdk.version>1.8</jdk.version>
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
@@ -129,7 +130,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.8.0,)</version>
+ <version>[${jdk.version}.0,)</version>
</requireJavaVersion>
</rules>
<failFast>true</failFast>
@@ -879,6 +880,8 @@
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
+ <source>${jdk.version}</source>
+ <javadocVersion>${jdk.version}</javadocVersion>
</configuration>
</plugin>
<plugin>
@@ -887,8 +890,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<optimize>true</optimize>
<debug>true</debug>
<encoding>UTF-8</encoding>