You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by nk...@apache.org on 2020/08/06 14:53:08 UTC
[zookeeper] branch master updated: ZOOKEEPER-3855: Upgrade jUnit in
ZooKeeper-Metrics-providers
This is an automated email from the ASF dual-hosted git repository.
nkalmar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 531aae3 ZOOKEEPER-3855: Upgrade jUnit in ZooKeeper-Metrics-providers
531aae3 is described below
commit 531aae3edcf88819f90a324de3171276ecfaba25
Author: Tamas Penzes <ta...@cloudera.com>
AuthorDate: Thu Aug 6 16:53:00 2020 +0200
ZOOKEEPER-3855: Upgrade jUnit in ZooKeeper-Metrics-providers
Change-Id: I511cb610e269b502e946f52d152db7dcf6d2f2d4
Author: Tamas Penzes <ta...@cloudera.com>
Reviewers: Enrico Olivelli <eo...@apache.org>, Norbert Kalmar <nk...@apache.org>
Closes #1421 from tamaashu/ZOOKEEPER-3855
---
.../zookeeper-prometheus-metrics/pom.xml | 10 +++++++---
.../metrics/prometheus/ExportJvmInfoTest.java | 4 ++--
.../prometheus/PrometheusMetricsProviderTest.java | 20 ++++++++++----------
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
index 4f70e98..d21d353 100755
--- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
+++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
@@ -75,10 +75,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-runner</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/ExportJvmInfoTest.java b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/ExportJvmInfoTest.java
index fb5353d..82dc5aa 100644
--- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/ExportJvmInfoTest.java
+++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/ExportJvmInfoTest.java
@@ -18,10 +18,10 @@
package org.apache.zookeeper.metrics.prometheus;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import io.prometheus.client.CollectorRegistry;
import java.util.Properties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests about Prometheus Metrics Provider. Please note that we are not testing
diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProviderTest.java b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProviderTest.java
index 2d691db..720cec4 100644
--- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProviderTest.java
+++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/test/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProviderTest.java
@@ -19,11 +19,11 @@
package org.apache.zookeeper.metrics.prometheus;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import io.prometheus.client.CollectorRegistry;
@@ -39,9 +39,9 @@ import org.apache.zookeeper.metrics.Gauge;
import org.apache.zookeeper.metrics.MetricsContext;
import org.apache.zookeeper.metrics.Summary;
import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests about Prometheus Metrics Provider. Please note that we are not testing
@@ -51,7 +51,7 @@ public class PrometheusMetricsProviderTest {
private PrometheusMetricsProvider provider;
- @Before
+ @BeforeEach
public void setup() throws Exception {
CollectorRegistry.defaultRegistry.clear();
provider = new PrometheusMetricsProvider();
@@ -62,7 +62,7 @@ public class PrometheusMetricsProviderTest {
provider.start();
}
- @After
+ @AfterEach
public void tearDown() {
if (provider != null) {
provider.stop();