embulk-output-sqlserver 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e793c760c471271fa0388e2313a9d2d329eb6f
-  data.tar.gz: 54633fc992bbe7f01faf4873ce22cb22bf738497
+  metadata.gz: 061683eb985abcdb6dfdeb2f8f69d959724699da
+  data.tar.gz: acf3b941ce60f1a7f3ff844893e5bbfe1d50eb59
 SHA512:
-  metadata.gz: 963f63991e65b0b49899fd4c2c951374198191e6aaddd56bc8d33693f446de37468af7edd6b91d4c9c7d64d3688765c35ac0f6e3f5f3457de5142f2c28a4bf8d
-  data.tar.gz: 92ee454069669fb5378b6d43bd564e931cc3e73885e2bdc4c39b01c11d4576a3b6ae44fb3dce9024fcc010d7b1c1e4f1b94facf76443aa87191a6fd8333025c0
+  metadata.gz: 32691b72800b548ede9ba7d9035c7fd948542f5c273e6a1deca18363966b0ccd55d5a35792c53cb1d98eb575082f3651c5b200abe73e41f1b97c8f1628817500
+  data.tar.gz: 4c43cda38c7c2f27650bb072efe6c02cccb3f7371b7c20274bb4f30b77b3c5af6e2c3bb2c9a51a7b6b98bf10e75c4432cd2a60b942903edae146ee8dabfde6ca

data/src/test/java/org/embulk/output/sqlserver/SQLServerOutputPluginTest.java

@@ -2,7 +2,6 @@ package org.embulk.output.sqlserver;
 
 import org.embulk.output.AbstractJdbcOutputPluginTest;
 import org.embulk.output.SQLServerOutputPlugin;
-import org.embulk.output.tester.EmbulkPluginTester;
 import org.embulk.spi.OutputPlugin;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -26,8 +25,6 @@ import static org.junit.Assert.assertEquals;
 public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
 {
     private static boolean useJtdsDriver = false;
-    private static boolean canTest;
-    private static EmbulkPluginTester tester = new EmbulkPluginTester();
     static {
         tester.addPlugin(OutputPlugin.class, "sqlserver", SQLServerOutputPlugin.class);
     }
@@ -44,11 +41,11 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
 
         try {
             new SQLServerOutputPluginTest().connect();
-            canTest = true;
+            enabled = true;
         } catch (Throwable t) {
             System.out.println(t);
         } finally {
-            if (!canTest) {
+            if (!enabled) {
                 System.out.println("Warning: you should prepare database in order to test (server = localhost, port = 1433, instance = SQLEXPRESS, database = TESTDB, user = TEST_USER, password = TEST_PW).");
             }
         }
@@ -57,17 +54,13 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirect() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-insert-direct.yml"));
+        test("/sqlserver/yml/test-insert-direct.yml");
 
         assertTable(1, table);
     }
@@ -75,15 +68,11 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-insert-direct.yml"));
+        test("/sqlserver/yml/test-insert-direct.yml");
 
         assertGeneratedTable(table);
     }
@@ -91,17 +80,13 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsert() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-insert.yml"));
+        test("/sqlserver/yml/test-insert.yml");
 
         assertTable(1, table);
     }
@@ -109,15 +94,11 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-insert.yml"));
+        test("/sqlserver/yml/test-insert.yml");
 
         assertGeneratedTable(table);
     }
@@ -125,17 +106,13 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testTruncateInsert() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-truncate-insert.yml"));
+        test("/sqlserver/yml/test-truncate-insert.yml");
 
         assertTable(0, table);
     }
@@ -143,17 +120,13 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplace() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-replace.yml"));
+        test("/sqlserver/yml/test-replace.yml");
 
         assertGeneratedTable(table);
     }
@@ -161,10 +134,6 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceLongName() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST___Ａ１２３４５６７８９Ｂ１２３４５６７８９Ｃ１２３４５６７８９Ｄ１２３４５６７８９Ｅ１２３４５６７８９Ｆ１２３４５６７８９Ｇ１２３４５６７８９Ｈ１２３４５６７８９Ｉ１２３４５６７８９Ｊ１２３４５６７８９Ｋ１２３４５６７８９Ｌ１２３４５６７８９";
         assertEquals(127, table.length());
 
@@ -172,7 +141,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-replace-long-name.yml"));
+        test("/sqlserver/yml/test-replace-long-name.yml");
 
         assertGeneratedTable(table);
     }
@@ -180,15 +149,11 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-replace.yml"));
+        test("/sqlserver/yml/test-replace.yml");
 
         assertGeneratedTable(table);
     }
@@ -196,17 +161,13 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testStringToTimestamp() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-string-timestamp.yml"));
+        test("/sqlserver/yml/test-string-timestamp.yml");
 
         assertTable(1, table, true);
     }
