Fixed nondetermistic tests in MappingRedisConverterUnitTests.

Closes #3242

Author: mp911de

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

@@ -15,33 +15,9 @@
  */
 package org.springframework.data.redis.core.convert;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.when;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.AccountInfo;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Address;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.AddressWithId;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.AddressWithPostcode;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Device;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.ExipringPersonWithExplicitProperty;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.ExpiringPerson;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Gender;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.JustSomeDifferentPropertyTypes;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.KEYSPACE_ACCOUNT;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.KEYSPACE_PERSON;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Location;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Outer;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Person;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.PersonWithConstructorAndAddress;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.RecursiveConstructorPerson;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Size;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.Species;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.TaVeren;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.TheWheelOfTime;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.TypeWithMaps;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.TypeWithObjectValueTypes;
-import static org.springframework.data.redis.core.convert.ConversionTestEntities.WithArrays;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.redis.core.convert.ConversionTestEntities.*;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -1053,7 +1029,7 @@ void writeShouldHonorCustomConversionOnRootType() {
 		address.country = "Tel'aran'rhiod";
 		address.city = "unknown";
 
-		assertThat(write(address)).containsEntry("_raw", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}");
+		assertThat(write(address).get("_raw")).contains("\"city\":\"unknown\"").contains("\"country\":\"Tel'aran'rhiod\"");
 	}
 
 	@Test // DATAREDIS-425, DATAREDIS-634
@@ -1074,7 +1050,7 @@ void writeShouldHonorCustomConversionOnNestedType() {
 		address.city = "unknown";
 		rand.address = address;
 
-		assertThat(write(rand)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}");
+		assertThat(write(rand).get("address")).contains("\"city\":\"unknown\"").contains("\"country\":\"Tel'aran'rhiod\"");
 	}
 
 	@Test // DATAREDIS-425
@@ -1769,7 +1745,8 @@ void writeShouldWritePartialUpdatePathWithRegisteredCustomConversionCorrectly()
 
 		PartialUpdate<Person> update = new PartialUpdate<>("123", Person.class).set("address", address);
 
-		assertThat(write(update)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}");
+		assertThat(write(update).get("address")).contains("\"city\":\"unknown\",")
+				.contains("\"country\":\"Tel'aran'rhiod\"");
 	}
 
 	@Test // DATAREDIS-471

src/test/java/org/springframework/data/redis/test/util/RedisTestData.java

@@ -37,9 +37,11 @@
 public class RedisTestData implements AssertProvider<RedisTestData.RedisBucketAssert> {
 
 	private final RedisData redisData;
+	private final Map<String, String> stringMap;
 
-	RedisTestData(RedisData redisData) {
+	private RedisTestData(RedisData redisData) {
 		this.redisData = redisData;
+		this.stringMap = toStringMap(redisData.getBucket().asMap());
 	}
 
 	public static RedisTestData from(RedisData data) {
@@ -48,7 +50,11 @@ public static RedisTestData from(RedisData data) {
 
 	@Override
 	public RedisBucketAssert assertThat() {
-		return new RedisBucketAssert(redisData);
+		return new RedisBucketAssert(redisData, stringMap);
+	}
+
+	public String get(String key) {
+		return stringMap.get(key);
 	}
 
 	public Bucket getBucket() {
@@ -69,9 +75,9 @@ public static class RedisBucketAssert extends MapAssert<String, String> {
 
 		private final RedisData redisData;
 
-		RedisBucketAssert(RedisData redisData) {
+		RedisBucketAssert(RedisData redisData, Map<String, String> stringMap) {
 
-			super(toStringMap(redisData.getBucket().asMap()));
+			super(stringMap);
 			this.redisData = redisData;
 		}
 
@@ -154,6 +160,6 @@ private static Map<String, String> toStringMap(Map<String, byte[]> source) {
 
 	@Override
 	public String toString() {
-		return toStringMap(getBucket().asMap()).toString();
+		return stringMap.toString();
 	}
 }