From 2de20fe9bbc9105ead62aea613e92a6f15eeb1ce Mon Sep 17 00:00:00 2001 From: Matthieu Brouillard Date: Wed, 18 Sep 2013 12:55:15 +0200 Subject: [PATCH 1/5] travis.yml added in order to introduce introduce ci --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..e358d2576 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: java +jdk: + - oraclejdk7 From 0048e10c0cc29bd108f5599f9a24d5d195d24536 Mon Sep 17 00:00:00 2001 From: Matthieu Brouillard Date: Wed, 18 Sep 2013 13:16:14 +0200 Subject: [PATCH 2/5] instrument .travis.yml file so that the build envrionment is not headless anymore found info from: http://ecmendenhall.github.io/blog/blog/2013/05/28/two-travis-ci-solutions/ --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index e358d2576..e557a70c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ language: java +before_install: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" jdk: - oraclejdk7 From 6ab4e606d6a32030c9c2a725bd05e1ec2f9e8e56 Mon Sep 17 00:00:00 2001 From: Matthieu Brouillard Date: Wed, 18 Sep 2013 16:07:00 +0200 Subject: [PATCH 3/5] changing TERM property to have clean output in travis logs --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e557a70c0..1917805ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: java before_install: - "export DISPLAY=:99.0" + - "export TERM=dumb" - "sh -e /etc/init.d/xvfb start" jdk: - oraclejdk7 From bedaaca0b07d0edf5bdd2a329580e26f593b02d5 Mon Sep 17 00:00:00 2001 From: Matthieu Brouillard Date: Wed, 18 Sep 2013 16:39:10 +0200 Subject: [PATCH 4/5] enhance travis build for better log add intilization of JavaFX Platform for some test (to avoid unnecessary log errors) --- .travis.yml | 3 +++ .../labs/JavaFXPlatformAbstractTest.java | 25 +++++++++++++++++++ .../labs/map/tile/TileRepositoryTest.java | 5 ++-- .../BingAttributionLoaderTest.java | 12 ++++++--- 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 src/test/java/jfxtras/labs/JavaFXPlatformAbstractTest.java diff --git a/.travis.yml b/.travis.yml index 1917805ce..204309380 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,8 @@ before_install: - "export DISPLAY=:99.0" - "export TERM=dumb" - "sh -e /etc/init.d/xvfb start" +script: gradle clean check --info +after_script: + - "cat ./build/test-results/*.xml" jdk: - oraclejdk7 diff --git a/src/test/java/jfxtras/labs/JavaFXPlatformAbstractTest.java b/src/test/java/jfxtras/labs/JavaFXPlatformAbstractTest.java new file mode 100644 index 000000000..41df79a13 --- /dev/null +++ b/src/test/java/jfxtras/labs/JavaFXPlatformAbstractTest.java @@ -0,0 +1,25 @@ +package jfxtras.labs; + +import java.util.concurrent.CountDownLatch; + +import javafx.embed.swing.JFXPanel; + +import javax.swing.SwingUtilities; + +import org.junit.BeforeClass; + +public class JavaFXPlatformAbstractTest { + @BeforeClass public static final void initJavaFXPlatform() { + final CountDownLatch latch = new CountDownLatch(1); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + new JFXPanel(); // initializes JavaFX environment + latch.countDown(); + } + }); + try { + latch.await(); + } catch (InterruptedException e) { + } + } +} diff --git a/src/test/java/jfxtras/labs/map/tile/TileRepositoryTest.java b/src/test/java/jfxtras/labs/map/tile/TileRepositoryTest.java index b738f1a42..a62ea1055 100644 --- a/src/test/java/jfxtras/labs/map/tile/TileRepositoryTest.java +++ b/src/test/java/jfxtras/labs/map/tile/TileRepositoryTest.java @@ -33,6 +33,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import javafx.scene.image.ImageView; +import jfxtras.labs.JavaFXPlatformAbstractTest; import jfxtras.labs.map.ApiKeys; import jfxtras.labs.map.tile.bing.BingTileSourceFactory; import jfxtras.labs.map.tile.bing.BingType; @@ -40,6 +41,7 @@ import jfxtras.labs.map.tile.osm.OsmTileSourceFactory; import jfxtras.labs.map.tile.osm.OsmType; +import org.junit.Before; import org.junit.Test; /** @@ -48,8 +50,7 @@ * @author Mario Schroeder * */ -public class TileRepositoryTest { - +public class TileRepositoryTest extends JavaFXPlatformAbstractTest { @Test public void testWithNull(){ diff --git a/src/test/java/jfxtras/labs/map/tile/attribution/BingAttributionLoaderTest.java b/src/test/java/jfxtras/labs/map/tile/attribution/BingAttributionLoaderTest.java index f41b96ad0..e473fb6d9 100644 --- a/src/test/java/jfxtras/labs/map/tile/attribution/BingAttributionLoaderTest.java +++ b/src/test/java/jfxtras/labs/map/tile/attribution/BingAttributionLoaderTest.java @@ -29,8 +29,14 @@ package jfxtras.labs.map.tile.attribution; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.util.List; +import jfxtras.labs.JavaFXPlatformAbstractTest; import jfxtras.labs.map.ApiKeys; import jfxtras.labs.map.tile.Attribution; import jfxtras.labs.map.tile.bing.BingAttributionLoader; @@ -38,16 +44,14 @@ import jfxtras.labs.map.tile.bing.BingMapMetaDataHandler; import jfxtras.labs.map.tile.bing.BingMetaDataHandler; +import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; - /** * * @author Mario Schroeder */ -public class BingAttributionLoaderTest { - +public class BingAttributionLoaderTest extends JavaFXPlatformAbstractTest { /** * Test of load method, of class BingAttributionLoader. */ From 74fba9cc6423aea36408cab39345db270fba5abd Mon Sep 17 00:00:00 2001 From: Matthieu Brouillard Date: Wed, 18 Sep 2013 17:26:35 +0200 Subject: [PATCH 5/5] simplification travis build file, show some info and tests logs failure on build failure --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 204309380..a2d0685b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ before_install: - "export DISPLAY=:99.0" - "export TERM=dumb" - "sh -e /etc/init.d/xvfb start" -script: gradle clean check --info -after_script: +script: gradle check --info +after_failure: - "cat ./build/test-results/*.xml" jdk: - - oraclejdk7 + - oraclejdk7 +