Commit e57349db authored by terrymanu's avatar terrymanu
Browse files

for #601: add assertion identify

parent 8732be24

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

+7 −2
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ public abstract class BaseIntegrateTest { 
    

    private final SQLCaseType caseType;

    

    private final int countInSameCase;

    

    private final String sql;

    

    private final String expectedDataFile;
@@ -80,10 +82,11 @@ public abstract class BaseIntegrateTest { 
    private final DataSetEnvironmentManager dataSetEnvironmentManager;

    

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

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

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

        this.databaseTypeEnvironment = databaseTypeEnvironment;

        this.assertion = assertion;

        this.caseType = caseType;

        this.countInSameCase = countInSameCase;

        sql = SQLCasesLoader.getInstance().getSupportedSQL(sqlCaseId);

        expectedDataFile = path.substring(0, path.lastIndexOf(File.separator) + 1) + "asserts/" + getExpectedDataFileType() + "/" + assertion.getExpectedDataFile();

        if (databaseTypeEnvironment.isEnabled()) {
@@ -127,13 +130,15 @@ public abstract class BaseIntegrateTest { 
    

    protected static Collection<Object[]> getParameters(final DatabaseType databaseType, final SQLCaseType caseType, final IntegrateTestCase integrateTestCase) {

        Collection<Object[]> result = new LinkedList<>();

        int countInSameCase = 0;

        for (IntegrateTestCaseAssertion assertion : integrateTestCase.getIntegrateTestCaseAssertions()) {

            Object[] data = new Object[5];

            Object[] data = new Object[6];

            data[0] = integrateTestCase.getSqlCaseId();

            data[1] = integrateTestCase.getPath();

            data[2] = assertion;

            data[3] = new DatabaseTypeEnvironment(databaseType, IntegrateTestEnvironment.getInstance().getDatabaseTypes().contains(databaseType));

            data[4] = caseType;

            data[5] = countInSameCase++;

            result.add(data);

        }

        return result;

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

+3 −3
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ public final class DDLIntegrateTest extends BaseIntegrateTest { 
    private final DDLIntegrateTestCaseAssertion assertion;

    

    public DDLIntegrateTest(final String sqlCaseId, final String path, final DDLIntegrateTestCaseAssertion assertion,

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

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

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

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

        this.assertion = assertion;

    }

    

    @Parameters(name = "{0} -> {2} -> {3} -> {4}")

    @Parameters(name = "{0}.{5} -> {2} -> {3} -> {4}")

    public static Collection<Object[]> getParameters() {

        // TODO sqlCasesLoader size should eq integrateTestCasesLoader size

        // assertThat(sqlCasesLoader.countAllSupportedSQLCases(), is(integrateTestCasesLoader.countAllDataSetTestCases()));

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

+3 −3
Original line number Diff line number Diff line
@@ -70,12 +70,12 @@ public final class DMLIntegrateTest extends BaseIntegrateTest { 
    private final DMLIntegrateTestCaseAssertion assertion;

    

    public DMLIntegrateTest(final String sqlCaseId, final String path, final DMLIntegrateTestCaseAssertion assertion, 

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

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

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

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

        this.assertion = assertion;

    }

    

    @Parameters(name = "{0} -> {2} -> {3} -> {4}")

    @Parameters(name = "{0}.{5} -> {2} -> {3} -> {4}")

    public static Collection<Object[]> getParameters() {

        // TODO sqlCasesLoader size should eq integrateTestCasesLoader size

        // assertThat(sqlCasesLoader.countAllSupportedSQLCases(), is(integrateTestCasesLoader.countAllDataSetTestCases()));

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

+3 −3
Original line number Diff line number Diff line
@@ -65,12 +65,12 @@ public final class DQLIntegrateTest extends BaseIntegrateTest { 
    private final DQLIntegrateTestCaseAssertion assertion;

    

    public DQLIntegrateTest(final String sqlCaseId, final String path, final DQLIntegrateTestCaseAssertion assertion,

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

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

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

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

        this.assertion = assertion;

    }

    

    @Parameters(name = "{0} -> {2} -> {3} -> {4}")

    @Parameters(name = "{0}.{5} -> {2} -> {3} -> {4}")

    public static Collection<Object[]> getParameters() {

        // TODO sqlCasesLoader size should eq integrateTestCasesLoader size

        // assertThat(sqlCasesLoader.countAllSupportedSQLCases(), is(integrateTestCasesLoader.countAllDataSetTestCases()));