Skip to content

Shardingsphere
Shardingsphere

apache / Shardingsphere

通知 56
Star 3
Fork 0
Shardingsphere
Shardingsphere

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 55438faf 编写于 作者: L Liang Zhang 提交者： GitHub
浏览文件
操作

Revise #5616 to support YAML shortcuts (#5629) 

* code style for SchemaChangedListenerTest

* support shortcut

* move yaml files into yaml folder
上级 ef21287c
隐藏空白更改
内联 并排
Showing with 41 addition and 43 deletion
sharding-orchestration/sharding-orchestration-core/sharding-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/listener/SchemaChangedListenerTest.java
浏览文件 @ 55438faf
......@@ -17,7 +17,7 @@
package org.apache.shardingsphere.orchestration.core.configcenter.listener;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.api.config.EncryptorRuleConfiguration;
import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration;
......@@ -28,24 +28,24 @@ import org.apache.shardingsphere.orchestration.core.common.event.DataSourceChang
import org.apache.shardingsphere.orchestration.core.common.event.EncryptRuleChangedEvent;
import org.apache.shardingsphere.orchestration.core.common.event.IgnoredShardingOrchestrationEvent;
import org.apache.shardingsphere.orchestration.core.common.event.MasterSlaveRuleChangedEvent;
import org.apache.shardingsphere.orchestration.core.common.event.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.orchestration.core.common.event.SchemaAddedEvent;
import org.apache.shardingsphere.orchestration.core.common.event.SchemaDeletedEvent;
import org.apache.shardingsphere.orchestration.core.common.event.ShardingOrchestrationEvent;
import org.apache.shardingsphere.orchestration.core.common.event.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.underlying.common.config.RuleConfiguration;
import org.apache.shardingsphere.underlying.common.yaml.representer.ShardingSphereYAMLRepresenter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
......@@ -54,15 +54,15 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class SchemaChangedListenerTest {
private static final String DATA_SOURCE_YAML = "data-source.yaml";
private static final String SHARDING_RULE_YAML = "sharding-rule.yaml";
private static final String MASTER_SLAVE_RULE_YAML = "master-slave-rule.yaml";
private static final String ENCRYPT_RULE_YAML = "encrypt-rule.yaml";
private static final String DATA_SOURCE_FILE = "yaml/data-source.yaml";
private static final String SHARDING_RULE_FILE = "yaml/sharding-rule.yaml";
private static final String MASTER_SLAVE_RULE_FILE = "yaml/master-slave-rule.yaml";
private static final String ENCRYPT_RULE_FILE = "yaml/encrypt-rule.yaml";
private SchemaChangedListener schemaChangedListener;
@Mock
......@@ -83,23 +83,16 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateDataSourceChangedEventForExistedSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/sharding_db/datasource", dataSource, ChangedType.UPDATED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(DataSourceChangedEvent.class));
assertThat(((DataSourceChangedEvent) actual).getShardingSchemaName(), is("sharding_db"));
}
private String readYamlIntoString(final String yamlFile) {
InputStream input = getClass().getClassLoader().getResourceAsStream(yamlFile);
Preconditions.checkNotNull(input, "file resource `%s` must not be null.", yamlFile);
Yaml yaml = new Yaml(new ShardingSphereYAMLRepresenter());
return yaml.dumpAsMap(yaml.load(input));
}
@Test
public void assertCreateRuleConfigurationsChangedEventForExistedSchema() {
String shardingRule = readYamlIntoString(SHARDING_RULE_YAML);
String shardingRule = readYAML(SHARDING_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/sharding_db/rule", shardingRule, ChangedType.UPDATED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(RuleConfigurationsChangedEvent.class));
......@@ -111,7 +104,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateMasterSlaveRuleChangedEventForExistedSchema() {
String masterSlaveRule = readYamlIntoString(MASTER_SLAVE_RULE_YAML);
String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/masterslave_db/rule", masterSlaveRule, ChangedType.UPDATED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(MasterSlaveRuleChangedEvent.class));
......@@ -121,7 +114,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptRuleChangedEventForExistedSchema() {
String encryptRule = readYamlIntoString(ENCRYPT_RULE_YAML);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/encrypt_db/rule", encryptRule, ChangedType.UPDATED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(EncryptRuleChangedEvent.class));
......@@ -143,8 +136,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateShardingSchemaAddedEventForNewSchema() {
String shardingRule = readYamlIntoString(SHARDING_RULE_YAML);
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String shardingRule = readYAML(SHARDING_RULE_FILE);
String dataSource = readYAML(DATA_SOURCE_FILE);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configCenterRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(shardingRule);
......@@ -157,8 +150,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateMasterSlaveSchemaAddedEventForNewSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String masterSlaveRule = readYamlIntoString(MASTER_SLAVE_RULE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configCenterRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
......@@ -171,8 +164,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptSchemaAddedEventForNewSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String encryptRule = readYamlIntoString(ENCRYPT_RULE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configCenterRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(encryptRule);
......@@ -185,7 +178,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaDeletedEventForNewSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/datasource", dataSource, ChangedType.DELETED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaDeletedEvent.class));
......@@ -194,7 +187,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithInvalidNodeChangedEvent() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db", dataSource, ChangedType.DELETED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(IgnoredShardingOrchestrationEvent.class));
......@@ -202,7 +195,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithNullShardingSchemaName() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/datasource", dataSource, ChangedType.DELETED);
ShardingOrchestrationEvent actual = schemaChangedListener.createShardingOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(IgnoredShardingOrchestrationEvent.class));
......@@ -210,8 +203,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithEncryptRuleConfigurationForNewSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String encryptRule = readYamlIntoString(ENCRYPT_RULE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configCenterRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", encryptRule, ChangedType.UPDATED);
......@@ -222,8 +215,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithShardingRuleConfigurationForNewSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String shardingRule = readYamlIntoString(SHARDING_RULE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
String shardingRule = readYAML(SHARDING_RULE_FILE);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configCenterRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", shardingRule, ChangedType.UPDATED);
......@@ -234,8 +227,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithMasterSlaveRuleConfigurationForNewSchema() {
String dataSource = readYamlIntoString(DATA_SOURCE_YAML);
String masterSlaveRule = readYamlIntoString(MASTER_SLAVE_RULE_YAML);
String dataSource = readYAML(DATA_SOURCE_FILE);
String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
when(configCenterRepository.get("/test/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configCenterRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", masterSlaveRule, ChangedType.UPDATED);
......@@ -243,4 +236,9 @@ public final class SchemaChangedListenerTest {
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(MasterSlaveRuleConfiguration.class));
}
@SneakyThrows
private String readYAML(final String yamlFile) {
return Files.readAllLines(Paths.get(ClassLoader.getSystemResource(yamlFile).toURI())).stream().map(each -> each + System.lineSeparator()).collect(Collectors.joining());
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或