From f1c4d4951e115c49eb8e1c3a8b83160ec2539648 Mon Sep 17 00:00:00 2001 From: Edwin Ing Date: Sat, 18 Oct 2025 22:03:56 -0500 Subject: [PATCH] Fixed nondetermistic tests in MappingRedisConverterUnitTests. Signed-off-by: Edwin Ing --- .../MappingRedisConverterUnitTests.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java index 8071bcf376..85087b1df2 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java @@ -100,6 +100,7 @@ * @author Mark Paluch * @author Golam Mazid Sajib * @author John Blum + * @author Edwin Ing */ @ExtendWith(MockitoExtension.class) class MappingRedisConverterUnitTests { @@ -1080,7 +1081,15 @@ void writeShouldHonorCustomConversionOnNestedType() { address.city = "unknown"; rand.address = address; - assertThat(write(rand)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"); + ObjectMapper mapper = new ObjectMapper(); + assertThat(write(rand)) + .hasEntrySatisfying("address", addr -> { + try { + assertThat(mapper.readTree(addr)).isEqualTo(mapper.readTree("{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}")); + } catch (Exception e) { + throw new AssertionError("Error during JSON comparison: " + e.getMessage(), e); + } + }); } @Test // DATAREDIS-425 @@ -1775,7 +1784,15 @@ void writeShouldWritePartialUpdatePathWithRegisteredCustomConversionCorrectly() PartialUpdate update = new PartialUpdate<>("123", Person.class).set("address", address); - assertThat(write(update)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"); + ObjectMapper mapper = new ObjectMapper(); + assertThat(write(update)) + .hasEntrySatisfying("address", addr -> { + try { + assertThat(mapper.readTree(addr)).isEqualTo(mapper.readTree("{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}")); + } catch (Exception e) { + throw new AssertionError("Error during JSON comparison: " + e.getMessage(), e); + } + }); } @Test // DATAREDIS-471