Merge pull request #24 from evolvedbinary/fail-build-on-fail-intergration

Fail build on fail intergration

Author: adamretter

pom.xml

@@ -258,10 +258,19 @@
                 <version>3.0.0-M5</version>
                 <executions>
                     <execution>
+                        <id>run-integration-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>verify-integration-tests-result</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
 

src/test/java/com/fusiondb/studio/api/API.java

@@ -61,6 +61,8 @@ public class API {
      */
     public static String ENV_VAR_FS_API_PORT = "FS_API_PORT";
 
+    private static String ENV_VAR_DOCKER_TEST_IMAGE = "DOCKER_TEST_IMAGE";
+
     /**
      * Get the Base URI for the Fusion Studio API.
      *
@@ -141,6 +143,7 @@ static <K, V> Map<K, V> mapOf(final Tuple2<K, V>... entries) {
         return map;
     }
 
+
     static <K, V>  Map<K, V>[] arrayOf(final Map<K, V>... entries) {
         if (entries == null) {
             return new Map[0];
@@ -152,4 +155,15 @@ static <K, V>  Map<K, V>[] arrayOf(final Map<K, V>... entries) {
         }
         return arrayOfMaps;
     }
+
+    static boolean testServerHasBadJsonSerialization() {
+        final String dockerTestImage = envVarOrDefault(ENV_VAR_DOCKER_TEST_IMAGE, null, envVarValue -> envVarValue);
+        if (dockerTestImage == null || dockerTestImage.isEmpty()) {
+            return false;
+        }
+
+        return dockerTestImage.endsWith("fusiondb-server:1.0.0-ALPHA2")
+                || dockerTestImage.endsWith("existdb:5.0.0")
+                || dockerTestImage.endsWith("existdb:5.2.0");
+    }
 }

src/test/java/com/fusiondb/studio/api/QueryIT.java

@@ -17,6 +17,7 @@
  */
 package com.fusiondb.studio.api;
 
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -256,6 +257,8 @@ public void serializeQueryAsAdaptive() {
 
     @Test
     public void serializeQueryAsJsonNoIndent() {
+        Assumptions.assumeFalse(testServerHasBadJsonSerialization());
+
         final Map<String, Object> requestBody = mapOf(
                 Tuple("query", "map {'a': 'b', 'x': ['y', 'z'], 't': true(), 'f': false() }"),
                 Tuple("defaultSerialization", mapOf(
@@ -278,6 +281,8 @@ public void serializeQueryAsJsonNoIndent() {
 
     @Test
     public void serializeQueryAsJsonIndent() {
+        Assumptions.assumeFalse(testServerHasBadJsonSerialization());
+
         final Map<String, Object> requestBody = mapOf(
                 Tuple("query", "map {'a': 'b', 'x': ['y', 'z'], 't': true(), 'f': false() }"),
                 Tuple("defaultSerialization", mapOf(