branch develop updated (763893c -> 47b56c9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git from 763893c Fix build new 47b56c9 Fix tests without x env 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 47b56c92ff6c6ded6117b82482b5d905c8919610 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jul 25 11:21:45 2016 +0200 Fix tests without x env Summary of changes: .../java/fr/ifremer/coser/services/PublicationServiceTest.java | 4 ++++ .../src/test/java/fr/ifremer/coser/services/WebServiceTest.java | 7 +++++++ 2 files changed, 11 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 47b56c92ff6c6ded6117b82482b5d905c8919610 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jul 25 11:21:45 2016 +0200 Fix tests without x env --- .../java/fr/ifremer/coser/services/PublicationServiceTest.java | 4 ++++ .../src/test/java/fr/ifremer/coser/services/WebServiceTest.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java b/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java index cdfb987..a642701 100644 --- a/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java +++ b/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java @@ -37,6 +37,7 @@ import org.apache.commons.io.FileUtils; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -94,6 +95,9 @@ public class PublicationServiceTest extends CoserTestAbstract { */ @Test public void testErrorExportHtml() throws CoserBusinessException, IOException { + // peux echouer a cause de jfreechart + Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); + Project project = createTestProject(projectService, false); List<ControlError> validationErrors = new ArrayList<ControlError>(); diff --git a/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java b/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java index 43aca47..8502edc 100644 --- a/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java +++ b/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java @@ -34,6 +34,7 @@ import java.util.Map; import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.io.FileUtils; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.util.FileUtil; @@ -217,6 +218,9 @@ public class WebServiceTest extends CoserTestAbstract { */ @Test public void testGetChartCom() throws CoserBusinessException { + // peux echouer a cause de jfreechart + Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); + registerUploadedResult("/web/upload2.zip"); File file = webService.getChart("ecorse", null, "Lbcomm", null, Locale.FRENCH); Assert.assertTrue(file.isFile()); @@ -314,6 +318,9 @@ public class WebServiceTest extends CoserTestAbstract { */ @Test public void testExtractDataAsZip() throws CoserBusinessException { + // peux echouer a cause de jfreechart + Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); + registerUploadedResult("/web/upload2.zip"); List<String> zones = Arrays.asList("ecorse"); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm