This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 1b4944455d6 Refactor AlterTrafficRuleHandlerTest and
CreateTrafficRuleHandlerTest (#18666)
1b4944455d6 is described below
commit 1b4944455d645d2cd0ccdb423d0de4108dc2ca79
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jun 28 21:38:05 2022 +0800
Refactor AlterTrafficRuleHandlerTest and CreateTrafficRuleHandlerTest
(#18666)
---
.../updatable/AlterTrafficRuleHandlerTest.java | 23 +++++++++---------
.../updatable/CreateTrafficRuleHandlerTest.java | 28 +++++++++++-----------
2 files changed, 25 insertions(+), 26 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandlerTest.java
index a30e46cb6f1..5d9a77fc515 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandlerTest.java
@@ -34,7 +34,6 @@ import
org.apache.shardingsphere.traffic.rule.TrafficStrategyRule;
import org.junit.Test;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
@@ -79,23 +78,23 @@ public final class AlterTrafficRuleHandlerTest extends
ProxyContextRestorer {
AlterTrafficRuleHandler handler = new AlterTrafficRuleHandler();
handler.init(new
AlterTrafficRuleStatement(Arrays.asList(trafficRuleSegment1,
trafficRuleSegment2)), null);
handler.execute();
- TrafficRuleConfiguration alterConfig =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class).getConfiguration();
- assertThat(alterConfig.getTrafficStrategies().size(), is(2));
- assertThat(alterConfig.getLoadBalancers().size(), is(2));
- assertThat(alterConfig.getTrafficAlgorithms().size(), is(2));
- assertThat(new
ArrayList<>(alterConfig.getTrafficStrategies()).get(0).getName(),
is("rule_name_1"));
-
assertNotNull(alterConfig.getTrafficAlgorithms().get("rule_name_1_distsql.fixture"));
-
assertNotNull(alterConfig.getLoadBalancers().get("rule_name_2_distsql.fixture"));
+ TrafficRuleConfiguration alteredConfig =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class).getConfiguration();
+ assertThat(alteredConfig.getTrafficStrategies().size(), is(2));
+ assertThat(alteredConfig.getLoadBalancers().size(), is(2));
+ assertThat(alteredConfig.getTrafficAlgorithms().size(), is(2));
+
assertThat(alteredConfig.getTrafficStrategies().iterator().next().getName(),
is("rule_name_1"));
+
assertNotNull(alteredConfig.getTrafficAlgorithms().get("rule_name_1_distsql.fixture"));
+
assertNotNull(alteredConfig.getLoadBalancers().get("rule_name_2_distsql.fixture"));
}
private ContextManager mockContextManager() {
- ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
+ ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
TrafficRule rule = mockTrafficRule();
when(rule.getConfiguration()).thenReturn(createTrafficRuleConfiguration());
ShardingSphereRuleMetaData globalRuleMetaData = new
ShardingSphereRuleMetaData(new LinkedList<>(Collections.singleton(rule)));
-
when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
- ProxyContext.init(contextManager);
- return contextManager;
+
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ ProxyContext.init(result);
+ return result;
}
private TrafficRule mockTrafficRule() {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandlerTest.java
index 957126d152a..c3a158fdff9 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandlerTest.java
@@ -79,26 +79,26 @@ public final class CreateTrafficRuleHandlerTest extends
ProxyContextRestorer {
CreateTrafficRuleHandler handler = new CreateTrafficRuleHandler();
handler.init(new
CreateTrafficRuleStatement(Arrays.asList(trafficRuleSegment1,
trafficRuleSegment2)), null);
handler.execute();
- TrafficRuleConfiguration addConfig =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class).getConfiguration();
- assertThat(addConfig.getTrafficStrategies().size(), is(4));
- assertThat(addConfig.getLoadBalancers().size(), is(4));
- assertThat(addConfig.getTrafficAlgorithms().size(), is(4));
- assertThat(new
ArrayList<>(addConfig.getTrafficStrategies()).get(2).getName(),
is("rule_name_3"));
- assertThat(new
ArrayList<>(addConfig.getTrafficStrategies()).get(3).getName(),
is("rule_name_4"));
- assertNotNull(addConfig.getTrafficAlgorithms().get("algorithm_2"));
- assertNotNull(addConfig.getLoadBalancers().get("load_balancer_2"));
-
assertNotNull(addConfig.getTrafficAlgorithms().get("rule_name_3_distsql.fixture"));
-
assertNotNull(addConfig.getLoadBalancers().get("rule_name_4_distsql.fixture"));
+ TrafficRuleConfiguration addedConfig =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TrafficRule.class).getConfiguration();
+ assertThat(addedConfig.getTrafficStrategies().size(), is(4));
+ assertThat(addedConfig.getLoadBalancers().size(), is(4));
+ assertThat(addedConfig.getTrafficAlgorithms().size(), is(4));
+ assertThat(new
ArrayList<>(addedConfig.getTrafficStrategies()).get(2).getName(),
is("rule_name_3"));
+ assertThat(new
ArrayList<>(addedConfig.getTrafficStrategies()).get(3).getName(),
is("rule_name_4"));
+ assertNotNull(addedConfig.getTrafficAlgorithms().get("algorithm_2"));
+ assertNotNull(addedConfig.getLoadBalancers().get("load_balancer_2"));
+
assertNotNull(addedConfig.getTrafficAlgorithms().get("rule_name_3_distsql.fixture"));
+
assertNotNull(addedConfig.getLoadBalancers().get("rule_name_4_distsql.fixture"));
}
private ContextManager mockContextManager() {
- ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
+ ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
TrafficRule rule = mockTrafficRule();
when(rule.getConfiguration()).thenReturn(createTrafficRuleConfiguration());
ShardingSphereRuleMetaData globalRuleMetaData = new
ShardingSphereRuleMetaData(new LinkedList<>(Collections.singleton(rule)));
-
when(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
- ProxyContext.init(contextManager);
- return contextManager;
+
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(globalRuleMetaData);
+ ProxyContext.init(result);
+ return result;
}
private TrafficRule mockTrafficRule() {
