This is an automated email from the ASF dual-hosted git repository.
chenzhida 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 94a74959f change TestInvocationPublishModelFactory to deterministic
implementation (#4947)
94a74959f is described below
commit 94a74959f81f8eff3ecded83067d44eff2406309
Author: Anthony Xu <[email protected]>
AuthorDate: Tue Oct 28 21:17:21 2025 -0500
change TestInvocationPublishModelFactory to deterministic implementation
(#4947)
---
.../core/publish/TestInvocationPublishModelFactory.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
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 ca232aec0..483aa6ab7 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,7 +30,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.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.core.env.Environment;
@@ -41,6 +40,8 @@ import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.vertx.core.json.Json;
+import org.skyscreamer.jsonassert.JSONAssert;
+
public class TestInvocationPublishModelFactory {
EventBus eventBus = new EventBus();
@@ -60,7 +61,7 @@ public class TestInvocationPublishModelFactory {
Environment environment = Mockito.mock(Environment.class);
@Test
- public void createDefaultPublishModel() {
+ public void createDefaultPublishModel() throws Exception {
Mockito.when(environment.getProperty(METRICS_WINDOW_TIME, int.class,
DEFAULT_METRICS_WINDOW_TIME))
.thenReturn(DEFAULT_METRICS_WINDOW_TIME);
Mockito.when(environment.getProperty(
@@ -170,8 +171,8 @@ public class TestInvocationPublishModelFactory {
}
}
""";
- Assertions.assertEquals(Json.encodePrettily(Json.decodeValue(expect,
Object.class)),
- Json.encodePrettily(model.getConsumer()));
+ JSONAssert.assertEquals(Json.encodePrettily(Json.decodeValue(expect,
Object.class)),
+ Json.encodePrettily(model.getConsumer()), false);
expect = """
{
@@ -269,8 +270,8 @@ public class TestInvocationPublishModelFactory {
}
}
""";
- Assertions.assertEquals(Json.encodePrettily(Json.decodeValue(expect,
Object.class)),
- Json.encodePrettily(model.getProducer()));
+ JSONAssert.assertEquals(Json.encodePrettily(Json.decodeValue(expect,
Object.class)),
+ Json.encodePrettily(model.getProducer()), false);
}
protected void prepareInvocation() {