Skip to content

Commit f1c4d49

Browse files
committed
Fixed nondetermistic tests in MappingRedisConverterUnitTests.
Signed-off-by: Edwin Ing <edwinji2@illinois.edu>
1 parent 88d8f84 commit f1c4d49

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
* @author Mark Paluch
101101
* @author Golam Mazid Sajib
102102
* @author John Blum
103+
* @author Edwin Ing
103104
*/
104105
@ExtendWith(MockitoExtension.class)
105106
class MappingRedisConverterUnitTests {
@@ -1080,7 +1081,15 @@ void writeShouldHonorCustomConversionOnNestedType() {
10801081
address.city = "unknown";
10811082
rand.address = address;
10821083

1083-
assertThat(write(rand)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}");
1084+
ObjectMapper mapper = new ObjectMapper();
1085+
assertThat(write(rand))
1086+
.hasEntrySatisfying("address", addr -> {
1087+
try {
1088+
assertThat(mapper.readTree(addr)).isEqualTo(mapper.readTree("{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"));
1089+
} catch (Exception e) {
1090+
throw new AssertionError("Error during JSON comparison: " + e.getMessage(), e);
1091+
}
1092+
});
10841093
}
10851094

10861095
@Test // DATAREDIS-425
@@ -1775,7 +1784,15 @@ void writeShouldWritePartialUpdatePathWithRegisteredCustomConversionCorrectly()
17751784

17761785
PartialUpdate<Person> update = new PartialUpdate<>("123", Person.class).set("address", address);
17771786

1778-
assertThat(write(update)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}");
1787+
ObjectMapper mapper = new ObjectMapper();
1788+
assertThat(write(update))
1789+
.hasEntrySatisfying("address", addr -> {
1790+
try {
1791+
assertThat(mapper.readTree(addr)).isEqualTo(mapper.readTree("{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"));
1792+
} catch (Exception e) {
1793+
throw new AssertionError("Error during JSON comparison: " + e.getMessage(), e);
1794+
}
1795+
});
17791796
}
17801797

17811798
@Test // DATAREDIS-471

0 commit comments

Comments
 (0)