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/05 16:14:45 UTC
[shardingsphere] branch master updated: Refactor driver's class names (#22681)
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 694bfcfc697 Refactor driver's class names (#22681)
694bfcfc697 is described below
commit 694bfcfc697ac71f054395ea3c0c02b600b6b104
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Dec 6 00:14:38 2022 +0800
Refactor driver's class names (#22681)
---
...ctYamlDataSourceTest.java => AbstractYamlDataSourceE2EIT.java} | 4 ++--
...rateTest.java => YamlShardingWithReadwriteSplittingE2EIT.java} | 6 +++---
...littingIntegrateTest.java => YamlReadwriteSplittingE2EIT.java} | 8 ++++----
.../{YamlShardingIntegrateTest.java => YamlShardingE2EIT.java} | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractYamlDataSourceTest.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractYamlDataSourceE2EIT.java
similarity index 95%
rename from test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractYamlDataSourceTest.java
rename to test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractYamlDataSourceE2EIT.java
index de3334cc814..873c9cceba7 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractYamlDataSourceTest.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/AbstractYamlDataSourceE2EIT.java
@@ -30,13 +30,13 @@ import java.util.List;
import java.util.Objects;
// TODO move to new acceptance test module with mode
-public abstract class AbstractYamlDataSourceTest {
+public abstract class AbstractYamlDataSourceE2EIT {
@BeforeClass
public static void createSchema() throws SQLException {
for (String each : getSchemaFiles()) {
RunScript.execute(
- createDataSource(getFileName(each)).getConnection(), new InputStreamReader(Objects.requireNonNull(AbstractYamlDataSourceTest.class.getClassLoader().getResourceAsStream(each))));
+ createDataSource(getFileName(each)).getConnection(), new InputStreamReader(Objects.requireNonNull(AbstractYamlDataSourceE2EIT.class.getClassLoader().getResourceAsStream(each))));
}
}
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/mix/YamlShardingWithReadwriteSplittingIntegrateTest.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/mix/YamlShardingWithReadwriteSplittingE2EIT.java
similarity index 94%
rename from test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/mix/YamlShardingWithReadwriteSplittingIntegrateTest.java
rename to test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/mix/YamlShardingWithReadwriteSplittingE2EIT.java
index bd78bbec4ac..2085e5f9a22 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/mix/YamlShardingWithReadwriteSplittingIntegrateTest.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/mix/YamlShardingWithReadwriteSplittingE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.driver.mix;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.driver.AbstractYamlDataSourceTest;
+import org.apache.shardingsphere.test.e2e.driver.AbstractYamlDataSourceE2EIT;
import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.junit.Test;
@@ -38,7 +38,7 @@ import java.util.Objects;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class YamlShardingWithReadwriteSplittingIntegrateTest extends AbstractYamlDataSourceTest {
+public final class YamlShardingWithReadwriteSplittingE2EIT extends AbstractYamlDataSourceE2EIT {
private final String filePath;
@@ -56,7 +56,7 @@ public final class YamlShardingWithReadwriteSplittingIntegrateTest extends Abstr
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new File(Objects.requireNonNull(YamlShardingWithReadwriteSplittingIntegrateTest.class.getResource(filePath)).toURI());
+ File yamlFile = new File(Objects.requireNonNull(YamlShardingWithReadwriteSplittingE2EIT.class.getResource(filePath)).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource = YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/readwrite/YamlReadwriteSplittingIntegrateTest.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/readwrite/YamlReadwriteSplittingE2EIT.java
similarity index 95%
rename from test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/readwrite/YamlReadwriteSplittingIntegrateTest.java
rename to test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/readwrite/YamlReadwriteSplittingE2EIT.java
index 82766d7369b..3c568ba5fcf 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/readwrite/YamlReadwriteSplittingIntegrateTest.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/readwrite/YamlReadwriteSplittingE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.driver.readwrite;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.driver.AbstractYamlDataSourceTest;
+import org.apache.shardingsphere.test.e2e.driver.AbstractYamlDataSourceE2EIT;
import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.junit.Test;
@@ -38,7 +38,7 @@ import java.util.Objects;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class YamlReadwriteSplittingIntegrateTest extends AbstractYamlDataSourceTest {
+public final class YamlReadwriteSplittingE2EIT extends AbstractYamlDataSourceE2EIT {
private final String filePath;
@@ -56,7 +56,7 @@ public final class YamlReadwriteSplittingIntegrateTest extends AbstractYamlDataS
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new File(Objects.requireNonNull(YamlReadwriteSplittingIntegrateTest.class.getResource(filePath)).toURI());
+ File yamlFile = new File(Objects.requireNonNull(YamlReadwriteSplittingE2EIT.class.getResource(filePath)).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource = YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
@@ -79,7 +79,7 @@ public final class YamlReadwriteSplittingIntegrateTest extends AbstractYamlDataS
@Test
public void assertWithDataSourceByYamlBytes() throws Exception {
- File yamlFile = new File(Objects.requireNonNull(YamlReadwriteSplittingIntegrateTest.class.getResource(filePath)).toURI());
+ File yamlFile = new File(Objects.requireNonNull(YamlReadwriteSplittingE2EIT.class.getResource(filePath)).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource = YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/sharding/YamlShardingIntegrateTest.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/sharding/YamlShardingE2EIT.java
similarity index 95%
rename from test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/sharding/YamlShardingIntegrateTest.java
rename to test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/sharding/YamlShardingE2EIT.java
index 61dfdc2f992..068f21adfb4 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/sharding/YamlShardingIntegrateTest.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/sharding/YamlShardingE2EIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.driver.sharding;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.driver.AbstractYamlDataSourceTest;
+import org.apache.shardingsphere.test.e2e.driver.AbstractYamlDataSourceE2EIT;
import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.junit.Test;
@@ -38,7 +38,7 @@ import java.util.Objects;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public class YamlShardingIntegrateTest extends AbstractYamlDataSourceTest {
+public class YamlShardingE2EIT extends AbstractYamlDataSourceE2EIT {
private final String filePath;
@@ -56,7 +56,7 @@ public class YamlShardingIntegrateTest extends AbstractYamlDataSourceTest {
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new File(Objects.requireNonNull(YamlShardingIntegrateTest.class.getResource(filePath)).toURI());
+ File yamlFile = new File(Objects.requireNonNull(YamlShardingE2EIT.class.getResource(filePath)).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource = YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);