Commit 0079cc2d authored by haocao's avatar haocao
Browse files

Removed expected sql assert from parsing dialect statement test case.

parent e1407725

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/AbstractBaseParseTest.java

+8 −12
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ public abstract class AbstractBaseParseTest { 
    @Getter(AccessLevel.PROTECTED)

    private final String sql;

    

    private final String expectedSQL;

    

    private final Tables expectedTables;

    

    private final Conditions expectedConditions;
@@ -73,10 +71,9 @@ public abstract class AbstractBaseParseTest { 
    

    private final Limit limit;

    

    protected AbstractBaseParseTest(final String testCaseName, final String sql, final String expectedSQL,

                                    final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

    protected AbstractBaseParseTest(final String testCaseName, final String sql, final Tables expectedTables, 

                                    final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        this.sql = sql;

        this.expectedSQL = expectedSQL;

        this.expectedTables = expectedTables;

        this.expectedConditions = expectedConditions;

        this.orderByColumns = expectedSQLStatement.getOrderByList().iterator();
@@ -111,20 +108,19 @@ public abstract class AbstractBaseParseTest { 
    }

    

    private static Object[] getDataParameter(final Assert assertObj) {

        final Object[] result = new Object[6];

        final Object[] result = new Object[5];

        result[0] = assertObj.getId();

        result[1] = assertObj.getSql();

        result[2] = assertObj.getExpectedSQL();

        result[3] = new Tables();

        result[2] = new Tables();

        if (null != assertObj.getTables()) {

            Tables tables = new Tables();

            for (com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.Table each : assertObj.getTables().getTables()) {

                Table table = new Table(each.getName(), Optional.fromNullable(each.getAlias())); 

                tables.add(table);

            }

            result[3] = tables;

            result[2] = tables;

        }

        result[4] = new Conditions();

        result[3] = new Conditions();

        if (null != assertObj.getConditions()) {

            Conditions conditions = new Conditions();

            for (com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.Condition each : assertObj.getConditions().getConditions()) {
@@ -157,7 +153,7 @@ public abstract class AbstractBaseParseTest { 
                }

                conditions.add(condition);

            }

            result[4] = conditions;

            result[3] = conditions;

        }

        final SelectStatement selectStatement = new SelectStatement();

        if (null != assertObj.getOrderByColumns()) {
@@ -209,7 +205,7 @@ public abstract class AbstractBaseParseTest { 
                selectStatement.setLimit(new Limit(assertObj.getLimit().getRowCount(), assertObj.getLimit().getRowCountParameterIndex()));

            }

        }

        result[5] = selectStatement;

        result[4] = selectStatement;

        return result;

    }

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLPreparedStatementForOneParameterTest.java

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import java.util.Collection; 
@RunWith(Parameterized.class)

public final class MySQLPreparedStatementForOneParameterTest extends AbstractBaseParseTest {

    

    public MySQLPreparedStatementForOneParameterTest(final String testCaseName, final String sql, final String expectedSQL, final Tables expectedTables,

    public MySQLPreparedStatementForOneParameterTest(final String testCaseName, final String sql, final Tables expectedTables,

                                                     final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedSQL, expectedTables, expectedConditions, expectedSQLStatement);

        super(testCaseName, sql, expectedTables, expectedConditions, expectedSQLStatement);

    }

    

    @Parameters(name = "{0}")

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLPreparedStatementForTwoParametersTest.java

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import java.util.Collection; 
public final class MySQLPreparedStatementForTwoParametersTest extends AbstractBaseParseTest {

    

    public MySQLPreparedStatementForTwoParametersTest(

            final String testCaseName, final String sql, final String expectedSQL,

            final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedSQL, expectedTables, expectedConditions, expectedSQLStatement);

            final String testCaseName, final String sql, final Tables expectedTables, 

            final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedTables, expectedConditions, expectedSQLStatement);

    }

    

    @Parameters(name = "{0}")

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLStatementTest.java

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import java.util.Collection; 
public final class MySQLStatementTest extends AbstractBaseParseTest {

    

    public MySQLStatementTest(

            final String testCaseName, final String sql, final String expectedSQL,

            final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedSQL, expectedTables, expectedConditions, expectedSQLStatement);

            final String testCaseName, final String sql, final Tables expectedTables, 

            final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedTables, expectedConditions, expectedSQLStatement);

    }

    

    @Parameters(name = "{0}")

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/OrParseTest.java

+3 −3
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ import java.util.Collection; 
public final class OrParseTest extends AbstractBaseParseTest {

    

    public OrParseTest(

            final String testCaseName, final String sql, final String expectedSQL,

            final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedSQL, expectedTables, expectedConditions, expectedSQLStatement);

            final String testCaseName, final String sql, final Tables expectedTables, 

            final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {

        super(testCaseName, sql, expectedTables, expectedConditions, expectedSQLStatement);

    }

    

    @Parameters(name = "{0}")