You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/03/03 03:53:51 UTC
[shardingsphere] branch master updated: Refactor annotation check on SQLParserIT (#24436)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 b6287ca2207 Refactor annotation check on SQLParserIT (#24436)
b6287ca2207 is described below
commit b6287ca22077484bc8d99f3eadad4653a10e913e
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Mar 3 11:53:43 2023 +0800
Refactor annotation check on SQLParserIT (#24436)
* Upgrade ExternalSQLParserIT to Junit 5
* Fix javadoc
* Refactor annotation check on SQLParserIT
---
.../test/it/sql/parser/external/ExternalSQLParserIT.java | 6 +++---
.../test/it/sql/parser/internal/InternalSQLParserIT.java | 4 +++-
.../test/it/sql/parser/internal/InternalUnsupportedSQLParserIT.java | 4 +++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
index 1e2e65090e6..c03dd403ef2 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.it.sql.parser.external;
+import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.util.exception.external.ShardingSphereExternalException;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
@@ -66,9 +67,8 @@ public abstract class ExternalSQLParserIT {
@Override
public Stream<? extends Arguments> provideArguments(final ExtensionContext extensionContext) {
ExternalSQLParserITSettings settings = extensionContext.getRequiredTestClass().getAnnotation(ExternalSQLParserITSettings.class);
- return null == settings
- ? Stream.empty()
- : getTestParameters(settings).stream().map(each -> Arguments.of(each.getSqlCaseId(), each.getDatabaseType(), each.getSql(), each.getReportType()));
+ Preconditions.checkNotNull(settings, "Annotation ExternalSQLParserITSettings is required.");
+ return getTestParameters(settings).stream().map(each -> Arguments.of(each.getSqlCaseId(), each.getDatabaseType(), each.getSql(), each.getReportType()));
}
private Collection<ExternalSQLParserTestParameter> getTestParameters(final ExternalSQLParserITSettings settings) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
index 97701439502..e9740ed0b55 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.it.sql.parser.internal;
+import com.google.common.base.Preconditions;
import org.apache.shardingsphere.distsql.parser.engine.api.DistSQLStatementParserEngine;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
@@ -71,7 +72,8 @@ public abstract class InternalSQLParserIT {
@Override
public Stream<? extends Arguments> provideArguments(final ExtensionContext extensionContext) {
InternalSQLParserITSettings settings = extensionContext.getRequiredTestClass().getAnnotation(InternalSQLParserITSettings.class);
- return null == settings ? Stream.empty() : getTestParameters(settings.value()).stream();
+ Preconditions.checkNotNull(settings, "Annotation InternalSQLParserITSettings is required.");
+ return getTestParameters(settings.value()).stream();
}
private Collection<Arguments> getTestParameters(final String... databaseTypes) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalUnsupportedSQLParserIT.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalUnsupportedSQLParserIT.java
index c36601ee8b6..0a1a0ffb500 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalUnsupportedSQLParserIT.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalUnsupportedSQLParserIT.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.it.sql.parser.internal;
+import com.google.common.base.Preconditions;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
@@ -54,7 +55,8 @@ public abstract class InternalUnsupportedSQLParserIT {
@Override
public Stream<? extends Arguments> provideArguments(final ExtensionContext extensionContext) {
InternalSQLParserITSettings settings = extensionContext.getRequiredTestClass().getAnnotation(InternalSQLParserITSettings.class);
- return null == settings ? Stream.empty() : getTestParameters(Arrays.asList(settings.value())).stream();
+ Preconditions.checkNotNull(settings, "Annotation InternalSQLParserITSettings is required.");
+ return getTestParameters(Arrays.asList(settings.value())).stream();
}
private Collection<Arguments> getTestParameters(final Collection<String> databaseTypes) {