From 19478a5890c82c646c08a2d95e2c05dc5867db00 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 7 May 2014 18:39:49 +0200
Subject: [PATCH] Skip some tests for FIREBIRD

---
 .../all/testcases/AbstractLoaderTests.java    |  1 +
 .../test/all/testcases/InsertUpdateTests.java | 58 ++-----------------
 2 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AbstractLoaderTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AbstractLoaderTests.java
index ae90e315a1..57e9d904fc 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AbstractLoaderTests.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/AbstractLoaderTests.java
@@ -227,6 +227,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             xxxx xxxxxxx
             xx [/pro] */
             case DERBY:
+            case FIREBIRD:
             case H2:
             case POSTGRES:
             case SQLITE:
diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/InsertUpdateTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/InsertUpdateTests.java
index 6da7cca6a2..73349dc3fa 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/InsertUpdateTests.java
@@ -936,19 +936,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     }
 
     public void testInsertOnDuplicateKeyUpdate() throws Exception {
-        switch (dialect()) {
-            /* [pro] xx
-            xxxx xxxxxxx
-            xxxx xxxx
-            xxxx xxxxxxx
-            xx [/pro] */
-            case DERBY:
-            case H2:
-            case POSTGRES:
-            case SQLITE:
-                log.info("SKIPPING", "ON DUPLICATE KEY UPDATE test");
-                return;
-        }
+        assumeFamilyNotIn(DERBY, FIREBIRD, H2, POSTGRES, SQLITE);
 
         jOOQAbstractTest.reset = false;
 
@@ -976,18 +964,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     }
 
     public void testInsertOnDuplicateKeyIgnore() throws Exception {
-        switch (dialect()) {
-            /* [pro] xx
-            xxxx xxxx
-            xxxx xxxxxxx
-            xx [/pro] */
-            case DERBY:
-            case H2:
-            case POSTGRES:
-            case SQLITE:
-                log.info("SKIPPING", "ON DUPLICATE KEY IGNORE test");
-                return;
-        }
+        assumeFamilyNotIn(DERBY, FIREBIRD, H2, POSTGRES, SQLITE);
 
         jOOQAbstractTest.reset = false;
 
@@ -1014,21 +991,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     }
 
     public void testMerge() throws Exception {
-        switch (dialect().family()) {
-            /* [pro] xx
-            xxxx xxxxxxx
-            xxxx xxxx
-            xxxx xxxxxxx
-            xx [/pro] */
-            case DERBY:
-            case H2:
-            case MARIADB:
-            case MYSQL:
-            case POSTGRES:
-            case SQLITE:
-                log.info("SKIPPING", "Merge tests");
-                return;
-        }
+        assumeFamilyNotIn(DERBY, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE);
 
         jOOQAbstractTest.reset = false;
 
@@ -1235,20 +1198,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     }
 
     public void testMergeWithH2SyntaxExtension() throws Exception {
-        switch (dialect()) {
-            /* [pro] xx
-            xxxx xxxxxxx
-            xxxx xxxx
-            xxxx xxxxxxx
-            xx [/pro] */
-            case DERBY:
-            case MARIADB:
-            case MYSQL:
-            case POSTGRES:
-            case SQLITE:
-                log.info("SKIPPING", "H2-specific MERGE syntax test");
-                return;
-        }
+        assumeFamilyNotIn(DERBY, FIREBIRD, MARIADB, MYSQL, POSTGRES, SQLITE);
 
         jOOQAbstractTest.reset = false;