Minor refactoring.

Author: harawata

src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java

@@ -22,7 +22,6 @@
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.cursor.Cursor;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ExecutorType;
@@ -42,10 +41,9 @@ class PostgresCursorTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    String url = PgContainer.INSTANCE.getJdbcUrl();
     Configuration configuration = new Configuration();
     Environment environment = new Environment("development", new JdbcTransactionFactory(),
-        new UnpooledDataSource(PgContainer.DRIVER, url, PgContainer.USER, PgContainer.PW));
+        PgContainer.getUnpooledDataSource());
     configuration.setEnvironment(environment);
     configuration.addMapper(Mapper.class);
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(configuration);

src/test/java/org/apache/ibatis/submitted/keycolumn/InsertTest.java

@@ -20,7 +20,6 @@
 import java.util.List;
 
 import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.executor.BatchResult;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
@@ -44,10 +43,9 @@ class InsertTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    String url = PgContainer.INSTANCE.getJdbcUrl();
     Configuration configuration = new Configuration();
     Environment environment = new Environment("development", new JdbcTransactionFactory(),
-        new UnpooledDataSource(PgContainer.DRIVER, url, PgContainer.USER, PgContainer.PW));
+        PgContainer.getUnpooledDataSource());
     configuration.setEnvironment(environment);
     configuration.addMapper(InsertMapper.class);
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(configuration);

src/test/java/org/apache/ibatis/submitted/multiple_resultsets/MultipleResultTest.java

@@ -19,7 +19,6 @@
 import java.util.List;
 
 import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
@@ -43,10 +42,9 @@ class MultipleResultTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    String url = PgContainer.INSTANCE.getJdbcUrl();
     Configuration configuration = new Configuration();
     Environment environment = new Environment("development", new JdbcTransactionFactory(),
-        new UnpooledDataSource(PgContainer.DRIVER, url, PgContainer.USER, PgContainer.PW));
+        PgContainer.getUnpooledDataSource());
     configuration.setEnvironment(environment);
     configuration.setMapUnderscoreToCamelCase(true);
     configuration.addMapper(Mapper.class);

src/test/java/org/apache/ibatis/submitted/postgres_genkeys/PostgresGeneratedKeysTest.java

@@ -18,7 +18,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
@@ -37,10 +36,9 @@ class PostgresGeneratedKeysTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    String url = PgContainer.INSTANCE.getJdbcUrl();
     Configuration configuration = new Configuration();
     Environment environment = new Environment("development", new JdbcTransactionFactory(),
-        new UnpooledDataSource(PgContainer.DRIVER, url, PgContainer.USER, PgContainer.PW));
+        PgContainer.getUnpooledDataSource());
     configuration.setEnvironment(environment);
     configuration.setUseGeneratedKeys(true);
     configuration.addMapper(Mapper.class);

src/test/java/org/apache/ibatis/submitted/refcursor/RefCursorTest.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import org.apache.ibatis.BaseDataTest;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ResultContext;
@@ -47,10 +46,9 @@ class RefCursorTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    String url = PgContainer.INSTANCE.getJdbcUrl();
     Configuration configuration = new Configuration();
     Environment environment = new Environment("development", new JdbcTransactionFactory(),
-        new UnpooledDataSource(PgContainer.DRIVER, url, PgContainer.USER, PgContainer.PW));
+        PgContainer.getUnpooledDataSource());
     configuration.setEnvironment(environment);
     configuration.addMapper(OrdersMapper.class);
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(configuration);

src/test/java/org/apache/ibatis/testcontainers/PgContainer.java

@@ -16,24 +16,33 @@
 
 package org.apache.ibatis.testcontainers;
 
+import javax.sql.DataSource;
+
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 public class PgContainer {
 
-  public static String USER = "u";
-  public static String PW = "p";
-  public static String DRIVER = "org.postgresql.Driver";
+  private static final String DB_NAME = "mybatis_test";
+  private static final String USERNAME = "u";
+  private static final String PASSWORD = "p";
+  private static final String DRIVER = "org.postgresql.Driver";
 
-  public static final PostgreSQLContainer<?> INSTANCE = initContainer();
+  private static final PostgreSQLContainer<?> INSTANCE = initContainer();
 
   private static PostgreSQLContainer<?> initContainer() {
     @SuppressWarnings("resource")
-    PostgreSQLContainer<?> container = new PostgreSQLContainer<>().withDatabaseName("mybatis_test").withUsername(USER)
-        .withPassword(PW);
+    PostgreSQLContainer<?> container = new PostgreSQLContainer<>().withDatabaseName(DB_NAME).withUsername(USERNAME)
+        .withPassword(PASSWORD);
     container.start();
     return container;
   }
 
+  public static DataSource getUnpooledDataSource() {
+    return new UnpooledDataSource(PgContainer.DRIVER, INSTANCE.getJdbcUrl(), PgContainer.USERNAME,
+        PgContainer.PASSWORD);
+  }
+
   private PgContainer() {
     super();
   }

src/test/java/org/apache/ibatis/type/SqlxmlTypeHandlerTest.java

@@ -24,7 +24,6 @@
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
@@ -51,10 +50,9 @@ class SqlxmlTypeHandlerTest extends BaseTypeHandlerTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    String url = PgContainer.INSTANCE.getJdbcUrl();
     Configuration configuration = new Configuration();
     Environment environment = new Environment("development", new JdbcTransactionFactory(),
-        new UnpooledDataSource(PgContainer.DRIVER, url, PgContainer.USER, PgContainer.PW));
+        PgContainer.getUnpooledDataSource());
     configuration.setEnvironment(environment);
     configuration.addMapper(Mapper.class);
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(configuration);