Commit 4b533d64 authored by terrymanu's avatar terrymanu
Browse files

for #601, move AuthorityEnvironmentManager to BaseDCLIntegrateTest

parent f556b332

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

+0 −6
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ import io.shardingsphere.dbtest.cases.assertion.IntegrateTestCasesLoader; 
import io.shardingsphere.dbtest.cases.assertion.root.IntegrateTestCaseAssertion;

import io.shardingsphere.dbtest.cases.assertion.root.SQLValue;

import io.shardingsphere.dbtest.env.DatabaseTypeEnvironment;

import io.shardingsphere.dbtest.env.EnvironmentPath;

import io.shardingsphere.dbtest.env.IntegrateTestEnvironment;

import io.shardingsphere.dbtest.env.authority.AuthorityEnvironmentManager;

import io.shardingsphere.test.sql.SQLCaseType;

import io.shardingsphere.test.sql.SQLCasesLoader;

import lombok.AccessLevel;
@@ -51,8 +49,6 @@ public abstract class SingleIntegrateTest extends BaseIntegrateTest { 
    

    private final String expectedDataFile;

    

    private final AuthorityEnvironmentManager authorityEnvironmentManager;

    

    public SingleIntegrateTest(final String sqlCaseId, final String path, final IntegrateTestCaseAssertion assertion, final String shardingRuleType,

                               final DatabaseTypeEnvironment databaseTypeEnvironment, final SQLCaseType caseType) 

            throws IOException, JAXBException, SQLException, ParseException {
@@ -61,8 +57,6 @@ public abstract class SingleIntegrateTest extends BaseIntegrateTest { 
        this.caseType = caseType;

        sql = getSQL(sqlCaseId);

        expectedDataFile = getExpectedDataFile(path, shardingRuleType, databaseTypeEnvironment.getDatabaseType(), assertion.getExpectedDataFile());

        authorityEnvironmentManager = new AuthorityEnvironmentManager(EnvironmentPath.getAuthorityResourcesPath(shardingRuleType), getDataSource(),

                getDatabaseTypeEnvironment().getDatabaseType());

    }

    

    private String getSQL(final String sqlCaseId) throws ParseException {

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

+6 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import io.shardingsphere.dbtest.cases.assertion.dcl.DCLIntegrateTestCaseAssertio 
import io.shardingsphere.dbtest.engine.SingleIntegrateTest;

import io.shardingsphere.dbtest.env.DatabaseTypeEnvironment;

import io.shardingsphere.dbtest.env.EnvironmentPath;

import io.shardingsphere.dbtest.env.authority.AuthorityEnvironmentManager;

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

import io.shardingsphere.test.sql.SQLCaseType;

import org.junit.After;
@@ -33,23 +34,26 @@ import java.text.ParseException; 


public abstract class BaseDCLIntegrateTest extends SingleIntegrateTest {

    

    private final AuthorityEnvironmentManager authorityEnvironmentManager;

    

    public BaseDCLIntegrateTest(final String sqlCaseId, final String path, final DCLIntegrateTestCaseAssertion assertion, final String shardingRuleType,

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

        super(sqlCaseId, path, assertion, shardingRuleType, databaseTypeEnvironment, caseType);

        authorityEnvironmentManager = new AuthorityEnvironmentManager(EnvironmentPath.getAuthorityResourcesPath(shardingRuleType), getDataSource(), getDatabaseTypeEnvironment().getDatabaseType());

    }

    

    @Before

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

        if (getDatabaseTypeEnvironment().isEnabled()) {

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

            getAuthorityEnvironmentManager().initialize();

            authorityEnvironmentManager.initialize();

        }

    }

    

    @After

    public void cleanData() throws SQLException {

        if (getDatabaseTypeEnvironment().isEnabled()) {

            getAuthorityEnvironmentManager().clean();

            authorityEnvironmentManager.clean();

        }

    }

}