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 4edd31ec59f Refactor: splitting ral-integration-test-cases.xml file
(#23990)
4edd31ec59f is described below
commit 4edd31ec59f2d74d4f86bfd896f9ee3573efd026
Author: gxxiong <[email protected]>
AuthorDate: Mon Feb 6 15:22:49 2023 +0800
Refactor: splitting ral-integration-test-cases.xml file (#23990)
* splitting ral-integration-test-cases.xml file
* splitting ral-integration-test-cases.xml file
---
.../resources/cases/ral/ral-integration-hint.xml | 54 +++++++++
.../cases/ral/ral-integration-preview.xml | 28 +++++
.../cases/ral/ral-integration-refresh.xml | 31 +++++
.../resources/cases/ral/ral-integration-set.xml | 27 +++++
.../resources/cases/ral/ral-integration-show.xml | 70 +++++++++++
.../cases/ral/ral-integration-test-cases.xml | 133 ---------------------
6 files changed, 210 insertions(+), 133 deletions(-)
diff --git
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-hint.xml
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-hint.xml
new file mode 100644
index 00000000000..a50f5c19447
--- /dev/null
+++ b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-hint.xml
@@ -0,0 +1,54 @@
+<?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="SHOW READWRITE_SPLITTING HINT STATUS">
+ <assertion expected-data-file="default_readwrite_splitting_hint.xml" />
+ <assertion expected-data-file="set_readwrite_splitting_hint.xml">
+ <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write" />
+ <destroy-sql sql="CLEAR READWRITE_SPLITTING HINT" />
+ </assertion>
+ <assertion expected-data-file="default_readwrite_splitting_hint.xml">
+ <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE =
write;CLEAR READWRITE_SPLITTING HINT" />
+ </assertion>
+ <assertion expected-data-file="default_readwrite_splitting_hint.xml">
+ <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE =
write;CLEAR HINT" />
+ </assertion>
+ </test-case>
+
+ <test-case sql="SHOW SHARDING HINT STATUS">
+ <assertion expected-data-file="default_sharding_hint.xml" />
+ <assertion expected-data-file="set_database_value_hint.xml">
+ <initial-sql sql="SET SHARDING HINT DATABASE_VALUE = 100" />
+ <destroy-sql sql="CLEAR SHARDING HINT" />
+ </assertion>
+ <assertion expected-data-file="add_database_value_hint.xml">
+ <initial-sql sql="ADD SHARDING HINT DATABASE_VALUE t_user_item=
100" />
+ <destroy-sql sql="CLEAR SHARDING HINT" />
+ </assertion>
+ <assertion expected-data-file="add_table_value_hint.xml">
+ <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item = 100"
/>
+ </assertion>
+ <assertion expected-data-file="default_sharding_hint.xml">
+ <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item=
100;CLEAR SHARDING HINT" />
+ </assertion>
+ <assertion expected-data-file="default_sharding_hint.xml">
+ <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item=
100;CLEAR HINT" />
+ </assertion>
+ </test-case>
+</integration-test-cases>
diff --git
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
new file mode 100644
index 00000000000..eea91f3b8fc
--- /dev/null
+++ b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
@@ -0,0 +1,28 @@
+<?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="preview select * from t_user_item">
+ <assertion expected-data-file="preview_sql.xml" />
+ </test-case>
+
+ <test-case
+ sql="PREVIEW SELECT * FROM t_single_table s INNER JOIN t_user_item
i ON s.single_id = i.item_id WHERE i.user_id = 1">
+ <assertion expected-data-file="preview_federation_select.xml" />
+ </test-case>
+</integration-test-cases>
diff --git
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-refresh.xml
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-refresh.xml
new file mode 100644
index 00000000000..a148ebdfd8a
--- /dev/null
+++ b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-refresh.xml
@@ -0,0 +1,31 @@
+<?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="REFRESH DATABASE METADATA FROM GOVERNANCE CENTER"
db-types="MySQL">
+ <assertion expected-data-file="show_sharding_table_rule.xml">
+ <assertion-sql sql="SHOW SHARDING TABLE RULES" />
+ </assertion>
+ <assertion expected-data-file="show_storage_units.xml">
+ <assertion-sql sql="SHOW STORAGE UNITS" />
+ </assertion>
+ <assertion expected-data-file="show_tables.xml">
+ <assertion-sql sql="SHOW TABLES" />
+ </assertion>
+ </test-case>
+</integration-test-cases>
diff --git
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-set.xml
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-set.xml
new file mode 100644
index 00000000000..daceedaab81
--- /dev/null
+++ b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-set.xml
@@ -0,0 +1,27 @@
+<?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="SET DIST VARIABLE sql_show = true;">
+ <assertion
expected-data-file="set_dist_variable_sql_show_equal_true.xml">
+ <initial-sql sql="SET DIST VARIABLE sql_show = true;" />
+ <assertion-sql sql="SHOW DIST VARIABLE WHERE name = sql_show;" />
+ <destroy-sql sql="SET DIST VARIABLE sql_show = false;" />
+ </assertion>
+ </test-case>
+</integration-test-cases>
diff --git
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-show.xml
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-show.xml
new file mode 100644
index 00000000000..d3a8289b902
--- /dev/null
+++ b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-show.xml
@@ -0,0 +1,70 @@
+<?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="show dist variable where name = transaction_type">
+ <assertion expected-data-file="default_transaction_type.xml" />
+ </test-case>
+
+ <test-case sql="show dist variable where name = transaction_type">
+ <assertion expected-data-file="transaction_type.xml">
+ <initial-sql sql="set dist variable transaction_type = 'XA'" />
+ <destroy-sql sql="set dist variable transaction_type = 'LOCAL'" />
+ </assertion>
+ </test-case>
+
+ <test-case sql="show dist variable where name = cached_connections">
+ <assertion expected-data-file="cached_connections.xml" />
+ </test-case>
+
+ <test-case sql="SHOW COMPUTE NODES">
+ <assertion expected-data-file="show_compute_nodes.xml" />
+ </test-case>
+
+ <test-case sql="SHOW AUTHORITY RULE;">
+ <assertion expected-data-file="show_authority_rule.xml" />
+ </test-case>
+
+ <test-case sql="SHOW TRANSACTION RULE;">
+ <assertion expected-data-file="show_transaction_rule.xml" />
+ </test-case>
+
+ <test-case sql="SHOW SQL_PARSER RULE;">
+ <assertion expected-data-file="show_sql_parse_rule.xml" />
+ </test-case>
+
+ <test-case sql="SHOW STATUS FROM READWRITE_SPLITTING RULES;">
+ <assertion
expected-data-file="show_status_from_readwrite_splitting_rules.xml" />
+ </test-case>
+
+ <test-case sql="SHOW DIST VARIABLES;">
+ <assertion expected-data-file="show_dist_variables.xml" />
+ </test-case>
+
+ <test-case sql="SHOW DIST VARIABLE WHERE name = sql_show;">
+ <assertion
expected-data-file="show_dist_variable_where_name_equal_sql_show.xml" />
+ </test-case>
+
+ <test-case sql="SHOW COMPUTE NODE INFO">
+ <assertion expected-data-file="show_compute_node_info.xml" />
+ </test-case>
+
+ <test-case sql="SHOW COMPUTE NODE MODE">
+ <assertion expected-data-file="show_compute_node_mode.xml" />
+ </test-case>
+</integration-test-cases>
diff --git
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
deleted file mode 100644
index abdeb5867ab..00000000000
--- a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
- ~ 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="SHOW READWRITE_SPLITTING HINT STATUS">
- <assertion expected-data-file="default_readwrite_splitting_hint.xml" />
- <assertion expected-data-file="set_readwrite_splitting_hint.xml">
- <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write" />
- <destroy-sql sql="CLEAR READWRITE_SPLITTING HINT" />
- </assertion>
- <assertion expected-data-file="default_readwrite_splitting_hint.xml">
- <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE =
write;CLEAR READWRITE_SPLITTING HINT" />
- </assertion>
- <assertion expected-data-file="default_readwrite_splitting_hint.xml">
- <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE =
write;CLEAR HINT" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW SHARDING HINT STATUS">
- <assertion expected-data-file="default_sharding_hint.xml" />
- <assertion expected-data-file="set_database_value_hint.xml">
- <initial-sql sql="SET SHARDING HINT DATABASE_VALUE = 100" />
- <destroy-sql sql="CLEAR SHARDING HINT" />
- </assertion>
- <assertion expected-data-file="add_database_value_hint.xml">
- <initial-sql sql="ADD SHARDING HINT DATABASE_VALUE t_user_item=
100" />
- <destroy-sql sql="CLEAR SHARDING HINT" />
- </assertion>
- <assertion expected-data-file="add_table_value_hint.xml">
- <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item = 100"
/>
- </assertion>
- <assertion expected-data-file="default_sharding_hint.xml">
- <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item=
100;CLEAR SHARDING HINT" />
- </assertion>
- <assertion expected-data-file="default_sharding_hint.xml">
- <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item=
100;CLEAR HINT" />
- </assertion>
- </test-case>
-
- <test-case sql="show dist variable where name = transaction_type">
- <assertion expected-data-file="default_transaction_type.xml" />
- </test-case>
-
- <test-case sql="show dist variable where name = transaction_type">
- <assertion expected-data-file="transaction_type.xml">
- <initial-sql sql="set dist variable transaction_type = 'XA'" />
- <destroy-sql sql="set dist variable transaction_type = 'LOCAL'" />
- </assertion>
- </test-case>
-
- <test-case sql="show dist variable where name = cached_connections">
- <assertion expected-data-file="cached_connections.xml" />
- </test-case>
-
- <test-case sql="preview select * from t_user_item">
- <assertion expected-data-file="preview_sql.xml" />
- </test-case>
-
- <test-case
- sql="PREVIEW SELECT * FROM t_single_table s INNER JOIN t_user_item
i ON s.single_id = i.item_id WHERE i.user_id = 1">
- <assertion expected-data-file="preview_federation_select.xml" />
- </test-case>
-
- <test-case sql="SHOW COMPUTE NODES">
- <assertion expected-data-file="show_compute_nodes.xml" />
- </test-case>
-
- <test-case sql="REFRESH DATABASE METADATA FROM GOVERNANCE CENTER"
db-types="MySQL">
- <assertion expected-data-file="show_sharding_table_rule.xml">
- <assertion-sql sql="SHOW SHARDING TABLE RULES" />
- </assertion>
- <assertion expected-data-file="show_storage_units.xml">
- <assertion-sql sql="SHOW STORAGE UNITS" />
- </assertion>
- <assertion expected-data-file="show_tables.xml">
- <assertion-sql sql="SHOW TABLES" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW AUTHORITY RULE;">
- <assertion expected-data-file="show_authority_rule.xml" />
- </test-case>
-
- <test-case sql="SHOW TRANSACTION RULE;">
- <assertion expected-data-file="show_transaction_rule.xml" />
- </test-case>
-
- <test-case sql="SHOW SQL_PARSER RULE;">
- <assertion expected-data-file="show_sql_parse_rule.xml" />
- </test-case>
-
- <test-case sql="SHOW STATUS FROM READWRITE_SPLITTING RULES;">
- <assertion
expected-data-file="show_status_from_readwrite_splitting_rules.xml" />
- </test-case>
-
- <test-case sql="SHOW DIST VARIABLES;">
- <assertion expected-data-file="show_dist_variables.xml" />
- </test-case>
-
- <test-case sql="SHOW DIST VARIABLE WHERE name = sql_show;">
- <assertion
expected-data-file="show_dist_variable_where_name_equal_sql_show.xml" />
- </test-case>
-
- <test-case sql="SET DIST VARIABLE sql_show = true;">
- <assertion
expected-data-file="set_dist_variable_sql_show_equal_true.xml">
- <initial-sql sql="SET DIST VARIABLE sql_show = true;" />
- <assertion-sql sql="SHOW DIST VARIABLE WHERE name = sql_show;" />
- <destroy-sql sql="SET DIST VARIABLE sql_show = false;" />
- </assertion>
- </test-case>
-
- <test-case sql="SHOW COMPUTE NODE INFO">
- <assertion expected-data-file="show_compute_node_info.xml" />
- </test-case>
-
- <test-case sql="SHOW COMPUTE NODE MODE">
- <assertion expected-data-file="show_compute_node_mode.xml" />
- </test-case>
-</integration-test-cases>
-
