You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/08/21 09:26:22 UTC
[shardingsphere] branch master updated: Add: add test case for
shardingRuleConfiguration (#6927) (#6945)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 cacd5f4 Add: add test case for shardingRuleConfiguration (#6927) (#6945)
cacd5f4 is described below
commit cacd5f4a30f9a27ffb457cfc28f9d13064cdb795
Author: 孙念君 Sun Nianjun <su...@huobi.com>
AuthorDate: Fri Aug 21 17:26:10 2020 +0800
Add: add test case for shardingRuleConfiguration (#6927) (#6945)
* Add: add test case for shardingRuleConfiguration (#6927)
* Refactor: typecast should follow with whitespace
* Remove: remove blank line
* Refactor: refactor the test case (#6927)
---
.../spring/boot/ShardingSpringBootStarterTest.java | 68 +++++++++++++++++++++-
1 file changed, 67 insertions(+), 1 deletion(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java
index 7c84a60..17453d9 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java
@@ -17,9 +17,12 @@
package org.apache.shardingsphere.sharding.spring.boot;
+import com.google.common.collect.Lists;
import org.apache.shardingsphere.sharding.algorithm.config.AlgorithmProvidedShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm;
import org.apache.shardingsphere.sharding.algorithm.sharding.inline.InlineShardingAlgorithm;
+import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,7 +31,10 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -67,7 +73,67 @@ public class ShardingSpringBootStarterTest {
@Test
public void assertShardingConfiguration() {
+ assertShardingConfigurationTables();
+ assertShardingConfigurationBindingTableGroups();
+ assertShardingConfigurationBroadcastTables();
+ assertShardingConfigurationDefaultDatabaseShardingStrategy();
+ assertShardingConfigurationShardingAlgorithms();
+ assertShardingConfigurationKeyGenerators();
+ }
+
+ private void assertShardingConfigurationTables() {
assertThat(shardingRuleConfiguration.getTables().size(), is(2));
- // TODO assert sharding configuration
+ List<ShardingTableRuleConfiguration> shardingTableRuleConfigurationList = Lists.newArrayList(shardingRuleConfiguration.getTables());
+ assertThat(shardingTableRuleConfigurationList.get(0).getLogicTable(), is("t_order"));
+ assertThat(shardingTableRuleConfigurationList.get(0).getActualDataNodes(), is("ds_$->{0..1}.t_order_$->{0..1}"));
+ assertThat(shardingTableRuleConfigurationList.get(0).getTableShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) shardingTableRuleConfigurationList.get(0).getTableShardingStrategy()).getShardingColumn(), is("order_id"));
+ assertThat(shardingTableRuleConfigurationList.get(0).getTableShardingStrategy().getShardingAlgorithmName(), is("orderTableShardingAlgorithm"));
+ assertThat(shardingTableRuleConfigurationList.get(0).getKeyGenerateStrategy().getColumn(), is("order_id"));
+ assertThat(shardingTableRuleConfigurationList.get(0).getKeyGenerateStrategy().getKeyGeneratorName(), is("keyGenerator"));
+ assertThat(shardingTableRuleConfigurationList.get(1).getLogicTable(), is("t_order_item"));
+ assertThat(shardingTableRuleConfigurationList.get(1).getActualDataNodes(), is("ds_$->{0..1}.t_order_item_$->{0..1}"));
+ assertThat(shardingTableRuleConfigurationList.get(1).getTableShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) shardingTableRuleConfigurationList.get(1).getTableShardingStrategy()).getShardingColumn(), is("order_id"));
+ assertThat(shardingTableRuleConfigurationList.get(1).getTableShardingStrategy().getShardingAlgorithmName(), is("orderItemTableShardingAlgorithm"));
+ assertThat(shardingTableRuleConfigurationList.get(1).getKeyGenerateStrategy().getColumn(), is("order_item_id"));
+ assertThat(shardingTableRuleConfigurationList.get(1).getKeyGenerateStrategy().getKeyGeneratorName(), is("keyGenerator"));
+ }
+
+ private void assertShardingConfigurationBindingTableGroups() {
+ assertThat(shardingRuleConfiguration.getBindingTableGroups().size(), is(2));
+ List<String> bindingTableGroupsList = new ArrayList<>(shardingRuleConfiguration.getBindingTableGroups());
+ assertThat(bindingTableGroupsList.get(0), is("t_order"));
+ assertThat(bindingTableGroupsList.get(1), is("t_order_item"));
+ }
+
+ private void assertShardingConfigurationBroadcastTables() {
+ assertThat(shardingRuleConfiguration.getBroadcastTables().size(), is(1));
+ assertThat(shardingRuleConfiguration.getBroadcastTables().iterator().next(), is("t_config"));
+ }
+
+ private void assertShardingConfigurationDefaultDatabaseShardingStrategy() {
+ assertThat(shardingRuleConfiguration.getDefaultDatabaseShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) shardingRuleConfiguration.getDefaultDatabaseShardingStrategy()).getShardingColumn(), is("user_id"));
+ assertThat(shardingRuleConfiguration.getDefaultDatabaseShardingStrategy().getShardingAlgorithmName(), is("databaseShardingAlgorithm"));
+ }
+
+ private void assertShardingConfigurationShardingAlgorithms() {
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().size(), is(3));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderItemTableShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderItemTableShardingAlgorithm").getType(), is("INLINE"));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderItemTableShardingAlgorithm").getProps().getProperty("algorithm.expression"), is("t_order_item_$->{order_id % 2}"));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("databaseShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("databaseShardingAlgorithm").getType(), is("INLINE"));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("databaseShardingAlgorithm").getProps().getProperty("algorithm.expression"), is("ds_$->{user_id % 2}"));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderTableShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderTableShardingAlgorithm").getType(), is("INLINE"));
+ assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderTableShardingAlgorithm").getProps().getProperty("algorithm.expression"), is("t_order_$->{order_id % 2}"));
+ }
+
+ private void assertShardingConfigurationKeyGenerators() {
+ assertThat(shardingRuleConfiguration.getKeyGenerators().size(), is(1));
+ assertThat(shardingRuleConfiguration.getKeyGenerators().get("keyGenerator"), instanceOf(SnowflakeKeyGenerateAlgorithm.class));
+ assertThat(shardingRuleConfiguration.getKeyGenerators().get("keyGenerator").getProps().getProperty("worker.id"), is("123"));
}
}