From bedaaca0b07d0edf5bdd2a329580e26f593b02d5 Mon Sep 17 00:00:00 2001
From: Matthieu Brouillard <matthieu@brouillard.fr>
Date: Wed, 18 Sep 2013 16:39:10 +0200
Subject: [PATCH] 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.
      */