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/11/13 07:34:29 UTC
[shardingsphere] branch master updated: Rename SQLParserExternalITEnvironment (#22134)
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 1f83889f8ef Rename SQLParserExternalITEnvironment (#22134)
1f83889f8ef is described below
commit 1f83889f8ef08a805f1cefb8fb752af1ef39d697
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Nov 13 15:34:23 2022 +0800
Rename SQLParserExternalITEnvironment (#22134)
---
.github/workflows/nightly-sql-parser.yml | 2 +-
...nt.java => SQLParserExternalITEnvironment.java} | 25 +++++++++++-----------
.../sql/parser/loader/SQLCaseLoader.java | 4 ++--
.../result/SQLParserResultProcessorManager.java | 4 ++--
.../result/impl/SQLParserCSVResultProcessor.java | 4 ++--
...rties => sql-parser-external-it-env.properties} | 6 +++---
6 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/nightly-sql-parser.yml b/.github/workflows/nightly-sql-parser.yml
index d8f0491bf7f..a10d48fc07b 100644
--- a/.github/workflows/nightly-sql-parser.yml
+++ b/.github/workflows/nightly-sql-parser.yml
@@ -52,7 +52,7 @@ jobs:
- name: Build prod with Maven
run: ./mvnw -T1C -B -ntp clean install
- name: Run SQL parser
- run: ./mvnw -nsu -B install -f test/integration-test/sql-parser/pom.xml -Dsql.parser.it.enabled=true
+ run: ./mvnw -nsu -B install -f test/integration-test/sql-parser/pom.xml -Dsql.parser.external.it.enabled=true
- uses: actions/upload-artifact@v3
with:
name: sql-report
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/env/IntegrationTestEnvironment.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/env/SQLParserExternalITEnvironment.java
similarity index 62%
rename from test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/env/IntegrationTestEnvironment.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/env/SQLParserExternalITEnvironment.java
index d321ac1bbea..f25961572d2 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/env/IntegrationTestEnvironment.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/env/SQLParserExternalITEnvironment.java
@@ -25,14 +25,12 @@ import java.io.InputStream;
import java.util.Properties;
/**
- * Integration test environment.
+ * SQL parser external IT environment.
*/
@Getter
-public final class IntegrationTestEnvironment {
+public final class SQLParserExternalITEnvironment {
- private static final IntegrationTestEnvironment INSTANCE = new IntegrationTestEnvironment();
-
- private final Properties props;
+ private static final SQLParserExternalITEnvironment INSTANCE = new SQLParserExternalITEnvironment();
private final boolean sqlParserITEnabled;
@@ -40,26 +38,27 @@ public final class IntegrationTestEnvironment {
private final String resultProcessorType;
- private IntegrationTestEnvironment() {
- props = loadProperties();
- sqlParserITEnabled = Boolean.parseBoolean(null == System.getProperty("sql.parser.it.enabled") ? props.get("sql.parser.it.enabled").toString() : System.getProperty("sql.parser.it.enabled"));
- resultPath = props.getOrDefault("sql.parser.it.report.path", "/tmp/").toString();
- resultProcessorType = props.getOrDefault("sql.parser.it.report.type", "LOG").toString();
+ private SQLParserExternalITEnvironment() {
+ Properties props = loadProperties();
+ sqlParserITEnabled = Boolean.parseBoolean(
+ null == System.getProperty("sql.parser.external.it.enabled") ? props.get("sql.parser.external.it.enabled").toString() : System.getProperty("sql.parser.external.it.enabled"));
+ resultPath = props.getOrDefault("sql.parser.external.it.report.path", "/tmp/").toString();
+ resultProcessorType = props.getOrDefault("sql.parser.external.it.report.type", "LOG").toString();
}
/**
* Get instance.
*
- * @return singleton instance
+ * @return got instance
*/
- public static IntegrationTestEnvironment getInstance() {
+ public static SQLParserExternalITEnvironment getInstance() {
return INSTANCE;
}
@SneakyThrows(IOException.class)
private Properties loadProperties() {
Properties result = new Properties();
- try (InputStream inputStream = IntegrationTestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
+ try (InputStream inputStream = SQLParserExternalITEnvironment.class.getClassLoader().getResourceAsStream("env/sql-parser-external-it-env.properties")) {
result.load(inputStream);
}
for (String each : System.getProperties().stringPropertyNames()) {
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java
index e3af8b011eb..47dc29240f9 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/loader/SQLCaseLoader.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.sql.parser.loader;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.integration.sql.parser.env.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.integration.sql.parser.env.SQLParserExternalITEnvironment;
import org.apache.shardingsphere.test.integration.sql.parser.loader.strategy.SQLCaseLoadStrategy;
import org.apache.shardingsphere.test.integration.sql.parser.loader.summary.FileSummary;
@@ -52,7 +52,7 @@ public final class SQLCaseLoader {
* @return loaded SQL cases
*/
public Collection<Object[]> load(final URI sqlCaseURI, final URI resultURI) {
- if (!IntegrationTestEnvironment.getInstance().isSqlParserITEnabled()) {
+ if (!SQLParserExternalITEnvironment.getInstance().isSqlParserITEnabled()) {
return Collections.emptyList();
}
Collection<Object[]> result = new LinkedList<>();
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/SQLParserResultProcessorManager.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/SQLParserResultProcessorManager.java
index fe8732562ad..83ccd73ac62 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/SQLParserResultProcessorManager.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/SQLParserResultProcessorManager.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.sql.parser.result;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.integration.sql.parser.env.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.integration.sql.parser.env.SQLParserExternalITEnvironment;
import java.io.File;
import java.lang.reflect.Constructor;
@@ -42,7 +42,7 @@ public final class SQLParserResultProcessorManager {
* @return the implementation of SQLParserResultProcessor
*/
public static SQLParserResultProcessor getProcessor(final String databaseType) {
- String type = IntegrationTestEnvironment.getInstance().getResultProcessorType();
+ String type = SQLParserExternalITEnvironment.getInstance().getResultProcessorType();
try {
Class<?> interfaceClazz = Class.forName(SQLParserResultProcessor.class.getPackage().getName() + "." + SQLParserResultProcessor.class.getSimpleName());
String packageName = interfaceClazz.getPackage().getName();
diff --git a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/impl/SQLParserCSVResultProcessor.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/impl/SQLParserCSVResultProcessor.java
index 3bc7795d5ff..7a3c44d6e72 100644
--- a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/impl/SQLParserCSVResultProcessor.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/test/integration/sql/parser/result/impl/SQLParserCSVResultProcessor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.sql.parser.result.impl;
import lombok.Getter;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
-import org.apache.shardingsphere.test.integration.sql.parser.env.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.integration.sql.parser.env.SQLParserExternalITEnvironment;
import org.apache.shardingsphere.test.integration.sql.parser.result.SQLParserResultProcessor;
import java.io.File;
@@ -39,7 +39,7 @@ public final class SQLParserCSVResultProcessor implements SQLParserResultProcess
public SQLParserCSVResultProcessor(final String databaseType) {
try {
- File csvFile = new File(IntegrationTestEnvironment.getInstance().getResultPath() + databaseType + "-result.csv");
+ File csvFile = new File(SQLParserExternalITEnvironment.getInstance().getResultPath() + databaseType + "-result.csv");
createHeader(csvFile);
printer = new CSVPrinter(new FileWriter(csvFile, true), CSVFormat.DEFAULT.builder().setSkipHeaderRecord(true).build());
} catch (final IOException ex) {
diff --git a/test/integration-test/sql-parser/src/test/resources/env/it-env.properties b/test/integration-test/sql-parser/src/test/resources/env/sql-parser-external-it-env.properties
similarity index 87%
rename from test/integration-test/sql-parser/src/test/resources/env/it-env.properties
rename to test/integration-test/sql-parser/src/test/resources/env/sql-parser-external-it-env.properties
index 6465df260d7..b2ccc5b5aa9 100644
--- a/test/integration-test/sql-parser/src/test/resources/env/it-env.properties
+++ b/test/integration-test/sql-parser/src/test/resources/env/sql-parser-external-it-env.properties
@@ -15,6 +15,6 @@
# limitations under the License.
#
-sql.parser.it.enabled=false
-sql.parser.it.report.path=/tmp/
-sql.parser.it.report.type=csv
+sql.parser.external.it.enabled=false
+sql.parser.external.it.report.path=/tmp/
+sql.parser.external.it.report.type=csv