Refactor integrate test cases 8th.

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/AbstractDBUnitTest.java

@@ -32,7 +32,6 @@ import org.dbunit.dataset.ITable;
 import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
 import org.h2.tools.RunScript;
 import org.junit.Before;
-import org.junit.BeforeClass;
 
 import javax.sql.DataSource;
 import java.io.File;
@@ -67,19 +66,26 @@ public abstract class AbstractDBUnitTest {
         databaseTestSQL = currentDatabaseTestSQL(DB_ENV);
     }
     
-    @BeforeClass
-    public static void createSchema() throws SQLException {
-        Connection conn;
-        for (int i = 0; i < 10; i++) {
-            for (String database : Arrays.asList("db", "dbtbl", "nullable", "master", "slave")) {
-                conn = createDataSource(database + "_" + i).getConnection();
-                RunScript.execute(conn, new InputStreamReader(AbstractDBUnitTest.class.getClassLoader().getResourceAsStream("integrate/schema/table/" + database + ".sql")));
-                conn.close();
+    static {
+        createSchema();
+    }
+    
+    private static void createSchema() {
+        try {
+            Connection conn;
+            for (int i = 0; i < 10; i++) {
+                for (String database : Arrays.asList("db", "dbtbl", "nullable", "master", "slave")) {
+                    conn = createDataSource(database + "_" + i).getConnection();
+                    RunScript.execute(conn, new InputStreamReader(AbstractDBUnitTest.class.getClassLoader().getResourceAsStream("integrate/schema/table/" + database + ".sql")));
+                    conn.close();
+                }
             }
+            conn = createDataSource("tbl").getConnection();
+            RunScript.execute(conn, new InputStreamReader(AbstractDBUnitTest.class.getClassLoader().getResourceAsStream("integrate/schema/table/tbl.sql")));
+            conn.close();
+        } catch (final SQLException ex) {
+            ex.printStackTrace();
         }
-        conn = createDataSource("tbl").getConnection();
-        RunScript.execute(conn, new InputStreamReader(AbstractDBUnitTest.class.getClassLoader().getResourceAsStream("integrate/schema/table/tbl.sql")));
-        conn.close();
     }
     
     @Before

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/tbl/AbstractShardingTablesOnlyDBUnitTest.java

@@ -86,6 +86,8 @@ public abstract class AbstractShardingTablesOnlyDBUnitTest extends AbstractDBUni
     @AfterClass
     public static void clear() {
         isShutdown = true;
-        shardingDataSource.close();
+        if (null != shardingDataSource) {
+            shardingDataSource.close();
+        }
     }
 }

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/AllJDBCTests.java

@@ -17,14 +17,9 @@
 
 package com.dangdang.ddframe.rdb.sharding.jdbc;
 
-import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ConnectionAdapterTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.DataSourceAdapterTest;
+import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.*;
 import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.invocation.JdbcMethodInvocationTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.PreparedStatementAdapterTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ResultSetAdapterTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.ResultSetGetterAdapterTest;
 import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.invocation.SetParameterMethodInvocationTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.StatementAdapterTest;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.connection.ShardingConnectionTest;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.MasterSlaveDataSourceTest;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSourceTest;
@@ -33,13 +28,7 @@ import com.dangdang.ddframe.rdb.sharding.jdbc.core.resultset.GeneratedKeysResult
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.statement.ShardingPreparedStatementTableOnlyTest;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.statement.ShardingPreparedStatementTest;
 import com.dangdang.ddframe.rdb.sharding.jdbc.core.statement.ShardingStatementTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedGeneratedKeysResultSetTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationConnectionTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationDataSourceTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationPreparedStatementTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationResultSetTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedOperationStatementTest;
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.UnsupportedUpdateOperationResultSetTest;
+import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.*;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;