This is an automated email from the ASF dual-hosted git repository.
shoothzj 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 ede3d2b5f Migrate parts of metrics module to junit5 (#4104)
ede3d2b5f is described below
commit ede3d2b5fbf00dcd22136e0764b3b4852c55a5d9
Author: pengxiangrui127 <[email protected]>
AuthorDate: Fri Dec 8 21:00:32 2023 +0800
Migrate parts of metrics module to junit5 (#4104)
---
metrics/metrics-core/pom.xml | 5 +
.../core/TestInvocationMetersInitializer.java | 224 +++++-----
.../metrics/core/TestOsMeterInitializer.java | 107 +++--
.../metrics/core/TestVertxMetersInitializer.java | 10 +-
.../metrics/core/meter/os/TestNetMeter.java | 452 ++++++++++-----------
.../metrics/core/meter/os/TestSystemMeter.java | 85 ++--
.../publish/TestInvocationPublishModelFactory.java | 2 +-
.../metrics/core/publish/TestPublishUtils.java | 2 +-
.../core/publish/TestSlowInvocationLogger.java | 154 +++----
.../publish/TestThreadPoolPublishModelFactory.java | 30 +-
.../model/invocation/TestOperationPerf.java | 2 +-
.../model/invocation/TestOperationPerfGroup.java | 2 +-
12 files changed, 506 insertions(+), 569 deletions(-)
diff --git a/metrics/metrics-core/pom.xml b/metrics/metrics-core/pom.xml
index 9d467b727..d1622d5c1 100644
--- a/metrics/metrics-core/pom.xml
+++ b/metrics/metrics-core/pom.xml
@@ -69,6 +69,11 @@
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
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 8705f89d1..83f85e78c 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
@@ -25,15 +25,20 @@ import java.util.List;
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
+import org.apache.servicecomb.core.invocation.InvocationStageTrace;
import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
import
org.apache.servicecomb.foundation.metrics.publish.MeasurementGroupConfig;
import org.apache.servicecomb.foundation.metrics.publish.MeasurementTree;
import
org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
import org.apache.servicecomb.swagger.invocation.InvocationType;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.servicecomb.swagger.invocation.Response;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.core.env.Environment;
import com.google.common.eventbus.EventBus;
@@ -41,9 +46,8 @@ import com.google.common.eventbus.EventBus;
import io.micrometer.core.instrument.Measurement;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import mockit.Expectations;
-import mockit.Mocked;
+@ExtendWith(MockitoExtension.class)
public class TestInvocationMetersInitializer {
EventBus eventBus = new EventBus();
@@ -51,12 +55,12 @@ public class TestInvocationMetersInitializer {
InvocationMetersInitializer invocationMetersInitializer = new
InvocationMetersInitializer();
- @Mocked
+ @Mock
Invocation invocation;
Environment environment = Mockito.mock(Environment.class);
- @Before
+ @BeforeEach
public void setup() {
Mockito.when(environment.getProperty(METRICS_WINDOW_TIME, int.class,
DEFAULT_METRICS_WINDOW_TIME))
.thenReturn(DEFAULT_METRICS_WINDOW_TIME);
@@ -67,36 +71,25 @@ public class TestInvocationMetersInitializer {
}
@Test
- public void consumerInvocation(@Mocked InvocationFinishEvent event) {
- new Expectations() {
- {
- invocation.isConsumer();
- result = true;
- invocation.getInvocationType();
- result = InvocationType.CONSUMER;
- invocation.getRealTransportName();
- result = CoreConst.RESTFUL;
- invocation.getMicroserviceQualifiedName();
- result = "m.s.o";
- invocation.getInvocationStageTrace().calcTotal();
- result = 9;
- invocation.getInvocationStageTrace().calcPrepare();
- result = 9;
- invocation.getInvocationStageTrace().calcConnection();
- result = 9;
- invocation.getInvocationStageTrace().calcConsumerEncodeRequest();
- result = 4;
- invocation.getInvocationStageTrace().calcConsumerSendRequest();
- result = 5;
- invocation.getInvocationStageTrace().calcWait();
- result = 9;
- invocation.getInvocationStageTrace().calcConsumerDecodeResponse();
- result = 9;
-
- event.getInvocation();
- result = invocation;
- }
- };
+ public void consumerInvocation() {
+ InvocationFinishEvent event = Mockito.mock(InvocationFinishEvent.class);
+ Mockito.when(invocation.isConsumer()).thenReturn(true);
+
Mockito.when(invocation.getInvocationType()).thenReturn(InvocationType.CONSUMER);
+
Mockito.when(invocation.getRealTransportName()).thenReturn(CoreConst.RESTFUL);
+
Mockito.when(invocation.getMicroserviceQualifiedName()).thenReturn("m.s.o");
+ InvocationStageTrace invocationStageTrace =
Mockito.mock(InvocationStageTrace.class);
+
Mockito.when(invocation.getInvocationStageTrace()).thenReturn(invocationStageTrace);
+ Mockito.when(invocationStageTrace.calcTotal()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcPrepare()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcConnection()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcConsumerEncodeRequest()).thenReturn(4L);
+
Mockito.when(invocationStageTrace.calcConsumerSendRequest()).thenReturn(5L);
+ Mockito.when(invocationStageTrace.calcWait()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcConsumerDecodeResponse()).thenReturn(9L);
+ Mockito.when(event.getInvocation()).thenReturn(invocation);
+ Response mockResponse = Mockito.spy(Response.class);
+ Mockito.when(event.getResponse()).thenReturn(mockResponse);
+ Mockito.doReturn(0).when(mockResponse).getStatusCode();
eventBus.post(event);
eventBus.post(event);
@@ -106,7 +99,7 @@ public class TestInvocationMetersInitializer {
new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME,
"stage"));
List<Measurement> measurements =
tree.findChild(MeterInvocationConst.INVOCATION_NAME, "total")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -116,7 +109,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"prepare")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -126,7 +119,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"consumer-send")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -136,7 +129,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"connection")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -146,8 +139,8 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"consumer-encode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -157,7 +150,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"connection")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -167,7 +160,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME, "wait")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -177,7 +170,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"consumer-decode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -187,41 +180,28 @@ public class TestInvocationMetersInitializer {
}
@Test
- public void edgeInvocation(@Mocked InvocationFinishEvent event) {
- new Expectations() {
- {
- invocation.isConsumer();
- result = true;
- invocation.isEdge();
- result = true;
- invocation.getRealTransportName();
- result = CoreConst.RESTFUL;
- invocation.getMicroserviceQualifiedName();
- result = "m.s.o";
- invocation.getInvocationStageTrace().calcTotal();
- result = 9;
- invocation.getInvocationStageTrace().calcPrepare();
- result = 9;
- invocation.getInvocationStageTrace().calcProviderDecodeRequest();
- result = 9;
- invocation.getInvocationStageTrace().calcConnection();
- result = 9;
- invocation.getInvocationStageTrace().calcConsumerEncodeRequest();
- result = 4;
- invocation.getInvocationStageTrace().calcConsumerSendRequest();
- result = 5;
- invocation.getInvocationStageTrace().calcConsumerDecodeResponse();
- result = 8;
- invocation.getInvocationStageTrace().calcWait();
- result = 9;
- invocation.getInvocationStageTrace().calcProviderEncodeResponse();
- result = 9;
- invocation.getInvocationStageTrace().calcProviderSendResponse();
- result = 9;
- event.getInvocation();
- result = invocation;
- }
- };
+ public void edgeInvocation() {
+ InvocationFinishEvent event = Mockito.mock(InvocationFinishEvent.class);
+ Mockito.when(invocation.isConsumer()).thenReturn(true);
+ Mockito.when(invocation.isEdge()).thenReturn(true);
+
Mockito.when(invocation.getRealTransportName()).thenReturn(CoreConst.RESTFUL);
+
Mockito.when(invocation.getMicroserviceQualifiedName()).thenReturn("m.s.o");
+ InvocationStageTrace invocationStageTrace =
Mockito.mock(InvocationStageTrace.class);
+
Mockito.when(invocation.getInvocationStageTrace()).thenReturn(invocationStageTrace);
+ Mockito.when(invocationStageTrace.calcTotal()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcPrepare()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcProviderDecodeRequest()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcConnection()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcConsumerEncodeRequest()).thenReturn(4L);
+
Mockito.when(invocationStageTrace.calcConsumerSendRequest()).thenReturn(5L);
+
Mockito.when(invocationStageTrace.calcConsumerDecodeResponse()).thenReturn(8L);
+ Mockito.when(invocationStageTrace.calcWait()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcProviderEncodeResponse()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcProviderSendResponse()).thenReturn(9L);
+ Mockito.when(event.getInvocation()).thenReturn(invocation);
+ Response mockResponse = Mockito.spy(Response.class);
+ Mockito.when(event.getResponse()).thenReturn(mockResponse);
+ Mockito.doReturn(0).when(mockResponse).getStatusCode();
eventBus.post(event);
eventBus.post(event);
@@ -232,7 +212,7 @@ public class TestInvocationMetersInitializer {
List<Measurement> measurements =
tree.findChild(MeterInvocationConst.INVOCATION_NAME, "total")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -242,7 +222,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"prepare")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -252,7 +232,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"consumer-send")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -262,7 +242,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"connection")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -272,7 +252,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"consumer-encode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -282,7 +262,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME, "wait")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -292,7 +272,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"consumer-decode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -302,7 +282,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"provider-decode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -312,7 +292,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"provider-encode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -322,7 +302,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"provider-send")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -332,35 +312,25 @@ public class TestInvocationMetersInitializer {
}
@Test
- public void producerInvocation(@Mocked InvocationFinishEvent event) {
- new Expectations() {
- {
- invocation.isConsumer();
- result = false;
- invocation.getInvocationType();
- result = InvocationType.PROVIDER;
- invocation.getRealTransportName();
- result = CoreConst.RESTFUL;
- invocation.getMicroserviceQualifiedName();
- result = "m.s.o";
- invocation.getInvocationStageTrace().calcTotal();
- result = 9;
- invocation.getInvocationStageTrace().calcPrepare();
- result = 9;
- invocation.getInvocationStageTrace().calcProviderDecodeRequest();
- result = 9;
- invocation.getInvocationStageTrace().calcQueue();
- result = 9;
- invocation.getInvocationStageTrace().calcBusinessExecute();
- result = 9;
- invocation.getInvocationStageTrace().calcProviderEncodeResponse();
- result = 9;
- invocation.getInvocationStageTrace().calcProviderSendResponse();
- result = 9;
- event.getInvocation();
- result = invocation;
- }
- };
+ public void producerInvocation() {
+ InvocationFinishEvent event = Mockito.mock(InvocationFinishEvent.class);
+ Mockito.when(invocation.isConsumer()).thenReturn(false);
+
Mockito.when(invocation.getInvocationType()).thenReturn(InvocationType.PROVIDER);
+
Mockito.when(invocation.getRealTransportName()).thenReturn(CoreConst.RESTFUL);
+
Mockito.when(invocation.getMicroserviceQualifiedName()).thenReturn("m.s.o");
+ InvocationStageTrace invocationStageTrace =
Mockito.mock(InvocationStageTrace.class);
+
Mockito.when(invocation.getInvocationStageTrace()).thenReturn(invocationStageTrace);
+ Mockito.when(invocationStageTrace.calcTotal()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcPrepare()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcProviderDecodeRequest()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcQueue()).thenReturn(9L);
+ Mockito.when(invocationStageTrace.calcBusinessExecute()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcProviderEncodeResponse()).thenReturn(9L);
+
Mockito.when(invocationStageTrace.calcProviderSendResponse()).thenReturn(9L);
+ Mockito.when(event.getInvocation()).thenReturn(invocation);
+ Response mockResponse = Mockito.spy(Response.class);
+ Mockito.when(event.getResponse()).thenReturn(mockResponse);
+ Mockito.doReturn(0).when(mockResponse).getStatusCode();
eventBus.post(event);
eventBus.post(event);
@@ -371,7 +341,7 @@ public class TestInvocationMetersInitializer {
List<Measurement> measurements =
tree.findChild(MeterInvocationConst.INVOCATION_NAME, "total")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -381,7 +351,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"prepare")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -391,7 +361,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"queue")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -401,7 +371,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"execute")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -411,7 +381,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"provider-decode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -421,7 +391,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"provider-encode")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
@@ -431,7 +401,7 @@ public class TestInvocationMetersInitializer {
measurements = tree.findChild(MeterInvocationConst.INVOCATION_NAME,
"provider-send")
.getMeasurements();
- Assert.assertEquals(3, measurements.size());
+ Assertions.assertEquals(3, measurements.size());
AssertUtil.assertMeasure(measurements, 0,
"statistic='COUNT', value=2.0");
AssertUtil.assertMeasure(measurements, 1,
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 f83f41693..c9461668d 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
@@ -29,24 +29,25 @@ 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.SystemMeter;
import org.apache.servicecomb.metrics.core.meter.os.net.InterfaceUsage;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
import org.mockito.Mockito;
import com.google.common.eventbus.EventBus;
-import com.google.common.io.CharSource;
import com.sun.management.OperatingSystemMXBean;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
+import org.mockito.junit.jupiter.MockitoExtension;
+@ExtendWith(MockitoExtension.class)
public class TestOsMeterInitializer {
MeterRegistry registry = new SimpleMeterRegistry();
- @Mocked
+ @Mock
EventBus eventBus;
@Test
@@ -55,64 +56,56 @@ public class TestOsMeterInitializer {
list.add("13 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1");
list.add("useless");
list.add("eth0: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
- new MockUp<CharSource>() {
- //Files.readFirstLine
- @Mock
- public String readFirstLine() {
- return list.get(0);
- }
- };
- new MockUp<FileUtils>() {
- @Mock
- public List<String> readLines(File file, Charset encoding) {
- return list;
- }
- };
- OsMetersInitializer osMetersInitializer = new OsMetersInitializer();
- osMetersInitializer.init(registry, eventBus, null);
+ try (MockedStatic<FileUtils> fileUtilsMockedStatic =
Mockito.mockStatic(FileUtils.class)) {
+ fileUtilsMockedStatic.when(() -> {
+ FileUtils.readLines(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(list);
+ OsMetersInitializer osMetersInitializer = new OsMetersInitializer();
+ osMetersInitializer.init(registry, eventBus, null);
- OsMeter osMeter = osMetersInitializer.getOsMeter();
- SystemMeter systemMeter = osMeter.getCpuMeter();
- OperatingSystemMXBean osBean = Mockito.mock(OperatingSystemMXBean.class);
- Mockito.when(osBean.getCpuLoad()).thenReturn(3.2D);
- Mockito.when(osBean.getProcessCpuLoad()).thenReturn(1.2D);
- systemMeter.setOsBean(osBean);
- NetMeter netMeter = osMeter.getNetMeter();
- netMeter.setOsLinux(true);
+ OsMeter osMeter = osMetersInitializer.getOsMeter();
+ SystemMeter systemMeter = osMeter.getCpuMeter();
+ OperatingSystemMXBean osBean = Mockito.mock(OperatingSystemMXBean.class);
+ Mockito.when(osBean.getCpuLoad()).thenReturn(3.2D);
+ Mockito.when(osBean.getProcessCpuLoad()).thenReturn(1.2D);
+ systemMeter.setOsBean(osBean);
+ NetMeter netMeter = osMeter.getNetMeter();
+ netMeter.setOsLinux(true);
- osMetersInitializer.poll(System.currentTimeMillis(), 1000);
+ osMetersInitializer.poll(System.currentTimeMillis(), 1000);
- MeasurementTree tree = new MeasurementTree();
- MeasurementGroupConfig group = new MeasurementGroupConfig();
- group.addGroup(OsMeter.OS_NAME, OsMeter.OS_TYPE);
- tree.from(registry.getMeters().iterator(), group);
+ MeasurementTree tree = new MeasurementTree();
+ MeasurementGroupConfig group = new MeasurementGroupConfig();
+ group.addGroup(OsMeter.OS_NAME, OsMeter.OS_TYPE);
+ tree.from(registry.getMeters().iterator(), group);
- Assertions.assertEquals(1.2D,
- tree.findChild(OsMeter.OS_NAME,
SystemMeter.PROCESS_CPU_USAGE).summary(), 0.0);
- Assertions.assertEquals(3.2D,
- tree.findChild(OsMeter.OS_NAME, SystemMeter.CPU_USAGE).summary(), 0.0);
+ Assertions.assertEquals(1.2D,
+ tree.findChild(OsMeter.OS_NAME,
SystemMeter.PROCESS_CPU_USAGE).summary(), 0.0);
+ Assertions.assertEquals(3.2D,
+ tree.findChild(OsMeter.OS_NAME,
SystemMeter.CPU_USAGE).summary(), 0.0);
- Map<String, InterfaceUsage> interfaceInfoMap =
netMeter.getInterfaceUsageMap();
- Assertions.assertEquals(1, interfaceInfoMap.size());
- InterfaceUsage eth0 = interfaceInfoMap.get("eth0");
- // recv Bps
- Assertions.assertEquals(0L, eth0.getReceive().getLastValue());
- Assertions.assertEquals(0, eth0.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, eth0.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(0L, eth0.getSend().getLastValue());
- Assertions.assertEquals(0, eth0.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, eth0.getSend().getIndex());
+ Map<String, InterfaceUsage> interfaceInfoMap =
netMeter.getInterfaceUsageMap();
+ Assertions.assertEquals(1, interfaceInfoMap.size());
+ InterfaceUsage eth0 = interfaceInfoMap.get("eth0");
+ // recv Bps
+ Assertions.assertEquals(0L, eth0.getReceive().getLastValue());
+ Assertions.assertEquals(0, eth0.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(0L, eth0.getSend().getLastValue());
+ Assertions.assertEquals(0, eth0.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getSend().getIndex());
- // recv pps
- Assertions.assertEquals(0L, eth0.getPacketsReceive().getLastValue());
- Assertions.assertEquals(0, eth0.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
+ // recv pps
+ Assertions.assertEquals(0L, eth0.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(0, eth0.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
- // send pps
- Assertions.assertEquals(0L, eth0.getPacketsSend().getLastValue());
- Assertions.assertEquals(0, eth0.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
+ // send pps
+ Assertions.assertEquals(0L, eth0.getPacketsSend().getLastValue());
+ Assertions.assertEquals(0, eth0.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
+ }
}
}
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 fc2c20c8c..75b3b8a60 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
@@ -31,10 +31,10 @@ import
org.apache.servicecomb.foundation.vertx.SharedVertxFactory;
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.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.core.env.Environment;
@@ -105,7 +105,7 @@ public class TestVertxMetersInitializer {
}
}
- @Before
+ @BeforeEach
public void setup() {
Mockito.when(environment.getProperty("servicecomb.transport.eventloop.size",
int.class, -1))
.thenReturn(-1);
@@ -115,7 +115,7 @@ public class TestVertxMetersInitializer {
HttpClients.load();
}
- @After
+ @AfterEach
public void teardown() {
HttpClients.destroy();
}
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 721ca1062..8ed2a920d 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
@@ -31,15 +31,15 @@ import
org.apache.servicecomb.foundation.metrics.publish.MeasurementGroupConfig;
import org.apache.servicecomb.foundation.metrics.publish.MeasurementNode;
import org.apache.servicecomb.foundation.metrics.publish.MeasurementTree;
import org.apache.servicecomb.metrics.core.meter.os.net.InterfaceUsage;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import io.micrometer.core.instrument.Measurement;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import mockit.Mock;
-import mockit.MockUp;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
public class TestNetMeter {
@Test
@@ -48,68 +48,67 @@ public class TestNetMeter {
list.add("useless");
list.add("useless");
list.add("eth0: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
- new MockUp<FileUtils>() {
- @Mock
- public List<String> readLines(File file, Charset encoding) {
- return list;
+
+ try (MockedStatic<FileUtils> fileUtilsMockedStatic =
Mockito.mockStatic(FileUtils.class)) {
+ fileUtilsMockedStatic.when(() -> {
+ FileUtils.readLines(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(list);
+
+ MeterRegistry meterRegistry = new SimpleMeterRegistry();
+ NetMeter netMeter = new NetMeter(meterRegistry, "os", Tags.of(OS_TYPE,
OS_TYPE_NET));
+ 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);
+
+ Map<String, InterfaceUsage> meterInterfaceInfoMap =
netMeter.getInterfaceUsageMap();
+ Assertions.assertTrue(meterInterfaceInfoMap.containsKey("eth0"));
+
+ InterfaceUsage eth0 = meterInterfaceInfoMap.get("eth0");
+
+ Assertions.assertEquals("eth0", eth0.getName());
+
+ // recv Bps
+ Assertions.assertEquals(1L, eth0.getReceive().getLastValue());
+ Assertions.assertEquals(1, eth0.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(1L, eth0.getSend().getLastValue());
+ Assertions.assertEquals(1, eth0.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getSend().getIndex());
+
+ // recv pps
+ Assertions.assertEquals(1L, eth0.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
+
+ // send pps
+ Assertions.assertEquals(1L, eth0.getPacketsSend().getLastValue());
+ Assertions.assertEquals(1, eth0.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
+
+ // measurement tree test
+ MeasurementGroupConfig group = new MeasurementGroupConfig();
+ group.addGroup(OsMeter.OS_NAME,
+ OS_TYPE,
+ new DefaultTagFinder(NetMeter.INTERFACE, true),
+ new DefaultTagFinder(NetMeter.STATISTIC, true));
+
+ MeasurementTree tree = new MeasurementTree();
+ tree.from(meterRegistry.getMeters().iterator(), group);
+ MeasurementNode osNode = tree.findChild(OsMeter.OS_NAME);
+ MeasurementNode netNode = osNode.findChild(OS_TYPE_NET);
+ Assertions.assertEquals(1, netNode.getChildren().size());
+ for (MeasurementNode interfaceNode : netNode.getChildren().values()) {
+ double sendRate =
interfaceNode.findChild(NetMeter.TAG_SEND.getValue()).summary();
+ double sendPacketsRate =
interfaceNode.findChild(NetMeter.TAG_PACKETS_SEND.getValue()).summary();
+ double receiveRate =
interfaceNode.findChild(NetMeter.TAG_RECEIVE.getValue()).summary();
+ double receivePacketsRate =
interfaceNode.findChild(NetMeter.TAG_PACKETS_RECEIVE.getValue()).summary();
+ Assertions.assertEquals(1, sendRate, 0);
+ Assertions.assertEquals(1, sendPacketsRate, 0);
+ Assertions.assertEquals(1, receiveRate, 0);
+ Assertions.assertEquals(1, receivePacketsRate, 0);
}
- };
- MeterRegistry meterRegistry = new SimpleMeterRegistry();
- NetMeter netMeter = new NetMeter(meterRegistry, "os", Tags.of(OS_TYPE,
OS_TYPE_NET));
- 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);
-
-
- Map<String, InterfaceUsage> meterInterfaceInfoMap =
netMeter.getInterfaceUsageMap();
- Assertions.assertTrue(meterInterfaceInfoMap.containsKey("eth0"));
-
- InterfaceUsage eth0 = meterInterfaceInfoMap.get("eth0");
-
- Assertions.assertEquals("eth0", eth0.getName());
-
- // recv Bps
- Assertions.assertEquals(1L, eth0.getReceive().getLastValue());
- Assertions.assertEquals(1, eth0.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, eth0.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(1L, eth0.getSend().getLastValue());
- Assertions.assertEquals(1, eth0.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, eth0.getSend().getIndex());
-
- // recv pps
- Assertions.assertEquals(1L, eth0.getPacketsReceive().getLastValue());
- Assertions.assertEquals(1, eth0.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
-
- // send pps
- Assertions.assertEquals(1L, eth0.getPacketsSend().getLastValue());
- Assertions.assertEquals(1, eth0.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
-
- // measurement tree test
- MeasurementGroupConfig group = new MeasurementGroupConfig();
- group.addGroup(OsMeter.OS_NAME,
- OS_TYPE,
- new DefaultTagFinder(NetMeter.INTERFACE, true),
- new DefaultTagFinder(NetMeter.STATISTIC, true));
-
- MeasurementTree tree = new MeasurementTree();
- tree.from(meterRegistry.getMeters().iterator(), group);
- MeasurementNode osNode = tree.findChild(OsMeter.OS_NAME);
- MeasurementNode netNode = osNode.findChild(OS_TYPE_NET);
- Assertions.assertEquals(1, netNode.getChildren().size());
- for (MeasurementNode interfaceNode : netNode.getChildren().values()) {
- double sendRate =
interfaceNode.findChild(NetMeter.TAG_SEND.getValue()).summary();
- double sendPacketsRate =
interfaceNode.findChild(NetMeter.TAG_PACKETS_SEND.getValue()).summary();
- double receiveRate =
interfaceNode.findChild(NetMeter.TAG_RECEIVE.getValue()).summary();
- double receivePacketsRate =
interfaceNode.findChild(NetMeter.TAG_PACKETS_RECEIVE.getValue()).summary();
- Assertions.assertEquals(1, sendRate, 0);
- Assertions.assertEquals(1, sendPacketsRate, 0);
- Assertions.assertEquals(1, receiveRate, 0);
- Assertions.assertEquals(1, receivePacketsRate, 0);
}
-
}
@@ -119,66 +118,66 @@ public class TestNetMeter {
list.add("useless");
list.add("useless");
list.add("eth0: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
- new MockUp<FileUtils>() {
- @Mock
- public List<String> readLines(File file, Charset encoding) {
- return list;
- }
- };
- MeterRegistry meterRegistry = new SimpleMeterRegistry();
- NetMeter netMeter = new NetMeter(meterRegistry, "net", Tags.empty());
- netMeter.setOsLinux(true);
- netMeter.poll(0, 0);
- Map<String, InterfaceUsage> netMap = netMeter.getInterfaceUsageMap();
- 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);
- Assertions.assertEquals(2, netMap.size());
- InterfaceUsage eth0 = netMap.get("eth0");
- Assertions.assertEquals("eth0", eth0.getName());
-
- // recv Bps
- Assertions.assertEquals(1L, eth0.getReceive().getLastValue());
- Assertions.assertEquals(1, eth0.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, eth0.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(1L, eth0.getSend().getLastValue());
- Assertions.assertEquals(1, eth0.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, eth0.getSend().getIndex());
-
- // recv pps
- Assertions.assertEquals(1L, eth0.getPacketsReceive().getLastValue());
- Assertions.assertEquals(1, eth0.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
-
- // send pps
- Assertions.assertEquals(1L, eth0.getPacketsSend().getLastValue());
- Assertions.assertEquals(1, eth0.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
-
- InterfaceUsage lo = netMap.get("lo");
- Assertions.assertEquals("lo", lo.getName());
-
- // recv Bps
- Assertions.assertEquals(0L, lo.getReceive().getLastValue());
- Assertions.assertEquals(0, lo.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, lo.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(0L, lo.getSend().getLastValue());
- Assertions.assertEquals(0, lo.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, lo.getSend().getIndex());
-
- // recv pps
- Assertions.assertEquals(0L, lo.getPacketsReceive().getLastValue());
- Assertions.assertEquals(0, lo.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, lo.getPacketsReceive().getIndex());
-
- // send pps
- Assertions.assertEquals(0L, lo.getPacketsSend().getLastValue());
- Assertions.assertEquals(0, lo.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, lo.getPacketsSend().getIndex());
+ try (MockedStatic<FileUtils> fileUtilsMockedStatic =
Mockito.mockStatic(FileUtils.class)) {
+ fileUtilsMockedStatic.when(() -> {
+ FileUtils.readLines(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(list);
+
+ MeterRegistry meterRegistry = new SimpleMeterRegistry();
+ NetMeter netMeter = new NetMeter(meterRegistry, "net", Tags.empty());
+ netMeter.setOsLinux(true);
+ netMeter.poll(0, 0);
+ Map<String, InterfaceUsage> netMap = netMeter.getInterfaceUsageMap();
+ 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);
+ Assertions.assertEquals(2, netMap.size());
+ InterfaceUsage eth0 = netMap.get("eth0");
+ Assertions.assertEquals("eth0", eth0.getName());
+
+ // recv Bps
+ Assertions.assertEquals(1L, eth0.getReceive().getLastValue());
+ Assertions.assertEquals(1, eth0.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(1L, eth0.getSend().getLastValue());
+ Assertions.assertEquals(1, eth0.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getSend().getIndex());
+
+ // recv pps
+ Assertions.assertEquals(1L, eth0.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
+
+ // send pps
+ Assertions.assertEquals(1L, eth0.getPacketsSend().getLastValue());
+ Assertions.assertEquals(1, eth0.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
+
+ InterfaceUsage lo = netMap.get("lo");
+ Assertions.assertEquals("lo", lo.getName());
+
+ // recv Bps
+ Assertions.assertEquals(0L, lo.getReceive().getLastValue());
+ Assertions.assertEquals(0, lo.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, lo.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(0L, lo.getSend().getLastValue());
+ Assertions.assertEquals(0, lo.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, lo.getSend().getIndex());
+
+ // recv pps
+ Assertions.assertEquals(0L, lo.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(0, lo.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, lo.getPacketsReceive().getIndex());
+
+ // send pps
+ Assertions.assertEquals(0L, lo.getPacketsSend().getLastValue());
+ Assertions.assertEquals(0, lo.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, lo.getPacketsSend().getIndex());
+ }
}
@@ -189,86 +188,87 @@ public class TestNetMeter {
list.add("useless");
list.add("eth0: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
list.add("lo: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
- new MockUp<FileUtils>() {
- @Mock
- public List<String> readLines(File file, Charset encoding) {
- return list;
- }
- };
- MeterRegistry meterRegistry = new SimpleMeterRegistry();
- NetMeter netMeter = new NetMeter(meterRegistry, "net", Tags.empty());
- netMeter.setOsLinux(true);
- netMeter.poll(0, 1);
- Map<String, InterfaceUsage> netMap = netMeter.getInterfaceUsageMap();
- Assertions.assertEquals(2, netMap.size());
- InterfaceUsage lo = netMap.get("lo");
- InterfaceUsage eth0 = netMap.get("eth0");
- Assertions.assertEquals("lo", lo.getName());
- // recv Bps
- Assertions.assertEquals(0L, lo.getReceive().getLastValue());
- Assertions.assertEquals(0, lo.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, lo.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(0L, lo.getSend().getLastValue());
- Assertions.assertEquals(0, lo.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, lo.getSend().getIndex());
-
- // recv pps
- Assertions.assertEquals(0L, lo.getPacketsReceive().getLastValue());
- Assertions.assertEquals(0, lo.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, lo.getPacketsReceive().getIndex());
-
- // send pps
- Assertions.assertEquals(0L, lo.getPacketsSend().getLastValue());
- Assertions.assertEquals(0, lo.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, lo.getPacketsSend().getIndex());
-
- Assertions.assertEquals("eth0", eth0.getName());
- // recv Bps
- Assertions.assertEquals(0L, eth0.getReceive().getLastValue());
- Assertions.assertEquals(0, eth0.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, eth0.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(0L, eth0.getSend().getLastValue());
- Assertions.assertEquals(0, eth0.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, eth0.getSend().getIndex());
-
- // recv pps
- Assertions.assertEquals(0L, eth0.getPacketsReceive().getLastValue());
- Assertions.assertEquals(0, eth0.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
-
- // send pps
- Assertions.assertEquals(0L, eth0.getPacketsSend().getLastValue());
- Assertions.assertEquals(0, eth0.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, eth0.getPacketsSend().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);
-
- Assertions.assertEquals("eth0", eth0.getName());
-
- // recv Bps
- Assertions.assertEquals(1L, eth0.getReceive().getLastValue());
- Assertions.assertEquals(1, eth0.getReceive().getRate(), 0.0);
- Assertions.assertEquals(0, eth0.getReceive().getIndex());
- // send Bps
- Assertions.assertEquals(1L, eth0.getSend().getLastValue());
- Assertions.assertEquals(1, eth0.getSend().getRate(), 0.0);
- Assertions.assertEquals(8, eth0.getSend().getIndex());
-
- // recv pps
- Assertions.assertEquals(1L, eth0.getPacketsReceive().getLastValue());
- Assertions.assertEquals(1, eth0.getPacketsReceive().getRate(), 0.0);
- Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
-
- // send pps
- Assertions.assertEquals(1L, eth0.getPacketsSend().getLastValue());
- Assertions.assertEquals(1, eth0.getPacketsSend().getRate(), 0.0);
- Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
- }
+ try (MockedStatic<FileUtils> fileUtilsMockedStatic =
Mockito.mockStatic(FileUtils.class)) {
+ fileUtilsMockedStatic.when(() -> {
+ FileUtils.readLines(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(list);
+
+ MeterRegistry meterRegistry = new SimpleMeterRegistry();
+ NetMeter netMeter = new NetMeter(meterRegistry, "net", Tags.empty());
+ netMeter.setOsLinux(true);
+ netMeter.poll(0, 1);
+
+ Map<String, InterfaceUsage> netMap = netMeter.getInterfaceUsageMap();
+ Assertions.assertEquals(2, netMap.size());
+ InterfaceUsage lo = netMap.get("lo");
+ InterfaceUsage eth0 = netMap.get("eth0");
+ Assertions.assertEquals("lo", lo.getName());
+ // recv Bps
+ Assertions.assertEquals(0L, lo.getReceive().getLastValue());
+ Assertions.assertEquals(0, lo.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, lo.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(0L, lo.getSend().getLastValue());
+ Assertions.assertEquals(0, lo.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, lo.getSend().getIndex());
+
+ // recv pps
+ Assertions.assertEquals(0L, lo.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(0, lo.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, lo.getPacketsReceive().getIndex());
+
+ // send pps
+ Assertions.assertEquals(0L, lo.getPacketsSend().getLastValue());
+ Assertions.assertEquals(0, lo.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, lo.getPacketsSend().getIndex());
+
+ Assertions.assertEquals("eth0", eth0.getName());
+ // recv Bps
+ Assertions.assertEquals(0L, eth0.getReceive().getLastValue());
+ Assertions.assertEquals(0, eth0.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(0L, eth0.getSend().getLastValue());
+ Assertions.assertEquals(0, eth0.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getSend().getIndex());
+
+ // recv pps
+ Assertions.assertEquals(0L, eth0.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(0, eth0.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
+
+ // send pps
+ Assertions.assertEquals(0L, eth0.getPacketsSend().getLastValue());
+ Assertions.assertEquals(0, eth0.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getPacketsSend().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);
+
+ Assertions.assertEquals("eth0", eth0.getName());
+
+ // recv Bps
+ Assertions.assertEquals(1L, eth0.getReceive().getLastValue());
+ Assertions.assertEquals(1, eth0.getReceive().getRate(), 0.0);
+ Assertions.assertEquals(0, eth0.getReceive().getIndex());
+ // send Bps
+ Assertions.assertEquals(1L, eth0.getSend().getLastValue());
+ Assertions.assertEquals(1, eth0.getSend().getRate(), 0.0);
+ Assertions.assertEquals(8, eth0.getSend().getIndex());
+
+ // recv pps
+ Assertions.assertEquals(1L, eth0.getPacketsReceive().getLastValue());
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getRate(), 0.0);
+ Assertions.assertEquals(1, eth0.getPacketsReceive().getIndex());
+
+ // send pps
+ Assertions.assertEquals(1L, eth0.getPacketsSend().getLastValue());
+ Assertions.assertEquals(1, eth0.getPacketsSend().getRate(), 0.0);
+ Assertions.assertEquals(9, eth0.getPacketsSend().getIndex());
+ }
+ }
@Test
public void testCalcMeasurements() {
@@ -276,30 +276,30 @@ public class TestNetMeter {
list.add("useless");
list.add("useless");
list.add("eth0: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
- new MockUp<FileUtils>() {
- @Mock
- public List<String> readLines(File file, Charset encoding) {
- return list;
- }
- };
MeterRegistry meterRegistry = new SimpleMeterRegistry();
- NetMeter netMeter = new NetMeter(meterRegistry, "net", Tags.empty());
- netMeter.setOsLinux(true);
- list.remove(2);
- list.add("eth0: 3 1 0 0 0 0 0 1 3 1
1 0 0 0 0 0");
- netMeter.poll(0, 1);
-
- MeasurementTree tree = new MeasurementTree();
- tree.from(meterRegistry.getMeters().iterator(),
- new MeasurementGroupConfig("net", "statistic"));
-
- Measurement receive = tree.findChild("net",
"receive").getMeasurements().get(0);
- Measurement send = tree.findChild("net", "send").getMeasurements().get(0);
- Measurement receivePackets = tree.findChild("net",
"receivePackets").getMeasurements().get(0);
- Measurement sendPackets = tree.findChild("net",
"sendPackets").getMeasurements().get(0);
- Assertions.assertEquals(3.0, send.getValue(), 0.0);
- Assertions.assertEquals(1.0, sendPackets.getValue(), 0.0);
- Assertions.assertEquals(3.0, receive.getValue(), 0.0);
- Assertions.assertEquals(1.0, receivePackets.getValue(), 0.0);
+ try (MockedStatic<FileUtils> fileUtilsMockedStatic =
Mockito.mockStatic(FileUtils.class)) {
+ fileUtilsMockedStatic.when(() -> {
+ FileUtils.readLines(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(list);
+
+ NetMeter netMeter = new NetMeter(meterRegistry, "net", Tags.empty());
+ netMeter.setOsLinux(true);
+ list.remove(2);
+ list.add("eth0: 3 1 0 0 0 0 0 1 3
1 1 0 0 0 0 0");
+ netMeter.poll(0, 1);
+ MeasurementTree tree = new MeasurementTree();
+ tree.from(meterRegistry.getMeters().iterator(),
+ new MeasurementGroupConfig("net", "statistic"));
+
+ Measurement receive = tree.findChild("net",
"receive").getMeasurements().get(0);
+ Measurement send = tree.findChild("net",
"send").getMeasurements().get(0);
+ Measurement receivePackets = tree.findChild("net",
"receivePackets").getMeasurements().get(0);
+ Measurement sendPackets = tree.findChild("net",
"sendPackets").getMeasurements().get(0);
+ Assertions.assertEquals(3.0, send.getValue(), 0.0);
+ Assertions.assertEquals(1.0, sendPackets.getValue(), 0.0);
+ Assertions.assertEquals(3.0, receive.getValue(), 0.0);
+ Assertions.assertEquals(1.0, receivePackets.getValue(), 0.0);
+ }
+
}
}
diff --git
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestSystemMeter.java
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestSystemMeter.java
index 2e6bec05b..05d32250d 100644
---
a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestSystemMeter.java
+++
b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/meter/os/TestSystemMeter.java
@@ -25,8 +25,9 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import
org.apache.servicecomb.foundation.metrics.publish.MeasurementGroupConfig;
import org.apache.servicecomb.foundation.metrics.publish.MeasurementTree;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
import org.mockito.Mockito;
import com.google.common.io.CharSource;
@@ -35,63 +36,57 @@ import com.sun.management.OperatingSystemMXBean;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
public class TestSystemMeter {
@Test
- public void testCalcMeasurement(@Mocked CharSource charSource) throws
IOException {
+ public void testCalcMeasurement() throws IOException {
MeterRegistry meterRegistry = new SimpleMeterRegistry();
-
+ CharSource charSource = Mockito.mock(CharSource.class);
List<String> list = new ArrayList<>();
list.add("useless");
list.add("useless");
list.add("eth0: 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0");
- new MockUp<FileUtils>() {
- @Mock
- public List<String> readLines(File file, Charset encoding) {
- return list;
- }
- };
- new MockUp<Files>() {
- @Mock
- public CharSource asCharSource(File file, Charset encoding) {
- return charSource;
- }
- };
+ try (MockedStatic<FileUtils> fileUtilsMockedStatic =
Mockito.mockStatic(FileUtils.class);
+ MockedStatic<Files> filesMockedStatic =
Mockito.mockStatic(Files.class)) {
+ fileUtilsMockedStatic.when(() -> {
+ FileUtils.readLines(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(list);
+ filesMockedStatic.when(() -> {
+ Files.asCharSource(Mockito.any(File.class),
Mockito.any(Charset.class));
+ }).thenReturn(charSource);
- OsMeter osMeter = new OsMeter(meterRegistry);
- list.clear();
- list.add("useless");
- list.add("useless");
- list.add("eth0: 1 1 0 0 0 0 0 1 1 1
1 0 0 0 0 0");
+ OsMeter osMeter = new OsMeter(meterRegistry);
+ list.clear();
+ list.add("useless");
+ list.add("useless");
+ list.add("eth0: 1 1 0 0 0 0 0 1 1
1 1 0 0 0 0 0");
- SystemMeter systemMeter = osMeter.getCpuMeter();
- OperatingSystemMXBean osBean = Mockito.mock(OperatingSystemMXBean.class);
- Mockito.when(osBean.getSystemLoadAverage()).thenReturn(0.775);
- Mockito.when(osBean.getCpuLoad()).thenReturn(0.875);
- Mockito.when(osBean.getProcessCpuLoad()).thenReturn(0.5);
- Mockito.when(osBean.getTotalMemorySize()).thenReturn(1000000000L);
- Mockito.when(osBean.getFreeMemorySize()).thenReturn(300000000L);
- systemMeter.setOsBean(osBean);
- NetMeter netMeter = osMeter.getNetMeter();
- netMeter.setOsLinux(true);
+ SystemMeter systemMeter = osMeter.getCpuMeter();
+ OperatingSystemMXBean osBean = Mockito.mock(OperatingSystemMXBean.class);
+ Mockito.when(osBean.getSystemLoadAverage()).thenReturn(0.775);
+ Mockito.when(osBean.getCpuLoad()).thenReturn(0.875);
+ Mockito.when(osBean.getProcessCpuLoad()).thenReturn(0.5);
+ Mockito.when(osBean.getTotalMemorySize()).thenReturn(1000000000L);
+ Mockito.when(osBean.getFreeMemorySize()).thenReturn(300000000L);
+ systemMeter.setOsBean(osBean);
+ NetMeter netMeter = osMeter.getNetMeter();
+ netMeter.setOsLinux(true);
- osMeter.poll(0, 1);
+ osMeter.poll(0, 1);
- MeasurementTree tree = new MeasurementTree();
- tree.from(meterRegistry.getMeters().iterator(),
- new MeasurementGroupConfig("os", "type"));
+ MeasurementTree tree = new MeasurementTree();
+ tree.from(meterRegistry.getMeters().iterator(),
+ new MeasurementGroupConfig("os", "type"));
- Assertions.assertEquals(0.875, tree.findChild("os",
"cpu").getMeasurements().get(0).getValue(), 0.0);
- Assertions.assertEquals(0.5, tree.findChild("os",
"processCpu").getMeasurements().get(0).getValue(), 0.0);
- Assertions.assertEquals(0.7, tree.findChild("os",
"memory").getMeasurements().get(0).getValue(), 0.0);
- Assertions.assertEquals(0.775, tree.findChild("os",
"sla").getMeasurements().get(0).getValue(), 0.0);
- Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(0).getValue(), 0.0);
- Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(1).getValue(), 0.0);
- Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(2).getValue(), 0.0);
- Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(3).getValue(), 0.0);
+ Assertions.assertEquals(0.875, tree.findChild("os",
"cpu").getMeasurements().get(0).getValue(), 0.0);
+ Assertions.assertEquals(0.5, tree.findChild("os",
"processCpu").getMeasurements().get(0).getValue(), 0.0);
+ Assertions.assertEquals(0.7, tree.findChild("os",
"memory").getMeasurements().get(0).getValue(), 0.0);
+ Assertions.assertEquals(0.775, tree.findChild("os",
"sla").getMeasurements().get(0).getValue(), 0.0);
+ Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(0).getValue(), 0.0);
+ Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(1).getValue(), 0.0);
+ Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(2).getValue(), 0.0);
+ Assertions.assertEquals(1.0, tree.findChild("os",
"net").getMeasurements().get(3).getValue(), 0.0);
+ }
}
}
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 8473f0434..ca232aec0 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
@@ -30,8 +30,8 @@ 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.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.core.env.Environment;
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 cb4508337..dc8b1ec72 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
@@ -29,10 +29,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.Test;
import org.junit.jupiter.api.Assertions;
import jakarta.ws.rs.core.Response.Status;
+import org.junit.jupiter.api.Test;
public class TestPublishUtils {
String op = "op";
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 34f8a8548..703a245a2 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
@@ -16,6 +16,7 @@
*/
package org.apache.servicecomb.metrics.core.publish;
+import com.google.common.eventbus.EventBus;
import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
import org.apache.servicecomb.core.Endpoint;
@@ -28,34 +29,36 @@ import
org.apache.servicecomb.core.invocation.InvocationStageTrace;
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.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-
-import mockit.Expectations;
-import mockit.Mocked;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
public class TestSlowInvocationLogger {
- @Mocked
+ @Mock
SCBEngine scbEngine;
- @Mocked
+ @Mock
Invocation invocation;
- @Mocked
+ @Mock
OperationMeta operationMeta;
- @Mocked
+ @Mock
RestOperationMeta restOperationMeta;
- @Mocked
+ @Mock
OperationConfig operationConfig;
- @Mocked
+ @Mock
Response response;
- @Mocked
+ @Mock
InvocationStageTrace stageTrace;
InvocationFinishEvent event;
@@ -64,14 +67,20 @@ public class TestSlowInvocationLogger {
LogCollector logCollector;
- @Before
+ @BeforeEach
public void setup() {
+ EventBus eventBus = Mockito.spy(EventBus.class);
+ Mockito.doNothing().when(eventBus).register(Mockito.any());
+ Mockito.when(scbEngine.getEventBus()).thenReturn(eventBus);
+ Mockito.when(invocation.getOperationMeta()).thenReturn(operationMeta);
+ Mockito.when(operationMeta.getConfig()).thenReturn(operationConfig);
+
logger = new SlowInvocationLogger(scbEngine);
event = new InvocationFinishEvent(invocation, response);
logCollector = new LogCollector();
}
- @After
+ @AfterEach
public void teardown() {
logCollector.teardown();
}
@@ -85,41 +94,27 @@ public class TestSlowInvocationLogger {
@Test
public void enableButNotSlow() {
- new Expectations() {
- {
- operationConfig.isSlowInvocationEnabled();
- result = true;
- operationConfig.getNanoSlowInvocation();
- result = 2;
- stageTrace.calcTotal();
- result = 1;
- }
- };
+
+ Mockito.when(operationConfig.isSlowInvocationEnabled()).thenReturn(true);
+ Mockito.when(operationConfig.getNanoSlowInvocation()).thenReturn(2L);
+ Mockito.when(stageTrace.calcTotal()).thenReturn(1L);
+ Mockito.when(invocation.getInvocationStageTrace()).thenReturn(stageTrace);
logger.onInvocationFinish(event);
Assertions.assertTrue(logCollector.getEvents().isEmpty());
}
@Test
- public void consumerSlow(@Mocked Endpoint endpoint) {
- new Expectations() {
- {
- invocation.getEndpoint();
- result = endpoint;
- endpoint.getEndpoint();
- result = "rest://1.1.1.1:1234";
- invocation.isConsumer();
- result = true;
- operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION);
- result = restOperationMeta;
- operationConfig.isSlowInvocationEnabled();
- result = true;
- operationConfig.getNanoSlowInvocation();
- result = 1;
- stageTrace.calcTotal();
- result = 1;
- }
- };
+ public void consumerSlow() {
+ Endpoint endpoint = Mockito.mock(Endpoint.class);
+ Mockito.when(invocation.getEndpoint()).thenReturn(endpoint);
+ Mockito.when(endpoint.getEndpoint()).thenReturn("rest://1.1.1.1:1234");
+ Mockito.when(invocation.isConsumer()).thenReturn(true);
+
Mockito.when(operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION)).thenReturn(restOperationMeta);
+ Mockito.when(operationConfig.isSlowInvocationEnabled()).thenReturn(true);
+ Mockito.when(operationConfig.getNanoSlowInvocation()).thenReturn(1L);
+ Mockito.when(stageTrace.calcTotal()).thenReturn(1L);
+ Mockito.when(invocation.getInvocationStageTrace()).thenReturn(stageTrace);
logger.onInvocationFinish(event);
Assertions.assertEquals("""
@@ -136,31 +131,21 @@ public class TestSlowInvocationLogger {
wait : 0.0ms
consumer-decode : 0.0ms
""",
- logCollector.getEvent(0).getMessage().getFormattedMessage());
+ logCollector.getEvent(0).getMessage().getFormattedMessage());
}
@Test
- public void edgeSlow(@Mocked Endpoint endpoint) {
- new Expectations() {
- {
- invocation.getEndpoint();
- result = endpoint;
- endpoint.getEndpoint();
- result = "rest://1.1.1.1:1234";
- invocation.isConsumer();
- result = true;
- invocation.isEdge();
- result = true;
- operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION);
- result = restOperationMeta;
- operationConfig.isSlowInvocationEnabled();
- result = true;
- operationConfig.getNanoSlowInvocation();
- result = 1;
- stageTrace.calcTotal();
- result = 1;
- }
- };
+ public void edgeSlow() {
+ Endpoint endpoint = Mockito.mock(Endpoint.class);
+ Mockito.when(invocation.getEndpoint()).thenReturn(endpoint);
+ Mockito.when(endpoint.getEndpoint()).thenReturn("rest://1.1.1.1:1234");
+ Mockito.when(invocation.isConsumer()).thenReturn(true);
+ Mockito.when(invocation.isEdge()).thenReturn(true);
+
Mockito.when(operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION)).thenReturn(restOperationMeta);
+ Mockito.when(operationConfig.isSlowInvocationEnabled()).thenReturn(true);
+ Mockito.when(operationConfig.getNanoSlowInvocation()).thenReturn(1L);
+ Mockito.when(stageTrace.calcTotal()).thenReturn(1L);
+ Mockito.when(invocation.getInvocationStageTrace()).thenReturn(stageTrace);
logger.onInvocationFinish(event);
Assertions.assertEquals("""
@@ -184,27 +169,20 @@ public class TestSlowInvocationLogger {
}
@Test
- public void producerSlow(@Mocked HttpServletRequestEx requestEx) {
- new Expectations() {
- {
- invocation.getRequestEx();
- result = requestEx;
- requestEx.getRemoteAddr();
- result = "1.1.1.1";
- requestEx.getRemotePort();
- result = 1234;
- invocation.isConsumer();
- result = false;
- operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION);
- result = restOperationMeta;
- operationConfig.isSlowInvocationEnabled();
- result = true;
- operationConfig.getNanoSlowInvocation();
- result = 1;
- stageTrace.calcTotal();
- result = 1;
- }
- };
+ public void producerSlow() {
+
+ HttpServletRequestEx requestEx = Mockito.mock(HttpServletRequestEx.class);
+
+ Mockito.when(invocation.getRequestEx()).thenReturn(requestEx);
+ Mockito.when(requestEx.getRemoteAddr()).thenReturn("1.1.1.1");
+ Mockito.when(requestEx.getRemotePort()).thenReturn(1234);
+ Mockito.when(invocation.isConsumer()).thenReturn(false);
+
Mockito.when(operationMeta.getExtData(RestConst.SWAGGER_REST_OPERATION)).thenReturn(restOperationMeta);
+ Mockito.when(operationConfig.isSlowInvocationEnabled()).thenReturn(true);
+ Mockito.when(operationConfig.getNanoSlowInvocation()).thenReturn(1L);
+ Mockito.when(stageTrace.calcTotal()).thenReturn(1L);
+ Mockito.when(invocation.getInvocationStageTrace()).thenReturn(stageTrace);
+
logger.onInvocationFinish(event);
Assertions.assertEquals("""
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 7a20f852c..aaf8756dd 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
@@ -24,35 +24,31 @@ import
org.apache.servicecomb.foundation.common.utils.JsonUtils;
import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
import org.apache.servicecomb.metrics.core.ThreadPoolMetersInitializer;
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
import org.mockito.Mockito;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mocked;
+import org.mockito.junit.jupiter.MockitoExtension;
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(MockitoExtension.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestThreadPoolPublishModelFactory {
MeterRegistry registry = new SimpleMeterRegistry();
- @Mocked
+ @Mock
BlockingQueue<Runnable> queue;
@Test
- public void createDefaultPublishModel(@Injectable ThreadPoolExecutorEx
threadPoolExecutor) throws Exception {
- new Expectations() {
- {
- threadPoolExecutor.getQueue();
- result = queue;
- queue.size();
- result = 10d;
- }
- };
+ public void createDefaultPublishModel() throws Exception {
+ ThreadPoolExecutorEx threadPoolExecutor =
Mockito.mock(ThreadPoolExecutorEx.class);
+ Mockito.when(threadPoolExecutor.getQueue()).thenReturn(queue);
+ Mockito.doReturn(10).when(queue).size();
MetricsBootstrapConfig metricsBootstrapConfig =
Mockito.mock(MetricsBootstrapConfig.class);
ThreadPoolMetersInitializer threadPoolMetersInitializer = new
ThreadPoolMetersInitializer() {
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 f5948016c..97079bfe1 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.core.invocation.InvocationStageTrace;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestOperationPerf {
String op = "op";
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 7dda01408..ff0191b14 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
@@ -18,10 +18,10 @@ package
org.apache.servicecomb.metrics.core.publish.model.invocation;
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.invocation.InvocationStageTrace;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import jakarta.ws.rs.core.Response.Status;
+import org.junit.jupiter.api.Test;
public class TestOperationPerfGroup {
String op = "op";
