diff --git a/sharding-sql-test/src/main/java/org/apache/shardingsphere/test/sql/loader/visitor/VisitorSQLCasesRegistry.java b/sharding-sql-test/src/main/java/org/apache/shardingsphere/test/sql/loader/visitor/VisitorSQLCasesRegistry.java
deleted file mode 100644
index 2ea36a04652c6..0000000000000
--- a/sharding-sql-test/src/main/java/org/apache/shardingsphere/test/sql/loader/visitor/VisitorSQLCasesRegistry.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.sql.loader.visitor;
-
-import lombok.Getter;
-import org.apache.shardingsphere.test.sql.loader.SQLCasesLoader;
-
-/**
- * SQL cases registry for visitor.
- *
- * @author panjuan
- */
-public final class VisitorSQLCasesRegistry {
-
- private static final VisitorSQLCasesRegistry INSTANCE = new VisitorSQLCasesRegistry();
-
- @Getter
- private SQLCasesLoader sqlCasesLoader;
-
- private VisitorSQLCasesRegistry() {
- sqlCasesLoader = new SQLCasesLoader("sql/visitor");
- }
-
- /**
- * Get singleton instance.
- *
- * @return singleton instance
- */
- public static VisitorSQLCasesRegistry getInstance() {
- return INSTANCE;
- }
-}
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dal/show.xml b/sharding-sql-test/src/main/resources/sql/visitor/dal/show.xml
deleted file mode 100644
index 53714df413a6d..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dal/show.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/alter_user.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/alter_user.xml
deleted file mode 100644
index 1c463b73481f2..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/alter_user.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/create_role.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/create_role.xml
deleted file mode 100644
index ced135615368d..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/create_role.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/create_user.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/create_user.xml
deleted file mode 100644
index aa42435d10dc3..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/create_user.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/drop-role.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/drop-role.xml
deleted file mode 100644
index 1bb937f95883e..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/drop-role.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/drop_user.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/drop_user.xml
deleted file mode 100644
index cd9772a43a4a9..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/drop_user.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/rename_user.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/rename_user.xml
deleted file mode 100644
index c1210097d322d..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/rename_user.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/set-role.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/set-role.xml
deleted file mode 100644
index 9c9448cb6106a..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/set-role.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dcl/set_password.xml b/sharding-sql-test/src/main/resources/sql/visitor/dcl/set_password.xml
deleted file mode 100644
index d73d0ec7ea070..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dcl/set_password.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/ddl/alter.xml b/sharding-sql-test/src/main/resources/sql/visitor/ddl/alter.xml
deleted file mode 100644
index e93b0b4117e4d..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/ddl/alter.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/ddl/create.xml b/sharding-sql-test/src/main/resources/sql/visitor/ddl/create.xml
deleted file mode 100644
index e10d4f25f946c..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/ddl/create.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/ddl/drop.xml b/sharding-sql-test/src/main/resources/sql/visitor/ddl/drop.xml
deleted file mode 100644
index 90301ccf9b9bb..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/ddl/drop.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/ddl/truncate.xml b/sharding-sql-test/src/main/resources/sql/visitor/ddl/truncate.xml
deleted file mode 100644
index c379112ce2d57..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/ddl/truncate.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dml/delete.xml b/sharding-sql-test/src/main/resources/sql/visitor/dml/delete.xml
deleted file mode 100644
index 7ed7754cf0e6e..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dml/delete.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dml/insert.xml b/sharding-sql-test/src/main/resources/sql/visitor/dml/insert.xml
deleted file mode 100644
index 690dc2f62f076..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dml/insert.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dml/update.xml b/sharding-sql-test/src/main/resources/sql/visitor/dml/update.xml
deleted file mode 100644
index a7fbf1c769f6a..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dml/update.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/dql/select.xml b/sharding-sql-test/src/main/resources/sql/visitor/dql/select.xml
deleted file mode 100644
index 8f683abcb7ea0..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/dql/select.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/sharding-sql-test/src/main/resources/sql/visitor/tcl/tcl.xml b/sharding-sql-test/src/main/resources/sql/visitor/tcl/tcl.xml
deleted file mode 100644
index a7c151d28f9cf..0000000000000
--- a/sharding-sql-test/src/main/resources/sql/visitor/tcl/tcl.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/engine/VisitorParameterizedParsingTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/engine/VisitorParameterizedParsingTest.java
index 6e8c0bd6a9a15..ce0b4255709ad 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/engine/VisitorParameterizedParsingTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/engine/VisitorParameterizedParsingTest.java
@@ -32,7 +32,7 @@
import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
import org.apache.shardingsphere.test.sql.SQLCaseType;
import org.apache.shardingsphere.test.sql.loader.SQLCasesLoader;
-import org.apache.shardingsphere.test.sql.loader.visitor.VisitorSQLCasesRegistry;
+import org.apache.shardingsphere.test.sql.loader.SQLCasesRegistry;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,15 +44,12 @@
import java.util.Collection;
import java.util.Properties;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
@RunWith(Parameterized.class)
@RequiredArgsConstructor
@Slf4j
public final class VisitorParameterizedParsingTest {
- private static final SQLCasesLoader SQL_CASES_LOADER = VisitorSQLCasesRegistry.getInstance().getSqlCasesLoader();
+ private static final SQLCasesLoader SQL_CASES_LOADER = SQLCasesRegistry.getInstance().getSqlCasesLoader();
private static final SQLParserTestCasesRegistry SQL_PARSER_TEST_CASES_REGISTRY = VisitorSQLParserTestCasesRegistryFactory.getInstance().getRegistry();
@@ -79,13 +76,24 @@ public void setUp() {
@Parameters(name = "{0} ({2}) -> {1}")
public static Collection