src/test/java/org/embulk/input/postgresql/PostgreSQLInputPluginTest.java in embulk-input-postgresql-0.7.4 vs src/test/java/org/embulk/input/postgresql/PostgreSQLInputPluginTest.java in embulk-input-postgresql-0.8.0

@@ -1,116 +1,85 @@
 package org.embulk.input.postgresql;
 
+import static java.util.Locale.ENGLISH;
 import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.Statement;
+import java.sql.SQLException;
 import java.util.Arrays;
-import java.util.List;
 
-import org.embulk.input.EmbulkPluginTester;
+import org.apache.commons.lang3.StringUtils;
+import org.embulk.input.AbstractJdbcInputPluginTest;
 import org.embulk.input.PostgreSQLInputPlugin;
 import org.embulk.spi.InputPlugin;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class PostgreSQLInputPluginTest
+public class PostgreSQLInputPluginTest extends AbstractJdbcInputPluginTest
 {
-    private static final String DATABASE = "test_db";
-    private static final String USER = "test_user";
-    private static final String PASSWORD = "test_pw";
-    private static final String URL = "jdbc:postgresql://localhost:5432/" + DATABASE;
-
-    private static boolean prepared = false;
-    private static EmbulkPluginTester tester = new EmbulkPluginTester(InputPlugin.class, "postgresql", PostgreSQLInputPlugin.class);
-
-    @BeforeClass
-    public static void prepare() throws Exception
+    @Override
+    protected void prepare() throws SQLException
     {
+        tester.addPlugin(InputPlugin.class, "postgresql", PostgreSQLInputPlugin.class);
+
         try {
             // Create User and Database
-            psql(String.format("DROP DATABASE IF EXISTS %s;", DATABASE));
-            psql(String.format("DROP USER IF EXISTS %s;", USER));
-            psql(String.format("CREATE USER %s WITH SUPERUSER PASSWORD '%s';", USER, PASSWORD));
-            psql(String.format("CREATE DATABASE %s WITH OWNER %s;", DATABASE, USER));
+            psql(String.format(ENGLISH, "DROP DATABASE IF EXISTS %s;", getDatabase()));
+            psql(String.format(ENGLISH, "DROP USER IF EXISTS %s;", getUser()));
+            psql(String.format(ENGLISH, "CREATE USER %s WITH SUPERUSER PASSWORD '%s';", getUser(), getPassword()));
+            psql(String.format(ENGLISH, "CREATE DATABASE %s WITH OWNER %s;", getDatabase(), getUser()));
         } catch (IOException e) {
             System.err.println(e);
             System.err.println("Warning: cannot prepare a database for testing embulk-input-postgresql.");
             // 1. install postgresql.
             // 2. add bin directory to path.
-            // 3. set environment variable PGPASSWORD
+            // 3. set environment variable PGPASSWORD or write pgpassword in tests.yml
             return;
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
 
-        prepared = true;
+        enabled = true;
 
         // Insert Data
-        try(Connection connection = DriverManager.getConnection(URL, USER, PASSWORD)) {
-            try (Statement statement = connection.createStatement()) {
-                String sql = "";
-                sql += "DROP TABLE IF EXISTS input_hstore;";
-                sql += "CREATE EXTENSION IF NOT EXISTS hstore WITH SCHEMA public;";
-                sql += "CREATE TABLE input_hstore (c1 hstore);";
-                sql += "INSERT INTO input_hstore (c1) VALUES('\"a\" => \"b\"');";
-                statement.execute(sql);
-            }
-        }
+        String sql = "";
+        sql += "DROP TABLE IF EXISTS input_hstore;";
+        sql += "CREATE EXTENSION IF NOT EXISTS hstore WITH SCHEMA public;";
+        sql += "CREATE TABLE input_hstore (c1 hstore);";
+        sql += "INSERT INTO input_hstore (c1) VALUES('\"a\" => \"b\"');";
+        executeSQL(sql);
     }
 
-    @AfterClass
-    public static void dispose()
-    {
-        tester.destroy();
-    }
-
     @Test
     public void testHstoreAsString() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/yml/input_hstore.yml"));
+        if (enabled) {
+            test("/yml/input_hstore.yml");
             assertEquals(Arrays.asList("c1", "\"\"\"a\"\"=>\"\"b\"\"\""),
                     read("postgresql-input000.00.csv"));
         }
     }
 
     @Test
     public void testHstoreAsJson() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/yml/input_hstore2.yml"));
+        if (enabled) {
+            test("/yml/input_hstore2.yml");
             assertEquals(Arrays.asList("c1", "\"{\"\"a\"\":\"\"b\"\"}\""),
                     read("postgresql-input000.00.csv"));
         }
     }
 
-    private List<String> read(String path) throws IOException
-    {
-        FileSystem fs = FileSystems.getDefault();
-        return Files.readAllLines(fs.getPath(path), Charset.defaultCharset());
-    }
-
-    private String convertPath(String name) throws URISyntaxException
-    {
-        if (getClass().getResource(name) == null) {
-            return name;
-        }
-        return new File(getClass().getResource(name).toURI()).getAbsolutePath();
-    }
-
-    private static void psql(String sql) throws IOException, InterruptedException {
+    private void psql(String sql) throws IOException, InterruptedException {
         ProcessBuilder pb = new ProcessBuilder("psql", "-w", "-c", sql);
+        String pgPassword = (String)getTestConfig("pgpassword", false);
+        if (!StringUtils.isEmpty(pgPassword)) {
+            pb.environment().put("PGPASSWORD", pgPassword);
+        }
         System.out.println("PSQL: " + pb.command().toString());
         final Process process = pb.start();
         final int code = process.waitFor();
         if (code != 0) {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
@@ -120,7 +89,14 @@
                 }
             }
             throw new IOException(String.format(
                     "Command finished with non-zero exit code. Exit code is %d.", code));
         }
+    }
+
+    @Override
+    protected Connection connect() throws SQLException
+    {
+        return DriverManager.getConnection(String.format(ENGLISH, "jdbc:postgresql://%s:%d/%s", getHost(), getPort(), getDatabase()),
+                getUser(), getPassword());
     }
 }