diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java index 6ef16b50843..91bcb8e51a8 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/common/cache/CommonCacheTest.java @@ -17,9 +17,9 @@ package org.apache.hertzbeat.collector.collect.common.cache; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java index bbe4c99d923..69145d23a93 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java @@ -17,12 +17,9 @@ package org.apache.hertzbeat.collector.collect.http.promethus.exporter; -import org.apache.hertzbeat.common.util.JsonUtil; -import org.junit.jupiter.api.Test; - -import java.util.Map; - import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.Map; +import org.junit.jupiter.api.Test; /** * Test case for {@link ExporterParser} diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/collect/mongodb/MongoCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/mongodb/MongoCollectImplTest.java index 72cbaf8d273..134275d511e 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/collect/mongodb/MongoCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/mongodb/MongoCollectImplTest.java @@ -19,14 +19,14 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.List; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.List; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.MongodbProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; @@ -72,7 +72,7 @@ void setUp() { } @Test - void MockTest() { + void mockTest() { CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder(); mongodbProtocol.setCommand("hostInfo.os"); Metrics metrics = new Metrics(); diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java index 03de6e012a2..cc4b89a66a5 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/collect/udp/UdpCollectImplTest.java @@ -57,7 +57,7 @@ void testPreCheck() { @Test void testCollect() { CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder(); - UdpProtocol ftpProtocol = UdpProtocol.builder() + UdpProtocol udpProtocol = UdpProtocol.builder() .timeout("10") .port("21") .host("127.0.0.1") @@ -73,7 +73,7 @@ void testCollect() { List aliasField = new ArrayList<>(); aliasField.add("responseTime"); Metrics metrics = new Metrics(); - metrics.setUdp(ftpProtocol); + metrics.setUdp(udpProtocol); metrics.setAliasFields(aliasField); udpCollect.preCheck(metrics); udpCollect.collect(builder, 1L, "test", metrics); @@ -88,7 +88,7 @@ void testCollect() { @Test void testCollectWithSocketException() { CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder(); - UdpProtocol ftpProtocol = UdpProtocol.builder() + UdpProtocol udpProtocol = UdpProtocol.builder() .timeout("10") .port("21") .host("127.0.0.1") @@ -104,7 +104,7 @@ void testCollectWithSocketException() { List aliasField = new ArrayList<>(); aliasField.add("responseTime"); Metrics metrics = new Metrics(); - metrics.setUdp(ftpProtocol); + metrics.setUdp(udpProtocol); metrics.setAliasFields(aliasField); udpCollect.preCheck(metrics); udpCollect.collect(builder, 1L, "test", metrics); @@ -116,7 +116,7 @@ void testCollectWithSocketException() { @Test void testCollectWithPortUnreachableException() { CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder(); - UdpProtocol ftpProtocol = UdpProtocol.builder() + UdpProtocol udpProtocol = UdpProtocol.builder() .timeout("10") .port("21") .host("127.0.0.1") @@ -132,7 +132,7 @@ void testCollectWithPortUnreachableException() { List aliasField = new ArrayList<>(); aliasField.add("responseTime"); Metrics metrics = new Metrics(); - metrics.setUdp(ftpProtocol); + metrics.setUdp(udpProtocol); metrics.setAliasFields(aliasField); udpCollect.preCheck(metrics); udpCollect.collect(builder, 1L, "test", metrics); 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 index 63cd4274ba5..f0f70cf14e0 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java @@ -32,8 +32,6 @@ 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; /** diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java index 33de401f49b..8472376fab7 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/util/JsonPathParserTest.java @@ -17,15 +17,12 @@ package org.apache.hertzbeat.collector.util; -import com.jayway.jsonpath.TypeRef; -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.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; /** * Test case for {@link JsonPathParser} @@ -80,62 +77,26 @@ class JsonPathParserTest { @Test void parseContentWithJsonPath() { // process array - List tom = JsonPathParser.parseContentWithJsonPath(JSON_ARRAY,"$[0].name"); + List tom = JsonPathParser.parseContentWithJsonPath(JSON_ARRAY, "$[0].name"); assertNotNull(tom); - assertEquals("tom",tom.get(0)); + assertEquals("tom", tom.get(0)); // get json array map - List entry = JsonPathParser.parseContentWithJsonPath(JSON_ARRAY,"$[1]"); + List entry = JsonPathParser.parseContentWithJsonPath(JSON_ARRAY, "$[1]"); assertNotNull(entry); entry.forEach(e -> { assertInstanceOf(Map.class, e); - assertEquals("543",((Map)e).get("speed")); + assertEquals("543", ((Map) e).get("speed")); }); // process object - List author = JsonPathParser.parseContentWithJsonPath(JSON_OBJECT,"$.store.book[0].author"); + List author = JsonPathParser.parseContentWithJsonPath(JSON_OBJECT, "$.store.book[0].author"); assertNotNull(author); - assertEquals("Nigel Rees",author.get(0)); + assertEquals("Nigel Rees", author.get(0)); // get json object map - List book = JsonPathParser.parseContentWithJsonPath(JSON_OBJECT,"$.store.book[1]"); + List book = JsonPathParser.parseContentWithJsonPath(JSON_OBJECT, "$.store.book[1]"); assertNotNull(book); book.forEach(e -> { assertInstanceOf(Map.class, e); - assertEquals("Sword of Honour",((Map)e).get("title")); - }); - } - - /** - * @throws java.lang.UnsupportedOperationException: Json-smart provider does not support TypeRef! Use a Jackson or Gson based provider - * need provid an provider to support TypeRef,like this: - * final Configuration configuration = Configuration.builder()// - * .jsonProvider(new JacksonJsonProvider(Json.mapper()))// - * .mappingProvider(new JacksonMappingProvider(Json.mapper()))// - * .build(); - */ -// @Test - void parseContentWithJsonPath2() { - TypeRef> typeStringRef = new TypeRef>() {}; - // process array - List tom = JsonPathParser.parseContentWithJsonPath(JSON_ARRAY,"$[0].name",typeStringRef); - assertNotNull(tom); - assertEquals("tom",tom.get(0)); - TypeRef> typeMapRef = new TypeRef>() {}; - // get json array map - List entry = JsonPathParser.parseContentWithJsonPath(JSON_ARRAY,"$[1]",typeMapRef); - assertNotNull(entry); - entry.forEach(e -> { - assertEquals("543",e.get("speed")); - }); - TypeRef> typeStrRef = new TypeRef>() {}; - // process object - List author = JsonPathParser.parseContentWithJsonPath(JSON_OBJECT,"$.store.book[0].author",typeStrRef); - assertNotNull(author); - assertEquals("Nigel Rees",author.get(0)); - TypeRef> typeObjMapRef = new TypeRef>() {}; - // get json object map - List book = JsonPathParser.parseContentWithJsonPath(JSON_OBJECT,"$.store.book[1]",typeObjMapRef); - assertNotNull(book); - book.forEach(e -> { - assertEquals("Sword of Honour",e.get("title")); + assertEquals("Sword of Honour", ((Map) e).get("title")); }); } } diff --git a/collector/src/test/java/org/apache/hertzbeat/collector/util/TimeExpressionUtilTest.java b/collector/src/test/java/org/apache/hertzbeat/collector/util/TimeExpressionUtilTest.java index f0cc04ce9fd..407de1dfb83 100644 --- a/collector/src/test/java/org/apache/hertzbeat/collector/util/TimeExpressionUtilTest.java +++ b/collector/src/test/java/org/apache/hertzbeat/collector/util/TimeExpressionUtilTest.java @@ -19,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; - import java.time.LocalDateTime; import org.junit.jupiter.api.Test;