[SCB-2475] migrate to junit5 metrics part1

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java

@@ -20,15 +20,14 @@
 
 import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
 import org.apache.servicecomb.foundation.metrics.registry.GlobalRegistry;
-import org.hamcrest.Matchers;
-import org.junit.Assert;
 import org.junit.Test;
 
 import com.google.common.eventbus.EventBus;
 import com.netflix.servo.DefaultMonitorRegistry;
 import com.netflix.spectator.api.Registry;
 
 import mockit.Deencapsulation;
+import org.junit.jupiter.api.Assertions;
 
 public class TestDefaultRegistryInitializer {
   GlobalRegistry globalRegistry = new GlobalRegistry();
@@ -42,16 +41,15 @@ public class TestDefaultRegistryInitializer {
   public void init() {
     registryInitializer.init(globalRegistry, new EventBus(), new MetricsBootstrapConfig());
 
-    Assert.assertEquals(-10, registryInitializer.getOrder());
-    Assert.assertThat(globalRegistry.getDefaultRegistry(),
-        Matchers.instanceOf(com.netflix.spectator.servo.ServoRegistry.class));
-    Assert.assertEquals(1, registries.size());
-    Assert.assertEquals(1, DefaultMonitorRegistry.getInstance().getRegisteredMonitors().size());
+    Assertions.assertEquals(-10, registryInitializer.getOrder());
+    Assertions.assertTrue(globalRegistry.getDefaultRegistry() instanceof com.netflix.spectator.servo.ServoRegistry);
+    Assertions.assertEquals(1, registries.size());
+    Assertions.assertEquals(1, DefaultMonitorRegistry.getInstance().getRegisteredMonitors().size());
 
     registryInitializer.destroy();
 
-    Assert.assertEquals(0, registries.size());
-    Assert.assertEquals(0, DefaultMonitorRegistry.getInstance().getRegisteredMonitors().size());
+    Assertions.assertEquals(0, registries.size());
+    Assertions.assertEquals(0, DefaultMonitorRegistry.getInstance().getRegisteredMonitors().size());
   }
 
   @Test

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java

@@ -29,7 +29,6 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java

@@ -16,8 +16,6 @@
  */
 package org.apache.servicecomb.metrics.core;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.servicecomb.core.Const;
 import org.apache.servicecomb.core.Invocation;
 import org.apache.servicecomb.core.event.InvocationFinishEvent;
@@ -27,6 +25,7 @@
 import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
 import org.apache.servicecomb.swagger.invocation.InvocationType;
 import org.apache.servicecomb.swagger.invocation.Response;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -37,6 +36,7 @@
 
 import mockit.Expectations;
 import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
 
 public class TestInvocationMetersInitializer {
   EventBus eventBus = new EventBus();
@@ -106,7 +106,7 @@ public void consumerInvocation(@Mocked InvocationFinishEvent event) {
 
     MeasurementTree tree = new MeasurementTree();
     tree.from(registry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
-    assertEquals(""
+    Assertions.assertEquals(""
             + "[Measurement(servicecomb.invocation:operation=m.s.o:role=CONSUMER:stage=total:statistic=count:status=0:transport=rest:type=stage,0,2.0), "
             + "Measurement(servicecomb.invocation:operation=m.s.o:role=CONSUMER:stage=total:statistic=totalTime:status=0:transport=rest:type=stage,0,1.8000000000000002E-8), "
             + "Measurement(servicecomb.invocation:operation=m.s.o:role=CONSUMER:stage=total:statistic=max:status=0:transport=rest:type=stage,0,9.000000000000001E-9), "
@@ -197,7 +197,7 @@ public void edgeInvocation(@Mocked InvocationFinishEvent event) {
 
     MeasurementTree tree = new MeasurementTree();
     tree.from(registry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
-    assertEquals(
+    Assertions.assertEquals(
         "[Measurement(servicecomb.invocation:operation=m.s.o:role=EDGE:stage=total:statistic=count:status=0:transport=rest:type=stage,0,2.0), "
             + "Measurement(servicecomb.invocation:operation=m.s.o:role=EDGE:stage=total:statistic=totalTime:status=0:transport=rest:type=stage,0,1.8000000000000002E-8), "
             + "Measurement(servicecomb.invocation:operation=m.s.o:role=EDGE:stage=total:statistic=max:status=0:transport=rest:type=stage,0,9.000000000000001E-9), "
@@ -288,7 +288,7 @@ public void producerInvocation(@Mocked InvocationFinishEvent event) {
 
     MeasurementTree tree = new MeasurementTree();
     tree.from(registry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
-    assertEquals(""
+    Assertions.assertEquals(""
             + "[Measurement(servicecomb.invocation:operation=m.s.o:role=PRODUCER:stage=total:statistic=count:status=0:transport=rest:type=stage,0,2.0), "
             + "Measurement(servicecomb.invocation:operation=m.s.o:role=PRODUCER:stage=total:statistic=totalTime:status=0:transport=rest:type=stage,0,1.8000000000000002E-8), "
             + "Measurement(servicecomb.invocation:operation=m.s.o:role=PRODUCER:stage=total:statistic=max:status=0:transport=rest:type=stage,0,9.000000000000001E-9), "

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestOsMeterInitializer.java

@@ -31,7 +31,6 @@
 import org.apache.servicecomb.metrics.core.meter.os.OsMeter;
 import org.apache.servicecomb.metrics.core.meter.os.cpu.CpuUtils;
 import org.apache.servicecomb.metrics.core.meter.os.net.InterfaceUsage;
-import org.junit.Assert;
 import org.junit.Test;
 
 import com.google.common.eventbus.EventBus;
@@ -44,6 +43,7 @@
 import mockit.Mock;
 import mockit.MockUp;
 import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
 
 public class TestOsMeterInitializer {
   GlobalRegistry globalRegistry = new GlobalRegistry(new ManualClock());
@@ -102,44 +102,44 @@ public Runtime getRuntime() {
     osMetersInitializer.setOsLinux(true);
     osMetersInitializer.init(globalRegistry, eventBus, null);
     OsMeter osMeter = osMetersInitializer.getOsMeter();
-    Assert.assertNotNull(osMeter);
-    Assert.assertNotNull(osMeter.getCpuMeter());
-    Assert.assertNotNull(osMeter.getNetMeter());
+    Assertions.assertNotNull(osMeter);
+    Assertions.assertNotNull(osMeter.getCpuMeter());
+    Assertions.assertNotNull(osMeter.getNetMeter());
     CpuMeter cpuMeter = osMeter.getCpuMeter();
     NetMeter netMeter = osMeter.getNetMeter();
-    Assert.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
 
-    Assert.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
 
     Map<String, InterfaceUsage> interfaceInfoMap = netMeter.getInterfaceUsageMap();
-    Assert.assertEquals(1, interfaceInfoMap.size());
+    Assertions.assertEquals(1, interfaceInfoMap.size());
     InterfaceUsage eth0 = interfaceInfoMap.get("eth0");
-    Assert.assertEquals(4, eth0.getNetStats().size());
+    Assertions.assertEquals(4, eth0.getNetStats().size());
     // recv Bps
-    Assert.assertEquals(0L, eth0.getNetStats().get(0).getLastValue());
-    Assert.assertEquals(0, eth0.getNetStats().get(0).getRate(), 0.0);
-    Assert.assertEquals(0, eth0.getNetStats().get(0).getIndex());
+    Assertions.assertEquals(0L, eth0.getNetStats().get(0).getLastValue());
+    Assertions.assertEquals(0, eth0.getNetStats().get(0).getRate(), 0.0);
+    Assertions.assertEquals(0, eth0.getNetStats().get(0).getIndex());
     // send Bps
-    Assert.assertEquals(0L, eth0.getNetStats().get(1).getLastValue());
-    Assert.assertEquals(0, eth0.getNetStats().get(1).getRate(), 0.0);
-    Assert.assertEquals(8, eth0.getNetStats().get(1).getIndex());
+    Assertions.assertEquals(0L, eth0.getNetStats().get(1).getLastValue());
+    Assertions.assertEquals(0, eth0.getNetStats().get(1).getRate(), 0.0);
+    Assertions.assertEquals(8, eth0.getNetStats().get(1).getIndex());
 
     // recv pps
-    Assert.assertEquals(0L, eth0.getNetStats().get(2).getLastValue());
-    Assert.assertEquals(0, eth0.getNetStats().get(2).getRate(), 0.0);
-    Assert.assertEquals(1, eth0.getNetStats().get(2).getIndex());
+    Assertions.assertEquals(0L, eth0.getNetStats().get(2).getLastValue());
+    Assertions.assertEquals(0, eth0.getNetStats().get(2).getRate(), 0.0);
+    Assertions.assertEquals(1, eth0.getNetStats().get(2).getIndex());
 
     // send pps
-    Assert.assertEquals(0L, eth0.getNetStats().get(3).getLastValue());
-    Assert.assertEquals(0, eth0.getNetStats().get(3).getRate(), 0.0);
-    Assert.assertEquals(9, eth0.getNetStats().get(3).getIndex());
+    Assertions.assertEquals(0L, eth0.getNetStats().get(3).getLastValue());
+    Assertions.assertEquals(0, eth0.getNetStats().get(3).getRate(), 0.0);
+    Assertions.assertEquals(9, eth0.getNetStats().get(3).getIndex());
   }
 
   @Test
   public void initFail() {
     OsMetersInitializer osMetersInitializer = new OsMetersInitializer();
     osMetersInitializer.setOsLinux(false);
     osMetersInitializer.init(null, eventBus, null);
-    Assert.assertNull(osMetersInitializer.getOsMeter());
+    Assertions.assertNull(osMetersInitializer.getOsMeter());
   }
 }

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java

@@ -28,7 +28,6 @@
 import org.apache.servicecomb.foundation.vertx.client.http.HttpClients;
 import org.apache.servicecomb.metrics.core.publish.DefaultLogPublisher;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,6 +47,7 @@
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServer;
 import io.vertx.ext.web.Router;
+import org.junit.jupiter.api.Assertions;
 
 public class TestVertxMetersInitializer {
   GlobalRegistry globalRegistry = new GlobalRegistry(new ManualClock());
@@ -190,6 +190,6 @@ private void testLog(LogCollector logCollector, List<Meter> meters, List<Measure
       expect = String.format(expect, serverLatency);
     }
 
-    Assert.assertEquals(expect, actual);
+    Assertions.assertEquals(expect, actual);
   }
 }

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestCpuMeter.java

@@ -25,7 +25,6 @@
 import java.util.List;
 
 import org.apache.servicecomb.metrics.core.meter.os.cpu.CpuUtils;
-import org.junit.Assert;
 import org.junit.Test;
 
 import com.google.common.io.CharSource;
@@ -37,6 +36,7 @@
 import mockit.Mock;
 import mockit.MockUp;
 import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
 
 public class TestCpuMeter {
 
@@ -76,8 +76,8 @@ public Runtime getRuntime() {
       }
     };
     CpuMeter cpuMeter = new CpuMeter(id);
-    Assert.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
-    Assert.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
 
     new Expectations() {
       {
@@ -87,8 +87,8 @@ public Runtime getRuntime() {
     };
     cpuMeter.update();
 
-    Assert.assertEquals(0.875, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
-    Assert.assertEquals(0.5, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.875, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.5, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
   }
 
   @Test
@@ -128,8 +128,8 @@ public Runtime getRuntime() {
       }
     };
     CpuMeter cpuMeter = new CpuMeter(id);
-    Assert.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
-    Assert.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
     new Expectations() {
       {
         charSource.readFirstLine();
@@ -138,8 +138,8 @@ public Runtime getRuntime() {
     };
     cpuMeter.update();
 
-    Assert.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
-    Assert.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getAllCpuUsage().getUsage(), 0.0);
+    Assertions.assertEquals(0.0, cpuMeter.getProcessCpuUsage().getUsage(), 0.0);
   }
 
   @Test
@@ -188,12 +188,12 @@ public Runtime getRuntime() {
       }
     };
     cpuMeter.calcMeasurements(measurements, 0);
-    Assert.assertEquals(2, measurements.size());
+    Assertions.assertEquals(2, measurements.size());
     Measurement measurement = measurements.get(0);
-    Assert.assertEquals(0, measurement.timestamp());
-    Assert.assertEquals(0.875, measurement.value(), 0.0);
+    Assertions.assertEquals(0, measurement.timestamp());
+    Assertions.assertEquals(0.875, measurement.value(), 0.0);
     measurement = measurements.get(1);
-    Assert.assertEquals(0, measurement.timestamp());
-    Assert.assertEquals(0.5, measurement.value(), 0.0);
+    Assertions.assertEquals(0, measurement.timestamp());
+    Assertions.assertEquals(0.5, measurement.value(), 0.0);
   }
 }