You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/11/26 13:52:40 UTC
[shardingsphere] branch master updated: Refactor SQLParserTestCaseLoaderCallback (#22447)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 5353100f28b Refactor SQLParserTestCaseLoaderCallback (#22447)
5353100f28b is described below
commit 5353100f28bf229a8b8046e33f3673ad6826d2ae
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 26 21:52:34 2022 +0800
Refactor SQLParserTestCaseLoaderCallback (#22447)
---
.../cases/parser/jaxb/RootSQLParserTestCases.java | 12 +++++------
.../loader/SQLParserTestCaseLoaderCallback.java | 24 +++++++++++-----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
index 26512a42c32..9b5337fcc01 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
@@ -1689,19 +1689,19 @@ public final class RootSQLParserTestCases {
private Map<String, SQLParserTestCase> getTestCaseMap(final List<? extends SQLParserTestCase> cases) {
Map<String, SQLParserTestCase> result = new HashMap<>(cases.size(), 1);
for (SQLParserTestCase each : cases) {
- checkDuplicatedTestCase(result, each);
+ checkDuplicatedTestCase(each, result);
result.put(each.getSqlCaseId(), each);
}
return result;
}
- private void checkDuplicatedTestCase(final Map<String, SQLParserTestCase> sources, final SQLParserTestCase target) {
- Preconditions.checkState(!sources.containsKey(target.getSqlCaseId()), "Find duplicated SQL Case ID: %s.", target.getSqlCaseId());
+ private void checkDuplicatedTestCase(final SQLParserTestCase newTestCase, final Map<String, SQLParserTestCase> existedTestCases) {
+ Preconditions.checkState(!existedTestCases.containsKey(newTestCase.getSqlCaseId()), "Find duplicated SQL Case ID: %s.", newTestCase.getSqlCaseId());
}
- private void checkDuplicatedTestCases(final Map<String, SQLParserTestCase> source, final Map<String, SQLParserTestCase> target) {
- Collection<String> caseIds = new HashSet<>(source.keySet());
- caseIds.retainAll(target.keySet());
+ private void checkDuplicatedTestCases(final Map<String, SQLParserTestCase> newTestCases, final Map<String, SQLParserTestCase> existedTestCases) {
+ Collection<String> caseIds = new HashSet<>(newTestCases.keySet());
+ caseIds.retainAll(existedTestCases.keySet());
Preconditions.checkState(caseIds.isEmpty(), "Find duplicated SQL Case IDs: %s.", caseIds);
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/loader/SQLParserTestCaseLoaderCallback.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/loader/SQLParserTestCaseLoaderCallback.java
index 55ae3875ed3..014bb350ba9 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/loader/SQLParserTestCaseLoaderCallback.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/parser/loader/SQLParserTestCaseLoaderCallback.java
@@ -43,9 +43,9 @@ public final class SQLParserTestCaseLoaderCallback implements CaseLoaderCallback
public Map<String, SQLParserTestCase> loadFromJar(final File jarFile, final String rootDirectory) throws JAXBException {
Map<String, SQLParserTestCase> result = new HashMap<>(Short.MAX_VALUE, 1);
for (String each : CaseFileLoader.loadFileNamesFromJar(jarFile, rootDirectory)) {
- Map<String, SQLParserTestCase> sqlParserTestCases = createSQLParserTestCases(SQLParserTestCaseLoaderCallback.class.getClassLoader().getResourceAsStream(each));
- checkDuplicate(result, sqlParserTestCases);
- result.putAll(sqlParserTestCases);
+ Map<String, SQLParserTestCase> testCases = createTestCases(SQLParserTestCaseLoaderCallback.class.getClassLoader().getResourceAsStream(each));
+ checkDuplicatedTestCases(testCases, result);
+ result.putAll(testCases);
}
return result;
}
@@ -54,22 +54,22 @@ public final class SQLParserTestCaseLoaderCallback implements CaseLoaderCallback
public Map<String, SQLParserTestCase> loadFromDirectory(final String rootDirectory) throws IOException, JAXBException {
Map<String, SQLParserTestCase> result = new HashMap<>(Short.MAX_VALUE, 1);
for (File each : CaseFileLoader.loadFilesFromDirectory(rootDirectory)) {
- try (FileInputStream fileInputStream = new FileInputStream(each)) {
- Map<String, SQLParserTestCase> sqlParserTestCases = createSQLParserTestCases(fileInputStream);
- checkDuplicate(result, sqlParserTestCases);
- result.putAll(sqlParserTestCases);
+ try (FileInputStream inputStream = new FileInputStream(each)) {
+ Map<String, SQLParserTestCase> testCases = createTestCases(inputStream);
+ checkDuplicatedTestCases(testCases, result);
+ result.putAll(testCases);
}
}
return result;
}
- private Map<String, SQLParserTestCase> createSQLParserTestCases(final InputStream inputStream) throws JAXBException {
+ private Map<String, SQLParserTestCase> createTestCases(final InputStream inputStream) throws JAXBException {
return ((RootSQLParserTestCases) JAXBContext.newInstance(RootSQLParserTestCases.class).createUnmarshaller().unmarshal(inputStream)).getAllCases();
}
- private void checkDuplicate(final Map<String, SQLParserTestCase> existedSQLParserTestCases, final Map<String, SQLParserTestCase> newSQLParserTestCases) {
- Collection<String> existedSQLParserTestCaseIds = new HashSet<>(existedSQLParserTestCases.keySet());
- existedSQLParserTestCaseIds.retainAll(newSQLParserTestCases.keySet());
- Preconditions.checkState(existedSQLParserTestCaseIds.isEmpty(), "Find duplicated SQL Case IDs: %s", existedSQLParserTestCaseIds);
+ private void checkDuplicatedTestCases(final Map<String, SQLParserTestCase> newTestCases, final Map<String, SQLParserTestCase> existedTestCases) {
+ Collection<String> caseIds = new HashSet<>(newTestCases.keySet());
+ caseIds.retainAll(existedTestCases.keySet());
+ Preconditions.checkState(caseIds.isEmpty(), "Find duplicated SQL Case IDs: %s", caseIds);
}
}