From d3b51a789268fd3b45a99ec050c290e7bbb29241 Mon Sep 17 00:00:00 2001 From: James Cullimore Date: Tue, 5 Mar 2019 17:10:33 +0000 Subject: [PATCH] issue #46 updated tests to work with postgres and sqlserver --- .../sql/suites/PostgreSqlTestSuite.java | 1 - .../common/controllers/data/DeleteTest.java | 16 ++++---------- .../common/controllers/data/SaveTest.java | 21 ++++++++----------- .../save/create/create-multiple-request.json | 4 ++-- .../create-update-request.json | 2 +- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/test/java/com/manywho/services/sql/suites/PostgreSqlTestSuite.java b/src/test/java/com/manywho/services/sql/suites/PostgreSqlTestSuite.java index ce04abd..dcfab02 100644 --- a/src/test/java/com/manywho/services/sql/suites/PostgreSqlTestSuite.java +++ b/src/test/java/com/manywho/services/sql/suites/PostgreSqlTestSuite.java @@ -26,7 +26,6 @@ UuidTest.class, CapitalLetterTest.class, AutoIncrementTest.class, - DeleteTest.class, com.manywho.services.sql.suites.postgresql.data.LoadTest.class, com.manywho.services.sql.suites.postgresql.data.DeleteTest.class, com.manywho.services.sql.suites.postgresql.data.SaveTest.class, diff --git a/src/test/java/com/manywho/services/sql/suites/common/controllers/data/DeleteTest.java b/src/test/java/com/manywho/services/sql/suites/common/controllers/data/DeleteTest.java index a736e47..46cc75e 100644 --- a/src/test/java/com/manywho/services/sql/suites/common/controllers/data/DeleteTest.java +++ b/src/test/java/com/manywho/services/sql/suites/common/controllers/data/DeleteTest.java @@ -46,14 +46,10 @@ public void testDeleteDataByExternalId() throws Exception { public void testDeleteMultipleDataByExternalId() throws Exception { DbConfigurationTest.setPropertiesIfNotInitialized("postgresql"); try (Connection connection = getSql2o().open()) { - String sqlCreateTable = "CREATE TABLE " + escapeTableName("testtable") + - "(" + - "id integer primary key auto_increment," + - "data text" + - ");"; + String sqlCreateTable = "CREATE TABLE " + escapeTableName("testtable") + "(id integer primary key, data text);"; connection.createQuery(sqlCreateTable).executeUpdate(); - String sqlInsert = "INSERT INTO " + escapeTableName("testtable")+ " (data) VALUES ('test1'), ('test2');"; + String sqlInsert = "INSERT INTO " + escapeTableName("testtable")+ " (id, data) VALUES (1, 'test1'), (2, 'test2');"; connection.createQuery(sqlInsert).executeUpdate(); } catch (Exception e) { throw e; @@ -90,14 +86,10 @@ public void testDeleteMultipleDataByExternalId() throws Exception { public void testDeleteMultipleMissingDataByExternalId() throws Exception { DbConfigurationTest.setPropertiesIfNotInitialized("postgresql"); try (Connection connection = getSql2o().open()) { - String sqlCreateTable = "CREATE TABLE " + escapeTableName("testtable") + - "(" + - "id integer primary key auto_increment," + - "data text" + - ");"; + String sqlCreateTable = "CREATE TABLE " + escapeTableName("testtable") + "(id integer primary key, data text);"; connection.createQuery(sqlCreateTable).executeUpdate(); - String sqlInsert = "INSERT INTO " + escapeTableName("testtable")+ "(data) VALUES ('test1');"; + String sqlInsert = "INSERT INTO " + escapeTableName("testtable")+ "(id, data) VALUES (1, 'test1');"; connection.createQuery(sqlInsert).executeUpdate(); } catch (Exception e) { throw e; diff --git a/src/test/java/com/manywho/services/sql/suites/common/controllers/data/SaveTest.java b/src/test/java/com/manywho/services/sql/suites/common/controllers/data/SaveTest.java index 1f1d95d..bc2277b 100644 --- a/src/test/java/com/manywho/services/sql/suites/common/controllers/data/SaveTest.java +++ b/src/test/java/com/manywho/services/sql/suites/common/controllers/data/SaveTest.java @@ -73,10 +73,7 @@ public void testUpdate() throws Exception { public void testUpdateMissingId () throws Exception { DbConfigurationTest.setPropertiesIfNotInitialized("mysql"); - try (Connection connection = getSql2o().open()) { - String sql = "CREATE TABLE " + escapeTableName("testtable") + " (id integer primary key auto_increment NOT NULL, data text);"; - connection.createQuery(sql).executeUpdate(); - } + createTestTable(); DefaultApiRequest.saveDataRequestAndAssertion("/data", "suites/common/data/save/update/update-missing-request.json", @@ -88,7 +85,7 @@ public void testUpdateMissingId () throws Exception { private void createTestTable() throws Exception { try (Connection connection = getSql2o().open()) { - String sql = "CREATE TABLE " + escapeTableName("testtable") + " (id integer primary key auto_increment NOT NULL, data text);"; + String sql = "CREATE TABLE " + escapeTableName("testtable") + " (id integer primary key NOT NULL, data text);"; connection.createQuery(sql).executeUpdate(); } } @@ -122,7 +119,7 @@ private void assertCountOfTestTable (int expected) throws Exception { } @Test - public void createMulitipleTest() throws Exception { + public void createMultipleTest() throws Exception { DbConfigurationTest.setPropertiesIfNotInitialized("postgresql"); createTestTable(); @@ -136,13 +133,13 @@ public void createMulitipleTest() throws Exception { } @Test - public void updateMulitipleTest() throws Exception { - DbConfigurationTest.setPropertiesIfNotInitialized("postgresql"); + public void updateMultipleTest() throws Exception { + DbConfigurationTest.setPropertiesIfNotInitialized("mysql"); createTestTable(); - insertToTestTable("first"); - insertToTestTable("second"); + insertToTestTable(1,"first"); + insertToTestTable(2,"second"); DefaultApiRequest.saveDataRequestAndAssertion("/data", @@ -159,7 +156,7 @@ public void updateAndCreateTest() throws Exception { createTestTable(); - insertToTestTable("first"); + insertToTestTable(1,"first"); DefaultApiRequest.saveDataRequestAndAssertion("/data", "suites/common/data/save/createAndUpdate/create-update-request.json", @@ -175,7 +172,7 @@ public void updateMultipleMissingId() throws Exception { createTestTable(); - insertToTestTable("first"); + insertToTestTable(1,"first"); DefaultApiRequest.saveDataRequestAndAssertion("/data", "suites/common/data/save/update/update-multiple-missing-request.json", diff --git a/src/test/resources/suites/common/data/save/create/create-multiple-request.json b/src/test/resources/suites/common/data/save/create/create-multiple-request.json index bda8e34..1d853f6 100644 --- a/src/test/resources/suites/common/data/save/create/create-multiple-request.json +++ b/src/test/resources/suites/common/data/save/create/create-multiple-request.json @@ -139,7 +139,7 @@ { "contentFormat": null, "contentType": "ContentNumber", - "contentValue": "0", + "contentValue": "1", "developerName": "id", "objectData": null, "typeElementId": null, @@ -167,7 +167,7 @@ { "contentFormat": null, "contentType": "ContentNumber", - "contentValue": "1", + "contentValue": "2", "developerName": "id", "objectData": null, "typeElementId": null, diff --git a/src/test/resources/suites/common/data/save/createAndUpdate/create-update-request.json b/src/test/resources/suites/common/data/save/createAndUpdate/create-update-request.json index 3a10c9a..3ed8a18 100644 --- a/src/test/resources/suites/common/data/save/createAndUpdate/create-update-request.json +++ b/src/test/resources/suites/common/data/save/createAndUpdate/create-update-request.json @@ -167,7 +167,7 @@ { "contentFormat": null, "contentType": "ContentNumber", - "contentValue": "", + "contentValue": "2", "developerName": "id", "objectData": null, "typeElementId": null,