Skip to content

Commit fd02d8e

Browse files
committed
change TestInvocationPublishModelFactory to deterministic implementation
1 parent d4db7c3 commit fd02d8e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
3131
import org.apache.servicecomb.swagger.invocation.InvocationType;
3232
import org.apache.servicecomb.swagger.invocation.Response;
33-
import org.junit.jupiter.api.Assertions;
3433
import org.junit.jupiter.api.Test;
3534
import org.mockito.Mockito;
3635
import org.springframework.core.env.Environment;
@@ -41,6 +40,8 @@
4140
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
4241
import io.vertx.core.json.Json;
4342

43+
import org.skyscreamer.jsonassert.JSONAssert;
44+
4445
public class TestInvocationPublishModelFactory {
4546
EventBus eventBus = new EventBus();
4647

@@ -60,7 +61,7 @@ public class TestInvocationPublishModelFactory {
6061
Environment environment = Mockito.mock(Environment.class);
6162

6263
@Test
63-
public void createDefaultPublishModel() {
64+
public void createDefaultPublishModel() throws Exception {
6465
Mockito.when(environment.getProperty(METRICS_WINDOW_TIME, int.class, DEFAULT_METRICS_WINDOW_TIME))
6566
.thenReturn(DEFAULT_METRICS_WINDOW_TIME);
6667
Mockito.when(environment.getProperty(
@@ -170,8 +171,8 @@ public void createDefaultPublishModel() {
170171
}
171172
}
172173
""";
173-
Assertions.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
174-
Json.encodePrettily(model.getConsumer()));
174+
JSONAssert.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
175+
Json.encodePrettily(model.getConsumer()), false);
175176

176177
expect = """
177178
{
@@ -269,8 +270,8 @@ public void createDefaultPublishModel() {
269270
}
270271
}
271272
""";
272-
Assertions.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
273-
Json.encodePrettily(model.getProducer()));
273+
JSONAssert.assertEquals(Json.encodePrettily(Json.decodeValue(expect, Object.class)),
274+
Json.encodePrettily(model.getProducer()), false);
274275
}
275276

276277
protected void prepareInvocation() {

0 commit comments

Comments
 (0)