Skip to content

Commit 3a1fa07

Browse files
authored
change MessageTest encoding tests to deterministic implementation (#4971)
1 parent 7269b99 commit 3a1fa07

File tree

1 file changed

+15
-4
lines changed
  • service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight

1 file changed

+15
-4
lines changed

service-registry/registry-lightweight/src/test/java/org/apache/servicecomb/registry/lightweight/MessageTest.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
package org.apache.servicecomb.registry.lightweight;
1919

2020
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.assertj.core.api.Assertions.fail;
2122

2223
import org.junit.jupiter.api.Test;
2324

2425
import io.vertx.core.json.Json;
26+
import org.skyscreamer.jsonassert.JSONAssert;
2527

2628
class MessageTest {
2729
private String toLinuxPrettyJson(Object value) {
@@ -33,7 +35,8 @@ private String toLinuxPrettyJson(Object value) {
3335
void should_encode_register_type() {
3436
Message<RegisterRequest> msg = Message.of(MessageType.REGISTER, new RegisterRequest());
3537

36-
assertThat(toLinuxPrettyJson(msg)).isEqualTo(""
38+
try {
39+
JSONAssert.assertEquals(toLinuxPrettyJson(msg), ""
3740
+ "{\n"
3841
+ " \"type\" : \"REGISTER\",\n"
3942
+ " \"body\" : {\n"
@@ -45,7 +48,11 @@ void should_encode_register_type() {
4548
+ " \"status\" : null,\n"
4649
+ " \"endpoints\" : null\n"
4750
+ " }\n"
48-
+ "}");
51+
+ "}", false);
52+
} catch (Exception e) {
53+
fail("Failed to compare JSONs: " + e.getMessage(), e);
54+
}
55+
4956
}
5057

5158
@Test
@@ -60,14 +67,18 @@ void should_decode_register_type() {
6067
void should_encode_unregister_type() {
6168
Message<UnregisterRequest> msg = Message.of(MessageType.UNREGISTER, new UnregisterRequest());
6269

63-
assertThat(toLinuxPrettyJson(msg)).isEqualTo(""
70+
try {
71+
JSONAssert.assertEquals(toLinuxPrettyJson(msg), ""
6472
+ "{\n"
6573
+ " \"type\" : \"UNREGISTER\",\n"
6674
+ " \"body\" : {\n"
6775
+ " \"serviceId\" : null,\n"
6876
+ " \"instanceId\" : null\n"
6977
+ " }\n"
70-
+ "}");
78+
+ "}", false);
79+
} catch (Exception e) {
80+
fail("Failed to compare JSONs: " + e.getMessage(), e);
81+
}
7182
}
7283

7384
@Test

0 commit comments

Comments
 (0)