[improve] Imporve checkstyle of test code. (#1864)

apache · Apr 28, 2024 · fd56652 · fd56652
1 parent 48e35be
commit fd56652
Show file tree

Hide file tree

Showing 45 changed files with 406 additions and 415 deletions.
diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java
@@ -18,7 +18,6 @@
 package org.apache.hertzbeat.alert;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.BeforeEach;
@@ -31,7 +30,7 @@
 class AlerterWorkerPoolTest {
 
     private static final int NUMBER_OF_THREADS = 10;
-    private AlerterWorkerPool pool ;
+    private AlerterWorkerPool pool;
     private AtomicInteger counter;
     private CountDownLatch latch;
 

diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java
@@ -17,11 +17,15 @@
 
 package org.apache.hertzbeat.alert.controller;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.util.Collections;
+import java.util.List;
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
+import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
-import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,12 +39,6 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.util.Collections;
-import java.util.List;
-
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * Test case for {@link AlertDefineController}
  */

diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefinesControllerTest.java
@@ -17,9 +17,19 @@
 
 package org.apache.hertzbeat.alert.controller;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
-import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -36,12 +46,6 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-
 /**
  * Test case for {@link AlertDefinesController}
  * Test whether the data mocked at the mock is correct, and test whether the format of the returned data is correct

diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertReportControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertReportControllerTest.java
@@ -17,6 +17,9 @@
 
 package org.apache.hertzbeat.alert.controller;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import org.apache.hertzbeat.alert.dto.GeneralCloudAlertReport;
 import org.apache.hertzbeat.alert.dto.TenCloudAlertReport;
 import org.apache.hertzbeat.alert.service.AlertService;
@@ -33,10 +36,6 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 /**
  * unit test for {@link AlertReportController }
  */

diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertsControllerTest.java
@@ -17,10 +17,17 @@
 
 package org.apache.hertzbeat.alert.controller;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
 import org.apache.hertzbeat.alert.dto.AlertSummary;
 import org.apache.hertzbeat.alert.service.AlertService;
-import org.apache.hertzbeat.common.entity.alerter.Alert;
 import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.Alert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,13 +44,6 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
-
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-
 /**
  * Test case for {@link AlertsController}
  */
@@ -67,7 +67,6 @@ void setUp() {
         ids = LongStream.rangeClosed(1, 10).boxed().collect(Collectors.toList());
     }
 
-//    @Test
     // todo: fix this test
     void getAlerts() throws Exception {
         String sortField = "id";

diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java
@@ -17,6 +17,19 @@
 
 package org.apache.hertzbeat.alert.service;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.anySet;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
 import org.apache.hertzbeat.alert.dao.AlertDefineBindDao;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
@@ -26,18 +39,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.*;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
 /**
  * Test case for {@link AlertDefineService}
  */

diff --git a/alerter/src/test/java/org/apache/hertzbeat/alert/util/AlertTemplateUtilTest.java b/alerter/src/test/java/org/apache/hertzbeat/alert/util/AlertTemplateUtilTest.java
@@ -17,13 +17,12 @@
 
 package org.apache.hertzbeat.alert.util;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import java.util.HashMap;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link AlertTemplateUtil}

diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImplTest.java
@@ -29,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.MockedConstruction;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;

diff --git a/...va/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java b/...va/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java
@@ -17,11 +17,9 @@
 
 package org.apache.hertzbeat.collector.collect.http.promethus.exporter;
 
-import org.junit.jupiter.api.Test;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -31,35 +29,35 @@ class ExporterParserTest {
 
     @Test
     void textToMetric() {
-        String resp = "# HELP disk_total_bytes Total space for path\n" +
-                        "# TYPE disk_total_bytes gauge\n" +
-                        "disk_total_bytes{path=\"C:\\\\hertzbeat\\\\repo\\\\testpath\",} 4.29496725504E11\n" +
-                        "# HELP  go_gc_cycles_automatic_gc_cycles_total Count of completed GC cycles generated by the Go runtime.\n" +
-                        "# TYPE go_gc_cycles_automatic_gc_cycles_total counter\n" +
-                        "go_gc_cycles_automatic_gc_cycles_total 0\n" +
-                        "# HELP go_gc_cycles_forced_gc_cycles_total Count of completed GC cycles forced by the application.\n" +
-                        "# TYPE go_gc_cycles_forced_gc_cycles_total counter\n" +
-                        "go_gc_cycles_forced_gc_cycles_total 0\n" +
-                        "# HELP go_gc_cycles_total_gc_cycles_total Count of all completed GC cycles.\n" +
-                        "# TYPE go_gc_cycles_total_gc_cycles_total counter\n" +
-                        "go_gc_cycles_total_gc_cycles_total 0\n" +
-                        "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n" +
-                        "# TYPE go_gc_duration_seconds summary\n" +
-                        "go_gc_duration_seconds{quantile=\"0\"} 0\n" +
-                        "go_gc_duration_seconds{quantile=\"0.25\"} 0\n" +
-                        "go_gc_duration_seconds{quantile=\"0.5\"} 0\n" +
-                        "go_gc_duration_seconds{quantile=\"0.75\"} 0\n" +
-                        "go_gc_duration_seconds{quantile=\"1\"} 0\n" +
-                        "# TYPE jvm info\n" +
-                        "# HELP jvm VM version info\n" +
-                        "jvm_info{runtime=\"OpenJDK Runtime Environment\",vendor=\"Azul Systems, Inc.\",version=\"11.0.13+8-LTS\"} 1.0\n" +
-                        "# TYPE jvm_gc_collection_seconds summary\n" +
-                        "# HELP jvm_gc_collection_seconds Time spent in a given JVM garbage collector in seconds.\n" +
-                        "jvm_gc_collection_seconds_count{gc=\"G1 Young Generation\"} 10.0\n" +
-                        "jvm_gc_collection_seconds_sum{gc=\"G1 Young Generation\"} 0.051\n" +
-                        "jvm_gc_collection_seconds_count{gc=\"G1 Old Generation\"} 0.0\n" +
-                        "jvm_gc_collection_seconds_sum{gc=\"G1 Old Generation\"} 0.0\n" +
-                        "# EOF";
+        String resp = "# HELP disk_total_bytes Total space for path\n"
+                + "# TYPE disk_total_bytes gauge\n"
+                        + "disk_total_bytes{path=\"C:\\\\hertzbeat\\\\repo\\\\testpath\",} 4.29496725504E11\n"
+                        + "# HELP  go_gc_cycles_automatic_gc_cycles_total Count of completed GC cycles generated by the Go runtime.\n"
+                        + "# TYPE go_gc_cycles_automatic_gc_cycles_total counter\n"
+                        + "go_gc_cycles_automatic_gc_cycles_total 0\n"
+                        + "# HELP go_gc_cycles_forced_gc_cycles_total Count of completed GC cycles forced by the application.\n"
+                        + "# TYPE go_gc_cycles_forced_gc_cycles_total counter\n"
+                        + "go_gc_cycles_forced_gc_cycles_total 0\n"
+                        + "# HELP go_gc_cycles_total_gc_cycles_total Count of all completed GC cycles.\n"
+                        + "# TYPE go_gc_cycles_total_gc_cycles_total counter\n"
+                        + "go_gc_cycles_total_gc_cycles_total 0\n"
+                        + "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n"
+                        + "# TYPE go_gc_duration_seconds summary\n"
+                        + "go_gc_duration_seconds{quantile=\"0\"} 0\n"
+                        + "go_gc_duration_seconds{quantile=\"0.25\"} 0\n"
+                        + "go_gc_duration_seconds{quantile=\"0.5\"} 0\n"
+                        + "go_gc_duration_seconds{quantile=\"0.75\"} 0\n"
+                        + "go_gc_duration_seconds{quantile=\"1\"} 0\n"
+                        + "# TYPE jvm info\n"
+                        + "# HELP jvm VM version info\n"
+                        + "jvm_info{runtime=\"OpenJDK Runtime Environment\",vendor=\"Azul Systems, Inc.\",version=\"11.0.13+8-LTS\"} 1.0\n"
+                        + "# TYPE jvm_gc_collection_seconds summary\n"
+                        + "# HELP jvm_gc_collection_seconds Time spent in a given JVM garbage collector in seconds.\n"
+                        + "jvm_gc_collection_seconds_count{gc=\"G1 Young Generation\"} 10.0\n"
+                        + "jvm_gc_collection_seconds_sum{gc=\"G1 Young Generation\"} 0.051\n"
+                        + "jvm_gc_collection_seconds_count{gc=\"G1 Old Generation\"} 0.0\n"
+                        + "jvm_gc_collection_seconds_sum{gc=\"G1 Old Generation\"} 0.0\n"
+                        + "# EOF";
         ExporterParser parser = new ExporterParser();
         Map<String, MetricFamily> metricFamilyMap = parser.textToMetric(resp);
         assertEquals(7, metricFamilyMap.size());

diff --git a/...tor/src/test/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java b/...tor/src/test/java/org/apache/hertzbeat/collector/dispatch/unit/TimeLengthConvertTest.java
@@ -17,12 +17,11 @@
 
 package org.apache.hertzbeat.collector.dispatch.unit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.apache.hertzbeat.collector.dispatch.unit.impl.TimeLengthConvert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Test case for {@link TimeLengthConvert}
  */

diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java
@@ -17,25 +17,24 @@
 
 package org.apache.hertzbeat.collector.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.hertzbeat.common.entity.job.Configmap;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import static org.junit.jupiter.api.Assertions.*;
-
 /**
  * Test case for {@link CollectUtil}
  */