Unit test adjustments for MySQL 5.7

diff --git a/src/test/java/com/iciql/test/AnnotationsTest.java b/src/test/java/com/iciql/test/AnnotationsTest.java
index f96fe76ef5e1cd5efd534d0e30b37587581a1033..a8d70ca9c7559ec32f4d51d5b09c1229c8081b7f 100644 (file)
--- a/src/test/java/com/iciql/test/AnnotationsTest.java
+++ b/src/test/java/com/iciql/test/AnnotationsTest.java
@@ -70,7 +70,7 @@ public class AnnotationsTest {
         boolean toUpper = meta.storesUpperCaseIdentifiers();
         boolean toLower = meta.storesLowerCaseIdentifiers();
         ResultSet rs = meta.getIndexInfo(null, prepName(schema, toUpper, toLower),
-                prepName("ANNOTATEDPRODUCT", toUpper, toLower), false, true);
+                prepName("AnnotatedProduct", toUpper, toLower), false, true);
 
         List<String> list = Utils.newArrayList();
         while (rs.next()) {

diff --git a/src/test/java/com/iciql/test/IciqlSuite.java b/src/test/java/com/iciql/test/IciqlSuite.java
index bbbd5c68aff74d2e25a10f7206a1b081eb456503..20a2e61ce02c916cb719fda82726e77ce3b651c3 100644 (file)
--- a/src/test/java/com/iciql/test/IciqlSuite.java
+++ b/src/test/java/com/iciql/test/IciqlSuite.java
@@ -110,7 +110,7 @@ public class IciqlSuite {
             new TestDb("Derby", "memory", "jdbc:derby:memory:iciql;create=true"),
             new TestDb("Derby", "file", "jdbc:derby:directory:testdbs/derby/iciql;create=true"),
             new TestDb("Derby", "tcp", "jdbc:derby://localhost:1527/testdbs/derby/iciql;create=true", "sa", "sa"),
-            new TestDb("MySQL", "tcp", "jdbc:mysql://localhost:3306/iciql?useSSL=false", "sa", "sa"),
+            new TestDb("MySQL", "tcp", "jdbc:mysql://localhost:3306/iciql?useSSL=false&nullNamePatternMatchesAll=true&nullCatalogMeansCurrent=true", "sa", "sa"),
             new TestDb("PostgreSQL", "tcp", "jdbc:postgresql://localhost:5432/iciql", "sa", "sa"),
 
             //

diff --git a/src/test/java/com/iciql/test/ModelsTest.java b/src/test/java/com/iciql/test/ModelsTest.java
index 5f77e9703d80d5eaf9d1348409a344ab32ee6851..579bf34fe5666432cb5d8627d24f61b5f1934f1a 100644 (file)
--- a/src/test/java/com/iciql/test/ModelsTest.java
+++ b/src/test/java/com/iciql/test/ModelsTest.java
@@ -139,7 +139,7 @@ public class ModelsTest {
         } else if (dbName.equals("MySQL")) {
             // MySQL uses timestamp default values like
             // 0000-00-00 00:00:00 and CURRENT_TIMESTAMP
-            assertEquals(1673, models.get(0).length());
+            assertEquals(1571, models.get(0).length());
         } else if (dbName.equals("SQLite")) {
             assertEquals(1566, models.get(0).length());
         } else {