branch develop updated (1a2d9b9 -> 9e128d8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 1a2d9b9 Fix logback config. new 9e128d8 fixes #150: Does not build on JDK11 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9e128d8a24c027c9af33b6caa02f09fdbf31773d Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Oct 24 16:00:15 2019 +0200 fixes #150: Does not build on JDK11 Summary of changes: .../java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 9e128d8a24c027c9af33b6caa02f09fdbf31773d Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Oct 24 16:00:15 2019 +0200 fixes #150: Does not build on JDK11 --- .../java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java index 624561f..37f1ee8 100644 --- a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java +++ b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java @@ -22,6 +22,7 @@ package org.chorem.jtimer.ui.report; +import com.google.gson.internal.JavaVersion; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.AbstractJTimerTest; @@ -214,8 +215,13 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Assert.assertNotNull(content); // no annotations - Assert.assertTrue(content.indexOf("* 2/3/09 2:10 PM : Test task and subtask time") > 0); - Assert.assertTrue(content.indexOf("* 12/11/08 12:00 AM : Not easy work") > 0); + if (JavaVersion.isJava9OrLater()) { + Assert.assertTrue(content.indexOf("* 2/3/09, 2:10 PM : Test task and subtask time") > 0); + Assert.assertTrue(content.indexOf("* 12/11/08, 12:00 AM : Not easy work") > 0); + } else { + Assert.assertTrue(content.indexOf("* 2/3/09 2:10 PM : Test task and subtask time") > 0); + Assert.assertTrue(content.indexOf("* 12/11/08 12:00 AM : Not easy work") > 0); + } /*FIXME saver.unlock(); } catch (DataLockingException e) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm