You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/06/06 15:40:45 UTC
[shardingsphere] branch master updated: Merge rewrite-test module
(#10682)
This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4f1f624 Merge rewrite-test module (#10682)
4f1f624 is described below
commit 4f1f6246bf7e4971de22ca68e3b2fa4b10fcb470
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Jun 6 23:39:57 2021 +0800
Merge rewrite-test module (#10682)
* Adjust sequence of pom order for feature import
* Merge rewrite-test module
* Merge rewrite-test module
---
.../shardingsphere-sharding-core/pom.xml | 6 ---
.../shardingsphere-infra-rewrite/pom.xml | 1 -
.../shardingsphere-infra-rewrite-test/pom.xml | 47 ----------------------
.../shardingsphere-rewrite-test/pom.xml | 6 ---
.../AbstractSQLRewriterParameterizedTest.java | 4 +-
.../parameter/SQLRewriteEngineTestParameters.java | 2 +-
.../SQLRewriteEngineTestParametersBuilder.java | 10 ++---
.../entity/RewriteAssertionEntity.java | 2 +-
.../entity/RewriteAssertionsRootEntity.java | 2 +-
.../parameterized/entity/RewriteInputEntity.java | 2 +-
.../parameterized/entity/RewriteOutputEntity.java | 2 +-
.../loader/RewriteAssertionsRootEntityLoader.java | 4 +-
.../EncryptSQLRewriterParameterizedTest.java | 12 +++---
.../MixSQLRewriterParameterizedTest.java | 12 +++---
.../ShardingSQLRewriterParameterizedTest.java | 12 +++---
.../encrypt/case}/alter_for_query_with_plain.xml | 2 +-
.../encrypt/case}/create_for_query_with_plain.xml | 2 +-
.../encrypt/case}/delete_for_query_with_cipher.xml | 2 +-
.../encrypt/case}/delete_for_query_with_plain.xml | 2 +-
.../{encrypt => scenario/encrypt/case}/insert.xml | 2 +-
.../encrypt/case}/select_for_query_with_cipher.xml | 2 +-
.../encrypt/case}/select_for_query_with_plain.xml | 2 +-
.../encrypt/case}/update_for_query_with_cipher.xml | 2 +-
.../encrypt/case}/update_for_query_with_plain.xml | 2 +-
.../encrypt/config}/query-with-cipher.yaml | 0
.../encrypt/config}/query-with-plain.yaml | 0
.../{mix => scenario/mix/case}/create.xml | 2 +-
.../mix/case}/delete_for_query_with_cipher.xml | 2 +-
.../mix/case}/delete_for_query_with_plain.xml | 2 +-
.../{mix => scenario/mix/case}/insert.xml | 2 +-
.../mix/case}/select_for_query_with_cipher.xml | 2 +-
.../mix/case}/select_for_query_with_plain.xml | 2 +-
.../mix/case}/update_for_query_with_cipher.xml | 2 +-
.../mix/case}/update_for_query_with_plain.xml | 2 +-
.../mix/config}/query-with-cipher.yaml | 0
.../mix/config}/query-with-plain.yaml | 0
.../{sharding => scenario/sharding/case}/alter.xml | 2 +-
.../sharding/case}/analyze.xml | 2 +-
.../sharding/case}/create.xml | 2 +-
.../sharding/case}/delete.xml | 2 +-
.../{sharding => scenario/sharding/case}/drop.xml | 2 +-
.../{sharding => scenario/sharding/case}/index.xml | 2 +-
.../sharding/case}/insert.xml | 2 +-
.../sharding/case}/select.xml | 2 +-
.../{sharding => scenario/sharding/case}/show.xml | 2 +-
.../sharding/case}/update.xml | 2 +-
.../sharding/config}/sharding-rule.yaml | 0
47 files changed, 59 insertions(+), 119 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
index 18c6f30..322e00d 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
@@ -61,12 +61,6 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-rewrite-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-sql-parser-sql92</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml b/shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml
index d8611ca..112c9b6 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-rewrite/pom.xml
@@ -31,6 +31,5 @@
<modules>
<module>shardingsphere-infra-rewrite-engine</module>
- <module>shardingsphere-infra-rewrite-test</module>
</modules>
</project>
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/pom.xml b/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/pom.xml
deleted file mode 100644
index d5ed126..0000000
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-rewrite</artifactId>
- <version>5.0.0-RC1-SNAPSHOT</version>
- </parent>
- <artifactId>shardingsphere-infra-rewrite-test</artifactId>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-rewrite-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/pom.xml b/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
index 96b287a..83769ec 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
@@ -44,12 +44,6 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-rewrite-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-sql-parser-sql92</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
similarity index 92%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
index a248349..bccb38c 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.engine;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.engine;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteUnit;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
index c45df44..e679aee 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
similarity index 90%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
index 6787fd1..1142284 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter;
import com.google.common.base.Splitter;
import com.google.common.primitives.Ints;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.rewrite.parameterized.entity.RewriteAssertionEntity;
-import org.apache.shardingsphere.infra.rewrite.parameterized.entity.RewriteAssertionsRootEntity;
-import org.apache.shardingsphere.infra.rewrite.parameterized.entity.RewriteOutputEntity;
-import org.apache.shardingsphere.infra.rewrite.parameterized.loader.RewriteAssertionsRootEntityLoader;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.entity.RewriteAssertionEntity;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.entity.RewriteAssertionsRootEntity;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.entity.RewriteOutputEntity;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.loader.RewriteAssertionsRootEntityLoader;
import java.io.File;
import java.util.ArrayList;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteAssertionEntity.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionEntity.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteAssertionEntity.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionEntity.java
index 1ae2462..dbd420b 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteAssertionEntity.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.entity;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
index 151dd29..892b096 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.entity;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
import lombok.Getter;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteInputEntity.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteInputEntity.java
similarity index 94%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteInputEntity.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteInputEntity.java
index ccdb6f7..9eb9613 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteInputEntity.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteInputEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.entity;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteOutputEntity.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteOutputEntity.java
similarity index 94%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteOutputEntity.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteOutputEntity.java
index 5da2466..ae782e8 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/entity/RewriteOutputEntity.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteOutputEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.entity;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
similarity index 90%
rename from shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
index 1bb800c..f2e93c4 100644
--- a/shardingsphere-infra/shardingsphere-infra-rewrite/shardingsphere-infra-rewrite-test/src/main/java/org/apache/shardingsphere/infra/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rewrite.parameterized.loader;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.loader;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.rewrite.parameterized.entity.RewriteAssertionsRootEntity;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.entity.RewriteAssertionsRootEntity;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
similarity index 92%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
index 81f69c5..0d74bde 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.scenario;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.binder.LogicSQL;
@@ -33,9 +33,9 @@ import org.apache.shardingsphere.infra.rewrite.engine.result.GenericSQLRewriteRe
import org.apache.shardingsphere.infra.rewrite.engine.result.RouteSQLRewriteResult;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteResult;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteUnit;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -58,7 +58,7 @@ import static org.mockito.Mockito.when;
public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewriterParameterizedTest {
- private static final String PATH = "encrypt";
+ private static final String CASE_PATH = "scenario/encrypt/case";
public EncryptSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final SQLRewriteEngineTestParameters testParameters) {
super(testParameters);
@@ -66,7 +66,7 @@ public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewrit
@Parameters(name = "{0}: {1} -> {2}")
public static Collection<Object[]> loadTestParameters() {
- return SQLRewriteEngineTestParametersBuilder.loadTestParameters(PATH.toUpperCase(), PATH, EncryptSQLRewriterParameterizedTest.class);
+ return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, EncryptSQLRewriterParameterizedTest.class);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
similarity index 94%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
index 785bc18..b3ca910 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.scenario;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.binder.LogicSQL;
@@ -36,9 +36,9 @@ import org.apache.shardingsphere.infra.rewrite.engine.result.GenericSQLRewriteRe
import org.apache.shardingsphere.infra.rewrite.engine.result.RouteSQLRewriteResult;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteResult;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteUnit;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -63,7 +63,7 @@ import java.util.Map;
public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterParameterizedTest {
- private static final String PATH = "mix";
+ private static final String CASE_PATH = "scenario/mix/case";
public MixSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final SQLRewriteEngineTestParameters testParameters) {
super(testParameters);
@@ -71,7 +71,7 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa
@Parameters(name = "{0}: {1} -> {2}")
public static Collection<Object[]> loadTestParameters() {
- return SQLRewriteEngineTestParametersBuilder.loadTestParameters(PATH.toUpperCase(), PATH, MixSQLRewriterParameterizedTest.class);
+ return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, MixSQLRewriterParameterizedTest.class);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
similarity index 94%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
index 5f3892c..dedd4b2 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized;
+package org.apache.shardingsphere.sharding.rewrite.parameterized.scenario;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.binder.LogicSQL;
@@ -38,9 +38,9 @@ import org.apache.shardingsphere.infra.rewrite.engine.result.GenericSQLRewriteRe
import org.apache.shardingsphere.infra.rewrite.engine.result.RouteSQLRewriteResult;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteResult;
import org.apache.shardingsphere.infra.rewrite.engine.result.SQLRewriteUnit;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
-import org.apache.shardingsphere.infra.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.AbstractSQLRewriterParameterizedTest;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
+import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParametersBuilder;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -67,7 +67,7 @@ import static org.mockito.Mockito.when;
public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewriterParameterizedTest {
- private static final String PATH = "sharding";
+ private static final String CASE_PATH = "scenario/sharding/case";
public ShardingSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final SQLRewriteEngineTestParameters testParameters) {
super(testParameters);
@@ -75,7 +75,7 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri
@Parameters(name = "{0}: {1} -> {2}")
public static Collection<Object[]> loadTestParameters() {
- return SQLRewriteEngineTestParametersBuilder.loadTestParameters(PATH.toUpperCase(), PATH, ShardingSQLRewriterParameterizedTest.class);
+ return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, ShardingSQLRewriterParameterizedTest.class);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/alter_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/alter_for_query_with_plain.xml
similarity index 97%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/alter_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/alter_for_query_with_plain.xml
index fef1891..6f45f3c 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/alter_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/alter_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-plain.yaml">
<rewrite-assertion id="add_column_for_plain">
<input sql="ALTER TABLE t_account_bak ADD COLUMN id int not null , ADD COLUMN password varchar(255) not null default ''" />
<output sql="ALTER TABLE t_account_bak ADD COLUMN id int not null , ADD COLUMN cipher_password varchar(255) not null default '' , ADD COLUMN assisted_query_password varchar(255) not null default '' , ADD COLUMN plain_password varchar(255) not null default ''" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/create_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/create_for_query_with_plain.xml
similarity index 94%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/create_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/create_for_query_with_plain.xml
index 4e85052..ffd33f5 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/create_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/create_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-plain.yaml">
<rewrite-assertion id="create_table_for_plain">
<input sql="CREATE TABLE t_account_bak (id int not null, name varchar(100) not null default '', password varchar(255) not null default '', primary key (`id`))" />
<output sql="CREATE TABLE t_account_bak (id int not null, name varchar(100) not null default '', cipher_password varchar(255) not null default '', assisted_query_password varchar(255) not null default '', plain_password varchar(255) not null default '', primary key (`id`))" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/delete_for_query_with_cipher.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/delete_for_query_with_cipher.xml
similarity index 96%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/delete_for_query_with_cipher.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/delete_for_query_with_cipher.xml
index 4ba25b8..1e0a599 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/delete_for_query_with_cipher.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/delete_for_query_with_cipher.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-cipher.yaml">
<rewrite-assertion id="delete_for_parameters">
<input sql="DELETE FROM t_account WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
<output sql="DELETE FROM t_account WHERE account_id = ? AND assisted_query_password = ? AND cipher_amount = ? AND status = ?" parameters="1, assisted_query_aaa, encrypt_1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/delete_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/delete_for_query_with_plain.xml
similarity index 95%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/delete_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/delete_for_query_with_plain.xml
index a9df8f8..4375a74 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/delete_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/delete_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-plain.yaml">
<rewrite-assertion id="delete_plain_for_parameters">
<input sql="DELETE FROM t_account_bak WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
<output sql="DELETE FROM t_account_bak WHERE account_id = ? AND plain_password = ? AND plain_amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/insert.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/insert.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/insert.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/insert.xml
index 53dc857..c3b1e29 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/insert.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/insert.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-cipher.yaml">
<rewrite-assertion id="insert_values_with_columns_for_parameters">
<input sql="INSERT INTO t_account(account_id, certificate_number, password, amount, status) VALUES (?, ?, ?, ?, ?), (2, '222X', 'bbb', 2000, 'OK'), (?, ?, ?, ?, ?), (4, '444X', 'ddd', 4000, 'OK')" parameters="1, 111X, aaa, 1000, OK, 3, 333X, ccc, 3000, OK" />
<output sql="INSERT INTO t_account(account_id, cipher_certificate_number, assisted_query_certificate_number, cipher_password, assisted_query_password, cipher_amount, status) VALUES (?, ?, ?, ?, ?, ?, ?), (2, 'encrypt_222X', 'assisted_query_222X', 'encrypt_bbb', 'assisted_query_bbb', 'encrypt_2000', 'OK'), (?, ?, ?, ?, ?, ?, ?), (4, 'encrypt_444X', 'assisted_query_444X', 'encrypt_ddd', 'assisted_query_ddd', 'encrypt_4000', 'OK')" parameters="1, encrypt_111X, assisted_query_111X, e [...]
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/select_for_query_with_cipher.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/select_for_query_with_cipher.xml
similarity index 98%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/select_for_query_with_cipher.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/select_for_query_with_cipher.xml
index 63a8c99..2285796 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/select_for_query_with_cipher.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/select_for_query_with_cipher.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-cipher.yaml">
<rewrite-assertion id="select_for_parameters">
<input sql="SELECT account_id, password, amount AS a, status AS s FROM t_account WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
<output sql="SELECT account_id, cipher_password AS password, cipher_amount AS a, status AS s FROM t_account WHERE account_id = ? AND assisted_query_password = ? AND cipher_amount = ? AND status = ?" parameters="1, assisted_query_aaa, encrypt_1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/select_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/select_for_query_with_plain.xml
similarity index 97%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/select_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/select_for_query_with_plain.xml
index 786333e..2739ccd 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/select_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/select_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-plain.yaml">
<rewrite-assertion id="select_plain_for_parameters">
<input sql="SELECT a.account_id, a.password, a.amount AS a, a.status AS s FROM t_account_bak AS a WHERE a.account_id = ? AND a.password = ? AND a.amount = ? AND a.status = ?" parameters="1, aaa, 1000, OK" />
<output sql="SELECT a.account_id, a.plain_password AS password, a.plain_amount AS a, a.status AS s FROM t_account_bak AS a WHERE a.account_id = ? AND a.plain_password = ? AND a.plain_amount = ? AND a.status = ?" parameters="1, aaa, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/update_for_query_with_cipher.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/update_for_query_with_cipher.xml
similarity index 98%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/update_for_query_with_cipher.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/update_for_query_with_cipher.xml
index 45193e3..30d2906 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/update_for_query_with_cipher.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/update_for_query_with_cipher.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-cipher.yaml">
<rewrite-assertion id="update_for_parameters">
<input sql="UPDATE t_account SET account_id = ?, certificate_number = ?, password = ?, amount = ?, status = ? WHERE account_id = ? AND certificate_number = ? AND password = ? AND amount = ? AND status = ?" parameters="1, 111X, aaa, 1000, OK, 1, 111X, aaa, 1000, OK" />
<output sql="UPDATE t_account SET account_id = ?, cipher_certificate_number = ?, assisted_query_certificate_number = ?, cipher_password = ?, assisted_query_password = ?, cipher_amount = ?, status = ? WHERE account_id = ? AND assisted_query_certificate_number = ? AND assisted_query_password = ? AND cipher_amount = ? AND status = ?" parameters="1, encrypt_111X, assisted_query_111X, encrypt_aaa, assisted_query_aaa, encrypt_1000, OK, 1, assisted_query_111X, assisted_query_aaa, encryp [...]
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/update_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/update_for_query_with_plain.xml
similarity index 96%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/update_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/update_for_query_with_plain.xml
index 8e04dde..d38715d 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/encrypt/update_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/case/update_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/encrypt/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/encrypt/config/query-with-plain.yaml">
<rewrite-assertion id="update_plain_for_parameters">
<input sql="UPDATE t_account_bak SET account_id = ?, password = ?, amount = ?, status = ? WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK, 1, aaa, 1000, OK" />
<output sql="UPDATE t_account_bak SET account_id = ?, cipher_password = ?, assisted_query_password = ?, plain_password = ?, cipher_amount = ?, plain_amount = ?, status = ? WHERE account_id = ? AND plain_password = ? AND plain_amount = ? AND status = ?" parameters="1, encrypt_aaa, assisted_query_aaa, aaa, encrypt_1000, 1000, OK, 1, aaa, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/encrypt/query-with-cipher.yaml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/config/query-with-cipher.yaml
similarity index 100%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/encrypt/query-with-cipher.yaml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/config/query-with-cipher.yaml
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/encrypt/query-with-plain.yaml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/config/query-with-plain.yaml
similarity index 100%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/encrypt/query-with-plain.yaml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/encrypt/config/query-with-plain.yaml
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/create.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/create.xml
similarity index 97%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/create.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/create.xml
index 4d6ec13..37eb1bf 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/create.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/create.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-cipher.yaml">
<rewrite-assertion id="create_table_with_single_cipher_column">
<input sql="CREATE TABLE t_account_detail(account_id INT, password VARCHAR(100));" />
<output sql="CREATE TABLE t_account_detail_0(account_id INT, cipher_password VARCHAR(100), assisted_query_password VARCHAR(100), plain_password VARCHAR(100));" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/delete_for_query_with_cipher.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/delete_for_query_with_cipher.xml
similarity index 97%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/delete_for_query_with_cipher.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/delete_for_query_with_cipher.xml
index b42ed57..c676154 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/delete_for_query_with_cipher.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/delete_for_query_with_cipher.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-cipher.yaml">
<rewrite-assertion id="delete_for_parameters">
<input sql="DELETE FROM t_account WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
<output sql="DELETE FROM t_account_1 WHERE account_id = ? AND assisted_query_password = ? AND cipher_amount = ? AND status = ?" parameters="1, assisted_query_aaa, encrypt_1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/delete_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/delete_for_query_with_plain.xml
similarity index 95%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/delete_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/delete_for_query_with_plain.xml
index 9e33c4a..bcec677 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/delete_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/delete_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-plain.yaml">
<rewrite-assertion id="delete_plain_for_parameters">
<input sql="DELETE FROM t_account_bak WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
<output sql="DELETE FROM t_account_bak_1 WHERE account_id = ? AND plain_password = ? AND plain_amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/insert.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/insert.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/insert.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/insert.xml
index 5802a1d..3c476b6 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/insert.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/insert.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-cipher.yaml">
<rewrite-assertion id="insert_values_with_columns_with_id_for_parameters">
<input sql="INSERT INTO t_account(account_id, password, amount, status) VALUES (?, ?, ?, ?), (2, 'bbb', 2000, 'OK'), (?, ?, ?, ?), (4, 'ddd', 4000, 'OK')" parameters="1, aaa, 1000, OK, 3, ccc, 3000, OK" />
<output sql="INSERT INTO t_account_1(account_id, cipher_password, assisted_query_password, cipher_amount, status) VALUES (?, ?, ?, ?, ?), (?, ?, ?, ?, ?)" parameters="1, encrypt_aaa, assisted_query_aaa, encrypt_1000, OK, 3, encrypt_ccc, assisted_query_ccc, encrypt_3000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/select_for_query_with_cipher.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/select_for_query_with_cipher.xml
similarity index 98%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/select_for_query_with_cipher.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/select_for_query_with_cipher.xml
index 8e30dd9..97dc7fb 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/select_for_query_with_cipher.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/select_for_query_with_cipher.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-cipher.yaml">
<rewrite-assertion id="select_for_parameters">
<input sql="SELECT account_id, password, amount AS a, status AS s FROM t_account WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK" />
<output sql="SELECT account_id, cipher_password AS password, cipher_amount AS a, status AS s FROM t_account_1 WHERE account_id = ? AND assisted_query_password = ? AND cipher_amount = ? AND status = ?" parameters="1, assisted_query_aaa, encrypt_1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/select_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/select_for_query_with_plain.xml
similarity index 98%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/select_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/select_for_query_with_plain.xml
index 2a176a8..d3184d7 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/select_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/select_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-plain.yaml">
<rewrite-assertion id="select_plain_for_parameters">
<input sql="SELECT a.account_id, a.password, a.amount AS a, a.status AS s FROM t_account_bak AS a WHERE a.account_id = ? AND a.password = ? AND a.amount = ? AND a.status = ?" parameters="1, aaa, 1000, OK" />
<output sql="SELECT a.account_id, a.plain_password AS password, a.plain_amount AS a, a.status AS s FROM t_account_bak_1 AS a WHERE a.account_id = ? AND a.plain_password = ? AND a.plain_amount = ? AND a.status = ?" parameters="1, aaa, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/update_for_query_with_cipher.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/update_for_query_with_cipher.xml
similarity index 97%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/update_for_query_with_cipher.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/update_for_query_with_cipher.xml
index 69c6403..6f0a3e0 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/update_for_query_with_cipher.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/update_for_query_with_cipher.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-cipher.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-cipher.yaml">
<rewrite-assertion id="update_for_parameters">
<input sql="UPDATE t_account SET account_id = ?, password = ?, amount = ?, status = ? WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK, 1, aaa, 1000, OK" />
<output sql="UPDATE t_account_1 SET account_id = ?, cipher_password = ?, assisted_query_password = ?, cipher_amount = ?, status = ? WHERE account_id = ? AND assisted_query_password = ? AND cipher_amount = ? AND status = ?" parameters="1, encrypt_aaa, assisted_query_aaa, encrypt_1000, OK, 1, assisted_query_aaa, encrypt_1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/update_for_query_with_plain.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/update_for_query_with_plain.xml
similarity index 96%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/update_for_query_with_plain.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/update_for_query_with_plain.xml
index a9e8e56..ef6ce12 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/mix/update_for_query_with_plain.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/case/update_for_query_with_plain.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/mix/query-with-plain.yaml">
+<rewrite-assertions yaml-rule="scenario/mix/config/query-with-plain.yaml">
<rewrite-assertion id="update_plain_for_parameters">
<input sql="UPDATE t_account_bak SET account_id = ?, password = ?, amount = ?, status = ? WHERE account_id = ? AND password = ? AND amount = ? AND status = ?" parameters="1, aaa, 1000, OK, 1, aaa, 1000, OK" />
<output sql="UPDATE t_account_bak_1 SET account_id = ?, cipher_password = ?, assisted_query_password = ?, plain_password = ?, cipher_amount = ?, plain_amount = ?, status = ? WHERE account_id = ? AND plain_password = ? AND plain_amount = ? AND status = ?" parameters="1, encrypt_aaa, assisted_query_aaa, aaa, encrypt_1000, 1000, OK, 1, aaa, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/mix/query-with-cipher.yaml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/config/query-with-cipher.yaml
similarity index 100%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/mix/query-with-cipher.yaml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/config/query-with-cipher.yaml
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/mix/query-with-plain.yaml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/config/query-with-plain.yaml
similarity index 100%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/mix/query-with-plain.yaml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/mix/config/query-with-plain.yaml
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/alter.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/alter.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/alter.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/alter.xml
index 47bbd78..22eaa47 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/alter.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/alter.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="alter_table_with_single_data_node_binding_table_with_add_foreign_constraint_for_postgresql" db-type="PostgreSQL">
<input sql="ALTER TABLE t_order ADD CONSTRAINT t_order_fk FOREIGN KEY (order_id) REFERENCES t_order_item (order_id)" />
<output sql="ALTER TABLE t_order_0 ADD CONSTRAINT t_order_fk_t_order_0 FOREIGN KEY (order_id) REFERENCES t_order_item_0 (order_id)" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/analyze.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/analyze.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/analyze.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/analyze.xml
index 5e3c272..73dc387 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/analyze.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/analyze.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="analyze_current_database_table_for_postgresql" db-type="PostgreSQL">
<input sql="ANALYZE" />
<output sql="ANALYZE" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/create.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/create.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/create.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/create.xml
index 288f17c..3fb0a80 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/create.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/create.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="create_table_with_single_data_node_binding_table_with_add_foreign_constraint_for_postgresql" db-type="PostgreSQL">
<input sql="CREATE TABLE t_order(order_id INT PRIMARY KEY, CONSTRAINT t_order_fk FOREIGN KEY (order_id) REFERENCES t_order_item (order_id))" />
<output sql="CREATE TABLE t_order_0(order_id INT PRIMARY KEY, CONSTRAINT t_order_fk FOREIGN KEY (order_id) REFERENCES t_order_item_0 (order_id))" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/delete.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/delete.xml
similarity index 96%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/delete.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/delete.xml
index a818a1a..22ee3fd 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/delete.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/delete.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="delete_with_sharding_value_for_parameters">
<input sql="DELETE FROM t_account WHERE account_id = ?" parameters="100" />
<output sql="DELETE FROM t_account_0 WHERE account_id = ?" parameters="100" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/drop.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/drop.xml
similarity index 98%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/drop.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/drop.xml
index cb7a288..abb7e9b 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/drop.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/drop.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="drop_table_with_single_data_node_binding_table_for_postgresql" db-type="PostgreSQL">
<input sql="DROP TABLE IF EXISTS t_order, t_order_item" />
<output sql="DROP TABLE IF EXISTS t_order_0, t_order_item_0" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/index.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/index.xml
similarity index 96%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/index.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/index.xml
index 7fab745..7b35101 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/index.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/index.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="create_index_for_mysql" db-type="MySQL">
<input sql="CREATE INDEX index_name_not_exist ON t_account (status)" />
<output sql="CREATE INDEX index_name_not_exist_t_account_0 ON t_account_0 (status)" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/insert.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/insert.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/insert.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/insert.xml
index 30eaafd..30f3f40 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/insert.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/insert.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="insert_values_with_columns_with_id_for_parameters">
<input sql="INSERT INTO t_account (account_id, amount, status) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE amount = VALUES(amount)" parameters="100, 1000, OK" />
<output sql="INSERT INTO t_account_0 (account_id, amount, status) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE amount = VALUES(amount)" parameters="100, 1000, OK" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/select.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/select.xml
similarity index 99%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/select.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/select.xml
index 4f6c575..c1daf0a 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/select.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/select.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="select_with_sharding_value_for_parameters">
<input sql="SELECT * FROM t_account WHERE account_id = ?" parameters="100" />
<output sql="SELECT * FROM t_account_0 WHERE account_id = ?" parameters="100" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/show.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/show.xml
similarity index 95%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/show.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/show.xml
index 004df53..5f7e860 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/show.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/show.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="show_columns_from_table_without_schema" db-type="MySQL">
<input sql="SHOW COLUMNS FROM t_account" />
<output sql="SHOW COLUMNS FROM t_account_0" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/update.xml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/update.xml
similarity index 97%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/update.xml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/update.xml
index 16a077d..545bf3b 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/sharding/update.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/case/update.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<rewrite-assertions yaml-rule="yaml/sharding/sharding-rule.yaml">
+<rewrite-assertions yaml-rule="scenario/sharding/config/sharding-rule.yaml">
<rewrite-assertion id="update_with_sharding_value_for_parameters">
<input sql="UPDATE t_account SET status = ? WHERE account_id = ?" parameters="'OK', 100" />
<output sql="UPDATE t_account_0 SET status = ? WHERE account_id = ?" parameters="'OK', 100" />
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/sharding/sharding-rule.yaml b/shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/config/sharding-rule.yaml
similarity index 100%
rename from shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/yaml/sharding/sharding-rule.yaml
rename to shardingsphere-test/shardingsphere-rewrite-test/src/test/resources/scenario/sharding/config/sharding-rule.yaml