embulk-output-oracle 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1074dcbca44c9b5e6cc3d80da2eea5b40538bb28
-  data.tar.gz: e560931b3c0dcb3851b4b330d06ed0a01103b34a
+  metadata.gz: ba951a3e467154c25d59dd8e37d0ea7ed345b2c1
+  data.tar.gz: 2460425a8bac3b445d80f9644680a21b84c5e972
 SHA512:
-  metadata.gz: 919fc3fc46e0ded5c4e0983459659bde509898506f546932b4b5029fe45ef617279ed0895b24e7352936574090f2097ba1cc2d9dc2dbc4a05d6a98a58b1d65a4
-  data.tar.gz: 1ab155c13bf488e439f3951b31d257f75ee226d1f4b1352212147107d835cf270a8f2859fd8cd09269f88e16798929898d26a4a0af1eb5a87df3191a9a45a31f
+  metadata.gz: edd79e76f7fa2631f556f6de2d838b2a205431eb89c262076b10c0bd48d808ee760b38f6550041829546e285fbc3dea6e59a6d59537755ec3416a639fea1fe95
+  data.tar.gz: a05efdd0d48d60f098affb33ceb8639f8246c780f405f1c513b126f10afd4fa274921ae294fed5e5de5980d42e3de485e82b4aecd62c7cd85a652555a8d17b44

data/src/test/java/org/embulk/output/oracle/OracleOutputPluginTest.java

@@ -23,7 +23,6 @@ import org.embulk.exec.PartialExecutionException;
 import org.embulk.input.filesplit.LocalFileSplitInputPlugin;
 import org.embulk.output.AbstractJdbcOutputPluginTest;
 import org.embulk.output.OracleOutputPlugin;
-import org.embulk.output.tester.EmbulkPluginTester;
 import org.embulk.spi.InputPlugin;
 import org.embulk.spi.OutputPlugin;
 import org.junit.BeforeClass;
@@ -32,8 +31,6 @@ import org.junit.Test;
 
 public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
 {
-    private static boolean canTest;
-    private static EmbulkPluginTester tester = new EmbulkPluginTester();
     static {
         tester.addPlugin(OutputPlugin.class, "oracle", OracleOutputPlugin.class);
         tester.addPlugin(InputPlugin.class, "filesplit", LocalFileSplitInputPlugin.class);
@@ -57,7 +54,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         try (Connection connection = new OracleOutputPluginTest().connect()) {
             String version = connection.getMetaData().getDriverVersion();
             System.out.println("Driver version = " + version);
-            canTest = true;
+            enabled = true;
 
         } catch (SQLException e) {
             System.err.println(e);
@@ -71,16 +68,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsert() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-insert.yml");
+        test("/oracle/yml/test-insert.yml");
 
         assertTable(table);
     }
@@ -88,15 +81,11 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        run("/oracle/yml/test-insert.yml");
+        test("/oracle/yml/test-insert.yml");
 
         assertGeneratedTable1(table);
     }
@@ -104,17 +93,13 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertEmpty() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
         new File(convertPath("/oracle/data/"), "test2").mkdir();
-        run("/oracle/yml/test-insert-empty.yml");
+        test("/oracle/yml/test-insert-empty.yml");
 
         assertTableEmpty(table);
     }
@@ -122,17 +107,13 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testTruncateInsert() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        run("/oracle/yml/test-truncate-insert.yml");
+        test("/oracle/yml/test-truncate-insert.yml");
 
         assertTable(table);
     }
@@ -140,17 +121,13 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testTruncateInsertOCIMethod() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
         insertRecord(table);
 
-        run("/oracle/yml/test-truncate-insert-oci-method.yml");
+        test("/oracle/yml/test-truncate-insert-oci-method.yml");
 
         assertTable(table);
     }
@@ -158,15 +135,11 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testTruncateInsertCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        run("/oracle/yml/test-truncate-insert.yml");
+        test("/oracle/yml/test-truncate-insert.yml");
 
         assertGeneratedTable1(table);
     }
@@ -174,16 +147,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirect() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-insert-direct.yml");
+        test("/oracle/yml/test-insert-direct.yml");
 
         assertTable(table);
     }
@@ -191,7 +160,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectDuplicate() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -202,7 +171,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         insertRecord(table, "A002");
 
         try {
-            run("/oracle/yml/test-insert-direct.yml");
+            test("/oracle/yml/test-insert-direct.yml");
             fail("Exception expected.");
         } catch (Exception e) {
             System.out.println(e);
@@ -212,17 +181,13 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectEmpty() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
         new File(convertPath("/oracle/data/"), "test2").mkdir();
-        run("/oracle/yml/test-insert-direct-empty.yml");
+        test("/oracle/yml/test-insert-direct-empty.yml");
 
         assertTableEmpty(table);
     }
@@ -230,15 +195,11 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        run("/oracle/yml/test-insert-direct.yml");
+        test("/oracle/yml/test-insert-direct.yml");
 
         assertGeneratedTable1(table);
     }
