提交 9c43eb6d 编写于 作者: H haocao

Refactor parser test case packages 2th.

上级 3493dd48
......@@ -19,7 +19,7 @@ package com.dangdang.ddframe.rdb.sharding.parsing;
import com.dangdang.ddframe.rdb.sharding.parsing.lexer.AllLexerTests;
import com.dangdang.ddframe.rdb.sharding.parsing.lexer.analyzer.TokenizerTest;
import com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.mysql.AllMySQLStatementTests;
import com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.AllSQLParserTests;
import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.AllStatementParserTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
......@@ -29,7 +29,7 @@ import org.junit.runners.Suite;
TokenizerTest.class,
AllLexerTests.class,
AllStatementParserTests.class,
AllMySQLStatementTests.class,
AllSQLParserTests.class,
SQLParsingEngineTest.class,
UnsupportedParseTest.class
})
......
......@@ -15,17 +15,17 @@
* </p>
*/
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.mysql;
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
MySQLStatementTest.class,
MySQLPreparedStatementForOneParameterTest.class,
MySQLPreparedStatementForTwoParametersTest.class,
StatementParserTest.class,
PreparedStatementParserForOneParameterTest.class,
PreparedStatementParserForTwoParametersTest.class,
OrParseTest.class
})
public class AllMySQLStatementTests {
public class AllSQLParserTests {
}
......@@ -15,7 +15,7 @@
* </p>
*/
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.mysql;
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect;
import com.dangdang.ddframe.rdb.sharding.api.fixture.ShardingRuleMockBuilder;
import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
......@@ -45,7 +45,7 @@ public final class OrParseTest extends AbstractBaseParseSQLTest {
@Parameters(name = "{0}")
public static Collection<Object[]> dataParameters() {
return AbstractBaseParseTest.dataParameters("parser/mysql/or/");
return AbstractBaseParseTest.dataParameters("parser/or/");
}
// TODO 归并字段,整合进mySQL测试
......
......@@ -15,7 +15,7 @@
* </p>
*/
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.mysql;
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect;
import com.dangdang.ddframe.rdb.sharding.api.fixture.ShardingRuleMockBuilder;
import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
......@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Set;
@RunWith(Parameterized.class)
public final class MySQLPreparedStatementForOneParameterTest extends AbstractBaseParseSQLTest {
public final class PreparedStatementParserForOneParameterTest extends AbstractBaseParseSQLTest {
public MySQLPreparedStatementForOneParameterTest(
public PreparedStatementParserForOneParameterTest(
final String testCaseName, final String sql, final Set<DatabaseType> types,
final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {
super(testCaseName, sql, types, expectedTables, expectedConditions, expectedSQLStatement);
......@@ -44,7 +44,7 @@ public final class MySQLPreparedStatementForOneParameterTest extends AbstractBas
@Parameters(name = "{0}")
public static Collection<Object[]> dataParameters() {
return AbstractBaseParseTest.dataParameters("parser/mysql/prepared_statement/one_param/");
return AbstractBaseParseTest.dataParameters("parser/prepared_statement/one_param/");
}
@Test
......
......@@ -15,7 +15,7 @@
* </p>
*/
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.mysql;
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect;
import com.dangdang.ddframe.rdb.sharding.api.fixture.ShardingRuleMockBuilder;
import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
......@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Set;
@RunWith(Parameterized.class)
public final class MySQLPreparedStatementForTwoParametersTest extends AbstractBaseParseSQLTest {
public final class PreparedStatementParserForTwoParametersTest extends AbstractBaseParseSQLTest {
public MySQLPreparedStatementForTwoParametersTest(
public PreparedStatementParserForTwoParametersTest(
final String testCaseName, final String sql, final Set<DatabaseType> types,
final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {
super(testCaseName, sql, types, expectedTables, expectedConditions, expectedSQLStatement);
......@@ -44,7 +44,7 @@ public final class MySQLPreparedStatementForTwoParametersTest extends AbstractBa
@Parameters(name = "{0}")
public static Collection<Object[]> dataParameters() {
return AbstractBaseParseTest.dataParameters("parser/mysql/prepared_statement/two_params/");
return AbstractBaseParseTest.dataParameters("parser/prepared_statement/two_params/");
}
@Test
......
......@@ -15,7 +15,7 @@
* </p>
*/
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect.mysql;
package com.dangdang.ddframe.rdb.sharding.parsing.parser.dialect;
import com.dangdang.ddframe.rdb.sharding.api.fixture.ShardingRuleMockBuilder;
import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
......@@ -34,9 +34,9 @@ import java.util.Collection;
import java.util.Set;
@RunWith(Parameterized.class)
public final class MySQLStatementTest extends AbstractBaseParseSQLTest {
public final class StatementParserTest extends AbstractBaseParseSQLTest {
public MySQLStatementTest(
public StatementParserTest(
final String testCaseName, final String sql, final Set<DatabaseType> types,
final Tables expectedTables, final Conditions expectedConditions, final SQLStatement expectedSQLStatement) {
super(testCaseName, sql, types, expectedTables, expectedConditions, expectedSQLStatement);
......@@ -44,7 +44,7 @@ public final class MySQLStatementTest extends AbstractBaseParseSQLTest {
@Parameters(name = "{0}")
public static Collection<Object[]> dataParameters() {
return AbstractBaseParseTest.dataParameters("parser/mysql/statement/");
return AbstractBaseParseTest.dataParameters("parser/statement/");
}
@Test
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册