This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 c67b4888f51 test(issue-21464): ShowShardingHintStatusStatement (#22193)
c67b4888f51 is described below
commit c67b4888f51321e841bdfc4874def1fdc62edc18
Author: Xin Huang <[email protected]>
AuthorDate: Wed Nov 16 16:07:06 2022 +0800
test(issue-21464): ShowShardingHintStatusStatement (#22193)
---
.../distsql/ral/impl/HintRALStatementAssert.java | 5 +++++
.../ShowReadwriteSplittingHintStatusStatementAssert.java | 4 ++--
...t.java => ShowShardingHintStatusStatementAssert.java} | 16 ++++++++--------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
index c0d83343b0d..99ad8ab5da1 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
@@ -25,18 +25,21 @@ import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShard
import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.SetShardingHintDatabaseValueStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.SetReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ShowReadwriteSplittingHintStatusStatement;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.ShowShardingHintStatusStatement;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint.AddShardingHintDatabaseValueStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint.AddShardingHintTableValueStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint.SetShardingHintDatabaseValueStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint.SetReadwriteSplittingHintStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint.ShowReadwriteSplittingHintStatusStatementAssert;
+import
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint.ShowShardingHintStatusStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.SQLParserTestCase;
import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.AddShardingHintDatabaseValueStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.AddShardingHintTableValueStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.SetShardingHintDatabaseValueStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.SetReadwriteSplittingHintStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.ShowReadwriteSplittingHintStatusStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.ShowShardingHintStatusStatementTestCase;
/**
* Hint RAL statement assert.
@@ -62,6 +65,8 @@ public class HintRALStatementAssert {
SetReadwriteSplittingHintStatementAssert.assertIs(assertContext,
(SetReadwriteSplittingHintStatement) actual,
(SetReadwriteSplittingHintStatementTestCase) expected);
} else if (actual instanceof
ShowReadwriteSplittingHintStatusStatement) {
ShowReadwriteSplittingHintStatusStatementAssert.assertIs(assertContext,
(ShowReadwriteSplittingHintStatusStatement) actual,
(ShowReadwriteSplittingHintStatusStatementTestCase) expected);
+ } else if (actual instanceof ShowShardingHintStatusStatement) {
+ ShowShardingHintStatusStatementAssert.assertIs(assertContext,
(ShowShardingHintStatusStatement) actual,
(ShowShardingHintStatusStatementTestCase) expected);
}
}
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
index ed45aa60614..762165ee50f 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
@@ -36,8 +36,8 @@ public class ShowReadwriteSplittingHintStatusStatementAssert {
* Assert show readwrite-splitting hint status statement is correct with
expected parser result.
*
* @param assertContext assert context
- * @param actual actual show readwrite-splitting status statement
- * @param expected expected show readwrite-splitting status statement test
case
+ * @param actual actual show readwrite-splitting hint status statement
+ * @param expected expected show readwrite-splitting hint status statement
test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowReadwriteSplittingHintStatusStatement actual, final
ShowReadwriteSplittingHintStatusStatementTestCase expected) {
if (null == expected) {
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowShardingHintStatusStatementAssert.java
similarity index 69%
copy from
test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
copy to
test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowShardingHintStatusStatementAssert.java
index ed45aa60614..70ba646dcb3 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowReadwriteSplittingHintStatusStatementAssert.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/ShowShardingHintStatusStatementAssert.java
@@ -19,27 +19,27 @@ package
org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dis
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ShowReadwriteSplittingHintStatusStatement;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.ShowShardingHintStatusStatement;
import
org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
-import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.ShowReadwriteSplittingHintStatusStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.ShowShardingHintStatusStatementTestCase;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
/**
- * Add readwrite-splitting hint status statement assert.
+ * Show sharding hint status statement assert.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ShowReadwriteSplittingHintStatusStatementAssert {
+public class ShowShardingHintStatusStatementAssert {
/**
- * Assert show readwrite-splitting hint status statement is correct with
expected parser result.
+ * Assert show sharding hint status statement is correct with expected
parser result.
*
* @param assertContext assert context
- * @param actual actual show readwrite-splitting status statement
- * @param expected expected show readwrite-splitting status statement test
case
+ * @param actual actual show sharding hint status statement
+ * @param expected expected show sharding hint status statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowReadwriteSplittingHintStatusStatement actual, final
ShowReadwriteSplittingHintStatusStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowShardingHintStatusStatement actual, final
ShowShardingHintStatusStatementTestCase expected) {
if (null == expected) {
assertNull(assertContext.getText("Actual statement should not
exist."), actual);
} else {