This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 474dec2 升级metrics模块单元测试框架，从JUnit4到JUnit5 (#2864)
474dec2 is described below
commit 474dec2b7bacec004a441960c79417ee4898650c
Author: hbyandy <[email protected]>
AuthorDate: Fri Feb 11 11:21:24 2022 +0800
升级metrics模块单元测试框架，从JUnit4到JUnit5 (#2864)
---
.../collector/BuildInfoCollectorTest.java | 9 +++---
.../register/PrometheusMetricsRegisterTest.java | 4 +--
.../service/PrometheusBootServiceTest.java | 16 +++++-----
.../shenyu/metrics/config/JmxConfigTest.java | 14 ++++-----
.../shenyu/metrics/config/MetricsConfigTest.java | 13 ++++-----
.../shenyu/metrics/enums/MetricsTypeEnumTest.java | 7 ++---
.../metrics/reporter/MetricsReporterTest.java | 34 ++++++++++++----------
7 files changed, 49 insertions(+), 48 deletions(-)
diff --git
a/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/collector/BuildInfoCollectorTest.java
b/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/collector/BuildInfoCollectorTest.java
index 665c789..d4e6aa5 100644
---
a/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/collector/BuildInfoCollectorTest.java
+++
b/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/collector/BuildInfoCollectorTest.java
@@ -17,10 +17,9 @@
package org.apache.shenyu.metrics.prometheus.collector;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* The Test Case For BuildInfoCollector.
@@ -29,7 +28,7 @@ public final class BuildInfoCollectorTest {
private BuildInfoCollector buildInfoCollector;
- @Before
+ @BeforeEach
public void setUp() {
buildInfoCollector = new BuildInfoCollector();
}
diff --git
a/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
b/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
index 6ad0a65..95feba6 100644
---
a/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
+++
b/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
@@ -20,12 +20,12 @@ package org.apache.shenyu.metrics.prometheus.register;
import io.prometheus.client.Counter;
import io.prometheus.client.Histogram;
import org.apache.shenyu.common.utils.ReflectUtils;
-import org.junit.Test;
import java.util.Map;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public final class PrometheusMetricsRegisterTest {
diff --git
a/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/service/PrometheusBootServiceTest.java
b/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/service/PrometheusBootServiceTest.java
index b40f723..526145f 100644
---
a/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/service/PrometheusBootServiceTest.java
+++
b/shenyu-metrics/shenyu-metrics-prometheus/src/test/java/org/apache/shenyu/metrics/prometheus/service/PrometheusBootServiceTest.java
@@ -23,17 +23,17 @@ import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.common.utils.ReflectUtils;
import org.apache.shenyu.metrics.config.MetricsConfig;
import org.apache.shenyu.metrics.prometheus.register.PrometheusMetricsRegister;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
import java.lang.reflect.Field;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for PrometheusMetricsTrackerManager.
@@ -42,7 +42,7 @@ public final class PrometheusBootServiceTest {
private static final PrometheusBootService PROMETHEUS_BOOT_SERVICE = new
PrometheusBootService();
- @Before
+ @BeforeEach
public void init() {
CollectorRegistry.defaultRegistry.clear();
}
@@ -62,7 +62,7 @@ public final class PrometheusBootServiceTest {
assertTrue(PROMETHEUS_BOOT_SERVICE.getRegistered().get());
}
- @AfterClass
+ @AfterAll
public static void close() {
PROMETHEUS_BOOT_SERVICE.stop();
}
diff --git
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/JmxConfigTest.java
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/JmxConfigTest.java
index d567189..9447b99 100644
---
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/JmxConfigTest.java
+++
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/JmxConfigTest.java
@@ -19,18 +19,18 @@ package org.apache.shenyu.metrics.config;
import org.apache.shenyu.metrics.config.JmxConfig.Rule;
import org.apache.shenyu.metrics.config.JmxConfig.Type;
-import org.junit.Before;
-import org.junit.Test;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import java.util.Collections;
import java.util.regex.Pattern;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* The Test Case For JmxConfig.
@@ -39,7 +39,7 @@ public final class JmxConfigTest {
private JmxConfig jmxConfig;
- @Before
+ @BeforeEach
public void setUp() throws MalformedObjectNameException {
jmxConfig = new JmxConfig();
jmxConfig.setStartDelaySeconds(10);
diff --git
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/MetricsConfigTest.java
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/MetricsConfigTest.java
index 69cda9e..150584d 100644
---
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/MetricsConfigTest.java
+++
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/config/MetricsConfigTest.java
@@ -17,14 +17,13 @@
package org.apache.shenyu.metrics.config;
-import org.junit.Before;
-import org.junit.Test;
-
import java.util.Properties;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* The Test Case For MetricsConfig.
@@ -33,7 +32,7 @@ public final class MetricsConfigTest {
private MetricsConfig metricsConfig;
- @Before
+ @BeforeEach
public void setUp() {
Properties properties = new Properties();
properties.setProperty("key", "value");
diff --git
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/enums/MetricsTypeEnumTest.java
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/enums/MetricsTypeEnumTest.java
index 830b012..6d81fe1 100644
---
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/enums/MetricsTypeEnumTest.java
+++
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/enums/MetricsTypeEnumTest.java
@@ -17,12 +17,11 @@
package org.apache.shenyu.metrics.enums;
-import org.junit.Test;
-
import java.util.Arrays;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* The Test Case For MetricsTypeEnum.
diff --git
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/reporter/MetricsReporterTest.java
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/reporter/MetricsReporterTest.java
index f4e9201..774a778 100644
---
a/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/reporter/MetricsReporterTest.java
+++
b/shenyu-metrics/shenyu-metrics-spi/src/test/java/org/apache/shenyu/metrics/reporter/MetricsReporterTest.java
@@ -20,12 +20,14 @@ package org.apache.shenyu.metrics.reporter;
import org.apache.shenyu.metrics.entity.Metric;
import org.apache.shenyu.metrics.enums.MetricType;
import org.apache.shenyu.metrics.spi.MetricsRegister;
-import org.junit.Test;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+
/**
* MetricsReporterTest.
*/
@@ -38,21 +40,23 @@ public class MetricsReporterTest {
MetricsReporter.register(metricsRegister);
}
- @Test(expected = RuntimeException.class)
+ @Test
public void testRegisterMetrics() {
- List<String> labels = Collections.singletonList("label");
- Collection<Metric> metricsCounter = Collections.singletonList(new
Metric(MetricType.COUNTER,
- "request_total", "shenyu request total count", labels));
- MetricsReporter.registerMetrics(metricsCounter);
- Collection<Metric> metricsGauge = Collections.singletonList(new
Metric(MetricType.GAUGE,
- "jvm.total.used", "shenyu jvm total used", labels));
- MetricsReporter.registerMetrics(metricsGauge);
- Collection<Metric> metricsHistogram = Collections.singletonList(new
Metric(MetricType.HISTOGRAM,
- "requests_latency_histogram_millis", "the shenyu proxy
executor latency millis", labels));
- MetricsReporter.registerMetrics(metricsHistogram);
- Collection<Metric> metricsNull = Collections.singletonList(new
Metric(null,
- null, null, labels));
- MetricsReporter.registerMetrics(metricsNull);
+ Assertions.assertThrows(RuntimeException.class, () -> {
+ List<String> labels = Collections.singletonList("label");
+ Collection<Metric> metricsCounter = Collections.singletonList(new
Metric(MetricType.COUNTER,
+ "request_total", "shenyu request total count", labels));
+ MetricsReporter.registerMetrics(metricsCounter);
+ Collection<Metric> metricsGauge = Collections.singletonList(new
Metric(MetricType.GAUGE,
+ "jvm.total.used", "shenyu jvm total used", labels));
+ MetricsReporter.registerMetrics(metricsGauge);
+ Collection<Metric> metricsHistogram =
Collections.singletonList(new Metric(MetricType.HISTOGRAM,
+ "requests_latency_histogram_millis", "the shenyu proxy
executor latency millis", labels));
+ MetricsReporter.registerMetrics(metricsHistogram);
+ Collection<Metric> metricsNull = Collections.singletonList(new
Metric(null,
+ null, null, labels));
+ MetricsReporter.registerMetrics(metricsNull);
+ });
}
@Test