@@ -246,17 +207,13 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectDirectMethod() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
         try {
-            run("/oracle/yml/test-insert-direct-direct-method.yml");
+            test("/oracle/yml/test-insert-direct-direct-method.yml");
         } catch (PartialExecutionException e) {
             if (e.getCause() != null && e.getCause().getClass().equals(RuntimeException.class)
                     && e.getCause().getCause() != null && e.getCause().getCause().getClass().equals(AssertionError.class)) {
@@ -274,16 +231,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectOCIMethod() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-insert-direct-oci-method.yml");
+        test("/oracle/yml/test-insert-direct-oci-method.yml");
 
         assertTable(table);
     }
@@ -291,7 +244,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectOCIMethodLarge() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -300,7 +253,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-insert-direct-oci-method-large.yml");
+        test("/oracle/yml/test-insert-direct-oci-method-large.yml");
 
         List<List<Object>> rows = select(table);
         assertEquals(9999, rows.size());
@@ -312,7 +265,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectOCIMethodDuplicate() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -323,7 +276,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         insertRecord(table, "A002");
 
         try {
-            run("/oracle/yml/test-insert-direct-oci-method.yml");
+            test("/oracle/yml/test-insert-direct-oci-method.yml");
             fail("Exception expected.");
         } catch (Exception e) {
             System.out.println(e);
@@ -333,16 +286,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectOCIMethodMultibyte() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "ＴＥＳＴ１";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-insert-direct-oci-method-multibyte.yml");
+        test("/oracle/yml/test-insert-direct-oci-method-multibyte.yml");
 
         assertTable(table);
     }
@@ -350,7 +299,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectOCIMethodMultibyteDuplicate() throws Exception
     {
-        if (!canTest) {
+        if (!enabled) {
             return;
         }
 
@@ -361,7 +310,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         insertRecord(table, "A002");
 
         try {
-            run("/oracle/yml/test-insert-direct-oci-method-multibyte.yml");
+            test("/oracle/yml/test-insert-direct-oci-method-multibyte.yml");
             fail("Exception expected.");
         } catch (Exception e) {
             System.out.println(e);
@@ -371,16 +320,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testInsertDirectOCIMethodSplit() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-insert-direct-oci-method-split.yml");
+        test("/oracle/yml/test-insert-direct-oci-method-split.yml");
 
         assertTable(table);
     }
@@ -388,16 +333,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testUrl() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-url.yml");
+        test("/oracle/yml/test-url.yml");
 
         assertTable(table);
     }
@@ -405,16 +346,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testLowerTable() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-lower-table.yml");
+        test("/oracle/yml/test-lower-table.yml");
 
         assertTable(table);
     }
@@ -422,16 +359,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testLowerColumn() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-lower-column.yml");
+        test("/oracle/yml/test-lower-column.yml");
 
         assertTable(table);
     }
@@ -439,16 +372,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testLowerColumnOptions() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-lower-column-options.yml");
+        test("/oracle/yml/test-lower-column-options.yml");
 
         assertTable(table);
     }
@@ -456,16 +385,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplace() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-replace.yml");
+        test("/oracle/yml/test-replace.yml");
 
         assertGeneratedTable2(table);
     }
@@ -473,16 +398,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceOCIMethod() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-replace-oci-method.yml");
+        test("/oracle/yml/test-replace-oci-method.yml");
 
         assertGeneratedTable2(table);
     }
@@ -490,16 +411,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceEmpty() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-replace-empty.yml");
+        test("/oracle/yml/test-replace-empty.yml");
 
         assertTableEmpty(table);
     }
@@ -507,15 +424,11 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceCreate() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
 
-        run("/oracle/yml/test-replace.yml");
+        test("/oracle/yml/test-replace.yml");
 
         assertGeneratedTable2(table);
     }
@@ -524,16 +437,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceLongName() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST12345678901234567890123456";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-replace-long-name.yml");
+        test("/oracle/yml/test-replace-long-name.yml");
 
         assertGeneratedTable2(table);
     }
@@ -541,13 +450,9 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testReplaceLongNameMultibyte() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "ＴＥＳＴ123456789012345678";
 
-        run("/oracle/yml/test-replace-long-name-multibyte.yml");
+        test("/oracle/yml/test-replace-long-name-multibyte.yml");
 
         assertGeneratedTable2(table);
     }
@@ -555,16 +460,12 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
     @Test
     public void testStringTimestamp() throws Exception
     {
-        if (!canTest) {
-            return;
-        }
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/oracle/yml/test-string-timestamp.yml");
+        test("/oracle/yml/test-string-timestamp.yml");
 
         assertTable(table);
     }
@@ -595,6 +496,10 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
 
     private void assertTable(String table) throws Exception
     {
+        if (!enabled) {
+            return;
+        }
+
         // datetime of UTC will be inserted by embulk.
         // datetime of default timezone will be selected by JDBC.
         TimeZone timeZone = TimeZone.getDefault();
@@ -642,12 +547,20 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
 
     private void assertTableEmpty(String table) throws Exception
     {
+        if (!enabled) {
+            return;
+        }
+
         List<List<Object>> rows = select(table);
         assertEquals(0, rows.size());
     }
 
     private void assertGeneratedTable1(String table) throws Exception
     {
+        if (!enabled) {
+            return;
+        }
+
         // datetime of UTC will be inserted by embulk.
         // datetime of default timezone will be selected by JDBC.
         TimeZone timeZone = TimeZone.getDefault();
@@ -695,6 +608,10 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
 
     private void assertGeneratedTable2(String table) throws Exception
     {
+        if (!enabled) {
+            return;
+        }
+
         // datetime of UTC will be inserted by embulk.
         // datetime of default timezone will be selected by JDBC.
         TimeZone timeZone = TimeZone.getDefault();
@@ -778,9 +695,4 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         return DriverManager.getConnection("jdbc:oracle:thin:@localhost:1521:TESTDB", "TEST_USER", "test_pw");
     }
 
-    private void run(String ymlName) throws Exception
-    {
-        tester.run(convertYml(ymlName));
-    }
-
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 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-oracle-0.6.4.jar
+- classpath/embulk-output-jdbc-0.6.5.jar
+- classpath/embulk-output-oracle-0.6.5.jar
 - lib/embulk/native/x86_64-linux/libembulk-output-oracle-oci.so
 - lib/embulk/native/x86_64-windows/embulk-output-oracle-oci.dll
 - lib/embulk/output/oracle.rb