@@ -214,7 +175,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testNativeString() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -223,7 +184,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         dropTable(table);
         executeSQL(String.format("CREATE TABLE %S (ITEM1 CHAR(4), ITEM2 VARCHAR(8), ITEM3 TEXT, ITEM4 NCHAR(4), ITEM5 NVARCHAR(8), ITEM6 NTEXT)", table));
 
-        tester.run(convertYml("/sqlserver/yml/test-native-string.yml"));
+        test("/sqlserver/yml/test-native-string.yml");
 
         List<List<Object>> rows = select(table);
         assertEquals(2, rows.size());
@@ -250,7 +211,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testNativeInteger() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -259,7 +220,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         dropTable(table);
         executeSQL(String.format("CREATE TABLE %S (ITEM1 TINYINT, ITEM2 SMALLINT, ITEM3 INT, ITEM4 BIGINT, ITEM5 BIT)", table));
 
-        tester.run(convertYml("/sqlserver/yml/test-native-integer.yml"));
+        test("/sqlserver/yml/test-native-integer.yml");
 
         List<List<Object>> rows = select(table);
         assertEquals(2, rows.size());
@@ -284,7 +245,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testNativeDecimal() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -293,7 +254,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         dropTable(table);
         executeSQL(String.format("CREATE TABLE %S (ITEM1 DECIMAL(20,2), ITEM2 NUMERIC(20,2), ITEM3 SMALLMONEY, ITEM4 MONEY, ITEM5 REAL, ITEM6 FLOAT)", table));
 
-        tester.run(convertYml("/sqlserver/yml/test-native-decimal.yml"));
+        test("/sqlserver/yml/test-native-decimal.yml");
 
         List<List<Object>> rows = select(table);
         assertEquals(2, rows.size());
@@ -320,7 +281,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testNativeDate() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -329,7 +290,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         dropTable(table);
         executeSQL(String.format("CREATE TABLE %S (ITEM1 DATE, ITEM2 SMALLDATETIME, ITEM3 DATETIME, ITEM4 DATETIME2, ITEM5 DATETIME2(2), ITEM6 TIME, ITEM7 TIME(2))", table));
 
-        tester.run(convertYml("/sqlserver/yml/test-native-date.yml"));
+        test("/sqlserver/yml/test-native-date.yml");
 
         List<List<Object>> rows = select(table);
         assertEquals(2, rows.size());
@@ -360,17 +321,13 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testNative() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        tester.run(convertYml("/sqlserver/yml/test-native.yml"));
+        test("/sqlserver/yml/test-native.yml");
 
         assertTable(1, table);
     }
@@ -378,19 +335,14 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testJtds() throws Exception
     {
-        boolean canTestJtds = false;
         useJtdsDriver = true;
         try {
-            new SQLServerOutputPluginTest().connect();
-            canTestJtds = true;
+            connect();
         } catch (Throwable t) {
             System.out.println(t);
-        } finally {
-            if (!canTestJtds) {
-                System.out.println("Warning: jTDS driver can't connect to database.");
-                System.out.println("(server = localhost, port = 1433, instance = SQLEXPRESS, database = TESTDB, user = TEST_USER, password = TEST_PW)");
-                return;
-            }
+            System.out.println("Warning: jTDS driver can't connect to database.");
+            System.out.println("(server = localhost, port = 1433, instance = SQLEXPRESS, database = TESTDB, user = TEST_USER, password = TEST_PW)");
+            return;
         }
 
         try {
@@ -398,7 +350,7 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
             dropTable(table);
             createTable(table);
             insertRecord(table);
-            tester.run(convertYml("/sqlserver/yml/test-jtds.yml"));
+            test("/sqlserver/yml/test-jtds.yml");
             assertTableJtds(1, table);
         } finally {
             useJtdsDriver = false;
@@ -518,6 +470,10 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
 
     private void assertTable(int skip, String table, boolean precise) throws Exception
     {
+        if (!enabled) {
+            return;
+        }
+
         List<List<Object>> rows = select(table);
         assertEquals(skip + 3, rows.size());
         rows = rows.subList(skip, skip + 3);
@@ -614,6 +570,10 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
 
     private void assertGeneratedTable(String table) throws Exception
     {
+        if (!enabled) {
+            return;
+        }
+
         List<List<Object>> rows = select(table);
         assertEquals(3, rows.size());
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sqlserver
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.6.4.jar
-- classpath/embulk-output-sqlserver-0.6.4.jar
+- classpath/embulk-output-jdbc-0.6.5.jar
+- classpath/embulk-output-sqlserver-0.6.5.jar
 - classpath/jtds-1.3.1.jar
 - lib/embulk/output/sqlserver.rb
 - src/main/java/org/embulk/output/SQLServerOutputPlugin.java