You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/05/18 09:51:12 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 metrics part1 (#2938)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 59e6d148b [SCB-2475] migrate to junit5 metrics part1 (#2938)
59e6d148b is described below
commit 59e6d148ba7c7036da29c5e9991c95b229fd5008
Author: LeKe <95...@users.noreply.github.com>
AuthorDate: Wed May 18 17:51:09 2022 +0800
[SCB-2475] migrate to junit5 metrics part1 (#2938)
---
.../core/TestDefaultRegistryInitializer.java | 16 +-
.../metrics/core/TestHealthBootListener.java | 1 -
.../core/TestInvocationMetersInitializer.java | 10 +-
.../metrics/core/TestOsMeterInitializer.java | 42 ++---
.../metrics/core/TestVertxMetersInitializer.java | 4 +-
.../metrics/core/meter/os/TestCpuMeter.java | 28 +--
.../metrics/core/meter/os/TestNetMeter.java | 192 ++++++++++-----------
.../metrics/core/meter/os/TestOsMeter.java | 16 +-
.../core/publish/TestDefaultLogPublisher.java | 17 +-
.../core/publish/TestHealthCheckerPublisher.java | 12 +-
.../publish/TestInvocationPublishModelFactory.java | 6 +-
.../core/publish/TestMetricsRestPublisher.java | 10 +-
.../metrics/core/publish/TestPublishUtils.java | 34 ++--
.../core/publish/TestSlowInvocationLogger.java | 12 +-
.../publish/TestThreadPoolPublishModelFactory.java | 6 +-
.../model/invocation/TestOperationPerf.java | 18 +-
.../model/invocation/TestOperationPerfGroup.java | 26 ++-
.../publish/model/invocation/TestPerfInfo.java | 28 +--
.../prometheus/TestPrometheusPublisher.java | 3 +-
19 files changed, 237 insertions(+), 244 deletions(-)
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java
index 7839ab17f..0bff8d2b0 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java
@@ -20,8 +20,6 @@ import java.util.List;
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;
@@ -29,6 +27,7 @@ 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
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
index 7715abab5..c14704103 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthBootListener.java
@@ -29,7 +29,6 @@ import org.apache.servicecomb.metrics.core.publish.HealthCheckerRestPublisher;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java
index 67f96a9b1..76bf7e261 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java
+++ b/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.foundation.metrics.registry.GlobalRegistry;
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 com.netflix.spectator.api.Registry;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestInvocationMetersInitializer {
EventBus eventBus = new EventBus();
@@ -106,7 +106,7 @@ public class TestInvocationMetersInitializer {
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 class TestInvocationMetersInitializer {
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 class TestInvocationMetersInitializer {
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), "
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestOsMeterInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestOsMeterInitializer.java
index 440176a3a..83bc88bc2 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestOsMeterInitializer.java
+++ b/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.NetMeter;
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.Expectations;
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,37 +102,37 @@ public class TestOsMeterInitializer {
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
@@ -140,6 +140,6 @@ public class TestOsMeterInitializer {
OsMetersInitializer osMetersInitializer = new OsMetersInitializer();
osMetersInitializer.setOsLinux(false);
osMetersInitializer.init(null, eventBus, null);
- Assert.assertNull(osMetersInitializer.getOsMeter());
+ Assertions.assertNull(osMetersInitializer.getOsMeter());
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
index f0a5a9f7e..da75c76ed 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
@@ -28,7 +28,6 @@ import org.apache.servicecomb.foundation.vertx.VertxUtils;
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.HttpClientRequest;
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 @@ public class TestVertxMetersInitializer {
expect = String.format(expect, serverLatency);
}
- Assert.assertEquals(expect, actual);
+ Assertions.assertEquals(expect, actual);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestCpuMeter.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestCpuMeter.java
index b2f321db0..8295bdcee 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestCpuMeter.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestCpuMeter.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
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.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestCpuMeter {
@@ -76,8 +76,8 @@ public class TestCpuMeter {
}
};
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 class TestCpuMeter {
};
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 class TestCpuMeter {
}
};
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 class TestCpuMeter {
};
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 class TestCpuMeter {
}
};
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);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestNetMeter.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestNetMeter.java
index b692c7a2f..89b8b49e4 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestNetMeter.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestNetMeter.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.servicecomb.metrics.core.meter.os.net.InterfaceUsage;
-import org.junit.Assert;
import org.junit.Test;
import com.netflix.spectator.api.Id;
@@ -33,6 +32,7 @@ import com.netflix.spectator.api.Measurement;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestNetMeter {
@Test
@@ -52,31 +52,31 @@ public class TestNetMeter {
list.add("eth0: 1 1 0 0 0 0 0 1 1 1 1 0 0 0 0 0");
netMeter.refreshNet(1);
Map<String, InterfaceUsage> meterInterfaceInfoMap = netMeter.getInterfaceUsageMap();
- Assert.assertTrue(meterInterfaceInfoMap.containsKey("eth0"));
+ Assertions.assertTrue(meterInterfaceInfoMap.containsKey("eth0"));
InterfaceUsage eth0 = meterInterfaceInfoMap.get("eth0");
- Assert.assertEquals("eth0", eth0.getName());
+ Assertions.assertEquals("eth0", eth0.getName());
- Assert.assertEquals(4, eth0.getNetStats().size());
+ Assertions.assertEquals(4, eth0.getNetStats().size());
// recv Bps
- Assert.assertEquals(1L, eth0.getNetStats().get(0).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(0).getRate(), 0.0);
- Assert.assertEquals(0, eth0.getNetStats().get(0).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(0).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(0).getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getNetStats().get(0).getIndex());
// send Bps
- Assert.assertEquals(1L, eth0.getNetStats().get(1).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(1).getRate(), 0.0);
- Assert.assertEquals(8, eth0.getNetStats().get(1).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(1).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(1).getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getNetStats().get(1).getIndex());
// recv pps
- Assert.assertEquals(1L, eth0.getNetStats().get(2).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(2).getRate(), 0.0);
- Assert.assertEquals(1, eth0.getNetStats().get(2).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(2).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(2).getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getNetStats().get(2).getIndex());
// send pps
- Assert.assertEquals(1L, eth0.getNetStats().get(3).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(3).getRate(), 0.0);
- Assert.assertEquals(9, eth0.getNetStats().get(3).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(3).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(3).getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getNetStats().get(3).getIndex());
}
@@ -94,56 +94,56 @@ public class TestNetMeter {
};
NetMeter netMeter = new NetMeter(id);
Map<String, InterfaceUsage> netMap = netMeter.getInterfaceUsageMap();
- Assert.assertEquals(1, netMap.size());
+ Assertions.assertEquals(1, netMap.size());
list.remove(2);
list.add("eth0: 1 1 0 0 0 0 0 1 1 1 1 0 0 0 0 0");
list.add("lo: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0");
netMeter.refreshNet(1);
- Assert.assertEquals(2, netMap.size());
+ Assertions.assertEquals(2, netMap.size());
InterfaceUsage eth0 = netMap.get("eth0");
- Assert.assertEquals("eth0", eth0.getName());
- Assert.assertEquals(4, eth0.getNetStats().size());
+ Assertions.assertEquals("eth0", eth0.getName());
+ Assertions.assertEquals(4, eth0.getNetStats().size());
// recv Bps
- Assert.assertEquals(1L, eth0.getNetStats().get(0).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(0).getRate(), 0.0);
- Assert.assertEquals(0, eth0.getNetStats().get(0).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(0).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(0).getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getNetStats().get(0).getIndex());
// send Bps
- Assert.assertEquals(1L, eth0.getNetStats().get(1).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(1).getRate(), 0.0);
- Assert.assertEquals(8, eth0.getNetStats().get(1).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(1).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(1).getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getNetStats().get(1).getIndex());
// recv pps
- Assert.assertEquals(1L, eth0.getNetStats().get(2).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(2).getRate(), 0.0);
- Assert.assertEquals(1, eth0.getNetStats().get(2).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(2).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(2).getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getNetStats().get(2).getIndex());
// send pps
- Assert.assertEquals(1L, eth0.getNetStats().get(3).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(3).getRate(), 0.0);
- Assert.assertEquals(9, eth0.getNetStats().get(3).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(3).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(3).getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getNetStats().get(3).getIndex());
InterfaceUsage lo = netMap.get("lo");
- Assert.assertEquals("lo", lo.getName());
+ Assertions.assertEquals("lo", lo.getName());
- Assert.assertEquals(4, lo.getNetStats().size());
+ Assertions.assertEquals(4, lo.getNetStats().size());
// recv Bps
- Assert.assertEquals(0L, lo.getNetStats().get(0).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(0).getRate(), 0.0);
- Assert.assertEquals(0, lo.getNetStats().get(0).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(0).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(0).getRate(), 0.0);
+ Assertions.assertEquals(0, lo.getNetStats().get(0).getIndex());
// send Bps
- Assert.assertEquals(0L, lo.getNetStats().get(1).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(1).getRate(), 0.0);
- Assert.assertEquals(8, lo.getNetStats().get(1).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(1).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(1).getRate(), 0.0);
+ Assertions.assertEquals(8, lo.getNetStats().get(1).getIndex());
// recv pps
- Assert.assertEquals(0L, lo.getNetStats().get(2).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(2).getRate(), 0.0);
- Assert.assertEquals(1, lo.getNetStats().get(2).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(2).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(2).getRate(), 0.0);
+ Assertions.assertEquals(1, lo.getNetStats().get(2).getIndex());
// send pps
- Assert.assertEquals(0L, lo.getNetStats().get(3).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(3).getRate(), 0.0);
- Assert.assertEquals(9, lo.getNetStats().get(3).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(3).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(3).getRate(), 0.0);
+ Assertions.assertEquals(9, lo.getNetStats().get(3).getIndex());
}
@@ -162,76 +162,76 @@ public class TestNetMeter {
};
NetMeter netMeter = new NetMeter(id);
Map<String, InterfaceUsage> netMap = netMeter.getInterfaceUsageMap();
- Assert.assertEquals(2, netMap.size());
+ Assertions.assertEquals(2, netMap.size());
InterfaceUsage lo = netMap.get("lo");
InterfaceUsage eth0 = netMap.get("eth0");
- Assert.assertEquals("lo", lo.getName());
- Assert.assertEquals(4, lo.getNetStats().size());
+ Assertions.assertEquals("lo", lo.getName());
+ Assertions.assertEquals(4, lo.getNetStats().size());
// recv Bps
- Assert.assertEquals(0L, lo.getNetStats().get(0).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(0).getRate(), 0.0);
- Assert.assertEquals(0, lo.getNetStats().get(0).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(0).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(0).getRate(), 0.0);
+ Assertions.assertEquals(0, lo.getNetStats().get(0).getIndex());
// send Bps
- Assert.assertEquals(0L, lo.getNetStats().get(1).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(1).getRate(), 0.0);
- Assert.assertEquals(8, lo.getNetStats().get(1).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(1).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(1).getRate(), 0.0);
+ Assertions.assertEquals(8, lo.getNetStats().get(1).getIndex());
// recv pps
- Assert.assertEquals(0L, lo.getNetStats().get(2).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(2).getRate(), 0.0);
- Assert.assertEquals(1, lo.getNetStats().get(2).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(2).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(2).getRate(), 0.0);
+ Assertions.assertEquals(1, lo.getNetStats().get(2).getIndex());
// send pps
- Assert.assertEquals(0L, lo.getNetStats().get(3).getLastValue());
- Assert.assertEquals(0, lo.getNetStats().get(3).getRate(), 0.0);
- Assert.assertEquals(9, lo.getNetStats().get(3).getIndex());
+ Assertions.assertEquals(0L, lo.getNetStats().get(3).getLastValue());
+ Assertions.assertEquals(0, lo.getNetStats().get(3).getRate(), 0.0);
+ Assertions.assertEquals(9, lo.getNetStats().get(3).getIndex());
- Assert.assertEquals("eth0", eth0.getName());
- Assert.assertEquals(4, eth0.getNetStats().size());
+ Assertions.assertEquals("eth0", eth0.getName());
+ 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());
list.remove(2);
list.remove(2);
list.add("eth0: 1 1 0 0 0 0 0 1 1 1 1 0 0 0 0 0");
netMeter.refreshNet(1);
- Assert.assertNull(netMap.get("lo"));
- Assert.assertEquals(1, netMap.size());
- Assert.assertEquals("eth0", eth0.getName());
- Assert.assertEquals(4, eth0.getNetStats().size());
+ Assertions.assertNull(netMap.get("lo"));
+ Assertions.assertEquals(1, netMap.size());
+ Assertions.assertEquals("eth0", eth0.getName());
+ Assertions.assertEquals(4, eth0.getNetStats().size());
// recv Bps
- Assert.assertEquals(1L, eth0.getNetStats().get(0).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(0).getRate(), 0.0);
- Assert.assertEquals(0, eth0.getNetStats().get(0).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(0).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(0).getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getNetStats().get(0).getIndex());
// send Bps
- Assert.assertEquals(1L, eth0.getNetStats().get(1).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(1).getRate(), 0.0);
- Assert.assertEquals(8, eth0.getNetStats().get(1).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(1).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(1).getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getNetStats().get(1).getIndex());
// recv pps
- Assert.assertEquals(1L, eth0.getNetStats().get(2).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(2).getRate(), 0.0);
- Assert.assertEquals(1, eth0.getNetStats().get(2).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(2).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(2).getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getNetStats().get(2).getIndex());
// send pps
- Assert.assertEquals(1L, eth0.getNetStats().get(3).getLastValue());
- Assert.assertEquals(1, eth0.getNetStats().get(3).getRate(), 0.0);
- Assert.assertEquals(9, eth0.getNetStats().get(3).getIndex());
+ Assertions.assertEquals(1L, eth0.getNetStats().get(3).getLastValue());
+ Assertions.assertEquals(1, eth0.getNetStats().get(3).getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getNetStats().get(3).getIndex());
}
@@ -252,14 +252,14 @@ public class TestNetMeter {
list.add("eth0: 3 1 0 0 0 0 0 1 3 1 1 0 0 0 0 0");
List<Measurement> measurements = new ArrayList<>();
netMeter.calcMeasurements(measurements, 0L, 1);
- Assert.assertEquals(4, measurements.size());
+ Assertions.assertEquals(4, measurements.size());
Measurement receive = measurements.get(0);
Measurement send = measurements.get(1);
Measurement receivePackets = measurements.get(2);
Measurement sendPackets = measurements.get(3);
- Assert.assertEquals(3.0, send.value(), 0.0);
- Assert.assertEquals(1.0, sendPackets.value(), 0.0);
- Assert.assertEquals(3.0, receive.value(), 0.0);
- Assert.assertEquals(1.0, receivePackets.value(), 0.0);
+ Assertions.assertEquals(3.0, send.value(), 0.0);
+ Assertions.assertEquals(1.0, sendPackets.value(), 0.0);
+ Assertions.assertEquals(3.0, receive.value(), 0.0);
+ Assertions.assertEquals(1.0, receivePackets.value(), 0.0);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestOsMeter.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestOsMeter.java
index 994c3ddde..375627d9b 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestOsMeter.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestOsMeter.java
@@ -27,7 +27,6 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.servicecomb.metrics.core.meter.os.cpu.CpuUtils;
-import org.junit.Assert;
import org.junit.Test;
import com.google.common.collect.Lists;
@@ -42,6 +41,7 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestOsMeter {
Registry registry = new DefaultRegistry(new ManualClock());
@@ -104,12 +104,12 @@ public class TestOsMeter {
};
osMeter.calcMeasurements(1, 1);
ArrayList<Measurement> measurements = Lists.newArrayList(osMeter.measure());
- Assert.assertEquals(6, measurements.size());
- Assert.assertEquals(0.875, measurements.get(0).value(), 0.0);
- Assert.assertEquals(0.5, measurements.get(1).value(), 0.0);
- Assert.assertEquals(1.0, measurements.get(2).value(), 0.0);
- Assert.assertEquals(1.0, measurements.get(3).value(), 0.0);
- Assert.assertEquals(1.0, measurements.get(4).value(), 0.0);
- Assert.assertEquals(1.0, measurements.get(5).value(), 0.0);
+ Assertions.assertEquals(6, measurements.size());
+ Assertions.assertEquals(0.875, measurements.get(0).value(), 0.0);
+ Assertions.assertEquals(0.5, measurements.get(1).value(), 0.0);
+ Assertions.assertEquals(1.0, measurements.get(2).value(), 0.0);
+ Assertions.assertEquals(1.0, measurements.get(3).value(), 0.0);
+ Assertions.assertEquals(1.0, measurements.get(4).value(), 0.0);
+ Assertions.assertEquals(1.0, measurements.get(5).value(), 0.0);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
index 3b6efe0f0..51752617a 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
@@ -43,10 +43,10 @@ import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPer
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroups;
import org.apache.servicecomb.metrics.core.publish.model.invocation.PerfInfo;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.junit.runners.MethodSorters;
import com.google.common.eventbus.EventBus;
@@ -57,7 +57,6 @@ import mockit.Expectations;
import mockit.Injectable;
import mockit.Mock;
import mockit.MockUp;
-import mockit.Mocked;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestDefaultLogPublisher {
@@ -91,7 +90,7 @@ public class TestDefaultLogPublisher {
};
publisher.init(globalRegistry, eventBus, new MetricsBootstrapConfig());
- Assert.assertFalse(registered.value);
+ Assertions.assertFalse(registered.value);
}
@Test
@@ -107,7 +106,7 @@ public class TestDefaultLogPublisher {
ArchaiusUtils.setProperty(DefaultLogPublisher.ENABLED, true);
publisher.init(globalRegistry, eventBus, new MetricsBootstrapConfig());
- Assert.assertTrue(registered.value);
+ Assertions.assertTrue(registered.value);
}
@Test
@@ -123,7 +122,7 @@ public class TestDefaultLogPublisher {
ArchaiusUtils.setProperty(DefaultLogPublisher.ENABLED, false);
publisher.init(globalRegistry, eventBus, new MetricsBootstrapConfig());
- Assert.assertNull(registered.value);
+ Assertions.assertNull(registered.value);
}
@Test
@@ -131,8 +130,8 @@ public class TestDefaultLogPublisher {
publisher.onPolledEvent(null);
LoggingEvent event = collector.getEvents().get(0);
- Assert.assertEquals("Failed to print perf log.", event.getMessage());
- Assert.assertEquals(NullPointerException.class, event.getThrowableInformation().getThrowable().getClass());
+ Assertions.assertEquals("Failed to print perf log.", event.getMessage());
+ Assertions.assertEquals(NullPointerException.class, event.getThrowableInformation().getThrowable().getClass());
}
@Test
@@ -238,7 +237,7 @@ public class TestDefaultLogPublisher {
List<LoggingEvent> events = collector.getEvents().stream()
.filter(e -> DefaultLogPublisher.class.getName().equals(e.getLoggerName())).collect(Collectors.toList());
LoggingEvent event = events.get(0);
- Assert.assertEquals("\n"
+ Assertions.assertEquals("\n"
+ "os:\n"
+ " cpu:\n"
+ " all usage: 100.00% all idle: 0.00% process: 100.00%\n"
@@ -288,7 +287,7 @@ public class TestDefaultLogPublisher {
event.getMessage());
} catch (Exception e) {
e.printStackTrace();
- Assert.fail("unexpected error happen. " + e.getMessage());
+ Assertions.fail("unexpected error happen. " + e.getMessage());
}
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestHealthCheckerPublisher.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestHealthCheckerPublisher.java
index 67a16521e..d8ffb01ed 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestHealthCheckerPublisher.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestHealthCheckerPublisher.java
@@ -22,9 +22,9 @@ import java.util.Map;
import org.apache.servicecomb.foundation.metrics.health.HealthCheckResult;
import org.apache.servicecomb.foundation.metrics.health.HealthChecker;
import org.apache.servicecomb.foundation.metrics.health.HealthCheckerManager;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestHealthCheckerPublisher {
private final HealthChecker good = new HealthChecker() {
@@ -62,7 +62,7 @@ public class TestHealthCheckerPublisher {
public void checkHealthGood() {
HealthCheckerManager.getInstance().register(good);
HealthCheckerRestPublisher publisher = new HealthCheckerRestPublisher();
- Assert.assertEquals(true, publisher.checkHealth());
+ Assertions.assertTrue(publisher.checkHealth());
}
@Test
@@ -70,7 +70,7 @@ public class TestHealthCheckerPublisher {
HealthCheckerManager.getInstance().register(good);
HealthCheckerManager.getInstance().register(bad);
HealthCheckerRestPublisher publisher = new HealthCheckerRestPublisher();
- Assert.assertEquals(false, publisher.checkHealth());
+ Assertions.assertFalse(publisher.checkHealth());
}
@Test
@@ -79,8 +79,8 @@ public class TestHealthCheckerPublisher {
HealthCheckerManager.getInstance().register(bad);
HealthCheckerRestPublisher publisher = new HealthCheckerRestPublisher();
Map<String, HealthCheckResult> content = publisher.checkHealthDetails();
- Assert.assertEquals(true, content.get("test").isHealthy());
- Assert.assertEquals("info", content.get("test").getInformation());
- Assert.assertEquals("extra data", content.get("test").getExtraData());
+ Assertions.assertTrue(content.get("test").isHealthy());
+ Assertions.assertEquals("info", content.get("test").getInformation());
+ Assertions.assertEquals("extra data", content.get("test").getExtraData());
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java
index 98a75a614..61288922c 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java
@@ -26,7 +26,6 @@ import org.apache.servicecomb.metrics.core.InvocationMetersInitializer;
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
import org.apache.servicecomb.swagger.invocation.InvocationType;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.junit.Assert;
import org.junit.Test;
import com.google.common.collect.Lists;
@@ -41,6 +40,7 @@ import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestInvocationPublishModelFactory {
EventBus eventBus = new EventBus();
@@ -206,7 +206,7 @@ public class TestInvocationPublishModelFactory {
+ " }\n"
+ " }\n"
+ "}";
- Assert.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
+ Assertions.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
Json.encodePrettily(model.getConsumer()));
expect = "{\n"
@@ -323,7 +323,7 @@ public class TestInvocationPublishModelFactory {
+ " }\n"
+ " }\n"
+ "}";
- Assert.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
+ Assertions.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
Json.encodePrettily(model.getProducer()));
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestMetricsRestPublisher.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestMetricsRestPublisher.java
index 40b72f390..e9b3b52fe 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestMetricsRestPublisher.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestMetricsRestPublisher.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
import org.apache.servicecomb.foundation.metrics.registry.GlobalRegistry;
-import org.junit.Assert;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
@@ -28,6 +27,7 @@ import com.netflix.spectator.api.Clock;
import com.netflix.spectator.api.DefaultRegistry;
import com.netflix.spectator.api.ManualClock;
import com.netflix.spectator.api.Registry;
+import org.junit.jupiter.api.Assertions;
public class TestMetricsRestPublisher {
MetricsRestPublisher publisher = new MetricsRestPublisher();
@@ -36,7 +36,7 @@ public class TestMetricsRestPublisher {
public void measure_globalRegistryNull() {
Map<String, Double> result = publisher.measure();
- Assert.assertEquals(0, result.size());
+ Assertions.assertEquals(0, result.size());
}
@Test
@@ -52,8 +52,8 @@ public class TestMetricsRestPublisher {
publisher.init(globalRegistry, eventBus, new MetricsBootstrapConfig());
Map<String, Double> result = publisher.measure();
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(0, result.get("name(statistic=count,t1=v1,t2=v2)"), 0);
- Assert.assertEquals(0, result.get("name(statistic=totalTime,t1=v1,t2=v2)"), 0);
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals(0, result.get("name(statistic=count,t1=v1,t2=v2)"), 0);
+ Assertions.assertEquals(0, result.get("name(statistic=totalTime,t1=v1,t2=v2)"), 0);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java
index bc4243106..600cd4887 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java
@@ -31,10 +31,10 @@ import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPer
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroups;
import org.apache.servicecomb.metrics.core.publish.model.invocation.PerfInfo;
import org.apache.servicecomb.metrics.core.publish.model.invocation.Utils;
-import org.junit.Assert;
import org.junit.Test;
import com.netflix.spectator.api.patterns.ThreadPoolMonitorPublishModelFactory;
+import org.junit.jupiter.api.Assertions;
public class TestPublishUtils {
String op = "op";
@@ -45,9 +45,9 @@ public class TestPublishUtils {
PerfInfo perf = PublishUtils.createPerfInfo(stageNode);
- Assert.assertEquals(10, perf.getTps(), 0);
- Assert.assertEquals(1000, perf.calcMsLatency(), 0);
- Assert.assertEquals(100000, perf.getMsMaxLatency(), 0);
+ Assertions.assertEquals(10, perf.getTps(), 0);
+ Assertions.assertEquals(1000, perf.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perf.getMsMaxLatency(), 0);
}
@Test
@@ -56,12 +56,12 @@ public class TestPublishUtils {
PerfInfo perfInfo = opPerf.findStage(MeterInvocationConst.STAGE_TOTAL);
Integer[] latencyDistribution = opPerf.getLatencyDistribution();
- Assert.assertEquals(10, perfInfo.getTps(), 0);
- Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
- Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
- Assert.assertEquals(2, latencyDistribution.length);
- Assert.assertEquals(1, latencyDistribution[0].intValue());
- Assert.assertEquals(2, latencyDistribution[1].intValue());
+ Assertions.assertEquals(10, perfInfo.getTps(), 0);
+ Assertions.assertEquals(1000, perfInfo.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
+ Assertions.assertEquals(2, latencyDistribution.length);
+ Assertions.assertEquals(1, latencyDistribution[0].intValue());
+ Assertions.assertEquals(2, latencyDistribution[1].intValue());
}
@Test
@@ -77,12 +77,12 @@ public class TestPublishUtils {
PerfInfo perfInfo = group.getSummary().findStage(MeterInvocationConst.STAGE_TOTAL);
Integer[] latencyDistribution = group.getSummary().getLatencyDistribution();
- Assert.assertEquals(10, perfInfo.getTps(), 0);
- Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
- Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
- Assert.assertEquals(2, latencyDistribution.length);
- Assert.assertEquals(1, latencyDistribution[0].intValue());
- Assert.assertEquals(2, latencyDistribution[1].intValue());
+ Assertions.assertEquals(10, perfInfo.getTps(), 0);
+ Assertions.assertEquals(1000, perfInfo.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
+ Assertions.assertEquals(2, latencyDistribution.length);
+ Assertions.assertEquals(1, latencyDistribution[0].intValue());
+ Assertions.assertEquals(2, latencyDistribution[1].intValue());
}
@Test
@@ -91,6 +91,6 @@ public class TestPublishUtils {
ThreadPoolMonitorPublishModelFactory.create(new MeasurementTree(), threadPools);
- Assert.assertTrue(threadPools.isEmpty());
+ Assertions.assertTrue(threadPools.isEmpty());
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
index 2f3762296..ec2b31c76 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestSlowInvocationLogger.java
@@ -31,12 +31,12 @@ import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.swagger.invocation.Response;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestSlowInvocationLogger {
@Mocked
@@ -84,7 +84,7 @@ public class TestSlowInvocationLogger {
public void disable() {
logger.onInvocationFinish(event);
- Assert.assertTrue(logCollector.getEvents().isEmpty());
+ Assertions.assertTrue(logCollector.getEvents().isEmpty());
}
@Test
@@ -101,7 +101,7 @@ public class TestSlowInvocationLogger {
};
logger.onInvocationFinish(event);
- Assert.assertTrue(logCollector.getEvents().isEmpty());
+ Assertions.assertTrue(logCollector.getEvents().isEmpty());
}
@Test
@@ -128,7 +128,7 @@ public class TestSlowInvocationLogger {
};
logger.onInvocationFinish(event);
- Assert.assertEquals(""
+ Assertions.assertEquals(""
+ "slow(0 ms) invocation, null:\n"
+ " http method: null\n"
+ " url : null\n"
@@ -174,7 +174,7 @@ public class TestSlowInvocationLogger {
};
logger.onInvocationFinish(event);
- Assert.assertEquals(""
+ Assertions.assertEquals(""
+ "slow(0 ms) invocation, null:\n"
+ " http method: null\n"
+ " url : null\n"
@@ -224,7 +224,7 @@ public class TestSlowInvocationLogger {
};
logger.onInvocationFinish(event);
- Assert.assertEquals(""
+ Assertions.assertEquals(""
+ "slow(0 ms) invocation, null:\n"
+ " http method: null\n"
+ " url : null\n"
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java
index c48acaedb..64a191b25 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java
@@ -23,9 +23,9 @@ import java.util.concurrent.ThreadPoolExecutor;
import org.apache.servicecomb.foundation.common.utils.JsonUtils;
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
-import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.junit.runners.MethodSorters;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -77,12 +77,12 @@ public class TestThreadPoolPublishModelFactory {
PublishModelFactory factory = new PublishModelFactory(Lists.newArrayList(registry.iterator()));
DefaultPublishModel model = factory.createDefaultPublishModel();
- Assert.assertEquals(
+ Assertions.assertEquals(
"{\"test\":{\"avgTaskCount\":0.0,\"avgCompletedTaskCount\":0.0,\"currentThreadsBusy\":0,\"maxThreads\":0,\"poolSize\":0,\"corePoolSize\":0,\"queueSize\":10,\"rejected\":\"NaN\"}}",
JsonUtils.writeValueAsString(model.getThreadPools()));
} catch (Throwable e) {
e.printStackTrace();
- Assert.fail("unexpected error happen. " + e.getMessage());
+ Assertions.fail("unexpected error happen. " + e.getMessage());
}
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerf.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerf.java
index 953aa1f93..f0fa83491 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerf.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerf.java
@@ -17,8 +17,8 @@
package org.apache.servicecomb.metrics.core.publish.model.invocation;
import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestOperationPerf {
String op = "op";
@@ -27,21 +27,21 @@ public class TestOperationPerf {
@Test
public void add() {
- Assert.assertTrue(opPerf.getStages().isEmpty());
+ Assertions.assertTrue(opPerf.getStages().isEmpty());
OperationPerf otherOpPerf = Utils.createOperationPerf(op);
opPerf.add(otherOpPerf);
- Assert.assertEquals(op, otherOpPerf.getOperation());
+ Assertions.assertEquals(op, otherOpPerf.getOperation());
PerfInfo perfInfo = opPerf.findStage(MeterInvocationConst.STAGE_TOTAL);
- Assert.assertEquals(10, perfInfo.getTps(), 0);
- Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
- Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
+ Assertions.assertEquals(10, perfInfo.getTps(), 0);
+ Assertions.assertEquals(1000, perfInfo.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
perfInfo = opPerf.findStage(MeterInvocationConst.STAGE_EXECUTION);
- Assert.assertEquals(10, perfInfo.getTps(), 0);
- Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
- Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
+ Assertions.assertEquals(10, perfInfo.getTps(), 0);
+ Assertions.assertEquals(1000, perfInfo.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java
index 88895d7a4..2f5601406 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java
@@ -20,10 +20,8 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestOperationPerfGroup {
String op = "op";
@@ -32,10 +30,10 @@ public class TestOperationPerfGroup {
@Test
public void construct() {
- Assert.assertEquals(Const.RESTFUL, group.getTransport());
- Assert.assertEquals(Status.OK.name(), group.getStatus());
- Assert.assertTrue(group.getOperationPerfs().isEmpty());
- Assert.assertNull(group.getSummary());
+ Assertions.assertEquals(Const.RESTFUL, group.getTransport());
+ Assertions.assertEquals(Status.OK.name(), group.getStatus());
+ Assertions.assertTrue(group.getOperationPerfs().isEmpty());
+ Assertions.assertNull(group.getSummary());
}
@Test
@@ -44,18 +42,18 @@ public class TestOperationPerfGroup {
group.addOperationPerf(opPerf);
group.addOperationPerf(opPerf);
- MatcherAssert.assertThat(group.getOperationPerfs(), Matchers.contains(opPerf, opPerf));
+ Assertions.assertTrue(group.getOperationPerfs().contains(opPerf));
OperationPerf summary = group.getSummary();
PerfInfo perfInfo = summary.findStage(MeterInvocationConst.STAGE_TOTAL);
- Assert.assertEquals(20, perfInfo.getTps(), 0);
- Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
- Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
+ Assertions.assertEquals(20, perfInfo.getTps(), 0);
+ Assertions.assertEquals(1000, perfInfo.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
perfInfo = summary.findStage(MeterInvocationConst.STAGE_EXECUTION);
- Assert.assertEquals(20, perfInfo.getTps(), 0);
- Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
- Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
+ Assertions.assertEquals(20, perfInfo.getTps(), 0);
+ Assertions.assertEquals(1000, perfInfo.calcMsLatency(), 0);
+ Assertions.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestPerfInfo.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestPerfInfo.java
index cdb58b542..3fec1908b 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestPerfInfo.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestPerfInfo.java
@@ -16,18 +16,18 @@
*/
package org.apache.servicecomb.metrics.core.publish.model.invocation;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestPerfInfo {
@Test
public void construct() {
PerfInfo perf = new PerfInfo();
- Assert.assertEquals(0, perf.getTps(), 0);
- Assert.assertEquals(0, perf.getMsTotalTime(), 0);
- Assert.assertEquals(0, perf.getMsMaxLatency(), 0);
- Assert.assertEquals(0, perf.calcMsLatency(), 0);
+ Assertions.assertEquals(0, perf.getTps(), 0);
+ Assertions.assertEquals(0, perf.getMsTotalTime(), 0);
+ Assertions.assertEquals(0, perf.getMsMaxLatency(), 0);
+ Assertions.assertEquals(0, perf.calcMsLatency(), 0);
}
@Test
@@ -46,10 +46,10 @@ public class TestPerfInfo {
other.setMsMaxLatency(200);
sum.add(other);
- Assert.assertEquals(30, sum.getTps(), 0);
- Assert.assertEquals(30, sum.getMsTotalTime(), 0);
- Assert.assertEquals(200, sum.getMsMaxLatency(), 0);
- Assert.assertEquals(1.0, sum.calcMsLatency(), 0);
+ Assertions.assertEquals(30, sum.getTps(), 0);
+ Assertions.assertEquals(30, sum.getMsTotalTime(), 0);
+ Assertions.assertEquals(200, sum.getMsMaxLatency(), 0);
+ Assertions.assertEquals(1.0, sum.calcMsLatency(), 0);
}
@Test
@@ -68,9 +68,9 @@ public class TestPerfInfo {
other.setMsMaxLatency(50);
sum.add(other);
- Assert.assertEquals(30, sum.getTps(), 0);
- Assert.assertEquals(1.0, sum.calcMsLatency(), 0);
- Assert.assertEquals(100, sum.getMsMaxLatency(), 0);
+ Assertions.assertEquals(30, sum.getTps(), 0);
+ Assertions.assertEquals(1.0, sum.calcMsLatency(), 0);
+ Assertions.assertEquals(100, sum.getMsMaxLatency(), 0);
}
@Test
@@ -80,6 +80,6 @@ public class TestPerfInfo {
perf.setMsTotalTime(10);
perf.setMsMaxLatency(100);
- Assert.assertEquals("PerfInfo [tps=10.0, msTotalTime=10.0, msLatency=1.0, msMaxLatency=100.0]", perf.toString());
+ Assertions.assertEquals("PerfInfo [tps=10.0, msTotalTime=10.0, msLatency=1.0, msMaxLatency=100.0]", perf.toString());
}
}
diff --git a/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java b/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
index 58aff53ea..fa2cc2fff 100644
--- a/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
+++ b/metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
@@ -30,7 +30,6 @@ import org.apache.servicecomb.foundation.metrics.registry.GlobalRegistry;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.registry.RegistrationManager;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
@@ -101,7 +100,7 @@ public class TestPrometheusPublisher {
URL url = new URL("http://localhost:" + server.getAddress().getPort() + "/metrics");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
try (InputStream is = conn.getInputStream()) {
- Assert.assertEquals("# HELP ServiceComb_Metrics ServiceComb Metrics\n" +
+ Assertions.assertEquals("# HELP ServiceComb_Metrics ServiceComb Metrics\n" +
"# TYPE ServiceComb_Metrics untyped\n" +
"count_name{appId=\"testAppId\",tag1=\"tag1v\",tag2=\"tag2v\",} 1.0\n",
IOUtils.toString(is, StandardCharsets.UTF_8));