Commit 0eeefd7d authored by terrymanu's avatar terrymanu
Browse files

for #601: refactor BaseIntegrateTest

parent 862122f3

sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/BaseIntegrateTest.java

+0 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import io.shardingsphere.dbtest.cases.assertion.root.IntegrateTestCaseAssertion; 
import io.shardingsphere.dbtest.env.DatabaseTypeEnvironment;

import io.shardingsphere.dbtest.env.EnvironmentPath;

import io.shardingsphere.dbtest.env.IntegrateTestEnvironment;

import io.shardingsphere.dbtest.env.dataset.DataSetEnvironmentManager;

import io.shardingsphere.dbtest.env.datasource.DataSourceUtil;

import io.shardingsphere.dbtest.env.schema.SchemaEnvironmentManager;

import io.shardingsphere.test.sql.SQLCaseType;
@@ -77,8 +76,6 @@ public abstract class BaseIntegrateTest { 
    

    private final DataSource dataSource;

    

    private final DataSetEnvironmentManager dataSetEnvironmentManager;

    

    public BaseIntegrateTest(final String sqlCaseId, final String path, final IntegrateTestCaseAssertion assertion, 

                             final DatabaseTypeEnvironment databaseTypeEnvironment, final SQLCaseType caseType, final int countInSameCase) throws IOException, JAXBException, SQLException {

        this.databaseTypeEnvironment = databaseTypeEnvironment;
@@ -90,11 +87,9 @@ public abstract class BaseIntegrateTest { 
        if (databaseTypeEnvironment.isEnabled()) {

            dataSourceMap = createDataSourceMap(assertion);

            dataSource = createDataSource(dataSourceMap);

            dataSetEnvironmentManager = new DataSetEnvironmentManager(EnvironmentPath.getDataInitializeResourceFile(assertion.getShardingRuleType()), dataSourceMap);

        } else {

            dataSourceMap = null;

            dataSource = null;

            dataSetEnvironmentManager = null;

        }

    }

sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/DDLIntegrateTest.java

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import io.shardingsphere.dbtest.cases.dataset.expected.metadata.ExpectedColumn; 
import io.shardingsphere.dbtest.cases.dataset.expected.metadata.ExpectedMetadata;

import io.shardingsphere.dbtest.cases.dataset.expected.metadata.ExpectedMetadataRoot;

import io.shardingsphere.dbtest.env.DatabaseTypeEnvironment;

import io.shardingsphere.dbtest.env.EnvironmentPath;

import io.shardingsphere.dbtest.env.dataset.DataSetEnvironmentManager;

import io.shardingsphere.test.sql.SQLCaseType;

import io.shardingsphere.test.sql.SQLCasesLoader;

import org.junit.Before;
@@ -90,9 +92,9 @@ public final class DDLIntegrateTest extends BaseIntegrateTest { 
    }

    

    @Before

    public void insertData() throws SQLException, ParseException {

    public void insertData() throws SQLException, ParseException, IOException, JAXBException {

        if (getDatabaseTypeEnvironment().isEnabled()) {

            getDataSetEnvironmentManager().initialize();

            new DataSetEnvironmentManager(EnvironmentPath.getDataInitializeResourceFile(assertion.getShardingRuleType()), getDataSourceMap()).initialize();

        }

    }

sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/DMLIntegrateTest.java

+6 −4
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import io.shardingsphere.dbtest.cases.dataset.init.DataSetRow; 
import io.shardingsphere.dbtest.cases.dataset.init.DataSetsRoot;

import io.shardingsphere.dbtest.common.SQLValue;

import io.shardingsphere.dbtest.env.DatabaseTypeEnvironment;

import io.shardingsphere.dbtest.env.EnvironmentPath;

import io.shardingsphere.dbtest.env.dataset.DataSetEnvironmentManager;

import io.shardingsphere.test.sql.SQLCaseType;

import io.shardingsphere.test.sql.SQLCasesLoader;

import org.junit.After;
@@ -98,16 +100,16 @@ public final class DMLIntegrateTest extends BaseIntegrateTest { 
    }

    

    @Before

    public void insertData() throws SQLException, ParseException {

    public void insertData() throws SQLException, ParseException, IOException, JAXBException {

        if (getDatabaseTypeEnvironment().isEnabled()) {

            getDataSetEnvironmentManager().initialize();

            new DataSetEnvironmentManager(EnvironmentPath.getDataInitializeResourceFile(assertion.getShardingRuleType()), getDataSourceMap()).initialize();

        }

    }

    

    @After

    public void clearData() throws SQLException {

    public void clearData() throws SQLException, IOException, JAXBException {

        if (getDatabaseTypeEnvironment().isEnabled()) {

            getDataSetEnvironmentManager().clear();

            new DataSetEnvironmentManager(EnvironmentPath.getDataInitializeResourceFile(assertion.getShardingRuleType()), getDataSourceMap()).clear();

        }

    }