1 files changed, 9 insertions, 10 deletions

diff --git a/container-core/src/test/java/com/yahoo/metrics/simple/MetricsTest.java b/container-core/src/test/java/com/yahoo/metrics/simple/MetricsTest.java
index c8a5f17fdfb..f64998f0be4 100644
--- a/container-core/src/test/java/com/yahoo/metrics/simple/MetricsTest.java
+++ b/container-core/src/test/java/com/yahoo/metrics/simple/MetricsTest.java
@@ -1,17 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.metrics.simple;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
-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;
 import com.yahoo.metrics.simple.jdisc.JdiscMetricsFactory;
 import com.yahoo.metrics.simple.jdisc.SimpleMetricConsumer;
 
@@ -23,19 +22,19 @@ import com.yahoo.metrics.simple.jdisc.SimpleMetricConsumer;
 public class MetricsTest extends UnitTestSetup {
     SimpleMetricConsumer metricApi;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.init();
         metricApi  = (SimpleMetricConsumer) new JdiscMetricsFactory(metricManager.get()).newInstance();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         super.fini();
     }
 
     @Test
-    public final void smokeTest() throws InterruptedException {
+    final void smokeTest() throws InterruptedException {
         final String metricName = "testMetric";
         metricApi.set(metricName, Double.valueOf(1.0d), null);
         updater.gotData.await(10, TimeUnit.SECONDS);
@@ -49,7 +48,7 @@ public class MetricsTest extends UnitTestSetup {
     }
 
     @Test
-    public final void testRedefinition() {
+    final void testRedefinition() {
         MetricReceiver r = metricManager.get();
         final String metricName = "gah";
         r.addMetricDefinition(metricName, new MetricSettings.Builder().build());