You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/02/09 13:29:51 UTC
[shardingsphere] branch master updated: splitting rql-integration-test-cases.xml file (#24079)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 12c8601a0d5 splitting rql-integration-test-cases.xml file (#24079)
12c8601a0d5 is described below
commit 12c8601a0d543121918d99db2a5fbb65663a3ce5
Author: gxxiong <xi...@foxmail.com>
AuthorDate: Thu Feb 9 21:29:42 2023 +0800
splitting rql-integration-test-cases.xml file (#24079)
---
.../resources/cases/rql/rql-integration-count.xml | 47 ++++++++++++++++++++++
...ion-test-cases.xml => rql-integration-show.xml} | 36 +++--------------
2 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/test/e2e/suite/src/test/resources/cases/rql/rql-integration-count.xml b/test/e2e/suite/src/test/resources/cases/rql/rql-integration-count.xml
new file mode 100644
index 00000000000..a147afb6064
--- /dev/null
+++ b/test/e2e/suite/src/test/resources/cases/rql/rql-integration-count.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<integration-test-cases>
+ <test-case sql="COUNT SINGLE TABLE" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
+ <assertion expected-data-file="count_single_table.xml" />
+ </test-case>
+
+ <test-case sql="COUNT SHARDING RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
+ <assertion expected-data-file="count_sharding_rule.xml" />
+ </test-case>
+
+ <test-case sql="COUNT READWRITE_SPLITTING RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
+ <assertion expected-data-file="count_readwrite_splitting_rule.xml" />
+ </test-case>
+
+ <test-case sql="COUNT DB_DISCOVERY RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
+ <assertion expected-data-file="count_database_discovery_rule.xml" />
+ </test-case>
+
+ <test-case sql="COUNT ENCRYPT RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
+ <assertion expected-data-file="count_encrypt_rule.xml" />
+ </test-case>
+
+ <test-case sql="COUNT SHADOW RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
+ <assertion expected-data-file="count_shadow_rule.xml" />
+ </test-case>
+
+ <test-case sql="COUNT MASK RULE;" scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,mask,mask_encrypt,mask_encrypt_sharding,mask_sharding">
+ <assertion expected-data-file="count_mask_rule.xml" />
+ </test-case>
+</integration-test-cases>
diff --git a/test/e2e/suite/src/test/resources/cases/rql/rql-integration-test-cases.xml b/test/e2e/suite/src/test/resources/cases/rql/rql-integration-show.xml
similarity index 77%
rename from test/e2e/suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
rename to test/e2e/suite/src/test/resources/cases/rql/rql-integration-show.xml
index f6443b1846a..c22a83276f1 100644
--- a/test/e2e/suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
+++ b/test/e2e/suite/src/test/resources/cases/rql/rql-integration-show.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
@@ -14,6 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
+
<integration-test-cases>
<test-case sql="SHOW STORAGE UNITS" scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-file="show_storage_units.xml" />
@@ -21,9 +23,9 @@
<!--TODO Support dynamic input of scenario names-->
<!--FIXME db scenario have a problem. #18964-->
-<!-- <test-case sql="SHOW DATABASE RESOURCES FROM ?" scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">-->
-<!-- <assertion expected-data-file="show_storage_units.xml" />-->
-<!-- </test-case>-->
+ <!-- <test-case sql="SHOW DATABASE RESOURCES FROM ?" scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">-->
+ <!-- <assertion expected-data-file="show_storage_units.xml" />-->
+ <!-- </test-case>-->
<test-case sql="SHOW SHARDING TABLE RULES" scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_table_rules.xml" />
@@ -101,10 +103,6 @@
<assertion expected-data-file="show_single_tables.xml" />
</test-case>
- <test-case sql="COUNT SINGLE TABLE" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
- <assertion expected-data-file="count_single_table.xml" />
- </test-case>
-
<test-case sql="SHOW READWRITE_SPLITTING RULES" scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
<assertion expected-data-file="show_readwrite_splitting_rules.xml" />
</test-case>
@@ -133,28 +131,4 @@
<test-case sql="SHOW DB_DISCOVERY HEARTBEATS" scenario-types="sharding_governance">
<assertion expected-data-file="show_discovery_heartbeats.xml" />
</test-case>
-
- <test-case sql="COUNT SHARDING RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
- <assertion expected-data-file="count_sharding_rule.xml" />
- </test-case>
-
- <test-case sql="COUNT READWRITE_SPLITTING RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
- <assertion expected-data-file="count_readwrite_splitting_rule.xml" />
- </test-case>
-
- <test-case sql="COUNT DB_DISCOVERY RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
- <assertion expected-data-file="count_database_discovery_rule.xml" />
- </test-case>
-
- <test-case sql="COUNT ENCRYPT RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
- <assertion expected-data-file="count_encrypt_rule.xml" />
- </test-case>
-
- <test-case sql="COUNT SHADOW RULE;" scenario-types="db,tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting,readwrite_splitting">
- <assertion expected-data-file="count_shadow_rule.xml" />
- </test-case>
-
- <test-case sql="COUNT MASK RULE;" scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,mask,mask_encrypt,mask_encrypt_sharding,mask_sharding">
- <assertion expected-data-file="count_mask_rule.xml" />
- </test-case>
</integration-test-cases>