From 4ad0e06aab49d4d770ecb3fdd4cbafec31c076de Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Wed, 27 Jan 2016 22:53:06 +1300
Subject: [PATCH] Testing CI - TestEncrypt change to only run against H2 for
 now

---
 src/test/java/com/avaje/ebean/BaseTestCase.java              | 5 +++++
 src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java | 5 +++++
 src/test/resources/logback-test.xml                          | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/avaje/ebean/BaseTestCase.java b/src/test/java/com/avaje/ebean/BaseTestCase.java
index 3a25f513c..07bda7c83 100644
--- a/src/test/java/com/avaje/ebean/BaseTestCase.java
+++ b/src/test/java/com/avaje/ebean/BaseTestCase.java
@@ -24,4 +24,9 @@ public class BaseTestCase {
     SpiEbeanServer spi = (SpiEbeanServer)Ebean.getDefaultServer();
     return spi.getDatabasePlatform().getName().startsWith("mssqlserver");
   }
+
+  public boolean isH2() {
+    SpiEbeanServer spi = (SpiEbeanServer)Ebean.getDefaultServer();
+    return spi.getDatabasePlatform().getName().equals("h2");
+  }
 }
diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java b/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java
index d86b41d22..35ffd93b7 100644
--- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java
+++ b/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java
@@ -25,6 +25,11 @@ public class TestEncrypt extends BaseTestCase {
   @Test
   public void testQueryBind() {
 
+    if (!isH2()) {
+      // only run this on H2 - PGCrypto not happy on CI server
+      return;
+    }
+
     LoggedSqlCollector.start();
     Ebean.find(EBasicEncrypt.class)
         .where().startsWith("description", "Rob")
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index a4a9ef8a3..e8064551d 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -77,7 +77,7 @@
   <logger name="com.avaje.ebean" level="INFO"/>
   <logger name="org.avaje.ebean" level="INFO"/>
 
-  <logger name="org.avaje.ebean.SQL" level="TRACE"/>
+  <!--<logger name="org.avaje.ebean.SQL" level="TRACE"/>-->
   <!--<logger name="org.avaje.ebean.TXN" level="TRACE"/>-->
   <!--<logger name="org.avaje.ebean.SUM" level="TRACE"/>-->