This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 51715797ef [improve] optimize `DnsCollectTest` with status code.
(#3209)
51715797ef is described below
commit 51715797efd3534458da62080e3ba7f1b23e143d
Author: Nick Guo <[email protected]>
AuthorDate: Thu Apr 3 14:01:10 2025 +0800
[improve] optimize `DnsCollectTest` with status code. (#3209)
Co-authored-by: tomsun28 <[email protected]>
---
.../collector/collect/dns/DnsCollectImplTest.java | 54 +++++++++-------------
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java
index c238c84afe..bdb5621fd8 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java
@@ -47,31 +47,28 @@ public class DnsCollectImplTest {
.address("www.google.com")
.timeout("3000")
.port("53")
+ .tcp("tcp")
.build();
}
@Test
public void testPreCheck() {
- assertThrows(IllegalArgumentException.class, () -> {
- Metrics metrics = new Metrics();
- metrics.setName("question");
- metrics.setDns(dnsProtocol);
- dnsCollect.preCheck(metrics);
- });
+ CollectRep.MetricsData.Builder builder =
CollectRep.MetricsData.newBuilder();
+ //metrics is null
+ dnsCollect.collect(builder, null);
+ assertEquals(CollectRep.Code.FAIL, builder.getCode());
- //query class is blank
+ //invalid DnsProtocol
+ Metrics metrics = new Metrics();
assertThrows(IllegalArgumentException.class, () -> {
DnsProtocol dns = DnsProtocol.builder().build();
-
- Metrics metrics = new Metrics();
metrics.setDns(dns);
dnsCollect.preCheck(metrics);
});
- // no exception throws
+ //validated DnsProtocol
assertDoesNotThrow(() -> {
- dnsProtocol.setTcp("tcp");
- Metrics metrics = new Metrics();
+ metrics.setName("question");
metrics.setDns(dnsProtocol);
dnsCollect.preCheck(metrics);
});
@@ -80,28 +77,23 @@ public class DnsCollectImplTest {
@Test
public void testCollect() {
CollectRep.MetricsData.Builder builder =
CollectRep.MetricsData.newBuilder();
- long monitorId = 666;
- String app = "testDNS";
- Metrics metrics = new Metrics();
- metrics.setName("question");
- metrics.setDns(dnsProtocol);
- metrics.setAliasFields(Collections.singletonList("section"));
- dnsCollect.collect(builder, metrics);
+ Metrics metrics0 = Metrics.builder()
+ .name("question")
+ .dns(dnsProtocol)
+ .aliasFields(Collections.singletonList("section"))
+ .build();
+ dnsCollect.collect(builder, metrics0);
+ assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
assertNotNull(builder.getValues(0).getColumns(0));
- // dns is null, no exception throws
- assertDoesNotThrow(() -> {
- dnsCollect.collect(builder, null);
- });
-
// metric name is header
- assertDoesNotThrow(() -> {
- Metrics metrics1 = new Metrics();
- metrics1.setName("header");
- metrics1.setDns(dnsProtocol);
- metrics1.setAliasFields(Collections.singletonList("section"));
- dnsCollect.collect(builder, metrics1);
- });
+ Metrics metrics1 = Metrics.builder()
+ .name("header")
+ .dns(dnsProtocol)
+ .aliasFields(Collections.singletonList("section"))
+ .build();
+ dnsCollect.collect(builder, metrics1);
+ assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
