You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/11/14 14:58:46 UTC

[shardingsphere] branch master updated: test(issue-21465): set-sharding-hint-database-value-statement (#22161)

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 02e9f441546 test(issue-21465): set-sharding-hint-database-value-statement (#22161)
02e9f441546 is described below

commit 02e9f441546a9cb283c4e760e702065cb9472dc5
Author: Xin Huang <57...@users.noreply.github.com>
AuthorDate: Mon Nov 14 22:58:36 2022 +0800

    test(issue-21465): set-sharding-hint-database-value-statement (#22161)
---
 .../distsql/ral/impl/HintRALStatementAssert.java   |  5 +++
 ...etShardingHintDatabaseValueStatementAssert.java | 52 ++++++++++++++++++++++
 ...ShardingHintDatabaseValueStatementTestCase.java | 11 ++++-
 test/parser/src/main/resources/case/ral/hint.xml   |  2 +-
 4 files changed, 68 insertions(+), 2 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 9c0d5b52db2..0718767fabe 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
@@ -22,12 +22,15 @@ import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
 import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintDatabaseValueStatement;
 import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintTableValueStatement;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.SetShardingHintDatabaseValueStatement;
 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.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;
 
 /**
  * Hint RAL statement assert.
@@ -47,6 +50,8 @@ public class HintRALStatementAssert {
             AddShardingHintTableValueStatementAssert.assertIs(assertContext, (AddShardingHintTableValueStatement) actual, (AddShardingHintTableValueStatementTestCase) expected);
         } else if (actual instanceof AddShardingHintDatabaseValueStatement) {
             AddShardingHintDatabaseValueStatementAssert.assertIs(assertContext, (AddShardingHintDatabaseValueStatement) actual, (AddShardingHintDatabaseValueStatementTestCase) expected);
+        } else if (actual instanceof SetShardingHintDatabaseValueStatement) {
+            SetShardingHintDatabaseValueStatementAssert.assertIs(assertContext, (SetShardingHintDatabaseValueStatement) actual, (SetShardingHintDatabaseValueStatementTestCase) expected);
         }
     }
 }
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/SetShardingHintDatabaseValueStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/SetShardingHintDatabaseValueStatementAssert.java
new file mode 100644
index 00000000000..7d2e2f61a5a
--- /dev/null
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/ral/impl/hint/SetShardingHintDatabaseValueStatementAssert.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.ral.impl.hint;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.SetShardingHintDatabaseValueStatement;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
+import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral.SetShardingHintDatabaseValueStatementTestCase;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Set sharding hint database value statement assert.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SetShardingHintDatabaseValueStatementAssert {
+    
+    /**
+     * Assert set sharding hint database value statement is correct with expected parser result.
+     *
+     * @param assertContext assert context
+     * @param actual actual set sharding hint database value statement
+     * @param expected expected set sharding hint database value statement test case
+     */
+    public static void assertIs(final SQLCaseAssertContext assertContext, final SetShardingHintDatabaseValueStatement actual, final SetShardingHintDatabaseValueStatementTestCase expected) {
+        if (null == expected) {
+            assertNull(assertContext.getText("Actual statement should not exist."), actual);
+        } else {
+            assertNotNull(assertContext.getText("Actual statement should exist."), actual);
+            assertThat(actual.getShardingValue(), is(expected.getShardingValue()));
+        }
+    }
+}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/SetShardingHintDatabaseValueStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/SetShardingHintDatabaseValueStatementTestCase.java
index fc7eeecbb76..a60ac3fa4cd 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/SetShardingHintDatabaseValueStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/SetShardingHintDatabaseValueStatementTestCase.java
@@ -17,10 +17,19 @@
 
 package org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.distsql.ral;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.SQLParserTestCase;
 
+import javax.xml.bind.annotation.XmlAttribute;
+
 /**
- * Set sharding hint database value test case.
+ * Set sharding hint database value statement test case.
  */
+@Getter
+@Setter
 public final class SetShardingHintDatabaseValueStatementTestCase extends SQLParserTestCase {
+    
+    @XmlAttribute(name = "sharding-value")
+    private String shardingValue;
 }
diff --git a/test/parser/src/main/resources/case/ral/hint.xml b/test/parser/src/main/resources/case/ral/hint.xml
index d449f415f9e..c7f406c713a 100644
--- a/test/parser/src/main/resources/case/ral/hint.xml
+++ b/test/parser/src/main/resources/case/ral/hint.xml
@@ -20,7 +20,7 @@
     <show-sharding-hint-status sql-case-id="show-sharding-hint-status" />
     <add-sharding-hint-database-value sql-case-id="add-sharding-hint-database-value" logic-table-name="T_ORDER" sharding-value="1"/>
     <add-sharding-hint-table-value sql-case-id="add-sharding-hint-table-value" logic-table-name="T_ORDER" sharding-value="1"/>
-    <set-sharding-hint-database-value sql-case-id="set-sharding-hint-database-value" />
+    <set-sharding-hint-database-value sql-case-id="set-sharding-hint-database-value" sharding-value="1"/>
     <clear-sharding-hint sql-case-id="clear-sharding-hint" />
     
     <show-readwrite-splitting-hint-source sql-case-id="show-readwrite-splitting-hint-source" />