terrymanu commented on a change in pull request #15216:
URL: https://github.com/apache/shardingsphere/pull/15216#discussion_r795225801
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
+ when(qualifiedSchema.getSchemaName()).thenReturn("test_schema");
+
when(mockPrimaryStateChangedEvent.getQualifiedSchema()).thenReturn(qualifiedSchema);
+ ShardingSphereRuleMetaData mockShardingSphereRuleMetaData =
mock(ShardingSphereRuleMetaData.class);
+ Collection<ShardingSphereRule> rules = new LinkedList<>();
+ StatusContainedRule mockStatusContainedRule =
mock(StatusContainedRule.class);
+ rules.add(mockStatusContainedRule);
+ when(mockShardingSphereRuleMetaData.getRules()).thenReturn(rules);
+ ShardingSphereMetaData mockShardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
when(mockShardingSphereMetaData.getRuleMetaData()).thenReturn(mockShardingSphereRuleMetaData);
+
contextManager.getMetaDataContexts().getMetaDataMap().put("test_schema",
mockShardingSphereMetaData);
+ coordinator.renew(mockPrimaryStateChangedEvent);
+ verify(mockStatusContainedRule, times(1)).updateStatus(any());
+ }
+
+ @Test
+ public void assertRenewInstanceStatus() {
+ StateEvent mockStateEvent = mock(StateEvent.class);
+
when(mockStateEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ Collection<String> testStates = new LinkedList<>();
+ testStates.add(StateType.OK.name());
+ testStates.add(StateType.LOCK.name());
+ when(mockStateEvent.getStatus()).thenReturn(testStates);
+ coordinator.renew(mockStateEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
Review comment:
These 2 assertNotNull maybe useless, the next assertion can include
these 2 assertNotNull.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
+ when(qualifiedSchema.getSchemaName()).thenReturn("test_schema");
+
when(mockPrimaryStateChangedEvent.getQualifiedSchema()).thenReturn(qualifiedSchema);
+ ShardingSphereRuleMetaData mockShardingSphereRuleMetaData =
mock(ShardingSphereRuleMetaData.class);
+ Collection<ShardingSphereRule> rules = new LinkedList<>();
+ StatusContainedRule mockStatusContainedRule =
mock(StatusContainedRule.class);
+ rules.add(mockStatusContainedRule);
+ when(mockShardingSphereRuleMetaData.getRules()).thenReturn(rules);
+ ShardingSphereMetaData mockShardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
when(mockShardingSphereMetaData.getRuleMetaData()).thenReturn(mockShardingSphereRuleMetaData);
+
contextManager.getMetaDataContexts().getMetaDataMap().put("test_schema",
mockShardingSphereMetaData);
+ coordinator.renew(mockPrimaryStateChangedEvent);
+ verify(mockStatusContainedRule, times(1)).updateStatus(any());
+ }
+
+ @Test
+ public void assertRenewInstanceStatus() {
+ StateEvent mockStateEvent = mock(StateEvent.class);
+
when(mockStateEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ Collection<String> testStates = new LinkedList<>();
+ testStates.add(StateType.OK.name());
+ testStates.add(StateType.LOCK.name());
+ when(mockStateEvent.getStatus()).thenReturn(testStates);
+ coordinator.renew(mockStateEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
+
assertThat(contextManager.getInstanceContext().getInstance().getStatus(),
is(testStates));
+ testStates.add(StateType.CIRCUIT_BREAK.name());
+ coordinator.renew(mockStateEvent);
+
assertThat(contextManager.getInstanceContext().getState().getCurrentState(),
is(StateType.CIRCUIT_BREAK));
+ }
+
+ @Test
+ public void assertRenewWorkerIdChange() {
+ WorkerIdEvent mockWorkerIdEvent = mock(WorkerIdEvent.class);
+ when(mockWorkerIdEvent.getWorkerId()).thenReturn(12223L);
+
when(mockWorkerIdEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ coordinator.renew(mockWorkerIdEvent);
+ assertNotNull(contextManager.getInstanceContext());
Review comment:
This assertNotNull maybe useless, the next assertion can include this
assertNotNull.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
Review comment:
1. `DS` is abbreviate, could you use `DataSource` instead of it?
2. ShardingSphere only can support single primary data source, should the
method name rename from `Names` to `Name`?
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
Review comment:
Is it necessary to mock `QualifiedSchema`? If the object is easy to
create, please consider about using `new` at first priority.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
+ when(qualifiedSchema.getSchemaName()).thenReturn("test_schema");
+
when(mockPrimaryStateChangedEvent.getQualifiedSchema()).thenReturn(qualifiedSchema);
+ ShardingSphereRuleMetaData mockShardingSphereRuleMetaData =
mock(ShardingSphereRuleMetaData.class);
+ Collection<ShardingSphereRule> rules = new LinkedList<>();
+ StatusContainedRule mockStatusContainedRule =
mock(StatusContainedRule.class);
+ rules.add(mockStatusContainedRule);
+ when(mockShardingSphereRuleMetaData.getRules()).thenReturn(rules);
+ ShardingSphereMetaData mockShardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
when(mockShardingSphereMetaData.getRuleMetaData()).thenReturn(mockShardingSphereRuleMetaData);
+
contextManager.getMetaDataContexts().getMetaDataMap().put("test_schema",
mockShardingSphereMetaData);
+ coordinator.renew(mockPrimaryStateChangedEvent);
+ verify(mockStatusContainedRule, times(1)).updateStatus(any());
+ }
+
+ @Test
+ public void assertRenewInstanceStatus() {
+ StateEvent mockStateEvent = mock(StateEvent.class);
Review comment:
Is it necessary to mock `StateEvent`? If the object is easy to create,
please consider about using `new` at first priority.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
+ when(qualifiedSchema.getSchemaName()).thenReturn("test_schema");
+
when(mockPrimaryStateChangedEvent.getQualifiedSchema()).thenReturn(qualifiedSchema);
+ ShardingSphereRuleMetaData mockShardingSphereRuleMetaData =
mock(ShardingSphereRuleMetaData.class);
+ Collection<ShardingSphereRule> rules = new LinkedList<>();
+ StatusContainedRule mockStatusContainedRule =
mock(StatusContainedRule.class);
+ rules.add(mockStatusContainedRule);
+ when(mockShardingSphereRuleMetaData.getRules()).thenReturn(rules);
+ ShardingSphereMetaData mockShardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
when(mockShardingSphereMetaData.getRuleMetaData()).thenReturn(mockShardingSphereRuleMetaData);
+
contextManager.getMetaDataContexts().getMetaDataMap().put("test_schema",
mockShardingSphereMetaData);
+ coordinator.renew(mockPrimaryStateChangedEvent);
+ verify(mockStatusContainedRule, times(1)).updateStatus(any());
+ }
+
+ @Test
+ public void assertRenewInstanceStatus() {
+ StateEvent mockStateEvent = mock(StateEvent.class);
+
when(mockStateEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ Collection<String> testStates = new LinkedList<>();
+ testStates.add(StateType.OK.name());
+ testStates.add(StateType.LOCK.name());
+ when(mockStateEvent.getStatus()).thenReturn(testStates);
+ coordinator.renew(mockStateEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
+
assertThat(contextManager.getInstanceContext().getInstance().getStatus(),
is(testStates));
+ testStates.add(StateType.CIRCUIT_BREAK.name());
+ coordinator.renew(mockStateEvent);
+
assertThat(contextManager.getInstanceContext().getState().getCurrentState(),
is(StateType.CIRCUIT_BREAK));
+ }
+
+ @Test
+ public void assertRenewWorkerIdChange() {
+ WorkerIdEvent mockWorkerIdEvent = mock(WorkerIdEvent.class);
Review comment:
Is it necessary to mock `WorkerIdEvent`? If the object is easy to
create, please consider about using `new` at first priority.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
+ when(qualifiedSchema.getSchemaName()).thenReturn("test_schema");
+
when(mockPrimaryStateChangedEvent.getQualifiedSchema()).thenReturn(qualifiedSchema);
+ ShardingSphereRuleMetaData mockShardingSphereRuleMetaData =
mock(ShardingSphereRuleMetaData.class);
+ Collection<ShardingSphereRule> rules = new LinkedList<>();
+ StatusContainedRule mockStatusContainedRule =
mock(StatusContainedRule.class);
+ rules.add(mockStatusContainedRule);
+ when(mockShardingSphereRuleMetaData.getRules()).thenReturn(rules);
+ ShardingSphereMetaData mockShardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
when(mockShardingSphereMetaData.getRuleMetaData()).thenReturn(mockShardingSphereRuleMetaData);
+
contextManager.getMetaDataContexts().getMetaDataMap().put("test_schema",
mockShardingSphereMetaData);
+ coordinator.renew(mockPrimaryStateChangedEvent);
+ verify(mockStatusContainedRule, times(1)).updateStatus(any());
+ }
+
+ @Test
+ public void assertRenewInstanceStatus() {
+ StateEvent mockStateEvent = mock(StateEvent.class);
+
when(mockStateEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ Collection<String> testStates = new LinkedList<>();
+ testStates.add(StateType.OK.name());
+ testStates.add(StateType.LOCK.name());
+ when(mockStateEvent.getStatus()).thenReturn(testStates);
+ coordinator.renew(mockStateEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
+
assertThat(contextManager.getInstanceContext().getInstance().getStatus(),
is(testStates));
+ testStates.add(StateType.CIRCUIT_BREAK.name());
+ coordinator.renew(mockStateEvent);
+
assertThat(contextManager.getInstanceContext().getState().getCurrentState(),
is(StateType.CIRCUIT_BREAK));
+ }
+
+ @Test
+ public void assertRenewWorkerIdChange() {
+ WorkerIdEvent mockWorkerIdEvent = mock(WorkerIdEvent.class);
+ when(mockWorkerIdEvent.getWorkerId()).thenReturn(12223L);
+
when(mockWorkerIdEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ coordinator.renew(mockWorkerIdEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
+ assertThat(contextManager.getInstanceContext().getWorkerId(),
is(12223L));
+ }
+
+ @Test
+ public void assertRenewInstanceLabels() {
+ LabelsEvent mockLabelsEvent = mock(LabelsEvent.class);
Review comment:
Is it necessary to mock `LabelsEvent`? If the object is easy to create,
please consider about using `new` at first priority.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
+ QualifiedSchema qualifiedSchema = mock(QualifiedSchema.class);
+ when(qualifiedSchema.getSchemaName()).thenReturn("test_schema");
+
when(mockPrimaryStateChangedEvent.getQualifiedSchema()).thenReturn(qualifiedSchema);
+ ShardingSphereRuleMetaData mockShardingSphereRuleMetaData =
mock(ShardingSphereRuleMetaData.class);
+ Collection<ShardingSphereRule> rules = new LinkedList<>();
+ StatusContainedRule mockStatusContainedRule =
mock(StatusContainedRule.class);
+ rules.add(mockStatusContainedRule);
+ when(mockShardingSphereRuleMetaData.getRules()).thenReturn(rules);
+ ShardingSphereMetaData mockShardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
when(mockShardingSphereMetaData.getRuleMetaData()).thenReturn(mockShardingSphereRuleMetaData);
+
contextManager.getMetaDataContexts().getMetaDataMap().put("test_schema",
mockShardingSphereMetaData);
+ coordinator.renew(mockPrimaryStateChangedEvent);
+ verify(mockStatusContainedRule, times(1)).updateStatus(any());
+ }
+
+ @Test
+ public void assertRenewInstanceStatus() {
+ StateEvent mockStateEvent = mock(StateEvent.class);
+
when(mockStateEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ Collection<String> testStates = new LinkedList<>();
+ testStates.add(StateType.OK.name());
+ testStates.add(StateType.LOCK.name());
+ when(mockStateEvent.getStatus()).thenReturn(testStates);
+ coordinator.renew(mockStateEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
+
assertThat(contextManager.getInstanceContext().getInstance().getStatus(),
is(testStates));
+ testStates.add(StateType.CIRCUIT_BREAK.name());
+ coordinator.renew(mockStateEvent);
+
assertThat(contextManager.getInstanceContext().getState().getCurrentState(),
is(StateType.CIRCUIT_BREAK));
+ }
+
+ @Test
+ public void assertRenewWorkerIdChange() {
+ WorkerIdEvent mockWorkerIdEvent = mock(WorkerIdEvent.class);
+ when(mockWorkerIdEvent.getWorkerId()).thenReturn(12223L);
+
when(mockWorkerIdEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ coordinator.renew(mockWorkerIdEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
+ assertThat(contextManager.getInstanceContext().getWorkerId(),
is(12223L));
+ }
+
+ @Test
+ public void assertRenewInstanceLabels() {
+ LabelsEvent mockLabelsEvent = mock(LabelsEvent.class);
+ Collection<String> labels = new LinkedList<String>();
+ labels.add("test");
+ when(mockLabelsEvent.getLabels()).thenReturn(labels);
+
when(mockLabelsEvent.getInstanceId()).thenReturn(contextManager.getInstanceContext().getInstance().getInstanceDefinition().getInstanceId().getId());
+ coordinator.renew(mockLabelsEvent);
+ assertNotNull(contextManager.getInstanceContext());
+ assertNotNull(contextManager.getInstanceContext().getInstance());
Review comment:
These 2 assertNotNull maybe useless, the next assertion can include
these 2 assertNotNull.
##########
File path:
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
##########
@@ -250,4 +258,63 @@ private OptimizerContext createOptimizerContext() {
when(result.getFederationMetaData().getSchemas()).thenReturn(schemas);
return result;
}
+
+ @Test
+ public void assertRenewPrimaryDSNames() {
+ PrimaryStateChangedEvent mockPrimaryStateChangedEvent =
mock(PrimaryStateChangedEvent.class);
Review comment:
Is it necessary to mock `PrimaryStateChangedEvent`? If the object is
easy to create, please consider about using `new` at first priority.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
