Commit 04f0f2ce authored by haocao's avatar haocao
Browse files

Refactor integrate test cases 8th.

parent 7af99396

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

+18 −12
Original line number Diff line number Diff line
@@ -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,8 +66,12 @@ public abstract class AbstractDBUnitTest { 
        databaseTestSQL = currentDatabaseTestSQL(DB_ENV);

    }

    

    @BeforeClass

    public static void createSchema() throws SQLException {

    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")) {
@@ -80,6 +83,9 @@ public abstract class AbstractDBUnitTest { 
            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();

        }

    }

    

    @Before

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

+3 −1
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ public abstract class AbstractShardingTablesOnlyDBUnitTest extends AbstractDBUni 
    @AfterClass

    public static void clear() {

        isShutdown = true;

        if (null != shardingDataSource) {

            shardingDataSource.close();

        }

    }

}

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

+2 −13
Original line number Diff line number Diff line
@@ -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;