This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 3d1e159 Improve unit test coverage for control-panel-cluster (#6807)
3d1e159 is described below
commit 3d1e159c1edc6a72f4fc25a66a03bc49658113c4
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Aug 12 18:04:36 2020 +0800
Improve unit test coverage for control-panel-cluster (#6807)
* Add unit test for ClusterFacade
* Add unit test for ClusterHeartbeatInstance
* Add unit test for HeartbeatTaskManager
* for checkstyle
---
.../cluster/facade/ClusterFacadeTest.java | 98 ++++++++++++++++++++++
.../heartbeat/ClusterHeartbeatInstanceTest.java | 23 +++++
.../heartbeat/task/HeartbeatTaskManagerTest.java | 6 ++
3 files changed, 127 insertions(+)
diff --git
a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterFacadeTest.java
b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterFacadeTest.java
new file mode 100644
index 0000000..b6a5bba
--- /dev/null
+++
b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterFacadeTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.cluster.facade;
+
+import lombok.SneakyThrows;
+import
org.apache.shardingsphere.cluster.configuration.config.ClusterConfiguration;
+import
org.apache.shardingsphere.cluster.configuration.config.HeartbeatConfiguration;
+import org.apache.shardingsphere.cluster.heartbeat.ClusterHeartbeatInstance;
+import org.apache.shardingsphere.cluster.heartbeat.response.HeartbeatResponse;
+import org.apache.shardingsphere.cluster.heartbeat.response.HeartbeatResult;
+import org.apache.shardingsphere.cluster.state.ClusterStateInstance;
+import org.apache.shardingsphere.cluster.state.InstanceState;
+import org.apache.shardingsphere.control.panel.spi.ControlPanelConfiguration;
+import
org.apache.shardingsphere.control.panel.spi.engine.ControlPanelFacadeEngine;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.internal.util.reflection.FieldSetter;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class ClusterFacadeTest {
+
+ private static final ClusterFacade INSTANCE = ClusterFacade.getInstance();
+
+ @Mock
+ private ClusterHeartbeatInstance clusterHeartbeatInstance;
+
+ @Mock
+ private ClusterStateInstance clusterStateInstance;
+
+ @Test
+ public void assertDetectHeartbeatBeforeInit() {
+ INSTANCE.detectHeartbeat(new HashMap<>());
+ }
+
+ @SneakyThrows(ReflectiveOperationException.class)
+ @Test
+ public void assertDetectHeartbeat() {
+ init();
+ FieldSetter.setField(INSTANCE,
ClusterFacade.class.getDeclaredField("clusterHeartbeatInstance"),
clusterHeartbeatInstance);
+ FieldSetter.setField(INSTANCE,
ClusterFacade.class.getDeclaredField("clusterStateInstance"),
clusterStateInstance);
+
when(clusterHeartbeatInstance.detect(anyMap())).thenReturn(buildHeartbeatResponse());
+ when(clusterStateInstance.loadInstanceState()).thenReturn(new
InstanceState());
+ INSTANCE.detectHeartbeat(new HashMap<>());
+ }
+
+ private void init() {
+ HeartbeatConfiguration heartBeatConfig = new HeartbeatConfiguration();
+ heartBeatConfig.setSql("select 1");
+ heartBeatConfig.setInterval(60);
+ heartBeatConfig.setRetryEnable(true);
+ heartBeatConfig.setRetryMaximum(3);
+ ClusterConfiguration clusterConfiguration = new ClusterConfiguration();
+ clusterConfiguration.setHeartbeat(heartBeatConfig);
+ List<ControlPanelConfiguration> controlPanelConfigs = new
LinkedList<>();
+ controlPanelConfigs.add(clusterConfiguration);
+ new ControlPanelFacadeEngine().init(controlPanelConfigs);
+ }
+
+ private HeartbeatResponse buildHeartbeatResponse() {
+ return new HeartbeatResponse(buildHeartbeatResult());
+ }
+
+ private Map<String, Collection<HeartbeatResult>> buildHeartbeatResult() {
+ Map<String, Collection<HeartbeatResult>> result = new HashMap<>();
+ Collection<HeartbeatResult> heartbeatResults = new ArrayList<>();
+ heartbeatResults.add(new HeartbeatResult("ds_0", true,
System.currentTimeMillis(), false));
+ heartbeatResults.add(new HeartbeatResult("ds_1", true,
System.currentTimeMillis(), false));
+ result.put("logic_db", heartbeatResults);
+ return result;
+ }
+}
diff --git
a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstanceTest.java
b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstanceTest.java
index bc1745f..0b1d469 100644
---
a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstanceTest.java
+++
b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/ClusterHeartbeatInstanceTest.java
@@ -17,14 +17,37 @@
package org.apache.shardingsphere.cluster.heartbeat;
+import
org.apache.shardingsphere.cluster.configuration.config.HeartbeatConfiguration;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertNotNull;
+@RunWith(MockitoJUnitRunner.class)
public final class ClusterHeartbeatInstanceTest {
+ private static final ClusterHeartbeatInstance INSTANCE =
ClusterHeartbeatInstance.getInstance();
+
+ @Before
+ public void setUp() {
+ HeartbeatConfiguration heartBeatConfig = new HeartbeatConfiguration();
+ heartBeatConfig.setSql("select 1");
+ heartBeatConfig.setInterval(60);
+ heartBeatConfig.setRetryEnable(true);
+ heartBeatConfig.setRetryMaximum(3);
+ INSTANCE.init(heartBeatConfig);
+ }
+
@Test
public void assertGetInstance() {
assertNotNull(ClusterHeartbeatInstance.getInstance());
}
+
+ @After
+ public void close() {
+ INSTANCE.close();
+ }
}
diff --git
a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManagerTest.java
b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManagerTest.java
index 45a5811..c289874 100644
---
a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManagerTest.java
+++
b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/task/HeartbeatTaskManagerTest.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.cluster.heartbeat.task;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.cluster.heartbeat.event.HeartbeatDetectNoticeEvent;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,4 +60,9 @@ public final class HeartbeatTaskManagerTest {
heartbeatTaskManager.start(heartbeatTask);
verify(executorService).scheduleAtFixedRate(any(Runnable.class),
anyLong(), anyLong(), any(TimeUnit.class));
}
+
+ @After
+ public void close() {
+ heartbeatTaskManager.close();
+ }
}
