You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/04 03:53:25 UTC
[shardingsphere] branch master updated: Rename packages of rewrite it test (#22635)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 0738468a4a8 Rename packages of rewrite it test (#22635)
0738468a4a8 is described below
commit 0738468a4a87c257ae5cbed4760d8c12fe37bab2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 4 11:53:19 2022 +0800
Rename packages of rewrite it test (#22635)
---
.../it/rewrite/engine/AbstractSQLRewriterIT.java} | 6 +++---
.../engine/parameter/SQLRewriteEngineTestParameters.java | 2 +-
.../parameter/SQLRewriteEngineTestParametersBuilder.java | 10 +++++-----
.../it/rewrite}/entity/RewriteAssertionEntity.java | 2 +-
.../it/rewrite}/entity/RewriteAssertionsRootEntity.java | 2 +-
.../it/rewrite}/entity/RewriteInputEntity.java | 2 +-
.../it/rewrite}/entity/RewriteOutputEntity.java | 2 +-
.../encrypt/RewriteNormalEncryptAlgorithmFixture.java | 2 +-
.../RewriteQueryAssistedEncryptAlgorithmFixture.java | 2 +-
.../encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java | 2 +-
...ewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java | 2 +-
.../keygen/RewriteKeyGenerateAlgorithmFixture.java | 2 +-
.../loader/RewriteAssertionsRootEntityLoader.java | 4 ++--
.../it/rewrite/scenario/EncryptSQLRewriterIT.java} | 16 ++++++++--------
.../it/rewrite/scenario/MixSQLRewriterIT.java} | 16 ++++++++--------
.../it/rewrite/scenario/ShardingSQLRewriterIT.java} | 16 ++++++++--------
...rg.apache.shardingsphere.encrypt.spi.EncryptAlgorithm | 8 ++++----
...ache.shardingsphere.sharding.spi.KeyGenerateAlgorithm | 2 +-
18 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/AbstractSQLRewriterIT.java
similarity index 97%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/AbstractSQLRewriterIT.java
index 1263f890b71..da97dd6b31e 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/AbstractSQLRewriterIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.engine;
+package org.apache.shardingsphere.test.it.rewrite.engine;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -56,7 +56,7 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigur
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
-import org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter.SQLRewriteEngineTestParameters;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParameters;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration;
import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule;
@@ -82,7 +82,7 @@ import static org.mockito.Mockito.when;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
@Getter
-public abstract class AbstractSQLRewriterParameterizedTest {
+public abstract class AbstractSQLRewriterIT {
private final SQLRewriteEngineTestParameters testParameters;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/parameter/SQLRewriteEngineTestParameters.java
similarity index 95%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/parameter/SQLRewriteEngineTestParameters.java
index 695530e8bef..3769ca741a2 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParameters.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/parameter/SQLRewriteEngineTestParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter;
+package org.apache.shardingsphere.test.it.rewrite.engine.parameter;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
similarity index 92%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
index 2cf64d65424..1a560bf479d 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.engine.parameter;
+package org.apache.shardingsphere.test.it.rewrite.engine.parameter;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -23,10 +23,10 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
-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 org.apache.shardingsphere.test.it.rewrite.entity.RewriteAssertionEntity;
+import org.apache.shardingsphere.test.it.rewrite.entity.RewriteAssertionsRootEntity;
+import org.apache.shardingsphere.test.it.rewrite.entity.RewriteOutputEntity;
+import org.apache.shardingsphere.test.it.rewrite.loader.RewriteAssertionsRootEntityLoader;
import java.io.File;
import java.util.ArrayList;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionEntity.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteAssertionEntity.java
similarity index 95%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionEntity.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteAssertionEntity.java
index 849392a6ce5..480c7885fe1 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionEntity.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteAssertionEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
+package org.apache.shardingsphere.test.it.rewrite.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteAssertionsRootEntity.java
similarity index 95%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteAssertionsRootEntity.java
index 892b096aedb..27ff0d218bb 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteAssertionsRootEntity.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteAssertionsRootEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
+package org.apache.shardingsphere.test.it.rewrite.entity;
import lombok.Getter;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteInputEntity.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteInputEntity.java
similarity index 94%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteInputEntity.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteInputEntity.java
index 9eb9613aec8..7409af9eb32 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteInputEntity.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteInputEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
+package org.apache.shardingsphere.test.it.rewrite.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteOutputEntity.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteOutputEntity.java
similarity index 94%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteOutputEntity.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteOutputEntity.java
index ae782e82c59..41b27c62a4a 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/entity/RewriteOutputEntity.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/entity/RewriteOutputEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.entity;
+package org.apache.shardingsphere.test.it.rewrite.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
similarity index 96%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
index dfddc626f61..aefca7d25c2 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.fixture.encrypt;
+package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
similarity index 96%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
index 4135d4b44c4..d2c523ef763 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.fixture.encrypt;
+package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
similarity index 95%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
index b37517b9653..615651f5744 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.fixture.encrypt;
+package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
similarity index 97%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
index 7327dfbf483..8749b784e37 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.fixture.encrypt;
+package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
similarity index 95%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
index 239185305ec..c7f482221c4 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.fixture.keygen;
+package org.apache.shardingsphere.test.it.rewrite.fixture.keygen;
import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/loader/RewriteAssertionsRootEntityLoader.java
similarity index 90%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/loader/RewriteAssertionsRootEntityLoader.java
index f2e93c47ed7..0b604547d08 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/loader/RewriteAssertionsRootEntityLoader.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/loader/RewriteAssertionsRootEntityLoader.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.loader;
+package org.apache.shardingsphere.test.it.rewrite.loader;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.sharding.rewrite.parameterized.entity.RewriteAssertionsRootEntity;
+import org.apache.shardingsphere.test.it.rewrite.entity.RewriteAssertionsRootEntity;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/EncryptSQLRewriterIT.java
similarity index 87%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/EncryptSQLRewriterIT.java
index 2f10f30e619..123d9c928f4 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/EncryptSQLRewriterIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.scenario;
+package org.apache.shardingsphere.test.it.rewrite.scenario;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
@@ -23,9 +23,9 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
-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.test.it.rewrite.engine.AbstractSQLRewriterIT;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParametersBuilder;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParameters;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
@@ -52,22 +52,22 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewriterParameterizedTest {
+public final class EncryptSQLRewriterIT extends AbstractSQLRewriterIT {
private static final String CASE_PATH = "scenario/encrypt/case";
- public EncryptSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
+ public EncryptSQLRewriterIT(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
super(testParams);
}
@Parameters(name = "{0}: {1} ({3}) -> {2}")
public static Collection<Object[]> loadTestParameters() {
- return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, EncryptSQLRewriterParameterizedTest.class);
+ return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, EncryptSQLRewriterIT.class);
}
@Override
protected YamlRootConfiguration createRootConfiguration() throws IOException {
- URL url = EncryptSQLRewriterParameterizedTest.class.getClassLoader().getResource(getTestParameters().getRuleFile());
+ URL url = EncryptSQLRewriterIT.class.getClassLoader().getResource(getTestParameters().getRuleFile());
Preconditions.checkNotNull(url, "Can not find rewrite rule yaml configuration");
return YamlEngine.unmarshal(new File(url.getFile()), YamlRootConfiguration.class);
}
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/MixSQLRewriterIT.java
similarity index 84%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/MixSQLRewriterIT.java
index e0b113f1420..7358631ab72 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/MixSQLRewriterIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.scenario;
+package org.apache.shardingsphere.test.it.rewrite.scenario;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereColumn;
@@ -25,9 +25,9 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
-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.test.it.rewrite.engine.AbstractSQLRewriterIT;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParametersBuilder;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParameters;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.junit.runners.Parameterized.Parameters;
@@ -45,22 +45,22 @@ import java.util.Map;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterParameterizedTest {
+public final class MixSQLRewriterIT extends AbstractSQLRewriterIT {
private static final String CASE_PATH = "scenario/mix/case";
- public MixSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
+ public MixSQLRewriterIT(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
super(testParams);
}
@Parameters(name = "{0}: {1} ({3}) -> {2}")
public static Collection<Object[]> loadTestParameters() {
- return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, MixSQLRewriterParameterizedTest.class);
+ return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, MixSQLRewriterIT.class);
}
@Override
protected YamlRootConfiguration createRootConfiguration() throws IOException {
- URL url = MixSQLRewriterParameterizedTest.class.getClassLoader().getResource(getTestParameters().getRuleFile());
+ URL url = MixSQLRewriterIT.class.getClassLoader().getResource(getTestParameters().getRuleFile());
Preconditions.checkNotNull(url, "Can not find rewrite rule yaml configurations");
return YamlEngine.unmarshal(new File(url.getFile()), YamlRootConfiguration.class);
}
diff --git a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/ShardingSQLRewriterIT.java
similarity index 86%
rename from test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
rename to test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/ShardingSQLRewriterIT.java
index 98f62989a8c..f35f10fc0a0 100644
--- a/test/it/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
+++ b/test/it/rewrite/src/test/java/org/apache/shardingsphere/test/it/rewrite/scenario/ShardingSQLRewriterIT.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameterized.scenario;
+package org.apache.shardingsphere.test.it.rewrite.scenario;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereColumn;
@@ -25,9 +25,9 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
-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.test.it.rewrite.engine.AbstractSQLRewriterIT;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParametersBuilder;
+import org.apache.shardingsphere.test.it.rewrite.engine.parameter.SQLRewriteEngineTestParameters;
import org.apache.shardingsphere.singletable.rule.SingleTableRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
@@ -49,22 +49,22 @@ import java.util.Optional;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewriterParameterizedTest {
+public final class ShardingSQLRewriterIT extends AbstractSQLRewriterIT {
private static final String CASE_PATH = "scenario/sharding/case";
- public ShardingSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
+ public ShardingSQLRewriterIT(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
super(testParams);
}
@Parameters(name = "{0}: {1} ({3}) -> {2}")
public static Collection<Object[]> loadTestParameters() {
- return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, ShardingSQLRewriterParameterizedTest.class);
+ return SQLRewriteEngineTestParametersBuilder.loadTestParameters(CASE_PATH.toUpperCase(), CASE_PATH, ShardingSQLRewriterIT.class);
}
@Override
protected YamlRootConfiguration createRootConfiguration() throws IOException {
- URL url = ShardingSQLRewriterParameterizedTest.class.getClassLoader().getResource(getTestParameters().getRuleFile());
+ URL url = ShardingSQLRewriterIT.class.getClassLoader().getResource(getTestParameters().getRuleFile());
Preconditions.checkNotNull(url, "Can not find rewrite rule yaml configuration");
return YamlEngine.unmarshal(new File(url.getFile()), YamlRootConfiguration.class);
}
diff --git a/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm b/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
index 11c58f9ea74..cef9c655b3b 100644
--- a/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
+++ b/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.shardingsphere.sharding.rewrite.fixture.encrypt.RewriteNormalEncryptAlgorithmFixture
-org.apache.shardingsphere.sharding.rewrite.fixture.encrypt.RewriteSchemaMetaDataAwareEncryptAlgorithmFixture
-org.apache.shardingsphere.sharding.rewrite.fixture.encrypt.RewriteQueryAssistedEncryptAlgorithmFixture
-org.apache.shardingsphere.sharding.rewrite.fixture.encrypt.RewriteQueryLikeEncryptAlgorithmFixture
+org.apache.shardingsphere.test.it.rewrite.fixture.encrypt.RewriteNormalEncryptAlgorithmFixture
+org.apache.shardingsphere.test.it.rewrite.fixture.encrypt.RewriteSchemaMetaDataAwareEncryptAlgorithmFixture
+org.apache.shardingsphere.test.it.rewrite.fixture.encrypt.RewriteQueryAssistedEncryptAlgorithmFixture
+org.apache.shardingsphere.test.it.rewrite.fixture.encrypt.RewriteQueryLikeEncryptAlgorithmFixture
diff --git a/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm b/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
index 5513a282d1d..3190ee2cad1 100644
--- a/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
+++ b/test/it/rewrite/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.sharding.rewrite.fixture.keygen.RewriteKeyGenerateAlgorithmFixture
+org.apache.shardingsphere.test.it.rewrite.fixture.keygen.RewriteKeyGenerateAlgorithmFixture