diff --git a/src/test/java/org/springframework/data/redis/ConnectionFactoryTracker.java b/src/test/java/org/springframework/data/redis/ConnectionFactoryTracker.java index e69429c4f..13d5f8b7f 100644 --- a/src/test/java/org/springframework/data/redis/ConnectionFactoryTracker.java +++ b/src/test/java/org/springframework/data/redis/ConnectionFactoryTracker.java @@ -49,7 +49,6 @@ public abstract class ConnectionFactoryTracker { try { if (connectionFactory instanceof DisposableBean) { ((DisposableBean) connectionFactory).destroy(); - // System.out.println("Succesfully cleaned up factory " + connectionFactory); } connFactories.remove(connectionFactory); } catch (Exception ex) { diff --git a/src/test/java/org/springframework/data/redis/PropertyEditorsTest.java b/src/test/java/org/springframework/data/redis/PropertyEditorsTest.java index f9969179b..9df736d0d 100644 --- a/src/test/java/org/springframework/data/redis/PropertyEditorsTest.java +++ b/src/test/java/org/springframework/data/redis/PropertyEditorsTest.java @@ -15,11 +15,12 @@ */ package org.springframework.data.redis; -import static org.junit.Assert.assertSame; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.data.redis.core.RedisOperations; @@ -46,10 +47,10 @@ public class PropertyEditorsTest { RedisViewPE bean = ctx.getBean(RedisViewPE.class); RedisOperations ops = ctx.getBean(RedisOperations.class); - assertSame(ops.opsForValue(), bean.getValueOps()); - assertSame(ops.opsForList(), bean.getListOps()); - assertSame(ops.opsForSet(), bean.getSetOps()); - assertSame(ops.opsForZSet(), bean.getZsetOps()); - assertSame(ops, bean.getHashOps().getOperations()); + assertThat(bean.getValueOps()).isSameAs(ops.opsForValue()); + assertThat(bean.getListOps()).isSameAs(ops.opsForList()); + assertThat(bean.getSetOps()).isSameAs(ops.opsForSet()); + assertThat(bean.getZsetOps()).isSameAs(ops.opsForZSet()); + assertThat(bean.getHashOps().getOperations()).isSameAs(ops); } } diff --git a/src/test/java/org/springframework/data/redis/VersionParserUnitTests.java b/src/test/java/org/springframework/data/redis/VersionParserUnitTests.java index 293e4e8b8..cb2a895a0 100644 --- a/src/test/java/org/springframework/data/redis/VersionParserUnitTests.java +++ b/src/test/java/org/springframework/data/redis/VersionParserUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -27,31 +26,31 @@ public class VersionParserUnitTests { @Test public void shouldParseNullToUnknown() { - assertThat(VersionParser.parseVersion(null), equalTo(Version.UNKNOWN)); + assertThat(VersionParser.parseVersion(null)).isEqualTo(Version.UNKNOWN); } @Test public void shouldParseEmptyVersionStringToUnknown() { - assertThat(VersionParser.parseVersion(""), equalTo(Version.UNKNOWN)); + assertThat(VersionParser.parseVersion("")).isEqualTo(Version.UNKNOWN); } @Test public void shouldParseInvalidVersionStringToUnknown() { - assertThat(VersionParser.parseVersion("ThisIsNoValidVersion"), equalTo(Version.UNKNOWN)); + assertThat(VersionParser.parseVersion("ThisIsNoValidVersion")).isEqualTo(Version.UNKNOWN); } @Test public void shouldParseMajorMinorWithoutPatchCorrectly() { - assertThat(VersionParser.parseVersion("1.2"), equalTo(new Version(1, 2, 0))); + assertThat(VersionParser.parseVersion("1.2")).isEqualTo(new Version(1, 2, 0)); } @Test public void shouldParseMajorMinorPatchCorrectly() { - assertThat(VersionParser.parseVersion("1.2.3"), equalTo(new Version(1, 2, 3))); + assertThat(VersionParser.parseVersion("1.2.3")).isEqualTo(new Version(1, 2, 3)); } @Test public void shouldParseMajorWithoutMinorPatchCorrectly() { - assertThat(VersionParser.parseVersion("1.2.3.a"), equalTo(new Version(1, 2, 3))); + assertThat(VersionParser.parseVersion("1.2.3.a")).isEqualTo(new Version(1, 2, 3)); } } diff --git a/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java b/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java index 48b93c391..1c543b597 100644 --- a/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java +++ b/src/test/java/org/springframework/data/redis/cache/LegacyRedisCacheTests.java @@ -16,14 +16,8 @@ package org.springframework.data.redis.cache; import static edu.umd.cs.mtc.TestFramework.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNot.*; -import static org.hamcrest.core.IsNull.*; -import static org.hamcrest.core.IsSame.*; -import static org.junit.Assert.*; -import static org.junit.Assume.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.*; import edu.umd.cs.mtc.MultithreadedTestCase; @@ -35,12 +29,12 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; -import org.hamcrest.core.IsInstanceOf; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.cache.Cache; import org.springframework.cache.Cache.ValueRetrievalException; import org.springframework.cache.Cache.ValueWrapper; @@ -72,7 +66,7 @@ public class LegacyRedisCacheTests { RedisCache cache; public LegacyRedisCacheTests(RedisTemplate template, ObjectFactory keyFactory, - ObjectFactory valueFactory, boolean allowCacheNullValues) { + ObjectFactory valueFactory, boolean allowCacheNullValues) { this.connectionFactory = template.getConnectionFactory(); this.keyFactory = keyFactory; @@ -134,12 +128,12 @@ public class LegacyRedisCacheTests { Object key = getKey(); Object value = getValue(); - assertNotNull(value); - assertNull(cache.get(key)); + assertThat(value).isNotNull(); + assertThat(cache.get(key)).isNull(); cache.put(key, value); ValueWrapper valueWrapper = cache.get(key); if (valueWrapper != null) { - assertThat(valueWrapper.get(), isEqual(value)); + assertThat(valueWrapper.get()).isEqualTo(value); } } @@ -151,13 +145,13 @@ public class LegacyRedisCacheTests { Object key2 = getKey(); Object value2 = getValue(); - assertNull(cache.get(key1)); + assertThat(cache.get(key1)).isNull(); cache.put(key1, value1); - assertNull(cache.get(key2)); + assertThat(cache.get(key2)).isNull(); cache.put(key2, value2); cache.clear(); - assertNull(cache.get(key2)); - assertNull(cache.get(key1)); + assertThat(cache.get(key2)).isNull(); + assertThat(cache.get(key1)).isNull(); } @Test @@ -189,7 +183,7 @@ public class LegacyRedisCacheTests { th.start(); th.join(); - assertFalse(failed.get()); + assertThat(failed.get()).isFalse(); final Object key3 = getKey(); final Object key4 = getKey(); @@ -199,11 +193,11 @@ public class LegacyRedisCacheTests { cache.put(key3, value3); cache.put(key4, value4); - assertNull(cache.get(key1)); - assertNull(cache.get(key2)); + assertThat(cache.get(key1)).isNull(); + assertThat(cache.get(key2)).isNull(); ValueWrapper valueWrapper = cache.get(k1); - assertNotNull(valueWrapper); - assertThat(valueWrapper.get(), isEqual(v1)); + assertThat(valueWrapper).isNotNull(); + assertThat(valueWrapper.get()).isEqualTo(v1); } @Test @@ -229,7 +223,7 @@ public class LegacyRedisCacheTests { new Thread(putCache).start(); } latch.await(); - assertFalse(monitorStateException.get()); + assertThat(monitorStateException.get()).isFalse(); } @Test // DATAREDIS-243 @@ -239,7 +233,7 @@ public class LegacyRedisCacheTests { Object value = getValue(); cache.put(key, value); - assertThat(value, isEqual(cache.get(key, Object.class))); + assertThat(value).isEqualTo(cache.get(key, Object.class)); } @Test // DATAREDIS-243 @@ -249,7 +243,7 @@ public class LegacyRedisCacheTests { Object value = getValue(); cache.put(key, value); - assertThat(cache.get(key, value.getClass()), IsInstanceOf. instanceOf(value.getClass())); + assertThat(cache.get(key, value.getClass())).isInstanceOf(value.getClass()); } @Test(expected = IllegalStateException.class) // DATAREDIS-243 @@ -271,7 +265,7 @@ public class LegacyRedisCacheTests { cache.put(key, value); Object invalidKey = "spring-data-redis".getBytes(); - assertThat(cache.get(invalidKey, value.getClass()), nullValue()); + assertThat(cache.get(invalidKey, value.getClass())).isNull(); } @Test // DATAREDIS-344, DATAREDIS-416 @@ -281,21 +275,21 @@ public class LegacyRedisCacheTests { Object value = getValue(); - assertThat(cache.putIfAbsent(key, value), nullValue()); + assertThat(cache.putIfAbsent(key, value)).isNull(); ValueWrapper wrapper = cache.putIfAbsent(key, value); if (!(value instanceof Number)) { - assertThat(wrapper.get(), not(sameInstance(value))); + assertThat(wrapper.get()).isNotSameAs(value); } - assertThat(wrapper.get(), equalTo(value)); + assertThat(wrapper.get()).isEqualTo(value); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-510, DATAREDIS-606 public void cachePutWithNullShouldNotAddStuffToRedis() { - assumeThat("Only suitable when cache does NOT allow null values.", allowCacheNullValues, is(false)); + assumeThat(allowCacheNullValues).as("Only suitable when cache does NOT allow null values.").isFalse(); Object key = getKey(); @@ -305,14 +299,14 @@ public class LegacyRedisCacheTests { @Test // DATAREDIS-510, DATAREDIS-606 public void cachePutWithNullShouldErrorAndLeaveExistingKeyUntouched() { - assumeThat("Only suitable when cache does NOT allow null values.", allowCacheNullValues, is(false)); + assumeThat(allowCacheNullValues).as("Only suitable when cache does NOT allow null values.").isFalse(); Object key = getKey(); Object value = getValue(); cache.put(key, value); - assertThat(cache.get(key).get(), is(equalTo(value))); + assertThat(cache.get(key).get()).isEqualTo(value); try { cache.put(key, null); @@ -320,7 +314,7 @@ public class LegacyRedisCacheTests { // forget this one. } - assertThat(cache.get(key).get(), is(equalTo(value))); + assertThat(cache.get(key).get()).isEqualTo(value); } @Test // DATAREDIS-443, DATAREDIS-452 @@ -331,32 +325,32 @@ public class LegacyRedisCacheTests { @Test // DATAREDIS-553 public void cachePutWithNullShouldAddStuffToRedisWhenCachingNullIsEnabled() { - assumeThat("Only suitable when cache does allow null values.", allowCacheNullValues, is(true)); + assumeThat(allowCacheNullValues).as("Only suitable when cache does allow null values.").isTrue(); Object key = getKey(); Object value = getValue(); cache.put(key, null); - assertThat(cache.get(key, String.class), is(nullValue())); + assertThat(cache.get(key, String.class)).isNull(); } @Test // DATAREDIS-553 public void testCacheGetSynchronizedNullAllowingNull() { - assumeThat("Only suitable when cache does allow null values.", allowCacheNullValues, is(true)); + assumeThat(allowCacheNullValues).as("Only suitable when cache does allow null values.").isTrue(); Object key = getKey(); Object value = cache.get(key, () -> null); - assertThat(value, is(nullValue())); - assertThat(cache.get(key).get(), is(nullValue())); + assertThat(value).isNull(); + assertThat(cache.get(key).get()).isNull(); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-553, DATAREDIS-606 public void testCacheGetSynchronizedNullNotAllowingNull() { - assumeThat("Only suitable when cache does NOT allow null values.", allowCacheNullValues, is(false)); + assumeThat(allowCacheNullValues).as("Only suitable when cache does NOT allow null values.").isFalse(); Object key = getKey(); Object value = cache.get(key, () -> null); @@ -374,14 +368,14 @@ public class LegacyRedisCacheTests { @Test // DATAREDIS-553 public void testCacheGetSynchronizedNullWithStoredNull() { - assumeThat("Only suitable when cache does allow null values.", allowCacheNullValues, is(true)); + assumeThat(allowCacheNullValues).as("Only suitable when cache does allow null values.").isTrue(); Object key = getKey(); cache.put(key, null); Object cachedValue = cache.get(key, () -> null); - assertThat(cachedValue, is(nullValue())); + assertThat(cachedValue).isNull(); } @SuppressWarnings("unused") @@ -408,13 +402,13 @@ public class LegacyRedisCacheTests { public void thread1() { assertTick(0); - assertThat(redisCache.get("key", cacheLoader), equalTo("test")); + assertThat(redisCache.get("key", cacheLoader)).isEqualTo("test"); } public void thread2() { waitForTick(1); - assertThat(redisCache.get("key", new TestCacheLoader<>("illegal value")), equalTo("test")); + assertThat(redisCache.get("key", new TestCacheLoader<>("illegal value"))).isEqualTo("test"); assertTick(2); } } diff --git a/src/test/java/org/springframework/data/redis/config/NamespaceTest.java b/src/test/java/org/springframework/data/redis/config/NamespaceTest.java index 12b09b6be..bcedd5578 100644 --- a/src/test/java/org/springframework/data/redis/config/NamespaceTest.java +++ b/src/test/java/org/springframework/data/redis/config/NamespaceTest.java @@ -15,12 +15,13 @@ */ package org.springframework.data.redis.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.listener.RedisMessageListenerContainer; @@ -46,7 +47,7 @@ public class NamespaceTest { @Test @IfProfileValue(name = "runLongTests", value = "true") public void testSanityTest() throws Exception { - assertTrue(container.isRunning()); + assertThat(container.isRunning()).isTrue(); Thread.sleep(TimeUnit.SECONDS.toMillis(8)); } @@ -62,6 +63,6 @@ public class NamespaceTest { int index = handler.throwables.size(); template.convertAndSend("exception", "test1"); handler.throwables.pollLast(3, TimeUnit.SECONDS); - assertEquals(index + 1, handler.throwables.size()); + assertThat(handler.throwables.size()).isEqualTo(index + 1); } } diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java index 8b3e854fb..96807f96b 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java @@ -15,19 +15,12 @@ */ package org.springframework.data.redis.connection; -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.*; -import static org.hamcrest.collection.IsEmptyCollection.*; -import static org.hamcrest.collection.IsIterableContainingInOrder.*; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.number.IsCloseTo.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldIncrBy.Overflow.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType.*; -import static org.springframework.data.redis.connection.BitFieldSubCommands.Offset.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit.*; import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.*; @@ -41,7 +34,7 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.hamcrest.core.IsNot; +import org.assertj.core.data.Offset; import org.junit.After; import org.junit.AfterClass; import org.junit.AssumptionViolatedException; @@ -49,6 +42,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.data.domain.Range.Bound; @@ -172,7 +166,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.expire("exp", 1)); verifyResults(Arrays.asList(true, true)); - assertTrue(waitFor(new KeyExpired("exp"), 3000l)); + assertThat(waitFor(new KeyExpired("exp"), 3000l)).isTrue(); } @Test @@ -182,7 +176,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("exp2", "true")); actual.add(connection.expireAt("exp2", System.currentTimeMillis() / 1000 + 1)); verifyResults(Arrays.asList(true, true)); - assertTrue(waitFor(new KeyExpired("exp2"), 3000l)); + assertThat(waitFor(new KeyExpired("exp2"), 3000l)).isTrue(); } @Test @@ -192,7 +186,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("exp", "true")); actual.add(connection.pExpire("exp", 100)); verifyResults(Arrays.asList(true, true)); - assertTrue(waitFor(new KeyExpired("exp"), 1000l)); + assertThat(waitFor(new KeyExpired("exp"), 1000l)).isTrue(); } @Test @@ -209,7 +203,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("exp2", "true")); actual.add(connection.pExpireAt("exp2", System.currentTimeMillis() + 200)); verifyResults(Arrays.asList(true, true)); - assertTrue(waitFor(new KeyExpired("exp2"), 1000l)); + assertThat(waitFor(new KeyExpired("exp2"), 1000l)).isTrue(); } @Test @@ -226,7 +220,7 @@ public abstract class AbstractConnectionIntegrationTests { String sha1 = connection.scriptLoad("return KEYS[1]"); initConnection(); actual.add(connection.evalSha(sha1, ReturnType.VALUE, 2, "key1", "key2")); - assertEquals("key1", new String((byte[]) getResults().get(0))); + assertThat(new String((byte[]) getResults().get(0))).isEqualTo("key1"); } @SuppressWarnings("unchecked") @@ -239,8 +233,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.evalSha(sha1, ReturnType.MULTI, 1, "key1", "arg1")); List results = getResults(); List scriptResults = (List) results.get(0); - assertEquals(Arrays.asList(new Object[] { "key1", "arg1" }), - Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })); + assertThat(Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })) + .isEqualTo(Arrays.asList(new Object[] { "key1", "arg1" })); } @SuppressWarnings("unchecked") @@ -253,8 +247,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(byteConnection.evalSha(sha1, ReturnType.MULTI, 1, "key1".getBytes(), "arg1".getBytes())); List results = getResults(); List scriptResults = (List) results.get(0); - assertEquals(Arrays.asList(new Object[] { "key1", "arg1" }), - Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })); + assertThat(Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })) + .isEqualTo(Arrays.asList(new Object[] { "key1", "arg1" })); } @Test(expected = RedisSystemException.class) @@ -276,7 +270,7 @@ public abstract class AbstractConnectionIntegrationTests { public void testEvalReturnString() { actual.add(connection.eval("return KEYS[1]", ReturnType.VALUE, 1, "foo")); byte[] result = (byte[]) getResults().get(0); - assertEquals("foo", new String(result)); + assertThat(new String(result)).isEqualTo("foo"); } @Test @@ -290,7 +284,7 @@ public abstract class AbstractConnectionIntegrationTests { @IfProfileValue(name = "redisVersion", value = "2.6+") public void testEvalReturnSingleOK() { actual.add(connection.eval("return redis.call('set','abc','ghk')", ReturnType.STATUS, 0)); - assertEquals(Arrays.asList(new Object[] { "OK" }), getResults()); + assertThat(getResults()).isEqualTo(Arrays.asList(new Object[] { "OK" })); } @Test(expected = RedisSystemException.class) @@ -320,8 +314,8 @@ public abstract class AbstractConnectionIntegrationTests { public void testEvalReturnArrayStrings() { actual.add(connection.eval("return {KEYS[1],ARGV[1]}", ReturnType.MULTI, 1, "foo", "bar")); List result = (List) getResults().get(0); - assertEquals(Arrays.asList(new Object[] { "foo", "bar" }), - Arrays.asList(new Object[] { new String(result.get(0)), new String(result.get(1)) })); + assertThat(Arrays.asList(new Object[] { new String(result.get(0)), new String(result.get(1)) })) + .isEqualTo(Arrays.asList(new Object[] { "foo", "bar" })); } @Test @@ -346,8 +340,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.eval("return { redis.call('set','abc','ghk'), redis.call('set','abc','lfdf')}", ReturnType.MULTI, 0)); List result = (List) getResults().get(0); - assertEquals(Arrays.asList(new Object[] { "OK", "OK" }), - Arrays.asList(new Object[] { new String(result.get(0)), new String(result.get(1)) })); + assertThat(Arrays.asList(new Object[] { new String(result.get(0)), new String(result.get(1)) })) + .isEqualTo(Arrays.asList(new Object[] { "OK", "OK" })); } @Test @@ -397,7 +391,7 @@ public abstract class AbstractConnectionIntegrationTests { Thread.sleep(200); connection.scriptKill(); getResults(); - assertTrue(waitFor(() -> scriptDead.get(), 3000l)); + assertThat(waitFor(() -> scriptDead.get(), 3000l)).isTrue(); } @Test @@ -430,7 +424,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get("expy")); verifyResults(Arrays.asList(true, "yep")); - assertTrue(waitFor(new KeyExpired("expy"), 2500l)); + assertThat(waitFor(new KeyExpired("expy"), 2500l)).isTrue(); } @Test // DATAREDIS-271 @@ -441,7 +435,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get("expy")); verifyResults(Arrays.asList(true, "yep")); - assertTrue(waitFor(new KeyExpired("expy"), 2500L)); + assertThat(waitFor(new KeyExpired("expy"), 2500L)).isTrue(); } @Test @@ -577,9 +571,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.info()); List results = getResults(); Properties info = (Properties) results.get(0); - assertTrue("at least 5 settings should be present", info.size() >= 5); + assertThat(info.size() >= 5).as("at least 5 settings should be present").isTrue(); String version = info.getProperty("redis_version"); - assertNotNull(version); + assertThat(version).isNotNull(); } @Test @@ -588,9 +582,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.info("server")); List results = getResults(); Properties info = (Properties) results.get(0); - assertTrue("at least 5 settings should be present", info.size() >= 5); + assertThat(info.size() >= 5).as("at least 5 settings should be present").isTrue(); String version = info.getProperty("redis_version"); - assertNotNull(version); + assertThat(version).isNotNull(); } @Test @@ -653,7 +647,7 @@ public abstract class AbstractConnectionIntegrationTests { verifyResults(Arrays.asList(new Object[] { Arrays.asList(new String[] { null, null }) })); StringRedisTemplate stringTemplate = new StringRedisTemplate(connectionFactory); List multiGet = stringTemplate.opsForValue().multiGet(Arrays.asList(keys)); - assertEquals(Arrays.asList(new String[] { null, null }), multiGet); + assertThat(multiGet).isEqualTo(Arrays.asList(new String[] { null, null })); } @Test @@ -700,9 +694,9 @@ public abstract class AbstractConnectionIntegrationTests { // Not all providers block on subscribe, give some time for messages to // be received Message message = messages.poll(5, TimeUnit.SECONDS); - assertNotNull(message); - assertEquals(expectedMessage, new String(message.getBody())); - assertEquals(expectedChannel, new String(message.getChannel())); + assertThat(message).isNotNull(); + assertThat(new String(message.getBody())).isEqualTo(expectedMessage); + assertThat(new String(message.getChannel())).isEqualTo(expectedChannel); } @Test @@ -712,7 +706,7 @@ public abstract class AbstractConnectionIntegrationTests { final BlockingDeque messages = new LinkedBlockingDeque<>(); final MessageListener listener = (message, pattern) -> { - assertEquals(expectedPattern, new String(pattern)); + assertThat(new String(pattern)).isEqualTo(expectedPattern); messages.add(message); }; @@ -744,11 +738,11 @@ public abstract class AbstractConnectionIntegrationTests { // Not all providers block on subscribe (Lettuce does not), give some // time for messages to be received Message message = messages.poll(5, TimeUnit.SECONDS); - assertNotNull(message); - assertEquals(expectedMessage, new String(message.getBody())); + assertThat(message).isNotNull(); + assertThat(new String(message.getBody())).isEqualTo(expectedMessage); message = messages.poll(5, TimeUnit.SECONDS); - assertNotNull(message); - assertEquals(expectedMessage, new String(message.getBody())); + assertThat(message).isNotNull(); + assertThat(new String(message.getBody())).isEqualTo(expectedMessage); } @Test(expected = DataAccessException.class) @@ -764,7 +758,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("foo", "bar")); actual.add(connection.execute("GET", "foo")); - assertEquals("bar", stringSerializer.deserialize((byte[]) getResults().get(1))); + assertThat(stringSerializer.deserialize((byte[]) getResults().get(1))).isEqualTo("bar"); } @Test @@ -772,7 +766,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.execute("PING")); List results = getResults(); - assertEquals("PONG", stringSerializer.deserialize((byte[]) results.get(0))); + assertThat(stringSerializer.deserialize((byte[]) results.get(0))).isEqualTo("PONG"); } @SuppressWarnings("unchecked") @@ -785,8 +779,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.exec()); List results = getResults(); List execResults = (List) results.get(0); - assertEquals(Arrays.asList(true, "value"), execResults); - assertEquals("value", connection.get("key")); + assertThat(execResults).isEqualTo(Arrays.asList(true, "value")); + assertThat(connection.get("key")).isEqualTo("value"); } @Test @@ -821,7 +815,7 @@ public abstract class AbstractConnectionIntegrationTests { connection.discard(); actual.add(connection.get("testitnow")); List results = getResults(); - assertEquals(Arrays.asList(new String[] { "willdo" }), results); + assertThat(results).isEqualTo(Arrays.asList(new String[] { "willdo" })); initConnection(); // Ensure we can run a new tx after discarding previous one testMultiExec(); @@ -911,7 +905,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("dbparam", "foo")); actual.add(connection.dbSize()); - assertTrue((Long) getResults().get(1) > 0); + assertThat((Long) getResults().get(1) > 0).isTrue(); } @Test @@ -926,7 +920,7 @@ public abstract class AbstractConnectionIntegrationTests { public void testGetConfig() { actual.add(connection.getConfig("*")); Properties config = (Properties) getResults().get(0); - assertTrue(!config.isEmpty()); + assertThat(!config.isEmpty()).isTrue(); } @Test @@ -980,7 +974,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("keytest", "true")); actual.add(connection.keys("key*")); - assertTrue(((Collection) getResults().get(1)).contains("keytest")); + assertThat(((Collection) getResults().get(1)).contains("keytest")).isTrue(); } @Test @@ -989,7 +983,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.set("some", "thing")); actual.add(connection.randomKey()); List results = getResults(); - assertNotNull(results.get(1)); + assertThat(results.get(1)).isNotNull(); } @Test @@ -1028,8 +1022,8 @@ public abstract class AbstractConnectionIntegrationTests { List results = getResults(); - assertTrue((Long) results.get(2) > TimeUnit.SECONDS.toMillis(5)); - assertTrue((Long) results.get(2) <= TimeUnit.SECONDS.toMillis(10)); + assertThat((Long) results.get(2) > TimeUnit.SECONDS.toMillis(5)).isTrue(); + assertThat((Long) results.get(2) <= TimeUnit.SECONDS.toMillis(10)).isTrue(); } @Test @@ -1051,7 +1045,7 @@ public abstract class AbstractConnectionIntegrationTests { List results = getResults(); - assertTrue((Long) results.get(2) > -1); + assertThat((Long) results.get(2) > -1).isTrue(); } @Test // DATAREDIS-526 @@ -1064,8 +1058,8 @@ public abstract class AbstractConnectionIntegrationTests { List results = getResults(); - assertTrue((Long) results.get(2) > TimeUnit.MINUTES.toSeconds(9)); - assertTrue((Long) results.get(2) <= TimeUnit.MINUTES.toSeconds(10)); + assertThat((Long) results.get(2) > TimeUnit.MINUTES.toSeconds(9)).isTrue(); + assertThat((Long) results.get(2) <= TimeUnit.MINUTES.toSeconds(10)).isTrue(); } @Test @@ -1139,7 +1133,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get("testing")); connection.restore("testing".getBytes(), 100l, (byte[]) results.get(1)); verifyResults(Arrays.asList(1l, null)); - assertTrue(waitFor(new KeyExpired("testing"), 400l)); + assertThat(waitFor(new KeyExpired("testing"), 400l)).isTrue(); } @Test @@ -1427,9 +1421,9 @@ public abstract class AbstractConnectionIntegrationTests { conn2.rPush("pop2", "hey"); actual.add(connection.bRPopLPush(1, "PopList", "pop2")); List results = getResults(); - assertEquals(Arrays.asList(new String[] { "world" }), results); - assertEquals(Arrays.asList(new String[] { "hello" }), connection.lRange("PopList", 0, -1)); - assertEquals(Arrays.asList(new String[] { "world", "hey" }), connection.lRange("pop2", 0, -1)); + assertThat(results).isEqualTo(Arrays.asList(new String[] { "world" })); + assertThat(connection.lRange("PopList", 0, -1)).isEqualTo(Arrays.asList(new String[] { "hello" })); + assertThat(connection.lRange("pop2", 0, -1)).isEqualTo(Arrays.asList(new String[] { "world", "hey" })); } @Test @@ -1565,7 +1559,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.sAdd("myset", "foo")); actual.add(connection.sAdd("myset", "bar")); actual.add(connection.sPop("myset")); - assertTrue(new HashSet<>(Arrays.asList(new String[] { "foo", "bar" })).contains((String) getResults().get(2))); + assertThat(new HashSet<>(Arrays.asList(new String[] { "foo", "bar" })).contains((String) getResults().get(2))) + .isTrue(); } @Test // DATAREDIS-688 @@ -1576,7 +1571,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.sAdd("myset", "baz")); actual.add(connection.sPop("myset", 2)); - assertThat((Collection) getResults().get(3), hasSize(2)); + assertThat((Collection) getResults().get(3)).hasSize(2); } @Test @@ -1584,13 +1579,13 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.sAdd("myset", "foo")); actual.add(connection.sAdd("myset", "bar")); actual.add(connection.sRandMember("myset")); - assertTrue(new HashSet<>(Arrays.asList(new String[] { "foo", "bar" })).contains(getResults().get(2))); + assertThat(new HashSet<>(Arrays.asList(new String[] { "foo", "bar" })).contains(getResults().get(2))).isTrue(); } @Test public void testSRandMemberKeyNotExists() { actual.add(connection.sRandMember("notexist")); - assertNull(getResults().get(0)); + assertThat(getResults().get(0)).isNull(); } @SuppressWarnings("rawtypes") @@ -1601,7 +1596,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.sAdd("myset", "bar")); actual.add(connection.sAdd("myset", "baz")); actual.add(connection.sRandMember("myset", 2)); - assertTrue(((Collection) getResults().get(3)).size() == 2); + assertThat(((Collection) getResults().get(3)).size() == 2).isTrue(); } @SuppressWarnings("rawtypes") @@ -1610,7 +1605,7 @@ public abstract class AbstractConnectionIntegrationTests { public void testSRandMemberCountNegative() { actual.add(connection.sAdd("myset", "foo")); actual.add(connection.sRandMember("myset", -2)); - assertEquals(Arrays.asList(new String[] { "foo", "foo" }), getResults().get(1)); + assertThat(getResults().get(1)).isEqualTo(Arrays.asList(new String[] { "foo", "foo" })); } @SuppressWarnings("rawtypes") @@ -1618,7 +1613,7 @@ public abstract class AbstractConnectionIntegrationTests { @IfProfileValue(name = "redisVersion", value = "2.6+") public void testSRandMemberCountKeyNotExists() { actual.add(connection.sRandMember("notexist", 2)); - assertTrue(((Collection) getResults().get(0)).isEmpty()); + assertThat(((Collection) getResults().get(0)).isEmpty()).isTrue(); } @Test @@ -2051,7 +2046,7 @@ public abstract class AbstractConnectionIntegrationTests { verifyResults(Arrays.asList(true, true)); connection.select(1); try { - assertEquals("bar", connection.get("foo")); + assertThat(connection.get("foo")).isEqualTo("bar"); } finally { if (connection.exists("foo")) { connection.del("foo"); @@ -2063,7 +2058,7 @@ public abstract class AbstractConnectionIntegrationTests { public void testLastSave() { actual.add(connection.lastSave()); List results = getResults(); - assertNotNull(results.get(0)); + assertThat(results.get(0)).isNotNull(); } @Test // DATAREDIS-206, DATAREDIS-513 @@ -2072,9 +2067,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.time()); List results = getResults(); - assertThat(results, is(not(empty()))); - assertThat(results.get(0), notNullValue()); - assertThat((Long) results.get(0) > 0, equalTo(true)); + assertThat(results).isNotEmpty(); + assertThat(results.get(0)).isNotNull(); + assertThat((Long) results.get(0) > 0).isTrue(); } @Test // DATAREDIS-269 @@ -2088,14 +2083,14 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.getClientList()); List results = getResults(); - assertNotNull(results.get(0)); + assertThat(results.get(0)).isNotNull(); List firstEntry = (List) results.get(0); - assertThat(firstEntry.size(), IsNot.not(0)); - assertThat(firstEntry.get(0), is(instanceOf(RedisClientInfo.class))); + assertThat(firstEntry.size()).isNotEqualTo(0); + assertThat(firstEntry.get(0)).isInstanceOf(RedisClientInfo.class); RedisClientInfo info = (RedisClientInfo) firstEntry.get(0); - assertThat(info.getDatabaseId(), is(notNullValue())); + assertThat(info.getDatabaseId()).isNotNull(); } @Test // DATAREDIS-290 @@ -2122,11 +2117,11 @@ public abstract class AbstractConnectionIntegrationTests { int i = 0; while (cursor.hasNext()) { byte[] value = cursor.next(); - assertThat(new String(value), not(containsString("spring"))); + assertThat(new String(value)).doesNotContain("spring"); i++; } - assertThat(i, is(itemCount)); + assertThat(i).isEqualTo(itemCount); } @Test // DATAREDIS-417 @@ -2140,11 +2135,11 @@ public abstract class AbstractConnectionIntegrationTests { int i = 0; while (cursor.hasNext()) { - assertThat(new String(cursor.next()), containsString("key:")); + assertThat(new String(cursor.next())).contains("key:"); i++; } - assertThat(i, is(10)); + assertThat(i).isEqualTo(10); } @Test // DATAREDIS-306 @@ -2170,13 +2165,13 @@ public abstract class AbstractConnectionIntegrationTests { StringTuple tuple = tuples.next(); - assertThat(tuple.getValueAsString(), anyOf(equalTo("Bob"), equalTo("James"), equalTo("Joe"))); - assertThat(tuple.getScore(), anyOf(equalTo(1D), equalTo(2D), equalTo(4D))); + assertThat(tuple.getValueAsString()).isIn("Bob", "James", "Joe"); + assertThat(tuple.getScore()).isIn(1D, 2D, 4D); count++; } - assertThat(count, equalTo(3)); + assertThat(count).isEqualTo(3); } @Test // DATAREDIS-304 @@ -2198,11 +2193,11 @@ public abstract class AbstractConnectionIntegrationTests { int i = 0; while (cursor.hasNext()) { - assertThat(cursor.next(), not(containsString("bar"))); + assertThat(cursor.next()).doesNotContain("bar"); i++; } - assertThat(i, is(6)); + assertThat(i).isEqualTo(6); } @Test // DATAREDIS-305 @@ -2231,13 +2226,13 @@ public abstract class AbstractConnectionIntegrationTests { String key = cursor.next().getKey(); - assertThat(key, not(containsString("bar"))); - assertThat(key, containsString("foo")); + assertThat(key).doesNotContain("bar"); + assertThat(key).contains("foo"); i++; } - assertThat(i, is(3)); + assertThat(i).isEqualTo(3); } @Test // DATAREDIS-308 @@ -2248,7 +2243,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.pfAdd("hll", "a", "b", "c")); List results = getResults(); - assertThat(results.get(0), is(1L)); + assertThat(results.get(0)).isEqualTo(1L); } @Test // DATAREDIS-308 @@ -2261,9 +2256,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.pfAdd("hll2", "e")); List results = getResults(); - assertThat(results.get(0), is(1L)); - assertThat(results.get(1), is(1L)); - assertThat(results.get(2), is(0L)); + assertThat(results.get(0)).isEqualTo(1L); + assertThat(results.get(1)).isEqualTo(1L); + assertThat(results.get(2)).isEqualTo(0L); } @Test // DATAREDIS-308 @@ -2275,8 +2270,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.pfCount("hll")); List results = getResults(); - assertThat(results.get(0), is(1L)); - assertThat(results.get(1), is(3L)); + assertThat(results.get(0)).isEqualTo(1L); + assertThat(results.get(1)).isEqualTo(3L); } @Test // DATAREDIS-308 @@ -2289,9 +2284,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.pfCount("hll", "hll2")); List results = getResults(); - assertThat(results.get(0), is(1L)); - assertThat(results.get(1), is(1L)); - assertThat(results.get(2), is(6L)); + assertThat(results.get(0)).isEqualTo(1L); + assertThat(results.get(1)).isEqualTo(1L); + assertThat(results.get(2)).isEqualTo(6L); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-308 @@ -2324,20 +2319,20 @@ public abstract class AbstractConnectionIntegrationTests { Set values = (Set) results.get(7); - assertThat(values, hasItems("a", "b", "c")); - assertThat(values, not(hasItems("d", "e", "f", "g"))); + assertThat(values).contains("a", "b", "c"); + assertThat(values).doesNotContain("d", "e", "f", "g"); values = (Set) results.get(8); - assertThat(values, hasItems("a", "b")); - assertThat(values, not(hasItem("c"))); + assertThat(values).contains("a", "b"); + assertThat(values).doesNotContain("c"); values = (Set) results.get(9); - assertThat(values, hasItems("b", "c", "d", "e", "f")); - assertThat(values, not(hasItems("a", "g"))); + assertThat(values).contains("b", "c", "d", "e", "f"); + assertThat(values).doesNotContain("a", "g"); values = (Set) results.get(10); - assertThat(values, hasItems("e", "f", "g")); - assertThat(values, not(hasItems("a", "b", "c", "d"))); + assertThat(values).contains("e", "f", "g"); + assertThat(values).doesNotContain("a", "b", "c", "d"); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-316, DATAREDIS-692 @@ -2359,9 +2354,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.pTtl(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(((Long) result.get(2)).doubleValue(), is(closeTo(500d, 499d))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(2)).doubleValue()).isCloseTo(500d, Offset.offset(499d)); } @Test // DATAREDIS-316 @@ -2377,11 +2372,11 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(result.get(2), is(Boolean.TRUE)); - assertThat(((Long) result.get(3)).doubleValue(), is(closeTo(500d, 499d))); - assertThat((result.get(4)), is(equalTo("data"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(result.get(2)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(3)).doubleValue()).isCloseTo(500d, Offset.offset(499d)); + assertThat((result.get(4))).isEqualTo("data"); } @Test // DATAREDIS-316 @@ -2397,11 +2392,11 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.FALSE)); - assertThat(result.get(2), is(Boolean.TRUE)); - assertThat(((Long) result.get(3)).doubleValue(), is(closeTo(-1, 0))); - assertThat((result.get(4)), is(equalTo("spring"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.FALSE); + assertThat(result.get(2)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(3)).doubleValue()).isCloseTo(-1, Offset.offset(0d)); + assertThat((result.get(4))).isEqualTo("spring"); } @Test // DATAREDIS-316 @@ -2416,10 +2411,10 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(((Long) result.get(2)).doubleValue(), is(closeTo(500d, 499d))); - assertThat((result.get(3)), is(equalTo("data"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(2)).doubleValue()).isCloseTo(500d, Offset.offset(499d)); + assertThat((result.get(3))).isEqualTo("data"); } @Test // DATAREDIS-316 @@ -2435,11 +2430,11 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(result.get(2), is(Boolean.TRUE)); - assertThat(((Long) result.get(3)).doubleValue(), is(closeTo(500, 499))); - assertThat((result.get(4)), is(equalTo("data"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(result.get(2)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(3)).doubleValue()).isCloseTo(500, Offset.offset(499d)); + assertThat((result.get(4))).isEqualTo("data"); } @Test // DATAREDIS-316 @@ -2454,9 +2449,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.FALSE)); - assertThat(result.get(1), is(Boolean.FALSE)); - assertThat(((Long) result.get(2)).doubleValue(), is(closeTo(-2, 0))); + assertThat(result.get(0)).isEqualTo(Boolean.FALSE); + assertThat(result.get(1)).isEqualTo(Boolean.FALSE); + assertThat(((Long) result.get(2)).doubleValue()).isCloseTo(-2, Offset.offset(0d)); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-316, DATAREDIS-692 @@ -2478,9 +2473,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.pTtl(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(((Long) result.get(2)).doubleValue(), is(closeTo(-1, 0))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(2)).doubleValue()).isCloseTo(-1, Offset.offset(0d)); } @Test // DATAREDIS-316 @@ -2497,11 +2492,11 @@ public abstract class AbstractConnectionIntegrationTests { List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(result.get(2), is(Boolean.TRUE)); - assertThat(((Long) result.get(3)).doubleValue(), is(closeTo(-1, 0))); - assertThat((result.get(4)), is(equalTo("data"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(result.get(2)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(3)).doubleValue()).isCloseTo(-1, Offset.offset(0d)); + assertThat((result.get(4))).isEqualTo("data"); } @Test // DATAREDIS-316 @@ -2517,11 +2512,11 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.FALSE)); - assertThat(result.get(2), is(Boolean.TRUE)); - assertThat(((Long) result.get(3)).doubleValue(), is(closeTo(-1, 0))); - assertThat((result.get(4)), is(equalTo("spring"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.FALSE); + assertThat(result.get(2)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(3)).doubleValue()).isCloseTo(-1d, Offset.offset(0d)); + assertThat((result.get(4))).isEqualTo("spring"); } @Test // DATAREDIS-316 @@ -2536,10 +2531,10 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(((Long) result.get(2)).doubleValue(), is(closeTo(-1, 0))); - assertThat((result.get(3)), is(equalTo("data"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(2)).doubleValue()).isCloseTo(-1, Offset.offset(0d)); + assertThat((result.get(3))).isEqualTo("data"); } @Test // DATAREDIS-316 @@ -2555,11 +2550,11 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.TRUE)); - assertThat(result.get(1), is(Boolean.TRUE)); - assertThat(result.get(2), is(Boolean.TRUE)); - assertThat(((Long) result.get(3)).doubleValue(), is(closeTo(-1, 0))); - assertThat((result.get(4)), is(equalTo("data"))); + assertThat(result.get(0)).isEqualTo(Boolean.TRUE); + assertThat(result.get(1)).isEqualTo(Boolean.TRUE); + assertThat(result.get(2)).isEqualTo(Boolean.TRUE); + assertThat(((Long) result.get(3)).doubleValue()).isCloseTo(-1, Offset.offset(0d)); + assertThat((result.get(4))).isEqualTo("data"); } @Test // DATAREDIS-316 @@ -2574,9 +2569,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.get(key)); List result = getResults(); - assertThat(result.get(0), is(Boolean.FALSE)); - assertThat(result.get(1), is(Boolean.FALSE)); - assertThat(((Long) result.get(2)).doubleValue(), is(closeTo(-2, 0))); + assertThat(result.get(0)).isEqualTo(Boolean.FALSE); + assertThat(result.get(1)).isEqualTo(Boolean.FALSE); + assertThat(((Long) result.get(2)).doubleValue()).isCloseTo(-2, Offset.offset(0d)); } @Test // DATAREDIS-438 @@ -2588,7 +2583,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoAdd(key, PALERMO)); List result = getResults(); - assertThat(result.get(0), is(1L)); + assertThat(result.get(0)).isEqualTo(1L); } @Test // DATAREDIS-438 @@ -2600,7 +2595,7 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoAdd(key, Arrays.asList(PALERMO, ARIGENTO, CATANIA, PALERMO))); List result = getResults(); - assertThat(result.get(0), is(3L)); + assertThat(result.get(0)).isEqualTo(3L); } @Test // DATAREDIS-438 @@ -2613,8 +2608,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoDist(key, PALERMO.getName(), CATANIA.getName())); List result = getResults(); - assertThat(((Distance) result.get(1)).getValue(), is(closeTo(166274.15156960033D, 0.005))); - assertThat(((Distance) result.get(1)).getUnit(), is("m")); + assertThat(((Distance) result.get(1)).getValue()).isCloseTo(166274.15156960033D, Offset.offset(0.005)); + assertThat(((Distance) result.get(1)).getUnit()).isEqualTo("m"); } @Test // DATAREDIS-438 @@ -2627,8 +2622,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoDist(key, PALERMO.getName(), CATANIA.getName(), Metrics.KILOMETERS)); List result = getResults(); - assertThat(((Distance) result.get(1)).getValue(), is(closeTo(166.27415156960033D, 0.005))); - assertThat(((Distance) result.get(1)).getUnit(), is("km")); + assertThat(((Distance) result.get(1)).getValue()).isCloseTo(166.27415156960033D, Offset.offset(0.005)); + assertThat(((Distance) result.get(1)).getUnit()).isEqualTo("km"); } @Test // DATAREDIS-438 @@ -2641,8 +2636,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoHash(key, PALERMO.getName(), CATANIA.getName())); List result = getResults(); - assertThat(((List) result.get(1)).get(0), is("sqc8b49rny0")); - assertThat(((List) result.get(1)).get(1), is("sqdtr74hyu0")); + assertThat(((List) result.get(1)).get(0)).isEqualTo("sqc8b49rny0"); + assertThat(((List) result.get(1)).get(1)).isEqualTo("sqdtr74hyu0"); } @Test // DATAREDIS-438 @@ -2655,9 +2650,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoHash(key, PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName())); List result = getResults(); - assertThat(((List) result.get(1)).get(0), is("sqc8b49rny0")); - assertThat(((List) result.get(1)).get(1), is(nullValue())); - assertThat(((List) result.get(1)).get(2), is("sqdtr74hyu0")); + assertThat(((List) result.get(1)).get(0)).isEqualTo("sqc8b49rny0"); + assertThat(((List) result.get(1)).get(1)).isNull(); + assertThat(((List) result.get(1)).get(2)).isEqualTo("sqdtr74hyu0"); } @Test // DATAREDIS-438 @@ -2671,11 +2666,11 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoPos(key, PALERMO.getName(), CATANIA.getName())); List result = getResults(); - assertThat(((List) result.get(1)).get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(((List) result.get(1)).get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(((List) result.get(1)).get(0).getX()).isCloseTo(POINT_PALERMO.getX(), Offset.offset(0.005)); + assertThat(((List) result.get(1)).get(0).getY()).isCloseTo(POINT_PALERMO.getY(), Offset.offset(0.005)); - assertThat(((List) result.get(1)).get(1).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(((List) result.get(1)).get(1).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(((List) result.get(1)).get(1).getX()).isCloseTo(POINT_CATANIA.getX(), Offset.offset(0.005)); + assertThat(((List) result.get(1)).get(1).getY()).isCloseTo(POINT_CATANIA.getY(), Offset.offset(0.005)); } @Test // DATAREDIS-438 @@ -2689,13 +2684,13 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoPos(key, PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName())); List result = getResults(); - assertThat(((List) result.get(1)).get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(((List) result.get(1)).get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(((List) result.get(1)).get(0).getX()).isCloseTo(POINT_PALERMO.getX(), Offset.offset(0.005)); + assertThat(((List) result.get(1)).get(0).getY()).isCloseTo(POINT_PALERMO.getY(), Offset.offset(0.005)); - assertThat(((List) result.get(1)).get(1), is(nullValue())); + assertThat(((List) result.get(1)).get(1)).isNull(); - assertThat(((List) result.get(1)).get(2).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(((List) result.get(1)).get(2).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(((List) result.get(1)).get(2).getX()).isCloseTo(POINT_CATANIA.getX(), Offset.offset(0.005)); + assertThat(((List) result.get(1)).get(2).getY()).isCloseTo(POINT_CATANIA.getY(), Offset.offset(0.005)); } @Test // DATAREDIS-438 @@ -2710,8 +2705,8 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.geoRadius(key, new Circle(new Point(15D, 37D), new Distance(150D, KILOMETERS)))); List results = getResults(); - assertThat(((GeoResults>) results.get(1)).getContent(), hasSize(3)); - assertThat(((GeoResults>) results.get(2)).getContent(), hasSize(2)); + assertThat(((GeoResults>) results.get(1)).getContent()).hasSize(3); + assertThat(((GeoResults>) results.get(2)).getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -2726,11 +2721,11 @@ public abstract class AbstractConnectionIntegrationTests { newGeoRadiusArgs().includeDistance())); List results = getResults(); - assertThat(((GeoResults>) results.get(1)).getContent(), hasSize(3)); - assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getValue(), - is(closeTo(130.423D, 0.005))); - assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getUnit(), - is("km")); + assertThat(((GeoResults>) results.get(1)).getContent()).hasSize(3); + assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getValue()) + .isCloseTo(130.423D, Offset.offset(0.005)); + assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getUnit()) + .isEqualTo("km"); } @Test // DATAREDIS-438 @@ -2745,7 +2740,7 @@ public abstract class AbstractConnectionIntegrationTests { newGeoRadiusArgs().limit(2))); List results = getResults(); - assertThat(((GeoResults>) results.get(1)).getContent(), hasSize(2)); + assertThat(((GeoResults>) results.get(1)).getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -2760,10 +2755,10 @@ public abstract class AbstractConnectionIntegrationTests { newGeoRadiusArgs().sortAscending())); List results = getResults(); - assertThat(((GeoResults>) results.get(1)).getContent().get(0).getContent().getName(), - is(PALERMO.getName())); - assertThat(((GeoResults>) results.get(1)).getContent().get(1).getContent().getName(), - is(ARIGENTO.getName())); + assertThat(((GeoResults>) results.get(1)).getContent().get(0).getContent().getName()) + .isEqualTo(PALERMO.getName()); + assertThat(((GeoResults>) results.get(1)).getContent().get(1).getContent().getName()) + .isEqualTo(ARIGENTO.getName()); } @Test // DATAREDIS-438 @@ -2778,11 +2773,11 @@ public abstract class AbstractConnectionIntegrationTests { newGeoRadiusArgs().includeDistance())); List results = getResults(); - assertThat(((GeoResults>) results.get(1)).getContent(), hasSize(2)); - assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getValue(), - is(closeTo(90.978D, 0.005))); - assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getUnit(), - is("km")); + assertThat(((GeoResults>) results.get(1)).getContent()).hasSize(2); + assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getValue()) + .isCloseTo(90.978D, Offset.offset(0.005)); + assertThat(((GeoResults>) results.get(1)).getContent().get(0).getDistance().getUnit()) + .isEqualTo("km"); } @Test // DATAREDIS-438 @@ -2797,7 +2792,7 @@ public abstract class AbstractConnectionIntegrationTests { newGeoRadiusArgs().limit(2))); List results = getResults(); - assertThat(((GeoResults>) results.get(1)).getContent(), hasSize(2)); + assertThat(((GeoResults>) results.get(1)).getContent()).hasSize(2); } @Test // DATAREDIS-698 @@ -2925,12 +2920,12 @@ public abstract class AbstractConnectionIntegrationTests { @WithRedisDriver({ RedisDriver.JEDIS, RedisDriver.LETTUCE }) public void bitFieldSetShouldWorkCorrectly() { - actual.add(connection.bitfield(KEY_1, create().set(INT_8).valueAt(offset(0L)).to(10L))); - actual.add(connection.bitfield(KEY_1, create().set(INT_8).valueAt(offset(0L)).to(20L))); + actual.add(connection.bitfield(KEY_1, create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)).to(10L))); + actual.add(connection.bitfield(KEY_1, create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)).to(20L))); List results = getResults(); - assertThat((List) results.get(0), contains(0L)); - assertThat((List) results.get(1), contains(10L)); + assertThat((List) results.get(0)).containsExactly(0L); + assertThat((List) results.get(1)).containsExactly(10L); } @Test // DATAREDIS-562 @@ -2938,10 +2933,10 @@ public abstract class AbstractConnectionIntegrationTests { @WithRedisDriver({ RedisDriver.JEDIS, RedisDriver.LETTUCE }) public void bitFieldGetShouldWorkCorrectly() { - actual.add(connection.bitfield(KEY_1, create().get(INT_8).valueAt(offset(0L)))); + actual.add(connection.bitfield(KEY_1, create().get(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)))); List results = getResults(); - assertThat((List) results.get(0), contains(0L)); + assertThat((List) results.get(0)).containsExactly(0L); } @Test // DATAREDIS-562 @@ -2949,10 +2944,11 @@ public abstract class AbstractConnectionIntegrationTests { @WithRedisDriver({ RedisDriver.JEDIS, RedisDriver.LETTUCE }) public void bitFieldIncrByShouldWorkCorrectly() { - actual.add(connection.bitfield(KEY_1, create().incr(INT_8).valueAt(offset(100L)).by(1L))); + actual + .add(connection.bitfield(KEY_1, create().incr(INT_8).valueAt(BitFieldSubCommands.Offset.offset(100L)).by(1L))); List results = getResults(); - assertThat((List) results.get(0), contains(1L)); + assertThat((List) results.get(0)).containsExactly(1L); } @Test // DATAREDIS-562 @@ -2960,16 +2956,20 @@ public abstract class AbstractConnectionIntegrationTests { @WithRedisDriver({ RedisDriver.JEDIS, RedisDriver.LETTUCE }) public void bitFieldIncrByWithOverflowShouldWorkCorrectly() { - actual.add(connection.bitfield(KEY_1, create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L))); - actual.add(connection.bitfield(KEY_1, create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L))); - actual.add(connection.bitfield(KEY_1, create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L))); - actual.add(connection.bitfield(KEY_1, create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L))); + actual.add(connection.bitfield(KEY_1, + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))); + actual.add(connection.bitfield(KEY_1, + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))); + actual.add(connection.bitfield(KEY_1, + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))); + actual.add(connection.bitfield(KEY_1, + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))); List results = getResults(); - assertThat((List) results.get(0), contains(1L)); - assertThat((List) results.get(1), contains(2L)); - assertThat((List) results.get(2), contains(3L)); - assertThat(results.get(3), is(notNullValue())); + assertThat((List) results.get(0)).containsExactly(1L); + assertThat((List) results.get(1)).containsExactly(2L); + assertThat((List) results.get(2)).containsExactly(3L); + assertThat(results.get(3)).isNotNull(); } @Test // DATAREDIS-562 @@ -2977,10 +2977,10 @@ public abstract class AbstractConnectionIntegrationTests { @WithRedisDriver({ RedisDriver.JEDIS, RedisDriver.LETTUCE }) public void bitfieldShouldAllowMultipleSubcommands() { - actual.add( - connection.bitfield(KEY_1, create().incr(signed(5)).valueAt(offset(100L)).by(1L).get(unsigned(4)).valueAt(0L))); + actual.add(connection.bitfield(KEY_1, + create().incr(signed(5)).valueAt(BitFieldSubCommands.Offset.offset(100L)).by(1L).get(unsigned(4)).valueAt(0L))); - assertThat((List) getResults().get(0), contains(1L, 0L)); + assertThat((List) getResults().get(0)).containsExactly(1L, 0L); } @Test // DATAREDIS-562 @@ -2988,14 +2988,16 @@ public abstract class AbstractConnectionIntegrationTests { @WithRedisDriver({ RedisDriver.JEDIS, RedisDriver.LETTUCE }) public void bitfieldShouldWorkUsingNonZeroBasedOffset() { - actual.add(connection.bitfield(KEY_1, create().set(INT_8).valueAt(offset(0L).multipliedByTypeLength()).to(100L) - .set(INT_8).valueAt(offset(1L).multipliedByTypeLength()).to(200L))); - actual.add(connection.bitfield(KEY_1, create().get(INT_8).valueAt(offset(0L).multipliedByTypeLength()).get(INT_8) - .valueAt(offset(1L).multipliedByTypeLength()))); + actual.add(connection.bitfield(KEY_1, + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L).multipliedByTypeLength()).to(100L).set(INT_8) + .valueAt(BitFieldSubCommands.Offset.offset(1L).multipliedByTypeLength()).to(200L))); + actual.add(connection.bitfield(KEY_1, + create().get(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L).multipliedByTypeLength()).get(INT_8) + .valueAt(BitFieldSubCommands.Offset.offset(1L).multipliedByTypeLength()))); List results = getResults(); - assertThat((List) results.get(0), contains(0L, 0L)); - assertThat((List) results.get(1), contains(100L, -56L)); + assertThat((List) results.get(0)).containsExactly(0L, 0L); + assertThat((List) results.get(1)).containsExactly(100L, -56L); } @Test // DATAREDIS-864 @@ -3007,9 +3009,9 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.type(KEY_1)); List results = getResults(); - assertThat(results, hasSize(2)); - assertThat(((RecordId) results.get(0)).getValue(), containsString("-")); - assertThat(results.get(1), is(DataType.STREAM)); + assertThat(results).hasSize(2); + assertThat(((RecordId) results.get(0)).getValue()).contains("-"); + assertThat(results.get(1)).isEqualTo(DataType.STREAM); } @Test // DATAREDIS-864 @@ -3024,8 +3026,8 @@ public abstract class AbstractConnectionIntegrationTests { List> messages = (List) results.get(1); - assertThat(messages.get(0).getStream(), is(KEY_1)); - assertThat(messages.get(0).getValue(), is(Collections.singletonMap(KEY_2, VALUE_2))); + assertThat(messages.get(0).getStream()).isEqualTo(KEY_1); + assertThat(messages.get(0).getValue()).isEqualTo(Collections.singletonMap(KEY_2, VALUE_2)); } @Test // DATAREDIS-864 @@ -3044,10 +3046,10 @@ public abstract class AbstractConnectionIntegrationTests { List> messages = (List) results.get(2); - assertThat(messages.get(0).getStream(), is(KEY_1)); - assertThat(messages.get(0).getValue(), is(Collections.singletonMap(KEY_2, VALUE_2))); + assertThat(messages.get(0).getStream()).isEqualTo(KEY_1); + assertThat(messages.get(0).getValue()).isEqualTo(Collections.singletonMap(KEY_2, VALUE_2)); - assertThat((List) results.get(3), is(empty())); + assertThat((List) results.get(3)).isEmpty(); } @Test // DATAREDIS-864 @@ -3060,15 +3062,15 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.xRange(KEY_1, org.springframework.data.domain.Range.unbounded())); List results = getResults(); - assertThat(results, hasSize(3)); + assertThat(results).hasSize(3); List> messages = (List) results.get(2); - assertThat(messages.get(0).getStream(), is(KEY_1)); - assertThat(messages.get(0).getValue(), is(Collections.singletonMap(KEY_2, VALUE_2))); + assertThat(messages.get(0).getStream()).isEqualTo(KEY_1); + assertThat(messages.get(0).getValue()).isEqualTo(Collections.singletonMap(KEY_2, VALUE_2)); - assertThat(messages.get(1).getStream(), is(KEY_1)); - assertThat(messages.get(1).getValue(), is(Collections.singletonMap(KEY_3, VALUE_3))); + assertThat(messages.get(1).getStream()).isEqualTo(KEY_1); + assertThat(messages.get(1).getValue()).isEqualTo(Collections.singletonMap(KEY_3, VALUE_3)); } @Test // DATAREDIS-864 @@ -3081,20 +3083,20 @@ public abstract class AbstractConnectionIntegrationTests { actual.add(connection.xRevRange(KEY_1, org.springframework.data.domain.Range.unbounded())); List results = getResults(); - assertThat(results, hasSize(3)); - assertThat(((RecordId)results.get(0)).getValue(), containsString("-")); + assertThat(results).hasSize(3); + assertThat(((RecordId) results.get(0)).getValue()).contains("-"); List> messages = (List) results.get(2); - assertThat(messages.get(0).getStream(), is(KEY_1)); - assertThat(messages.get(0).getValue(), is(Collections.singletonMap(KEY_3, VALUE_3))); + assertThat(messages.get(0).getStream()).isEqualTo(KEY_1); + assertThat(messages.get(0).getValue()).isEqualTo(Collections.singletonMap(KEY_3, VALUE_3)); - assertThat(messages.get(1).getStream(), is(KEY_1)); - assertThat(messages.get(1).getValue(), is(Collections.singletonMap(KEY_2, VALUE_2))); + assertThat(messages.get(1).getStream()).isEqualTo(KEY_1); + assertThat(messages.get(1).getValue()).isEqualTo(Collections.singletonMap(KEY_2, VALUE_2)); } protected void verifyResults(List expected) { - assertEquals(expected, getResults()); + assertThat(getResults()).isEqualTo(expected); } protected List getResults() { diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java index ee2c0c403..0241bede1 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java @@ -16,13 +16,14 @@ package org.springframework.data.redis.connection; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; import org.junit.Ignore; import org.junit.Test; + import org.springframework.test.annotation.IfProfileValue; /** @@ -117,7 +118,7 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends Abstrac public void testClosePipelineNotOpen() { getResults(); List results = connection.closePipeline(); - assertTrue(results.isEmpty()); + assertThat(results.isEmpty()).isTrue(); } @Test // DATAREDIS-417 @@ -136,9 +137,9 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends Abstrac for (int i = 0; i < actual.size(); i++) { expectedPipeline.add(null); } - assertEquals(expectedPipeline, actual); + assertThat(actual).isEqualTo(expectedPipeline); List results = getResults(); - assertEquals(expected, results); + assertThat(results).isEqualTo(expected); } protected List getResults() { diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionTransactionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionTransactionIntegrationTests.java index ff72cafdc..fdefa943f 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionTransactionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionTransactionIntegrationTests.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.redis.connection; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; import org.junit.Ignore; import org.junit.Test; + import org.springframework.test.annotation.IfProfileValue; /** @@ -127,8 +127,8 @@ abstract public class AbstractConnectionTransactionIntegrationTests extends Abst for (int i = 0; i < actual.size(); i++) { expectedTx.add(null); } - assertEquals(expectedTx, actual); + assertThat(actual).isEqualTo(expectedTx); List results = getResults(); - assertEquals(expected, results); + assertThat(results).isEqualTo(expected); } } diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java b/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java index 296bf36a4..4c0724ee5 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractTransactionalTestBase.java @@ -15,6 +15,8 @@ */ package org.springframework.data.redis.connection; +import static org.assertj.core.api.Assertions.*; + import java.sql.Connection; import java.sql.SQLException; import java.util.Arrays; @@ -22,12 +24,11 @@ import java.util.List; import javax.sql.DataSource; -import org.hamcrest.core.Is; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -105,9 +106,9 @@ public abstract class AbstractTransactionalTestBase { RedisConnection connection = factory.getConnection(); for (String key : KEYS) { - Assert.assertThat( - "Values for " + key + " should " + (valuesShouldHaveBeenPersisted ? "" : "NOT ") + "have been found.", - connection.exists(key.getBytes()), Is.is(valuesShouldHaveBeenPersisted)); + assertThat(connection.exists(key.getBytes())) + .as("Values for " + key + " should " + (valuesShouldHaveBeenPersisted ? "" : "NOT ") + "have been found.") + .isEqualTo(valuesShouldHaveBeenPersisted); } connection.close(); } diff --git a/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java b/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java index 0c4c30c18..5b262440f 100644 --- a/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/ClusterCommandExecutorUnitTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.connection; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.data.redis.test.util.MockitoUtils.*; @@ -25,7 +23,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashSet; -import org.hamcrest.core.IsInstanceOf; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,6 +30,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.convert.converter.Converter; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.dao.DataAccessException; @@ -232,8 +230,8 @@ public class ClusterCommandExecutorUnitTests { executor.executeCommandOnAllNodes(COMMAND_CALLBACK); } catch (ClusterCommandExecutionFailureException e) { - assertThat(e.getCauses().size(), is(1)); - assertThat(e.getCauses().iterator().next(), IsInstanceOf.instanceOf(DataAccessException.class)); + assertThat(e.getCauses().size()).isEqualTo(1); + assertThat(e.getCauses().iterator().next()).isInstanceOf(DataAccessException.class); } verify(con1, times(1)).theWheelWeavesAsTheWheelWills(); @@ -250,7 +248,7 @@ public class ClusterCommandExecutorUnitTests { MultiNodeResult result = executor.executeCommandOnAllNodes(COMMAND_CALLBACK); - assertThat(result.resultsAsList(), hasItems("rand", "mat", "perrin")); + assertThat(result.resultsAsList()).contains("rand", "mat", "perrin"); } @Test // DATAREDIS-315, DATAREDIS-467 @@ -267,10 +265,10 @@ public class ClusterCommandExecutorUnitTests { new HashSet<>( Arrays.asList("key-1".getBytes(), "key-2".getBytes(), "key-3".getBytes(), "key-9".getBytes()))); - assertThat(result.resultsAsList(), hasItems("rand", "mat", "perrin", "egwene")); + assertThat(result.resultsAsList()).contains("rand", "mat", "perrin", "egwene"); // check that 2 keys have been routed to node1 - assertThat(captor.getAllValues().size(), is(2)); + assertThat(captor.getAllValues().size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -296,7 +294,7 @@ public class ClusterCommandExecutorUnitTests { executor.setMaxRedirects(4); executor.executeCommandOnSingleNode(COMMAND_CALLBACK, CLUSTER_NODE_1); } catch (Exception e) { - assertThat(e, IsInstanceOf.instanceOf(TooManyClusterRedirectionsException.class)); + assertThat(e).isInstanceOf(TooManyClusterRedirectionsException.class); } verify(con1, times(2)).theWheelWeavesAsTheWheelWills(); diff --git a/src/test/java/org/springframework/data/redis/connection/ClusterSlotHashUtilsTests.java b/src/test/java/org/springframework/data/redis/connection/ClusterSlotHashUtilsTests.java index 6bc4cf41f..7cc8da3dd 100644 --- a/src/test/java/org/springframework/data/redis/connection/ClusterSlotHashUtilsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/ClusterSlotHashUtilsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.connection; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; @@ -28,6 +28,7 @@ import java.util.Random; import org.junit.ClassRule; import org.junit.Test; + import org.springframework.data.redis.test.util.RedisClusterRule; import org.springframework.util.StringUtils; @@ -54,9 +55,9 @@ public class ClusterSlotHashUtilsTests { int slot = ClusterSlotHashUtil.calculateSlot(key); Long serverSlot = jedis.clusterKeySlot(key); - assertEquals( - String.format("Expected slot for key '%s' to be %s but server calculated %s.", key, slot, serverSlot), - serverSlot.intValue(), slot); + assertThat(slot) + .as(String.format("Expected slot for key '%s' to be %s but server calculated %s.", key, slot, serverSlot)) + .isEqualTo(serverSlot.intValue()); } jedis.close(); @@ -87,18 +88,18 @@ public class ClusterSlotHashUtilsTests { int slot1 = ClusterSlotHashUtil.calculateSlot(key1); int slot2 = ClusterSlotHashUtil.calculateSlot(key2); - assertEquals(String.format("Expected slot for prefixed keys '%s' and '%s' to be %s but was %s.", key1, key2, - slot1, slot2), slot1, slot2); + assertThat(slot2).as(String.format("Expected slot for prefixed keys '%s' and '%s' to be %s but was %s.", key1, + key2, slot1, slot2)).isEqualTo(slot1); Long serverSlot1 = jedis.clusterKeySlot(key1); Long serverSlot2 = jedis.clusterKeySlot(key2); - assertEquals( - String.format("Expected slot for key '%s' to be %s but server calculated %s.", key1, slot1, serverSlot1), - serverSlot1.intValue(), slot1); - assertEquals( - String.format("Expected slot for key '%s' to be %s but server calculated %s.", key2, slot2, serverSlot2), - serverSlot1.intValue(), slot1); + assertThat(slot1).as( + String.format("Expected slot for key '%s' to be %s but server calculated %s.", key1, slot1, serverSlot1)) + .isEqualTo(serverSlot1.intValue()); + assertThat(slot1).as( + String.format("Expected slot for key '%s' to be %s but server calculated %s.", key2, slot2, serverSlot2)) + .isEqualTo(serverSlot1.intValue()); } jedis.close(); diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java index 31387527f..d25d13a8c 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.connection; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -25,6 +25,7 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; + import org.springframework.data.geo.Distance; import org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit; import org.springframework.data.redis.connection.stream.RecordId; @@ -1565,9 +1566,8 @@ public class DefaultStringRedisConnectionPipelineTxTests extends DefaultStringRe connection.get(bar); connection.exec(); List results = connection.closePipeline(); - assertEquals( - Arrays.asList(new Object[] { Arrays.asList(new Object[] { bar }), Arrays.asList(new Object[] { foo }) }), - results); + assertThat(results).isEqualTo( + Arrays.asList(new Object[] { Arrays.asList(new Object[] { bar }), Arrays.asList(new Object[] { foo }) })); } @Test // DATAREDIS-438 diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java index 3db8e87b9..0547fbe05 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.connection; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.ArrayList; @@ -35,6 +35,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.mockito.MockitoAnnotations; + import org.springframework.data.geo.Circle; import org.springframework.data.geo.Distance; import org.springframework.data.geo.GeoResult; @@ -45,11 +46,6 @@ import org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation; import org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs; import org.springframework.data.redis.connection.RedisListCommands.Position; import org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption; -import org.springframework.data.redis.connection.stream.Consumer; -import org.springframework.data.redis.connection.stream.RecordId; -import org.springframework.data.redis.connection.stream.ReadOffset; -import org.springframework.data.redis.connection.stream.StreamOffset; -import org.springframework.data.redis.connection.stream.StreamReadOptions; import org.springframework.data.redis.connection.RedisStringCommands.BitOperation; import org.springframework.data.redis.connection.RedisZSetCommands.Aggregate; import org.springframework.data.redis.connection.RedisZSetCommands.Limit; @@ -57,6 +53,11 @@ import org.springframework.data.redis.connection.RedisZSetCommands.Tuple; import org.springframework.data.redis.connection.RedisZSetCommands.Weights; import org.springframework.data.redis.connection.StringRedisConnection.StringTuple; import org.springframework.data.redis.connection.convert.Converters; +import org.springframework.data.redis.connection.stream.Consumer; +import org.springframework.data.redis.connection.stream.ReadOffset; +import org.springframework.data.redis.connection.stream.RecordId; +import org.springframework.data.redis.connection.stream.StreamOffset; +import org.springframework.data.redis.connection.stream.StreamReadOptions; import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.serializer.StringRedisSerializer; @@ -2172,6 +2173,6 @@ public class DefaultStringRedisConnectionTests { } protected void verifyResults(List expected) { - assertEquals(expected, getResults()); + assertThat(getResults()).isEqualTo(expected); } } diff --git a/src/test/java/org/springframework/data/redis/connection/RedisClusterConfigurationUnitTests.java b/src/test/java/org/springframework/data/redis/connection/RedisClusterConfigurationUnitTests.java index ec445cf7e..0b5037aff 100644 --- a/src/test/java/org/springframework/data/redis/connection/RedisClusterConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/RedisClusterConfigurationUnitTests.java @@ -15,16 +15,14 @@ */ package org.springframework.data.redis.connection; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import org.junit.Test; + import org.springframework.core.env.PropertySource; import org.springframework.mock.env.MockPropertySource; import org.springframework.util.StringUtils; @@ -45,9 +43,9 @@ public class RedisClusterConfigurationUnitTests { RedisClusterConfiguration config = new RedisClusterConfiguration(Collections.singleton(HOST_AND_PORT_1)); - assertThat(config.getClusterNodes().size(), is(1)); - assertThat(config.getClusterNodes(), hasItems(new RedisNode("127.0.0.1", 123))); - assertThat(config.getMaxRedirects(), nullValue()); + assertThat(config.getClusterNodes().size()).isEqualTo(1); + assertThat(config.getClusterNodes()).contains(new RedisNode("127.0.0.1", 123)); + assertThat(config.getMaxRedirects()).isNull(); } @Test // DATAREDIS-315 @@ -57,9 +55,9 @@ public class RedisClusterConfigurationUnitTests { new HashSet<>(Arrays.asList(HOST_AND_PORT_1, HOST_AND_PORT_2, HOST_AND_PORT_3))); - assertThat(config.getClusterNodes().size(), is(3)); - assertThat(config.getClusterNodes(), - hasItems(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), new RedisNode("localhost", 789))); + assertThat(config.getClusterNodes().size()).isEqualTo(3); + assertThat(config.getClusterNodes()).contains(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), + new RedisNode("localhost", 789)); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 @@ -77,7 +75,7 @@ public class RedisClusterConfigurationUnitTests { RedisClusterConfiguration config = new RedisClusterConfiguration(Collections. emptySet()); - assertThat(config.getClusterNodes().size(), is(0)); + assertThat(config.getClusterNodes().size()).isEqualTo(0); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 @@ -90,8 +88,8 @@ public class RedisClusterConfigurationUnitTests { RedisClusterConfiguration config = new RedisClusterConfiguration(new MockPropertySource()); - assertThat(config.getMaxRedirects(), nullValue()); - assertThat(config.getClusterNodes().size(), is(0)); + assertThat(config.getMaxRedirects()).isNull(); + assertThat(config.getClusterNodes().size()).isEqualTo(0); } @Test // DATAREDIS-315 @@ -103,8 +101,8 @@ public class RedisClusterConfigurationUnitTests { RedisClusterConfiguration config = new RedisClusterConfiguration(propertySource); - assertThat(config.getMaxRedirects(), is(5)); - assertThat(config.getClusterNodes(), hasItems(new RedisNode("127.0.0.1", 123))); + assertThat(config.getMaxRedirects()).isEqualTo(5); + assertThat(config.getClusterNodes()).contains(new RedisNode("127.0.0.1", 123)); } @Test // DATAREDIS-315 @@ -117,9 +115,9 @@ public class RedisClusterConfigurationUnitTests { RedisClusterConfiguration config = new RedisClusterConfiguration(propertySource); - assertThat(config.getMaxRedirects(), is(5)); - assertThat(config.getClusterNodes(), - hasItems(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), new RedisNode("localhost", 789))); + assertThat(config.getMaxRedirects()).isEqualTo(5); + assertThat(config.getClusterNodes()).contains(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), + new RedisNode("localhost", 789)); } } diff --git a/src/test/java/org/springframework/data/redis/connection/RedisSentinelConfigurationUnitTests.java b/src/test/java/org/springframework/data/redis/connection/RedisSentinelConfigurationUnitTests.java index ec74dba66..8fbe3bd18 100644 --- a/src/test/java/org/springframework/data/redis/connection/RedisSentinelConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/RedisSentinelConfigurationUnitTests.java @@ -15,16 +15,14 @@ */ package org.springframework.data.redis.connection; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import org.junit.Test; + import org.springframework.core.env.PropertySource; import org.springframework.mock.env.MockPropertySource; import org.springframework.util.StringUtils; @@ -45,8 +43,8 @@ public class RedisSentinelConfigurationUnitTests { RedisSentinelConfiguration config = new RedisSentinelConfiguration("mymaster", Collections.singleton(HOST_AND_PORT_1)); - assertThat(config.getSentinels().size(), is(1)); - assertThat(config.getSentinels(), hasItems(new RedisNode("127.0.0.1", 123))); + assertThat(config.getSentinels().size()).isEqualTo(1); + assertThat(config.getSentinels()).contains(new RedisNode("127.0.0.1", 123)); } @Test // DATAREDIS-372 @@ -56,9 +54,9 @@ public class RedisSentinelConfigurationUnitTests { new HashSet<>(Arrays.asList( HOST_AND_PORT_1, HOST_AND_PORT_2, HOST_AND_PORT_3))); - assertThat(config.getSentinels().size(), is(3)); - assertThat(config.getSentinels(), - hasItems(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), new RedisNode("localhost", 789))); + assertThat(config.getSentinels().size()).isEqualTo(3); + assertThat(config.getSentinels()).contains(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), + new RedisNode("localhost", 789)); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-372 @@ -76,7 +74,7 @@ public class RedisSentinelConfigurationUnitTests { RedisSentinelConfiguration config = new RedisSentinelConfiguration("mymaster", Collections. emptySet()); - assertThat(config.getSentinels().size(), is(0)); + assertThat(config.getSentinels().size()).isEqualTo(0); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-372 @@ -89,8 +87,8 @@ public class RedisSentinelConfigurationUnitTests { RedisSentinelConfiguration config = new RedisSentinelConfiguration(new MockPropertySource()); - assertThat(config.getMaster(), nullValue()); - assertThat(config.getSentinels().size(), is(0)); + assertThat(config.getMaster()).isNull(); + assertThat(config.getSentinels().size()).isEqualTo(0); } @Test // DATAREDIS-372 @@ -102,9 +100,9 @@ public class RedisSentinelConfigurationUnitTests { RedisSentinelConfiguration config = new RedisSentinelConfiguration(propertySource); - assertThat(config.getMaster().getName(), is("myMaster")); - assertThat(config.getSentinels().size(), is(1)); - assertThat(config.getSentinels(), hasItems(new RedisNode("127.0.0.1", 123))); + assertThat(config.getMaster().getName()).isEqualTo("myMaster"); + assertThat(config.getSentinels().size()).isEqualTo(1); + assertThat(config.getSentinels()).contains(new RedisNode("127.0.0.1", 123)); } @Test // DATAREDIS-372 @@ -117,8 +115,8 @@ public class RedisSentinelConfigurationUnitTests { RedisSentinelConfiguration config = new RedisSentinelConfiguration(propertySource); - assertThat(config.getSentinels().size(), is(3)); - assertThat(config.getSentinels(), - hasItems(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), new RedisNode("localhost", 789))); + assertThat(config.getSentinels().size()).isEqualTo(3); + assertThat(config.getSentinels()).contains(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456), + new RedisNode("localhost", 789)); } } diff --git a/src/test/java/org/springframework/data/redis/connection/RedisServerUnitTests.java b/src/test/java/org/springframework/data/redis/connection/RedisServerUnitTests.java index 30331c511..7567c31cd 100644 --- a/src/test/java/org/springframework/data/redis/connection/RedisServerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/RedisServerUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Properties; @@ -34,7 +33,7 @@ public class RedisServerUnitTests { RedisServer redisServer = RedisServer.newServerFrom(createProperties()); - assertThat(redisServer.getNumberOtherSentinels(), is(2L)); + assertThat(redisServer.getNumberOtherSentinels()).isEqualTo(2L); } private Properties createProperties() { diff --git a/src/test/java/org/springframework/data/redis/connection/convert/ConvertersUnitTests.java b/src/test/java/org/springframework/data/redis/connection/convert/ConvertersUnitTests.java index 7b402d77b..dcf217898 100644 --- a/src/test/java/org/springframework/data/redis/connection/convert/ConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/convert/ConvertersUnitTests.java @@ -15,14 +15,12 @@ */ package org.springframework.data.redis.connection.convert; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Iterator; import org.junit.Test; + import org.springframework.data.redis.connection.RedisClusterNode; import org.springframework.data.redis.connection.RedisClusterNode.Flag; import org.springframework.data.redis.connection.RedisClusterNode.LinkState; @@ -64,48 +62,48 @@ public class ConvertersUnitTests { Iterator nodes = Converters.toSetOfRedisClusterNodes(REDIS_3_0_CLUSTER_NODES_RESPONSE).iterator(); RedisClusterNode node = nodes.next(); // 127.0.0.1:6379 - assertThat(node.getId(), is("ef570f86c7b1a953846668debc177a3a16733420")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6379)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(0), is(true)); - assertThat(node.getSlotRange().contains(5460), is(true)); - assertThat(node.getSlotRange().contains(5461), is(false)); - assertThat(node.getSlotRange().contains(5602), is(true)); - assertThat(node.getFlags(), hasItems(Flag.MASTER, Flag.MYSELF)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("ef570f86c7b1a953846668debc177a3a16733420"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6379); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(0)).isTrue(); + assertThat(node.getSlotRange().contains(5460)).isTrue(); + assertThat(node.getSlotRange().contains(5461)).isFalse(); + assertThat(node.getSlotRange().contains(5602)).isTrue(); + assertThat(node.getFlags()).contains(Flag.MASTER, Flag.MYSELF); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); node = nodes.next(); // 127.0.0.1:6380 - assertThat(node.getId(), is("0f2ee5df45d18c50aca07228cc18b1da96fd5e84")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6380)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(5460), is(false)); - assertThat(node.getSlotRange().contains(5461), is(true)); - assertThat(node.getSlotRange().contains(5462), is(false)); - assertThat(node.getSlotRange().contains(10922), is(true)); - assertThat(node.getFlags(), hasItems(Flag.MASTER)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("0f2ee5df45d18c50aca07228cc18b1da96fd5e84"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6380); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(5460)).isFalse(); + assertThat(node.getSlotRange().contains(5461)).isTrue(); + assertThat(node.getSlotRange().contains(5462)).isFalse(); + assertThat(node.getSlotRange().contains(10922)).isTrue(); + assertThat(node.getFlags()).contains(Flag.MASTER); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); node = nodes.next(); // 127.0.0.1:638 - assertThat(node.getId(), is("3b9b8192a874fa8f1f09dbc0ee20afab5738eee7")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6381)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(10923), is(true)); - assertThat(node.getSlotRange().contains(16383), is(true)); - assertThat(node.getFlags(), hasItems(Flag.MASTER)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("3b9b8192a874fa8f1f09dbc0ee20afab5738eee7"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6381); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(10923)).isTrue(); + assertThat(node.getSlotRange().contains(16383)).isTrue(); + assertThat(node.getFlags()).contains(Flag.MASTER); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); node = nodes.next(); // 127.0.0.1:7369 - assertThat(node.getId(), is("8cad73f63eb996fedba89f041636f17d88cda075")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(7369)); - assertThat(node.getType(), is(NodeType.SLAVE)); - assertThat(node.getMasterId(), is("ef570f86c7b1a953846668debc177a3a16733420")); - assertThat(node.getSlotRange(), notNullValue()); - assertThat(node.getFlags(), hasItems(Flag.SLAVE)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("8cad73f63eb996fedba89f041636f17d88cda075"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(7369); + assertThat(node.getType()).isEqualTo(NodeType.SLAVE); + assertThat(node.getMasterId()).isEqualTo("ef570f86c7b1a953846668debc177a3a16733420"); + assertThat(node.getSlotRange()).isNotNull(); + assertThat(node.getFlags()).contains(Flag.SLAVE); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); } @Test // DATAREDIS-315 @@ -114,48 +112,48 @@ public class ConvertersUnitTests { Iterator nodes = Converters.toSetOfRedisClusterNodes(REDIS_3_2_CLUSTER_NODES_RESPONSE).iterator(); RedisClusterNode node = nodes.next(); // 127.0.0.1:6379 - assertThat(node.getId(), is("ef570f86c7b1a953846668debc177a3a16733420")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6379)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(0), is(true)); - assertThat(node.getSlotRange().contains(5460), is(true)); - assertThat(node.getSlotRange().contains(5461), is(false)); - assertThat(node.getSlotRange().contains(5602), is(true)); - assertThat(node.getFlags(), hasItems(Flag.MASTER, Flag.MYSELF)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("ef570f86c7b1a953846668debc177a3a16733420"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6379); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(0)).isTrue(); + assertThat(node.getSlotRange().contains(5460)).isTrue(); + assertThat(node.getSlotRange().contains(5461)).isFalse(); + assertThat(node.getSlotRange().contains(5602)).isTrue(); + assertThat(node.getFlags()).contains(Flag.MASTER, Flag.MYSELF); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); node = nodes.next(); // 127.0.0.1:6380 - assertThat(node.getId(), is("0f2ee5df45d18c50aca07228cc18b1da96fd5e84")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6380)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(5460), is(false)); - assertThat(node.getSlotRange().contains(5461), is(true)); - assertThat(node.getSlotRange().contains(5462), is(false)); - assertThat(node.getSlotRange().contains(10922), is(true)); - assertThat(node.getFlags(), hasItems(Flag.MASTER)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("0f2ee5df45d18c50aca07228cc18b1da96fd5e84"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6380); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(5460)).isFalse(); + assertThat(node.getSlotRange().contains(5461)).isTrue(); + assertThat(node.getSlotRange().contains(5462)).isFalse(); + assertThat(node.getSlotRange().contains(10922)).isTrue(); + assertThat(node.getFlags()).contains(Flag.MASTER); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); node = nodes.next(); // 127.0.0.1:638 - assertThat(node.getId(), is("3b9b8192a874fa8f1f09dbc0ee20afab5738eee7")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6381)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(10923), is(true)); - assertThat(node.getSlotRange().contains(16383), is(true)); - assertThat(node.getFlags(), hasItems(Flag.MASTER)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("3b9b8192a874fa8f1f09dbc0ee20afab5738eee7"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6381); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(10923)).isTrue(); + assertThat(node.getSlotRange().contains(16383)).isTrue(); + assertThat(node.getFlags()).contains(Flag.MASTER); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); node = nodes.next(); // 127.0.0.1:7369 - assertThat(node.getId(), is("8cad73f63eb996fedba89f041636f17d88cda075")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(7369)); - assertThat(node.getType(), is(NodeType.SLAVE)); - assertThat(node.getMasterId(), is("ef570f86c7b1a953846668debc177a3a16733420")); - assertThat(node.getSlotRange(), notNullValue()); - assertThat(node.getFlags(), hasItems(Flag.SLAVE)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); + assertThat(node.getId()).isEqualTo("8cad73f63eb996fedba89f041636f17d88cda075"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(7369); + assertThat(node.getType()).isEqualTo(NodeType.SLAVE); + assertThat(node.getMasterId()).isEqualTo("ef570f86c7b1a953846668debc177a3a16733420"); + assertThat(node.getSlotRange()).isNotNull(); + assertThat(node.getFlags()).contains(Flag.SLAVE); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); } @Test // DATAREDIS-315 @@ -165,11 +163,11 @@ public class ConvertersUnitTests { .iterator(); RedisClusterNode node = nodes.next(); // 127.0.0.1:6379 - assertThat(node.getId(), is("ef570f86c7b1a953846668debc177a3a16733420")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6379)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getSlotRange().contains(3456), is(true)); + assertThat(node.getId()).isEqualTo("ef570f86c7b1a953846668debc177a3a16733420"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6379); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getSlotRange().contains(3456)).isTrue(); } @Test // DATAREDIS-315 @@ -179,13 +177,13 @@ public class ConvertersUnitTests { CLUSTER_NODE_WITH_FAIL_FLAG_AND_DISCONNECTED_LINK_STATE).iterator(); RedisClusterNode node = nodes.next(); - assertThat(node.getId(), is("b8b5ee73b1d1997abff694b3fe8b2397d2138b6d")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(7382)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getFlags(), hasItems(Flag.MASTER, Flag.FAIL)); - assertThat(node.getLinkState(), is(LinkState.DISCONNECTED)); - assertThat(node.getSlotRange().getSlots().size(), is(0)); + assertThat(node.getId()).isEqualTo("b8b5ee73b1d1997abff694b3fe8b2397d2138b6d"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(7382); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getFlags()).contains(Flag.MASTER, Flag.FAIL); + assertThat(node.getLinkState()).isEqualTo(LinkState.DISCONNECTED); + assertThat(node.getSlotRange().getSlots().size()).isEqualTo(0); } @Test // DATAREDIS-315 @@ -194,13 +192,13 @@ public class ConvertersUnitTests { Iterator nodes = Converters.toSetOfRedisClusterNodes(CLUSTER_NODE_IMPORTING_SLOT).iterator(); RedisClusterNode node = nodes.next(); - assertThat(node.getId(), is("ef570f86c7b1a953846668debc177a3a16733420")); - assertThat(node.getHost(), is("127.0.0.1")); - assertThat(node.getPort(), is(6379)); - assertThat(node.getType(), is(NodeType.MASTER)); - assertThat(node.getFlags(), hasItem(Flag.MASTER)); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); - assertThat(node.getSlotRange().getSlots().size(), is(0)); + assertThat(node.getId()).isEqualTo("ef570f86c7b1a953846668debc177a3a16733420"); + assertThat(node.getHost()).isEqualTo("127.0.0.1"); + assertThat(node.getPort()).isEqualTo(6379); + assertThat(node.getType()).isEqualTo(NodeType.MASTER); + assertThat(node.getFlags()).contains(Flag.MASTER); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); + assertThat(node.getSlotRange().getSlots().size()).isEqualTo(0); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java index b49905ad0..65bdcc7c6 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java @@ -15,12 +15,11 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import static org.springframework.data.redis.connection.BitFieldSubCommands.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldIncrBy.Overflow.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType.*; -import static org.springframework.data.redis.connection.BitFieldSubCommands.Offset.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit.*; import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.*; @@ -49,6 +48,7 @@ import org.springframework.data.geo.Circle; import org.springframework.data.geo.Distance; import org.springframework.data.geo.GeoResults; import org.springframework.data.geo.Point; +import org.springframework.data.redis.connection.BitFieldSubCommands; import org.springframework.data.redis.connection.ClusterConnectionTests; import org.springframework.data.redis.connection.ClusterSlotHashUtil; import org.springframework.data.redis.connection.DataType; @@ -142,7 +142,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.append(KEY_1_BYTES, VALUE_1_BYTES); clusterConnection.append(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1.concat(VALUE_2))); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1.concat(VALUE_2)); } @Test // DATAREDIS-315 @@ -150,8 +150,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.bRPopLPush(0, KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(KEY_2_BYTES), is(true)); + assertThat(clusterConnection.bRPopLPush(0, KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(KEY_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -159,8 +159,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.bRPopLPush(0, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_2_BYTES), is(true)); + assertThat(clusterConnection.bRPopLPush(0, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -169,7 +169,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setbit(KEY_1, 0, true); nativeConnection.setbit(KEY_1, 1, false); - assertThat(clusterConnection.bitCount(KEY_1_BYTES), is(1L)); + assertThat(clusterConnection.bitCount(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -181,7 +181,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setbit(KEY_1, 3, false); nativeConnection.setbit(KEY_1, 4, true); - assertThat(clusterConnection.bitCount(KEY_1_BYTES, 0, 3), is(3L)); + assertThat(clusterConnection.bitCount(KEY_1_BYTES, 0, 3)).isEqualTo(3L); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -197,7 +197,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.bitOp(BitOperation.AND, SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.get(SAME_SLOT_KEY_3), is("bab")); + assertThat(nativeConnection.get(SAME_SLOT_KEY_3)).isEqualTo("bab"); } @Test // DATAREDIS-315 @@ -206,7 +206,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.lpush(KEY_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.bLPop(100, KEY_1_BYTES, KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bLPop(100, KEY_1_BYTES, KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -215,7 +215,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.lpush(SAME_SLOT_KEY_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.bLPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bLPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -224,7 +224,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.lpush(KEY_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.bRPop(100, KEY_1_BYTES, KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bRPop(100, KEY_1_BYTES, KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -233,12 +233,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.lpush(SAME_SLOT_KEY_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.bRPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bRPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 public void clientListShouldGetInfosForAllClients() { - assertThat(clusterConnection.getClientList().isEmpty(), is(false)); + assertThat(clusterConnection.getClientList().isEmpty()).isFalse(); } @Test // DATAREDIS-315 @@ -246,12 +246,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Map> masterSlaveMap = clusterConnection.clusterGetMasterSlaveMap(); - assertThat(masterSlaveMap, notNullValue()); - assertThat(masterSlaveMap.size(), is(3)); - assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT)), - hasItem(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT))); - assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT)).isEmpty(), is(true)); - assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_3_PORT)).isEmpty(), is(true)); + assertThat(masterSlaveMap).isNotNull(); + assertThat(masterSlaveMap.size()).isEqualTo(3); + assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT))) + .contains(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT)); + assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT)).isEmpty()).isTrue(); + assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_3_PORT)).isEmpty()).isTrue(); } @Test // DATAREDIS-315 @@ -260,8 +260,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Set slaves = clusterConnection .clusterGetSlaves(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT)); - assertThat(slaves.size(), is(1)); - assertThat(slaves, hasItem(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT))); + assertThat(slaves.size()).isEqualTo(1); + assertThat(slaves).contains(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT)); } @Test // DATAREDIS-315 @@ -270,7 +270,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1, VALUE_1); nativeConnection.set(SAME_SLOT_KEY_2, VALUE_2); - assertThat(clusterConnection.clusterCountKeysInSlot(ClusterSlotHashUtil.calculateSlot(SAME_SLOT_KEY_1)), is(2L)); + assertThat(clusterConnection.clusterCountKeysInSlot(ClusterSlotHashUtil.calculateSlot(SAME_SLOT_KEY_1))) + .isEqualTo(2L); } @Test // DATAREDIS-315 @@ -279,9 +280,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty())), is(1L)); - assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7380, SlotRange.empty())), is(1L)); - assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7381, SlotRange.empty())), is(0L)); + assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()))).isEqualTo(1L); + assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7380, SlotRange.empty()))).isEqualTo(1L); + assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7381, SlotRange.empty()))).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -290,7 +291,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.dbSize(), is(2L)); + assertThat(clusterConnection.dbSize()).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -298,7 +299,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "5"); - assertThat(clusterConnection.decrBy(KEY_1_BYTES, 4), is(1L)); + assertThat(clusterConnection.decrBy(KEY_1_BYTES, 4)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -306,7 +307,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "5"); - assertThat(clusterConnection.decr(KEY_1_BYTES), is(4L)); + assertThat(clusterConnection.decr(KEY_1_BYTES)).isEqualTo(4L); } @Test // DATAREDIS-315 @@ -317,8 +318,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.del(KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.get(KEY_1), nullValue()); - assertThat(nativeConnection.get(KEY_2), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNull(); + assertThat(nativeConnection.get(KEY_2)).isNull(); } @Test // DATAREDIS-315 @@ -329,8 +330,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.del(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.get(SAME_SLOT_KEY_1), nullValue()); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), nullValue()); + assertThat(nativeConnection.get(SAME_SLOT_KEY_1)).isNull(); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isNull(); } @Test // DATAREDIS-315 @@ -340,7 +341,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.del(KEY_1_BYTES); - assertThat(nativeConnection.get(KEY_1), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNull(); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -356,7 +357,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { byte[] dumpedValue = clusterConnection.dump(KEY_1_BYTES); clusterConnection.restore(KEY_2_BYTES, 0, dumpedValue); - assertThat(nativeConnection.get(KEY_2), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-696 @@ -370,12 +371,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.keyCommands().restore(KEY_1_BYTES, 0, dumpedValue, true); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 public void echoShouldReturnInputCorrectly() { - assertThat(clusterConnection.echo(VALUE_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.echo(VALUE_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -386,18 +387,18 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { @Test // DATAREDIS-689 public void executeWithArgs() { - assertThat(clusterConnection.execute("SET", KEY_1_BYTES, VALUE_1_BYTES), is("OK".getBytes())); + assertThat(clusterConnection.execute("SET", KEY_1_BYTES, VALUE_1_BYTES)).isEqualTo("OK".getBytes()); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-689 public void executeWithKeyAndArgs() { - assertThat(clusterConnection.execute("SET", KEY_1_BYTES, Collections.singletonList(VALUE_1_BYTES)), - is("OK".getBytes())); + Object result = clusterConnection.execute("SET", KEY_1_BYTES, Collections.singletonList(VALUE_1_BYTES)); + assertThat(result).isEqualTo("OK".getBytes()); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-689 @@ -410,13 +411,13 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "true"); - assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-529 public void existsWithMultipleKeysShouldConsiderAbsentKeys() { - assertThat(clusterConnection.keyCommands().exists("no-exist-1".getBytes(), "no-exist-2".getBytes()), is(0L)); + assertThat(clusterConnection.keyCommands().exists("no-exist-1".getBytes(), "no-exist-2".getBytes())).isEqualTo(0L); } @Test // DATAREDIS-529 @@ -426,8 +427,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_2, "true"); nativeConnection.set(KEY_3, "true"); - assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES, "nonexistent".getBytes()), - is(3L)); + assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES, "nonexistent".getBytes())) + .isEqualTo(3L); } @Test // DATAREDIS-315 @@ -437,7 +438,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.expireAt(KEY_1_BYTES, System.currentTimeMillis() / 1000 + 5000); - assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -447,7 +448,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.expire(KEY_1_BYTES, 5); - assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -458,8 +459,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.flushDb(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty())); - assertThat(nativeConnection.get(KEY_1), notNullValue()); - assertThat(nativeConnection.get(KEY_2), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNotNull(); + assertThat(nativeConnection.get(KEY_2)).isNull(); } @Test // DATAREDIS-315 @@ -470,20 +471,20 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.flushDb(); - assertThat(nativeConnection.get(KEY_1), nullValue()); - assertThat(nativeConnection.get(KEY_2), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNull(); + assertThat(nativeConnection.get(KEY_2)).isNull(); } @Test // DATAREDIS-438 @IfProfileValue(name = "redisVersion", value = "3.2+") public void geoAddMultipleGeoLocations() { - assertThat(clusterConnection.geoAdd(KEY_1_BYTES, Arrays.asList(PALERMO, ARIGENTO, CATANIA, PALERMO)), is(3L)); + assertThat(clusterConnection.geoAdd(KEY_1_BYTES, Arrays.asList(PALERMO, ARIGENTO, CATANIA, PALERMO))).isEqualTo(3L); } @Test // DATAREDIS-438 @IfProfileValue(name = "redisVersion", value = "3.2+") public void geoAddSingleGeoLocation() { - assertThat(clusterConnection.geoAdd(KEY_1_BYTES, PALERMO), is(1L)); + assertThat(clusterConnection.geoAdd(KEY_1_BYTES, PALERMO)).isEqualTo(1L); } @Test // DATAREDIS-438 @@ -495,8 +496,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1_BYTES, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); Distance distance = clusterConnection.geoDist(KEY_1_BYTES, PALERMO.getName(), CATANIA.getName()); - assertThat(distance.getValue(), is(closeTo(166274.15156960033D, 0.005))); - assertThat(distance.getUnit(), is("m")); + assertThat(distance.getValue()).isCloseTo(166274.15156960033D, offset(0.005)); + assertThat(distance.getUnit()).isEqualTo("m"); } @Test // DATAREDIS-438 @@ -508,8 +509,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1_BYTES, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); Distance distance = clusterConnection.geoDist(KEY_1_BYTES, PALERMO.getName(), CATANIA.getName(), KILOMETERS); - assertThat(distance.getValue(), is(closeTo(166.27415156960033D, 0.005))); - assertThat(distance.getUnit(), is("km")); + assertThat(distance.getValue()).isCloseTo(166.27415156960033D, offset(0.005)); + assertThat(distance.getUnit()).isEqualTo("km"); } @@ -521,7 +522,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1_BYTES, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); List result = clusterConnection.geoHash(KEY_1_BYTES, PALERMO.getName(), CATANIA.getName()); - assertThat(result, contains("sqc8b49rny0", "sqdtr74hyu0")); + assertThat(result).containsExactly("sqc8b49rny0", "sqdtr74hyu0"); } @Test // DATAREDIS-438 @@ -533,7 +534,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { List result = clusterConnection.geoHash(KEY_1_BYTES, PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName()); - assertThat(result, contains("sqc8b49rny0", (String) null, "sqdtr74hyu0")); + assertThat(result).containsExactly("sqc8b49rny0", (String) null, "sqdtr74hyu0"); } @Test // DATAREDIS-438 @@ -545,11 +546,11 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { List positions = clusterConnection.geoPos(KEY_1_BYTES, PALERMO.getName(), CATANIA.getName()); - assertThat(positions.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(positions.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(positions.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(positions.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(positions.get(1).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(positions.get(1).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(positions.get(1).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(positions.get(1).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); } @Test // DATAREDIS-438 @@ -562,13 +563,13 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { List positions = clusterConnection.geoPos(KEY_1_BYTES, PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName()); - assertThat(positions.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(positions.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(positions.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(positions.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(positions.get(1), is(nullValue())); + assertThat(positions.get(1)).isNull(); - assertThat(positions.get(2).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(positions.get(2).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(positions.get(2).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(positions.get(2).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); } @Test // DATAREDIS-438 @@ -582,7 +583,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadiusByMember(KEY_1_BYTES, PALERMO.getName(), new Distance(200, KILOMETERS), newGeoRadiusArgs().limit(2)); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -596,9 +597,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadiusByMember(KEY_1_BYTES, PALERMO.getName(), new Distance(100, KILOMETERS), newGeoRadiusArgs().includeDistance()); - assertThat(result.getContent(), hasSize(2)); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(90.978D, 0.005))); - assertThat(result.getContent().get(0).getDistance().getUnit(), is("km")); + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(90.978D, offset(0.005)); + assertThat(result.getContent().get(0).getDistance().getUnit()).isEqualTo("km"); } @Test // DATAREDIS-438 @@ -612,8 +613,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadiusByMember(KEY_1_BYTES, PALERMO.getName(), new Distance(100, KILOMETERS), newGeoRadiusArgs().sortAscending()); - assertThat(result.getContent().get(0).getContent().getName(), is(PALERMO.getName())); - assertThat(result.getContent().get(1).getContent().getName(), is(ARIGENTO.getName())); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(PALERMO.getName()); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(ARIGENTO.getName()); } @Test // DATAREDIS-438 @@ -627,7 +628,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadius(KEY_1_BYTES, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().limit(2)); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -641,9 +642,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadius(KEY_1_BYTES, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().includeDistance()); - assertThat(result.getContent(), hasSize(3)); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(130.423D, 0.005))); - assertThat(result.getContent().get(0).getDistance().getUnit(), is("km")); + assertThat(result.getContent()).hasSize(3); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(130.423D, offset(0.005)); + assertThat(result.getContent().get(0).getDistance().getUnit()).isEqualTo("km"); } @Test // DATAREDIS-438 @@ -656,7 +657,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadius(KEY_1_BYTES, new Circle(new Point(15D, 37D), new Distance(150D, KILOMETERS))); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -667,7 +668,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1_BYTES, ARIGENTO.getPoint().getX(), ARIGENTO.getPoint().getY(), ARIGENTO.getName()); nativeConnection.geoadd(KEY_1_BYTES, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); - assertThat(clusterConnection.geoRemove(KEY_1_BYTES, ARIGENTO.getName()), is(1L)); + assertThat(clusterConnection.geoRemove(KEY_1_BYTES, ARIGENTO.getName())).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -676,13 +677,14 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setbit(KEY_1, 0, true); nativeConnection.setbit(KEY_1, 1, false); - assertThat(clusterConnection.getBit(KEY_1_BYTES, 0), is(true)); - assertThat(clusterConnection.getBit(KEY_1_BYTES, 1), is(false)); + assertThat(clusterConnection.getBit(KEY_1_BYTES, 0)).isTrue(); + assertThat(clusterConnection.getBit(KEY_1_BYTES, 1)).isFalse(); } @Test // DATAREDIS-315 public void getClusterNodeForKeyShouldReturnNodeCorrectly() { - assertThat((RedisNode) clusterConnection.clusterGetNodeForKey(KEY_1_BYTES), is(new RedisNode("127.0.0.1", 7380))); + assertThat((RedisNode) clusterConnection.clusterGetNodeForKey(KEY_1_BYTES)) + .isEqualTo(new RedisNode("127.0.0.1", 7380)); } @Test // DATAREDIS-315, DATAREDIS-661 @@ -690,7 +692,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Properties result = clusterConnection.getConfig(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT), "*"); - assertThat(result.getProperty("slaveof"), endsWith("7379")); + assertThat(result.getProperty("slaveof")).endsWith("7379"); } @Test // DATAREDIS-315, DATAREDIS-661 @@ -700,12 +702,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { // config get *max-*-entries on redis 3.0.7 returns 8 entries per node while on 3.2.0-rc3 returns 6. // @link https://github.com/spring-projects/spring-data-redis/pull/187 - assertThat(result.size() % 3, is(0)); + assertThat(result.size() % 3).isEqualTo(0); for (Object o : result.keySet()) { - assertThat(o.toString(), startsWith(CLUSTER_HOST)); - assertThat(result.getProperty(o.toString()), not(startsWith(CLUSTER_HOST))); + assertThat(o.toString()).startsWith(CLUSTER_HOST); + assertThat(result.getProperty(o.toString())).doesNotStartWith(CLUSTER_HOST); } } @@ -714,7 +716,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.getRange(KEY_1_BYTES, 0, 2), is(JedisConverters.toBytes("val"))); + assertThat(clusterConnection.getRange(KEY_1_BYTES, 0, 2)).isEqualTo(JedisConverters.toBytes("val")); } @Test // DATAREDIS-315 @@ -724,8 +726,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { byte[] valueBeforeSet = clusterConnection.getSet(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(valueBeforeSet, is(VALUE_1_BYTES)); - assertThat(nativeConnection.get(KEY_1), is(VALUE_2)); + assertThat(valueBeforeSet).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -733,7 +735,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.get(KEY_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -744,8 +746,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hDel(KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.hexists(KEY_1_BYTES, KEY_2_BYTES), is(false)); - assertThat(nativeConnection.hexists(KEY_1_BYTES, KEY_3_BYTES), is(true)); + assertThat(nativeConnection.hexists(KEY_1_BYTES, KEY_2_BYTES)).isFalse(); + assertThat(nativeConnection.hexists(KEY_1_BYTES, KEY_3_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -753,9 +755,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_2_BYTES), is(true)); - assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_3_BYTES), is(false)); - assertThat(clusterConnection.hExists(JedisConverters.toBytes("foo"), KEY_2_BYTES), is(false)); + assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_2_BYTES)).isTrue(); + assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_3_BYTES)).isFalse(); + assertThat(clusterConnection.hExists(JedisConverters.toBytes("foo"), KEY_2_BYTES)).isFalse(); } @Test // DATAREDIS-315 @@ -769,8 +771,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Map hGetAll = clusterConnection.hGetAll(KEY_1_BYTES); - assertThat(hGetAll.containsKey(KEY_2_BYTES), is(true)); - assertThat(hGetAll.containsKey(KEY_3_BYTES), is(true)); + assertThat(hGetAll.containsKey(KEY_2_BYTES)).isTrue(); + assertThat(hGetAll.containsKey(KEY_3_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -778,7 +780,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.hGet(KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.hGet(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -789,7 +791,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hIncrBy(KEY_1_BYTES, KEY_3_BYTES, 3.5D); - assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_3_BYTES), is(JedisConverters.toBytes(5.5D))); + assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_3_BYTES)).isEqualTo(JedisConverters.toBytes(5.5D)); } @Test // DATAREDIS-315 @@ -800,7 +802,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hIncrBy(KEY_1_BYTES, KEY_3_BYTES, 3); - assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_3_BYTES), is(JedisConverters.toBytes(5L))); + assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_3_BYTES)).isEqualTo(JedisConverters.toBytes(5L)); } @Test // DATAREDIS-315 @@ -809,7 +811,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); nativeConnection.hset(KEY_1_BYTES, KEY_3_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.hKeys(KEY_1_BYTES), hasItems(KEY_2_BYTES, KEY_3_BYTES)); + assertThat(clusterConnection.hKeys(KEY_1_BYTES)).contains(KEY_2_BYTES, KEY_3_BYTES); } @Test // DATAREDIS-315 @@ -818,7 +820,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); nativeConnection.hset(KEY_1_BYTES, KEY_3_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.hLen(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.hLen(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -827,7 +829,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); nativeConnection.hset(KEY_1_BYTES, KEY_3_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.hMGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.hMGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -839,7 +841,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hMSet(KEY_1_BYTES, hashes); - assertThat(nativeConnection.hmget(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(nativeConnection.hmget(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-479 @@ -860,7 +862,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { i++; } - assertThat(i, is(nrOfValues)); + assertThat(i).isEqualTo(nrOfValues); } @Test // DATAREDIS-315 @@ -870,7 +872,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hSetNX(KEY_1_BYTES, KEY_2_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -878,7 +880,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hSetNX(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -886,7 +888,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hSet(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.hget(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-698 @@ -894,7 +896,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_3); - assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_2_BYTES), is(Long.valueOf(VALUE_3.length()))); + assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_2_BYTES)) + .isEqualTo(Long.valueOf(VALUE_3.length())); } @Test // DATAREDIS-698 @@ -902,12 +905,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_3); - assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_3_BYTES), is(0L)); + assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_3_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-698 public void hStrLenReturnsZeroWhenKeyDoesNotExist() { - assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_1_BYTES), is(0L)); + assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_1_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -916,7 +919,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); nativeConnection.hset(KEY_1_BYTES, KEY_3_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.hVals(KEY_1_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.hVals(KEY_1_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -924,7 +927,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1"); - assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5.5D), is(6.5D)); + assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5.5D)).isEqualTo(6.5D); } @Test // DATAREDIS-315 @@ -932,7 +935,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1"); - assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5), is(6L)); + assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5)).isEqualTo(6L); } @Test // DATAREDIS-315 @@ -940,7 +943,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1"); - assertThat(clusterConnection.incr(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.incr(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -948,7 +951,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Properties properties = clusterConnection.info(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT)); - assertThat(properties.getProperty("tcp_port"), is(Integer.toString(MASTER_NODE_2_PORT))); + assertThat(properties.getProperty("tcp_port")).isEqualTo(Integer.toString(MASTER_NODE_2_PORT)); } @Test // DATAREDIS-315 @@ -956,16 +959,16 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Properties properties = clusterConnection.info(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT), "server"); - assertThat(properties.getProperty("tcp_port"), is(Integer.toString(MASTER_NODE_2_PORT))); - assertThat(properties.getProperty("used_memory"), nullValue()); + assertThat(properties.getProperty("tcp_port")).isEqualTo(Integer.toString(MASTER_NODE_2_PORT)); + assertThat(properties.getProperty("used_memory")).isNull(); } @Test // DATAREDIS-315, DATAREDIS-685 public void infoShouldCollectionInfoFromAllClusterNodes() { Properties singleNodeInfo = clusterConnection.serverCommands().info(new RedisClusterNode("127.0.0.1", 7380)); - assertThat(Double.valueOf(clusterConnection.serverCommands().info().size()), - closeTo(singleNodeInfo.size() * 3, 12d)); + assertThat(Double.valueOf(clusterConnection.serverCommands().info().size())).isCloseTo(singleNodeInfo.size() * 3, + offset(12d)); } @Test // DATAREDIS-315 @@ -974,7 +977,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.keys(JedisConverters.toBytes("*")), hasItems(KEY_1_BYTES, KEY_2_BYTES)); + assertThat(clusterConnection.keys(JedisConverters.toBytes("*"))).contains(KEY_1_BYTES, KEY_2_BYTES); } @Test // DATAREDIS-315 @@ -986,8 +989,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Set keysOnNode = clusterConnection.keys(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()), JedisConverters.toBytes("*")); - assertThat(keysOnNode, hasItems(KEY_2_BYTES)); - assertThat(keysOnNode, not(hasItems(KEY_1_BYTES))); + assertThat(keysOnNode).contains(KEY_2_BYTES).doesNotContain(KEY_1_BYTES); } @Test(expected = InvalidDataAccessApiUsageException.class) // DATAREDIS-635 @@ -1005,14 +1007,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - Cursor cursor = clusterConnection.scan(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()), - ScanOptions.NONE); + Cursor cursor = clusterConnection.scan(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()), NONE); List keysOnNode = new ArrayList<>(); cursor.forEachRemaining(keysOnNode::add); - assertThat(keysOnNode, hasItems(KEY_2_BYTES)); - assertThat(keysOnNode, not(hasItems(KEY_1_BYTES))); + assertThat(keysOnNode).contains(KEY_2_BYTES).doesNotContain(KEY_1_BYTES); } @Test // DATAREDIS-315 @@ -1020,7 +1020,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.rpush(KEY_1, VALUE_1, VALUE_2, "foo", "bar"); - assertThat(clusterConnection.lIndex(KEY_1_BYTES, 1), is(VALUE_2_BYTES)); + assertThat(clusterConnection.lIndex(KEY_1_BYTES, 1)).isEqualTo(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1030,7 +1030,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lInsert(KEY_1_BYTES, Position.AFTER, VALUE_2_BYTES, JedisConverters.toBytes("booh!")); - assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(2), is("booh!")); + assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(2)).isEqualTo("booh!"); } @Test // DATAREDIS-315 @@ -1038,7 +1038,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.lLen(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.lLen(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1046,7 +1046,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.rpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.lPop(KEY_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.lPop(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1054,7 +1054,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lPushX(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.exists(KEY_1), is(false)); + assertThat(nativeConnection.exists(KEY_1)).isFalse(); } @Test // DATAREDIS-315 @@ -1062,7 +1062,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lPush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.lrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1070,7 +1070,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.lRange(KEY_1_BYTES, 0L, -1L), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.lRange(KEY_1_BYTES, 0L, -1L)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1080,7 +1080,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lRem(KEY_1_BYTES, 1L, VALUE_1_BYTES); - assertThat(nativeConnection.llen(KEY_1), is(3L)); + assertThat(nativeConnection.llen(KEY_1)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1090,7 +1090,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lSet(KEY_1_BYTES, 1L, VALUE_1_BYTES); - assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(1), is(VALUE_1)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1100,7 +1100,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lTrim(KEY_1_BYTES, 2, 3); - assertThat(nativeConnection.lrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1109,7 +1109,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, VALUE_1_BYTES); nativeConnection.set(KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES), contains(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES)).containsExactly(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-756 @@ -1120,7 +1120,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_3_BYTES, VALUE_3_BYTES); List result = clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES, KEY_1_BYTES); - assertThat(result, contains(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES, VALUE_1_BYTES)); + assertThat(result).containsExactly(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1129,8 +1129,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES); nativeConnection.set(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), - contains(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).containsExactly(VALUE_1_BYTES, + VALUE_2_BYTES); } @Test // DATAREDIS-756 @@ -1140,7 +1140,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES); List result = clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES, SAME_SLOT_KEY_1_BYTES); - assertThat(result, contains(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_1_BYTES)); + assertThat(result).containsExactly(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1151,10 +1151,10 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { map.put(KEY_1_BYTES, VALUE_1_BYTES); map.put(KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mSetNX(map), is(false)); + assertThat(clusterConnection.mSetNX(map)).isFalse(); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_3)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_3); } @Test // DATAREDIS-315 @@ -1164,10 +1164,10 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { map.put(KEY_1_BYTES, VALUE_1_BYTES); map.put(KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mSetNX(map), is(true)); + assertThat(clusterConnection.mSetNX(map)).isTrue(); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1177,10 +1177,10 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { map.put(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES); map.put(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mSetNX(map), is(true)); + assertThat(clusterConnection.mSetNX(map)).isTrue(); - assertThat(nativeConnection.get(SAME_SLOT_KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(SAME_SLOT_KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1192,8 +1192,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.mSet(map); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1205,8 +1205,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.mSet(map); - assertThat(nativeConnection.get(SAME_SLOT_KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(SAME_SLOT_KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_2); } @Test(expected = UnsupportedOperationException.class) // DATAREDIS-315 @@ -1226,7 +1226,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pExpireAt(KEY_1_BYTES, System.currentTimeMillis() + 5000); - assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1236,7 +1236,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pExpire(KEY_1_BYTES, 5000); - assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(JedisConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1244,8 +1244,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pSetEx(KEY_1_BYTES, 5000, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.ttl(KEY_1) > 1, is(true)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.ttl(KEY_1) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1254,7 +1254,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.expire(KEY_1, 5); - assertThat(clusterConnection.pTtl(KEY_1_BYTES) > 1, is(true)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1262,17 +1262,17 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.pTtl(KEY_1_BYTES), is(-1L)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES)).isEqualTo(-1L); } @Test // DATAREDIS-315 public void pTtlShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.pTtl(KEY_1_BYTES), is(-2L)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES)).isEqualTo(-2L); } @Test // DATAREDIS-526 public void pTtlWithTimeUnitShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.pTtl(KEY_1_BYTES, TimeUnit.HOURS), is(-2L)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES, TimeUnit.HOURS)).isEqualTo(-2L); } @Test // DATAREDIS-315 @@ -1280,8 +1280,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setex(KEY_1_BYTES, 10, VALUE_1_BYTES); - assertThat(clusterConnection.persist(KEY_1_BYTES), is(Boolean.TRUE)); - assertThat(nativeConnection.ttl(KEY_1_BYTES), is(-1L)); + assertThat(clusterConnection.persist(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.ttl(KEY_1_BYTES)).isEqualTo(-1L); } @Test // DATAREDIS-315 @@ -1289,7 +1289,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pfAdd(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(nativeConnection.pfcount(KEY_1_BYTES), is(3L)); + assertThat(nativeConnection.pfcount(KEY_1_BYTES)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1298,7 +1298,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.pfadd(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); nativeConnection.pfadd(SAME_SLOT_KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.pfCount(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(3L)); + assertThat(clusterConnection.pfCount(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1306,7 +1306,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.pfadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(clusterConnection.pfCount(KEY_1_BYTES), is(3L)); + assertThat(clusterConnection.pfCount(KEY_1_BYTES)).isEqualTo(3L); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -1331,17 +1331,17 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pfMerge(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.pfcount(SAME_SLOT_KEY_3), is(3L)); + assertThat(nativeConnection.pfcount(SAME_SLOT_KEY_3)).isEqualTo(3L); } @Test // DATAREDIS-315 public void pingShouldRetrunPong() { - assertThat(clusterConnection.ping(), is("PONG")); + assertThat(clusterConnection.ping()).isEqualTo("PONG"); } @Test // DATAREDIS-315 public void pingShouldRetrunPongForExistingNode() { - assertThat(clusterConnection.ping(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty())), is("PONG")); + assertThat(clusterConnection.ping(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()))).isEqualTo("PONG"); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 @@ -1354,8 +1354,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.rPopLPush(KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(KEY_2_BYTES), is(true)); + assertThat(clusterConnection.rPopLPush(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(KEY_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -1363,8 +1363,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.rPopLPush(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_2_BYTES), is(true)); + assertThat(clusterConnection.rPopLPush(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -1372,7 +1372,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.rpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.rPop(KEY_1_BYTES), is(VALUE_2_BYTES)); + assertThat(clusterConnection.rPop(KEY_1_BYTES)).isEqualTo(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1380,7 +1380,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rPushX(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.exists(KEY_1), is(false)); + assertThat(nativeConnection.exists(KEY_1)).isFalse(); } @Test // DATAREDIS-315 @@ -1388,7 +1388,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rPush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.lrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1397,12 +1397,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.randomKey(), notNullValue()); + assertThat(clusterConnection.randomKey()).isNotNull(); } @Test // DATAREDIS-315 public void randomKeyShouldReturnNullWhenNoKeysAvailable() { - assertThat(clusterConnection.randomKey(), nullValue()); + assertThat(clusterConnection.randomKey()).isNull(); } @Test // DATAREDIS-315 @@ -1412,8 +1412,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rename(KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(false)); - assertThat(nativeConnection.get(KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isFalse(); + assertThat(nativeConnection.get(KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1421,10 +1421,10 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.renameNX(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(Boolean.TRUE)); + assertThat(clusterConnection.renameNX(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isTrue(); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_1_BYTES), is(false)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_1_BYTES)).isFalse(); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1433,10 +1433,10 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, VALUE_1_BYTES); nativeConnection.set(KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES), is(Boolean.FALSE)); + assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES)).isFalse(); - assertThat(nativeConnection.get(KEY_1_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.get(KEY_2_BYTES), is(VALUE_2_BYTES)); + assertThat(nativeConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.get(KEY_2_BYTES)).isEqualTo(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1444,10 +1444,10 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES), is(Boolean.TRUE)); + assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES)).isTrue(); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(false)); - assertThat(nativeConnection.get(KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isFalse(); + assertThat(nativeConnection.get(KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1457,8 +1457,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rename(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_1_BYTES), is(false)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_1_BYTES)).isFalse(); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1466,7 +1466,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sAdd(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.smembers(KEY_1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.smembers(KEY_1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1474,7 +1474,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sCard(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.sCard(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1483,7 +1483,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.sadd(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.sDiff(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), hasItems(VALUE_1_BYTES)); + assertThat(clusterConnection.sDiff(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315, DATAREDIS-647 @@ -1493,8 +1493,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_2_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); nativeConnection.sadd(KEY_3_BYTES, VALUE_1_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES), hasItems(VALUE_1_BYTES)); - assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), is(empty())); + assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES)).contains(VALUE_1_BYTES); + assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).isEmpty(); } @Test // DATAREDIS-315 @@ -1505,7 +1505,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sDiffStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3_BYTES), hasItems(VALUE_1_BYTES)); + assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3_BYTES)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1516,7 +1516,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sDiffStore(KEY_3_BYTES, KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.smembers(KEY_3_BYTES), hasItems(VALUE_1_BYTES)); + assertThat(nativeConnection.smembers(KEY_3_BYTES)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1525,7 +1525,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.sadd(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.sInter(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), hasItem(VALUE_2_BYTES)); + assertThat(clusterConnection.sInter(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1534,7 +1534,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.sadd(KEY_2_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.sInter(KEY_1_BYTES, KEY_2_BYTES), hasItem(VALUE_2_BYTES)); + assertThat(clusterConnection.sInter(KEY_1_BYTES, KEY_2_BYTES)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1545,7 +1545,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sInterStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3_BYTES), hasItem(VALUE_2_BYTES)); + assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3_BYTES)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1556,7 +1556,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sInterStore(KEY_3_BYTES, KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.smembers(KEY_3_BYTES), hasItem(VALUE_2_BYTES)); + assertThat(nativeConnection.smembers(KEY_3_BYTES)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1564,7 +1564,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sIsMember(KEY_1_BYTES, JedisConverters.toBytes("foo")), is(false)); + assertThat(clusterConnection.sIsMember(KEY_1_BYTES, JedisConverters.toBytes("foo"))).isFalse(); } @Test // DATAREDIS-315 @@ -1572,7 +1572,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sIsMember(KEY_1_BYTES, VALUE_1_BYTES), is(true)); + assertThat(clusterConnection.sIsMember(KEY_1_BYTES, VALUE_1_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -1580,7 +1580,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sMembers(KEY_1_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.sMembers(KEY_1_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1591,8 +1591,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sMove(KEY_1_BYTES, KEY_2_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.sismember(KEY_1_BYTES, VALUE_2_BYTES), is(false)); - assertThat(nativeConnection.sismember(KEY_2_BYTES, VALUE_2_BYTES), is(true)); + assertThat(nativeConnection.sismember(KEY_1_BYTES, VALUE_2_BYTES)).isFalse(); + assertThat(nativeConnection.sismember(KEY_2_BYTES, VALUE_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -1603,8 +1603,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sMove(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.sismember(SAME_SLOT_KEY_1_BYTES, VALUE_2_BYTES), is(false)); - assertThat(nativeConnection.sismember(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES), is(true)); + assertThat(nativeConnection.sismember(SAME_SLOT_KEY_1_BYTES, VALUE_2_BYTES)).isFalse(); + assertThat(nativeConnection.sismember(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -1612,7 +1612,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sPop(KEY_1_BYTES), notNullValue()); + assertThat(clusterConnection.sPop(KEY_1_BYTES)).isNotNull(); } @Test // DATAREDIS-668 @@ -1620,8 +1620,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(clusterConnection.setCommands().sPop(KEY_1_BYTES, 2), hasSize(2)); - assertThat(nativeConnection.scard(KEY_1), is(1L)); + assertThat(clusterConnection.setCommands().sPop(KEY_1_BYTES, 2)).hasSize(2); + assertThat(nativeConnection.scard(KEY_1)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -1629,7 +1629,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sRandMember(KEY_1_BYTES), notNullValue()); + assertThat(clusterConnection.sRandMember(KEY_1_BYTES)).isNotNull(); } @Test // DATAREDIS-315 @@ -1637,7 +1637,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sRandMember(KEY_1_BYTES, 3), notNullValue()); + assertThat(clusterConnection.sRandMember(KEY_1_BYTES, 3)).isNotNull(); } @Test // DATAREDIS-315 @@ -1647,7 +1647,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sRem(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.smembers(KEY_1), hasItems(VALUE_1)); + assertThat(nativeConnection.smembers(KEY_1)).contains(VALUE_1); } @Test // DATAREDIS-315 @@ -1656,8 +1656,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.sadd(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.sUnion(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(clusterConnection.sUnion(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).contains(VALUE_1_BYTES, + VALUE_2_BYTES, VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -1666,8 +1666,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); nativeConnection.sadd(KEY_2_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(clusterConnection.sUnion(KEY_1_BYTES, KEY_2_BYTES), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(clusterConnection.sUnion(KEY_1_BYTES, KEY_2_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES, + VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -1678,7 +1678,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sUnionStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -1689,7 +1689,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sUnionStore(KEY_3_BYTES, KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.smembers(KEY_3_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(nativeConnection.smembers(KEY_3_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -1708,8 +1708,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setBit(KEY_1_BYTES, 0, true); clusterConnection.setBit(KEY_1_BYTES, 1, false); - assertThat(nativeConnection.getbit(KEY_1, 0), is(true)); - assertThat(nativeConnection.getbit(KEY_1, 1), is(false)); + assertThat(nativeConnection.getbit(KEY_1, 0)).isTrue(); + assertThat(nativeConnection.getbit(KEY_1, 1)).isFalse(); } @Test // DATAREDIS-315 @@ -1717,8 +1717,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setEx(KEY_1_BYTES, 5, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.ttl(KEY_1) > 1, is(true)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.ttl(KEY_1) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1728,7 +1728,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setNX(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1736,7 +1736,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setNX(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1746,7 +1746,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setRange(KEY_1_BYTES, JedisConverters.toBytes("UE"), 3); - assertThat(nativeConnection.get(KEY_1), is("valUE1")); + assertThat(nativeConnection.get(KEY_1)).isEqualTo("valUE1"); } @Test // DATAREDIS-315 @@ -1754,7 +1754,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-316 @@ -1764,9 +1764,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_2_BYTES, Expiration.seconds(1), SetOption.ifAbsent()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(true)); - assertThat(nativeConnection.ttl(KEY_1_BYTES), is(-1L)); - assertThat(nativeConnection.get(KEY_1_BYTES), is(equalTo(VALUE_1_BYTES))); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.ttl(KEY_1_BYTES)).isEqualTo(-1L); + assertThat(nativeConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-316 @@ -1774,8 +1774,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.seconds(1), SetOption.ifAbsent()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(true)); - assertThat(nativeConnection.ttl(KEY_1_BYTES), is(1L)); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.ttl(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-316 @@ -1783,7 +1783,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.seconds(1), SetOption.ifPresent()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(false)); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isFalse(); } @Test // DATAREDIS-316 @@ -1793,9 +1793,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_2_BYTES, Expiration.seconds(1), SetOption.ifPresent()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(true)); - assertThat(nativeConnection.ttl(KEY_1_BYTES), is(1L)); - assertThat(nativeConnection.get(KEY_1_BYTES), is(equalTo(VALUE_2_BYTES))); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.ttl(KEY_1_BYTES)).isEqualTo(1L); + assertThat(nativeConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_2_BYTES); } @Test // DATAREDIS-316 @@ -1803,8 +1803,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.milliseconds(500), SetOption.upsert()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(true)); - assertThat(nativeConnection.pttl(KEY_1).doubleValue(), is(closeTo(500d, 499d))); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.pttl(KEY_1).doubleValue()).isCloseTo(500d, offset(499d)); } @Test // DATAREDIS-316 @@ -1812,8 +1812,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.seconds(1), SetOption.upsert()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(true)); - assertThat(nativeConnection.ttl(KEY_1_BYTES), is(1L)); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.ttl(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-316 @@ -1821,8 +1821,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.persistent(), SetOption.ifAbsent()); - assertThat(nativeConnection.exists(KEY_1_BYTES), is(true)); - assertThat(nativeConnection.ttl(KEY_1_BYTES), is(-1L)); + assertThat(nativeConnection.exists(KEY_1_BYTES)).isTrue(); + assertThat(nativeConnection.ttl(KEY_1_BYTES)).isEqualTo(-1L); } @Test(expected = UnsupportedOperationException.class) // DATAREDIS-316 @@ -1836,7 +1836,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void shouldAllowSettingAndGettingValues() { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.get(KEY_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1844,13 +1844,13 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_2, VALUE_1); - assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES), is(1L)); - assertThat(nativeConnection.exists(KEY_2_BYTES), is(true)); + assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES)).isEqualTo(1L); + assertThat(nativeConnection.exists(KEY_2_BYTES)).isTrue(); } @Test // DATAREDIS-315 public void sortAndStoreShouldReturnZeroWhenListDoesNotExist() { - assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES), is(0L)); + assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -1858,8 +1858,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_2, VALUE_1); - assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha()), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha())).contains(VALUE_1_BYTES, + VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1876,7 +1876,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { cursor.next(); } - assertThat(count, is(30)); + assertThat(count).isEqualTo(30); } @Test // DATAREDIS-315 @@ -1884,7 +1884,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.strLen(KEY_1_BYTES), is(6L)); + assertThat(clusterConnection.strLen(KEY_1_BYTES)).isEqualTo(6L); } @Test // DATAREDIS-315 @@ -1892,12 +1892,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.ttl(KEY_1_BYTES), is(-1L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES)).isEqualTo(-1L); } @Test // DATAREDIS-315 public void ttlShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.ttl(KEY_1_BYTES), is(-2L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES)).isEqualTo(-2L); } @Test // DATAREDIS-315 @@ -1906,12 +1906,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.expire(KEY_1, 5); - assertThat(clusterConnection.ttl(KEY_1_BYTES) > 1, is(true)); + assertThat(clusterConnection.ttl(KEY_1_BYTES) > 1).isTrue(); } @Test // DATAREDIS-526 public void ttlWithTimeUnitShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.ttl(KEY_1_BYTES, TimeUnit.HOURS), is(-2L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES, TimeUnit.HOURS)).isEqualTo(-2L); } @Test // DATAREDIS-315 @@ -1921,9 +1921,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_2_BYTES, VALUE_2_BYTES); nativeConnection.hmset(KEY_3_BYTES, Collections.singletonMap(KEY_1_BYTES, VALUE_1_BYTES)); - assertThat(clusterConnection.type(KEY_1_BYTES), is(DataType.SET)); - assertThat(clusterConnection.type(KEY_2_BYTES), is(DataType.STRING)); - assertThat(clusterConnection.type(KEY_3_BYTES), is(DataType.HASH)); + assertThat(clusterConnection.type(KEY_1_BYTES)).isEqualTo(DataType.SET); + assertThat(clusterConnection.type(KEY_2_BYTES)).isEqualTo(DataType.STRING); + assertThat(clusterConnection.type(KEY_3_BYTES)).isEqualTo(DataType.HASH); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -1945,7 +1945,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zAdd(KEY_1_BYTES, tuples); - assertThat(nativeConnection.zcard(KEY_1_BYTES), is(2L)); + assertThat(nativeConnection.zcard(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1954,7 +1954,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zAdd(KEY_1_BYTES, 10D, VALUE_1_BYTES); clusterConnection.zAdd(KEY_1_BYTES, 20D, VALUE_2_BYTES); - assertThat(nativeConnection.zcard(KEY_1_BYTES), is(2L)); + assertThat(nativeConnection.zcard(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1964,7 +1964,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zCard(KEY_1_BYTES), is(3L)); + assertThat(clusterConnection.zCard(KEY_1_BYTES)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1974,7 +1974,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zCount(KEY_1_BYTES, 10, 20), is(2L)); + assertThat(clusterConnection.zCount(KEY_1_BYTES, 10, 20)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1985,7 +1985,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zIncrBy(KEY_1_BYTES, 100D, VALUE_1_BYTES); - assertThat(nativeConnection.zrank(KEY_1_BYTES, VALUE_1_BYTES), is(1L)); + assertThat(nativeConnection.zrank(KEY_1_BYTES, VALUE_1_BYTES)).isEqualTo(1L); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -2004,7 +2004,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zInterStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3_BYTES, 0, -1), hasItems(VALUE_2_BYTES)); + assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3_BYTES, 0, -1)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2020,25 +2020,25 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Set values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().lte("c")); - assertThat(values, - hasItems(JedisConverters.toBytes("a"), JedisConverters.toBytes("b"), JedisConverters.toBytes("c"))); - assertThat(values, not(hasItems(JedisConverters.toBytes("d"), JedisConverters.toBytes("e"), - JedisConverters.toBytes("f"), JedisConverters.toBytes("g")))); + assertThat(values).contains(JedisConverters.toBytes("a"), JedisConverters.toBytes("b"), + JedisConverters.toBytes("c")); + assertThat(values).doesNotContain(JedisConverters.toBytes("d"), JedisConverters.toBytes("e"), + JedisConverters.toBytes("f"), JedisConverters.toBytes("g")); values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().lt("c")); - assertThat(values, hasItems(JedisConverters.toBytes("a"), JedisConverters.toBytes("b"))); - assertThat(values, not(hasItem(JedisConverters.toBytes("c")))); + assertThat(values).contains(JedisConverters.toBytes("a"), JedisConverters.toBytes("b")); + assertThat(values).doesNotContain(JedisConverters.toBytes("c")); values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().gte("aaa").lt("g")); - assertThat(values, hasItems(JedisConverters.toBytes("b"), JedisConverters.toBytes("c"), - JedisConverters.toBytes("d"), JedisConverters.toBytes("e"), JedisConverters.toBytes("f"))); - assertThat(values, not(hasItems(JedisConverters.toBytes("a"), JedisConverters.toBytes("g")))); + assertThat(values).contains(JedisConverters.toBytes("b"), JedisConverters.toBytes("c"), + JedisConverters.toBytes("d"), JedisConverters.toBytes("e"), JedisConverters.toBytes("f")); + assertThat(values).doesNotContain(JedisConverters.toBytes("a"), JedisConverters.toBytes("g")); values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().gte("e")); - assertThat(values, - hasItems(JedisConverters.toBytes("e"), JedisConverters.toBytes("f"), JedisConverters.toBytes("g"))); - assertThat(values, not(hasItems(JedisConverters.toBytes("a"), JedisConverters.toBytes("b"), - JedisConverters.toBytes("c"), JedisConverters.toBytes("d")))); + assertThat(values).contains(JedisConverters.toBytes("e"), JedisConverters.toBytes("f"), + JedisConverters.toBytes("g")); + assertThat(values).doesNotContain(JedisConverters.toBytes("a"), JedisConverters.toBytes("b"), + JedisConverters.toBytes("c"), JedisConverters.toBytes("d")); } @Test // DATAREDIS-315 @@ -2048,7 +2048,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10, 20), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10, 20)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2058,7 +2058,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L), hasItems(VALUE_1_BYTES)); + assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2068,8 +2068,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10, 20), - hasItems((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D))); + assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10, 20)) + .contains((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D)); } @Test // DATAREDIS-315 @@ -2079,8 +2079,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L), - hasItems((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D))); + assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L)) + .contains((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D)); } @Test // DATAREDIS-315 @@ -2090,7 +2090,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRange(KEY_1_BYTES, 1, 2), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.zRange(KEY_1_BYTES, 1, 2)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2100,8 +2100,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRangeWithScores(KEY_1_BYTES, 1, 2), - hasItems((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D))); + assertThat(clusterConnection.zRangeWithScores(KEY_1_BYTES, 1, 2)) + .contains((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D)); } @Test // DATAREDIS-315 @@ -2110,7 +2110,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 10D, VALUE_1_BYTES); nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); - assertThat(clusterConnection.zRank(KEY_1_BYTES, VALUE_2_BYTES), is(1L)); + assertThat(clusterConnection.zRank(KEY_1_BYTES, VALUE_2_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -2119,7 +2119,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 10D, VALUE_1_BYTES); nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); - assertThat(clusterConnection.zRevRank(KEY_1_BYTES, VALUE_2_BYTES), is(0L)); + assertThat(clusterConnection.zRevRank(KEY_1_BYTES, VALUE_2_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -2131,8 +2131,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zRemRangeByScore(KEY_1_BYTES, 15D, 25D); - assertThat(nativeConnection.zcard(KEY_1_BYTES), is(2L)); - assertThat(nativeConnection.zrange(KEY_1_BYTES, 0, -1), hasItems(VALUE_1_BYTES, VALUE_3_BYTES)); + assertThat(nativeConnection.zcard(KEY_1_BYTES)).isEqualTo(2L); + assertThat(nativeConnection.zrange(KEY_1_BYTES, 0, -1)).contains(VALUE_1_BYTES, VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -2144,8 +2144,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zRemRange(KEY_1_BYTES, 1, 2); - assertThat(nativeConnection.zcard(KEY_1_BYTES), is(1L)); - assertThat(nativeConnection.zrange(KEY_1_BYTES, 0, -1), hasItem(VALUE_1_BYTES)); + assertThat(nativeConnection.zcard(KEY_1_BYTES)).isEqualTo(1L); + assertThat(nativeConnection.zrange(KEY_1_BYTES, 0, -1)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2156,7 +2156,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zRem(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.zcard(KEY_1_BYTES), is(1L)); + assertThat(nativeConnection.zcard(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -2166,7 +2166,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D), hasItems(VALUE_2_BYTES, VALUE_1_BYTES)); + assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D)).contains(VALUE_2_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2176,7 +2176,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L), hasItems(VALUE_2_BYTES)); + assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2186,8 +2186,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D), - hasItems((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D))); + assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D)) + .contains((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D)); } @Test // DATAREDIS-315 @@ -2197,8 +2197,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L), - hasItems((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D))); + assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L)) + .contains((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D)); } @Test // DATAREDIS-315 @@ -2208,7 +2208,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRevRange(KEY_1_BYTES, 1, 2), hasItems(VALUE_3_BYTES, VALUE_1_BYTES)); + assertThat(clusterConnection.zRevRange(KEY_1_BYTES, 1, 2)).contains(VALUE_3_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2218,8 +2218,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); nativeConnection.zadd(KEY_1_BYTES, 5D, VALUE_3_BYTES); - assertThat(clusterConnection.zRevRangeWithScores(KEY_1_BYTES, 1, 2), - hasItems((Tuple) new DefaultTuple(VALUE_3_BYTES, 5D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D))); + assertThat(clusterConnection.zRevRangeWithScores(KEY_1_BYTES, 1, 2)) + .contains((Tuple) new DefaultTuple(VALUE_3_BYTES, 5D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D)); } @Test // DATAREDIS-479 @@ -2239,7 +2239,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { count++; } - assertThat(count, equalTo(nrOfValues)); + assertThat(count).isEqualTo(nrOfValues); } @Test // DATAREDIS-315 @@ -2248,7 +2248,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1_BYTES, 10D, VALUE_1_BYTES); nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES); - assertThat(clusterConnection.zScore(KEY_1_BYTES, VALUE_2_BYTES), is(20D)); + assertThat(clusterConnection.zScore(KEY_1_BYTES, VALUE_2_BYTES)).isEqualTo(20D); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -2265,8 +2265,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zUnionStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3_BYTES, 0, -1), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3_BYTES, 0, -1)).contains(VALUE_1_BYTES, VALUE_2_BYTES, + VALUE_3_BYTES); } @Test // DATAREDIS-694 @@ -2275,12 +2275,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_1); - assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), is(2L)); + assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-694 public void touchReturnsZeroIfNoKeysTouched() { - assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES), is(0L)); + assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-693 @@ -2289,12 +2289,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_1); - assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), is(2L)); + assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-693 public void unlinkReturnsZeroIfNoKeysTouched() { - assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES), is(0L)); + assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-697 @@ -2303,7 +2303,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, HexStringUtils.hexToBytes("fff000")); - assertThat(clusterConnection.stringCommands().bitPos(KEY_1_BYTES, false), is(12L)); + assertThat(clusterConnection.stringCommands().bitPos(KEY_1_BYTES, false)).isEqualTo(12L); } @Test // DATAREDIS-697 @@ -2313,7 +2313,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, HexStringUtils.hexToBytes("fff0f0")); assertThat(clusterConnection.stringCommands().bitPos(KEY_1_BYTES, true, - org.springframework.data.domain.Range.of(Bound.inclusive(2L), Bound.unbounded())), is(16L)); + org.springframework.data.domain.Range.of(Bound.inclusive(2L), Bound.unbounded()))).isEqualTo(16L); } @Test // DATAREDIS-716 @@ -2321,12 +2321,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, "1000".getBytes()); - assertThat(clusterConnection.keyCommands().encodingOf(KEY_1_BYTES), is(RedisValueEncoding.INT)); + assertThat(clusterConnection.keyCommands().encodingOf(KEY_1_BYTES)).isEqualTo(RedisValueEncoding.INT); } @Test // DATAREDIS-716 public void encodingReturnsVacantWhenKeyDoesNotExist() { - assertThat(clusterConnection.keyCommands().encodingOf(KEY_2_BYTES), is(RedisValueEncoding.VACANT)); + assertThat(clusterConnection.keyCommands().encodingOf(KEY_2_BYTES)).isEqualTo(RedisValueEncoding.VACANT); } @Test // DATAREDIS-716 @@ -2335,12 +2335,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1_BYTES, VALUE_1_BYTES); nativeConnection.get(KEY_1_BYTES); - assertThat(clusterConnection.keyCommands().idletime(KEY_1_BYTES), is(Duration.ofSeconds(0))); + assertThat(clusterConnection.keyCommands().idletime(KEY_1_BYTES)).isEqualTo(Duration.ofSeconds(0)); } @Test // DATAREDIS-716 public void idldetimeReturnsNullWhenKeyDoesNotExist() { - assertThat(clusterConnection.keyCommands().idletime(KEY_3_BYTES), is(nullValue())); + assertThat(clusterConnection.keyCommands().idletime(KEY_3_BYTES)).isNull(); } @Test // DATAREDIS-716 @@ -2348,12 +2348,12 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.keyCommands().refcount(KEY_1_BYTES), is(1L)); + assertThat(clusterConnection.keyCommands().refcount(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-716 public void refcountReturnsNullWhenKeyDoesNotExist() { - assertThat(clusterConnection.keyCommands().refcount(KEY_3_BYTES), is(nullValue())); + assertThat(clusterConnection.keyCommands().refcount(KEY_3_BYTES)).isNull(); } @Test // DATAREDIS-562 @@ -2361,9 +2361,9 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void bitFieldSetShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().set(INT_8).valueAt(offset(0L)).to(10L)), contains(0L)); + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)).to(10L))).containsExactly(0L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().set(INT_8).valueAt(offset(0L)).to(20L)), contains(10L)); + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)).to(20L))).containsExactly(10L); } @Test // DATAREDIS-562 @@ -2371,7 +2371,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void bitFieldGetShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().get(INT_8).valueAt(offset(0L))), contains(0L)); + create().get(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)))).containsExactly(0L); } @Test // DATAREDIS-562 @@ -2379,7 +2379,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void bitFieldIncrByShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(INT_8).valueAt(offset(100L)).by(1L)), contains(1L)); + create().incr(INT_8).valueAt(BitFieldSubCommands.Offset.offset(100L)).by(1L))).containsExactly(1L); } @Test // DATAREDIS-562 @@ -2387,13 +2387,17 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void bitFieldIncrByWithOverflowShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), contains(1L)); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))) + .containsExactly(1L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), contains(2L)); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))) + .containsExactly(2L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), contains(3L)); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))) + .containsExactly(3L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)).get(0), is(nullValue())); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L)).get(0)) + .isNull(); } @Test // DATAREDIS-562 @@ -2401,7 +2405,8 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void bitfieldShouldAllowMultipleSubcommands() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(signed(5)).valueAt(offset(100L)).by(1L).get(unsigned(4)).valueAt(0L)), contains(1L, 0L)); + create().incr(signed(5)).valueAt(BitFieldSubCommands.Offset.offset(100L)).by(1L).get(unsigned(4)).valueAt(0L))) + .containsExactly(1L, 0L); } @Test // DATAREDIS-562 @@ -2409,13 +2414,14 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { public void bitfieldShouldWorkUsingNonZeroBasedOffset() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().set(INT_8).valueAt(offset(0L).multipliedByTypeLength()).to(100L).set(INT_8) - .valueAt(offset(1L).multipliedByTypeLength()).to(200L)), - contains(0L, 0L)); + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L).multipliedByTypeLength()).to(100L).set(INT_8) + .valueAt(BitFieldSubCommands.Offset.offset(1L).multipliedByTypeLength()).to(200L))).containsExactly(0L, 0L); assertThat( - clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), create().get(INT_8) - .valueAt(offset(0L).multipliedByTypeLength()).get(INT_8).valueAt(offset(1L).multipliedByTypeLength())), - contains(100L, -56L)); + clusterConnection.stringCommands() + .bitField(JedisConverters.toBytes(KEY_1), + create().get(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L).multipliedByTypeLength()).get(INT_8) + .valueAt(BitFieldSubCommands.Offset.offset(1L).multipliedByTypeLength()))).containsExactly(100L, + -56L); } @Test // DATAREDIS-1005 @@ -2428,7 +2434,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { Long result = clusterConnection.scriptingCommands().eval(luaScriptBin, ReturnType.VALUE, 1, keyAndArgs); - assertThat(result, is(1L)); + assertThat(result).isEqualTo(1L); } @Test // DATAREDIS-1005 @@ -2441,7 +2447,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { String result = clusterConnection.scriptingCommands().scriptLoad(luaScriptBin); - assertThat(result, is(digest)); + assertThat(result).isEqualTo(digest); } @Test // DATAREDIS-1005 @@ -2459,7 +2465,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.scriptingCommands().evalSha(luaScriptBin, ReturnType.VALUE, 1, keyAndArgs); fail("expected InvalidDataAccessApiUsageException"); } catch (InvalidDataAccessApiUsageException e) { - assertThat(e.getMessage(), containsString("NOSCRIPT")); + assertThat(e.getMessage()).contains("NOSCRIPT"); } } @@ -2474,6 +2480,6 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests { clusterConnection.scriptingCommands().scriptLoad(JedisConverters.toBytes(luaScript)); Long result = clusterConnection.scriptingCommands().evalSha(digest, ReturnType.VALUE, 1, keyAndArgs); - assertThat(result, is(1L)); + assertThat(result).isEqualTo(1L); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java index 0c192a1df..0cd2adf2b 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.data.redis.test.util.MockitoUtils.*; @@ -169,11 +167,11 @@ public class JedisClusterConnectionUnitTests { @Test // DATAREDIS-315 public void isClosedShouldReturnConnectionStateCorrectly() { - assertThat(connection.isClosed(), is(false)); + assertThat(connection.isClosed()).isFalse(); connection.close(); - assertThat(connection.isClosed(), is(true)); + assertThat(connection.isClosed()).isTrue(); } @Test // DATAREDIS-315 @@ -184,7 +182,7 @@ public class JedisClusterConnectionUnitTests { when(con3Mock.clusterInfo()).thenReturn(CLUSTER_INFO_RESPONSE); ClusterInfo p = connection.clusterGetClusterInfo(); - assertThat(p.getSlotsAssigned(), is(16384L)); + assertThat(p.getSlotsAssigned()).isEqualTo(16384L); verifyInvocationsAcross("clusterInfo", times(1), con1Mock, con2Mock, con3Mock); } @@ -267,8 +265,8 @@ public class JedisClusterConnectionUnitTests { try { connection.serverCommands().dbSize(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT)); } catch (IllegalArgumentException e) { - assertThat(e.getMessage(), - containsString("Node " + CLUSTER_HOST + ":" + SLAVEOF_NODE_1_PORT + " is unknown to cluster")); + assertThat(e.getMessage()) + .contains("Node " + CLUSTER_HOST + ":" + SLAVEOF_NODE_1_PORT + " is unknown to cluster"); } } @@ -304,7 +302,7 @@ public class JedisClusterConnectionUnitTests { Long result = connection.serverCommands().dbSize(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_3_PORT)); - assertThat(result, is(42L)); + assertThat(result).isEqualTo(42L); } @Test // DATAREDIS-315, DATAREDIS-890 @@ -362,13 +360,11 @@ public class JedisClusterConnectionUnitTests { IllegalArgumentException exception = new IllegalArgumentException("Aw, snap!"); - expectedException.expect(RedisSystemException.class); - expectedException.expectMessage(exception.getMessage()); - expectedException.expectCause(is(exception)); - doThrow(exception).when(clusterMock).set("foo".getBytes(), "bar".getBytes()); - connection.set("foo".getBytes(), "bar".getBytes()); + assertThatExceptionOfType(RedisSystemException.class) + .isThrownBy(() -> connection.set("foo".getBytes(), "bar".getBytes())) + .withMessageContaining(exception.getMessage()).withCause(exception); } @Test // DATAREDIS-794 diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java index fd9798135..89ccbb67b 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactoryIntegrationTests.java @@ -15,13 +15,13 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import redis.clients.jedis.JedisShardInfo; import org.junit.After; import org.junit.Test; + import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.RedisStandaloneConfiguration; @@ -52,7 +52,7 @@ public class JedisConnectionFactoryIntegrationTests { factory.setPort(1234); factory.afterPropertiesSet(); - assertThat(factory.getConnection().ping(), equalTo("PONG")); + assertThat(factory.getConnection().ping()).isEqualTo("PONG"); } @Test // DATAREDIS-574 @@ -63,6 +63,6 @@ public class JedisConnectionFactoryIntegrationTests { JedisClientConfiguration.defaultConfiguration()); factory.afterPropertiesSet(); - assertThat(factory.getConnection().ping(), equalTo("PONG")); + assertThat(factory.getConnection().ping()).isEqualTo("PONG"); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactorySentinelIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactorySentinelIntegrationTests.java index 07c59153b..c86868f56 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactorySentinelIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactorySentinelIntegrationTests.java @@ -15,12 +15,12 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Rule; import org.junit.Test; + import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisSentinelConfiguration; import org.springframework.data.redis.test.util.RedisSentinelRule; @@ -60,8 +60,8 @@ public class JedisConnectionFactorySentinelIntegrationTests { RedisConnection connection = factory.getConnection(); - assertThat(factory.getUsePool(), is(true)); - assertThat(connection.getClientName(), equalTo("clientName")); + assertThat(factory.getUsePool()).isTrue(); + assertThat(connection.getClientName()).isEqualTo("clientName"); } @Test // DATAREDIS-324 @@ -70,7 +70,7 @@ public class JedisConnectionFactorySentinelIntegrationTests { factory = new JedisConnectionFactory(SENTINEL_CONFIG); factory.afterPropertiesSet(); - assertThat(factory.getConnection().ping(), equalTo("PONG")); + assertThat(factory.getConnection().ping()).isEqualTo("PONG"); } @Test // DATAREDIS-552 @@ -80,6 +80,6 @@ public class JedisConnectionFactorySentinelIntegrationTests { factory.setClientName("clientName"); factory.afterPropertiesSet(); - assertThat(factory.getConnection().getClientName(), equalTo("clientName")); + assertThat(factory.getConnection().getClientName()).isEqualTo("clientName"); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java index 792ca4665..d1a75f3bf 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import redis.clients.jedis.JedisPoolConfig; @@ -28,13 +27,11 @@ import java.util.concurrent.BlockingDeque; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import org.hamcrest.core.AllOf; -import org.hamcrest.core.IsCollectionContaining; -import org.hamcrest.core.IsInstanceOf; import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.redis.RedisConnectionFailureException; import org.springframework.data.redis.SettingsUtils; @@ -100,8 +97,8 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati actual.add(byteConnection.evalSha(sha1, ReturnType.MULTI, 1, "key1".getBytes(), "arg1".getBytes())); List results = getResults(); List scriptResults = (List) results.get(0); - assertEquals(Arrays.asList(new Object[] { "key1", "arg1" }), - Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })); + assertThat(Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })) + .isEqualTo(Arrays.asList(new Object[] { "key1", "arg1" })); } @Test @@ -152,7 +149,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati strTuples.add(new DefaultStringTuple("Bob".getBytes(), "Bob", 2.0)); strTuples.add(new DefaultStringTuple("James".getBytes(), "James", 2.0)); Long added = connection.zAdd("myset", strTuples); - assertEquals(2L, added.longValue()); + assertThat(added.longValue()).isEqualTo(2L); } @Test(expected = InvalidDataAccessApiUsageException.class) @@ -256,9 +253,9 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati connection.subscribe(listener, expectedChannel.getBytes()); Message message = messages.poll(5, TimeUnit.SECONDS); - assertNotNull(message); - assertEquals(expectedMessage, new String(message.getBody())); - assertEquals(expectedChannel, new String(message.getChannel())); + assertThat(message).isNotNull(); + assertThat(new String(message.getBody())).isEqualTo(expectedMessage); + assertThat(new String(message.getChannel())).isEqualTo(expectedChannel); } @Test @@ -269,7 +266,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati final BlockingDeque messages = new LinkedBlockingDeque<>(); final MessageListener listener = (message, pattern) -> { - assertEquals(expectedPattern, new String(pattern)); + assertThat(new String(pattern)).isEqualTo(expectedPattern); messages.add(message); }; @@ -314,11 +311,11 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati // Not all providers block on subscribe (Lettuce does not), give some // time for messages to be received Message message = messages.poll(5, TimeUnit.SECONDS); - assertNotNull(message); - assertEquals(expectedMessage, new String(message.getBody())); + assertThat(message).isNotNull(); + assertThat(new String(message.getBody())).isEqualTo(expectedMessage); message = messages.poll(5, TimeUnit.SECONDS); - assertNotNull(message); - assertEquals(expectedMessage, new String(message.getBody())); + assertThat(message).isNotNull(); + assertThat(new String(message.getBody())).isEqualTo(expectedMessage); } @Test @@ -351,9 +348,9 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati connection.set("redis", "supercalifragilisticexpialidocious"); assertThat( - (Iterable) connection.execute("MGET", "spring".getBytes(), "data".getBytes(), "redis".getBytes()), - AllOf.allOf(IsInstanceOf.instanceOf(List.class), IsCollectionContaining.hasItems("awesome".getBytes(), - "cool".getBytes(), "supercalifragilisticexpialidocious".getBytes()))); + (Iterable) connection.execute("MGET", "spring".getBytes(), "data".getBytes(), "redis".getBytes())) + .isInstanceOf(List.class) + .contains("awesome".getBytes(), "cool".getBytes(), "supercalifragilisticexpialidocious".getBytes()); } @Test // DATAREDIS-286, DATAREDIS-564 @@ -365,7 +362,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati connection.expire("expireKey", seconds); long ttl = connection.ttl("expireKey"); - assertThat(ttl, is(seconds)); + assertThat(ttl).isEqualTo(seconds); } @Test // DATAREDIS-286 @@ -377,8 +374,10 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati connection.pExpire("pexpireKey", millis); long ttl = connection.pTtl("pexpireKey"); - assertTrue(String.format("difference between millis=%s and ttl=%s should not be greater than 20ms but is %s", - millis, ttl, millis - ttl), millis - ttl < 20L); + assertThat(millis - ttl < 20L) + .as(String.format("difference between millis=%s and ttl=%s should not be greater than 20ms but is %s", millis, + ttl, millis - ttl)) + .isTrue(); } @Test // DATAREDIS-330 @@ -387,12 +386,12 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati ((JedisConnection) byteConnection).setSentinelConfiguration( new RedisSentinelConfiguration().master("mymaster").sentinel("127.0.0.1", 26379).sentinel("127.0.0.1", 26380)); - assertThat(connection.getSentinelConnection(), notNullValue()); + assertThat(connection.getSentinelConnection()).isNotNull(); } @Test // DATAREDIS-552 public void shouldSetClientName() { - assertThat(connection.getClientName(), is(equalTo("jedis-client"))); + assertThat(connection.getClientName()).isEqualTo("jedis-client"); } @Test // DATAREDIS-106 @@ -404,6 +403,6 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati Set zRangeByScore = connection.zRangeByScore("myzset", "(1", "2"); - assertEquals("two", zRangeByScore.iterator().next()); + assertThat(zRangeByScore.iterator().next()).isEqualTo("two"); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java index a0b1d017c..72caef38e 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineIntegrationTests.java @@ -15,7 +15,9 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; + +import redis.clients.jedis.JedisPoolConfig; import java.util.Arrays; import java.util.List; @@ -24,6 +26,7 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.AbstractConnectionPipelineIntegrationTests; @@ -33,8 +36,6 @@ import org.springframework.data.redis.test.util.RelaxedJUnit4ClassRunner; import org.springframework.test.annotation.IfProfileValue; import org.springframework.test.context.ContextConfiguration; -import redis.clients.jedis.JedisPoolConfig; - /** * Integration test of {@link JedisConnection} pipeline functionality * @@ -102,7 +103,7 @@ public class JedisConnectionPipelineIntegrationTests extends AbstractConnectionP actual.add(connection.exec()); List results = getResults(); List execResults = (List) results.get(0); - assertEquals(Arrays.asList(new Object[] { true, "somethingelse" }), execResults); + assertThat(execResults).isEqualTo(Arrays.asList(new Object[] { true, "somethingelse" })); } @Test diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineTxIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineTxIntegrationTests.java index 41af783f1..1a3db7944 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineTxIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionPipelineTxIntegrationTests.java @@ -15,12 +15,13 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; import org.junit.Ignore; import org.junit.Test; + import org.springframework.data.redis.connection.RedisPipelineException; import org.springframework.test.annotation.IfProfileValue; @@ -60,10 +61,10 @@ public class JedisConnectionPipelineTxIntegrationTests extends JedisConnectionTr @SuppressWarnings("unchecked") protected List getResults() { - assertNull(connection.exec()); + assertThat(connection.exec()).isNull(); List pipelined = connection.closePipeline(); // We expect only the results of exec to be in the closed pipeline - assertEquals(1, pipelined.size()); + assertThat(pipelined.size()).isEqualTo(1); List txResults = (List) pipelined.get(0); // Return exec results and this test should behave exactly like its superclass return txResults; diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java index f4451ce39..2fca7e2ab 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java @@ -19,6 +19,7 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.redis.connection.AbstractConnectionTransactionIntegrationTests; import org.springframework.data.redis.test.util.RelaxedJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java index 3a3776543..5a12f8508 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import redis.clients.jedis.Client; @@ -78,7 +77,7 @@ public class JedisConnectionUnitTestSuite { ArgumentCaptor captor = ArgumentCaptor.forClass(byte[].class); verifyNativeConnectionInvocation().eval(captor.capture(), any(byte[].class), any(byte[][].class)); - assertThat(captor.getValue(), equalTo("return redis.call('SHUTDOWN','NOSAVE')".getBytes())); + assertThat(captor.getValue()).isEqualTo("return redis.call('SHUTDOWN','NOSAVE')".getBytes()); } @Test // DATAREDIS-184 @@ -89,7 +88,7 @@ public class JedisConnectionUnitTestSuite { ArgumentCaptor captor = ArgumentCaptor.forClass(byte[].class); verifyNativeConnectionInvocation().eval(captor.capture(), any(byte[].class), any(byte[][].class)); - assertThat(captor.getValue(), equalTo("return redis.call('SHUTDOWN','SAVE')".getBytes())); + assertThat(captor.getValue()).isEqualTo("return redis.call('SHUTDOWN','SAVE')".getBytes()); } @Test // DATAREDIS-267 @@ -132,37 +131,27 @@ public class JedisConnectionUnitTestSuite { @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 public void restoreShouldThrowExceptionWhenTtlInMillisExceedsIntegerRange() { - connection.restore("foo".getBytes(), new Long(Integer.MAX_VALUE) + 1L, "bar".getBytes()); + connection.restore("foo".getBytes(), (long) Integer.MAX_VALUE + 1L, "bar".getBytes()); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 public void setExShouldThrowExceptionWhenTimeExceedsIntegerRange() { - connection.setEx("foo".getBytes(), new Long(Integer.MAX_VALUE) + 1L, "bar".getBytes()); - } - - @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 - public void getRangeShouldThrowExceptionWhenStartExceedsIntegerRange() { - connection.getRange("foo".getBytes(), new Long(Integer.MAX_VALUE) + 1L, Integer.MAX_VALUE); - } - - @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 - public void getRangeShouldThrowExceptionWhenEndExceedsIntegerRange() { - connection.getRange("foo".getBytes(), Integer.MAX_VALUE, new Long(Integer.MAX_VALUE) + 1L); + connection.setEx("foo".getBytes(), (long) Integer.MAX_VALUE + 1L, "bar".getBytes()); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 public void sRandMemberShouldThrowExceptionWhenCountExceedsIntegerRange() { - connection.sRandMember("foo".getBytes(), new Long(Integer.MAX_VALUE) + 1L); + connection.sRandMember("foo".getBytes(), (long) Integer.MAX_VALUE + 1L); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 public void zRangeByScoreShouldThrowExceptionWhenOffsetExceedsIntegerRange() { - connection.zRangeByScore("foo".getBytes(), "foo", "bar", new Long(Integer.MAX_VALUE) + 1L, Integer.MAX_VALUE); + connection.zRangeByScore("foo".getBytes(), "foo", "bar", (long) Integer.MAX_VALUE + 1L, Integer.MAX_VALUE); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-472 public void zRangeByScoreShouldThrowExceptionWhenCountExceedsIntegerRange() { - connection.zRangeByScore("foo".getBytes(), "foo", "bar", Integer.MAX_VALUE, new Long(Integer.MAX_VALUE) + 1L); + connection.zRangeByScore("foo".getBytes(), "foo", "bar", Integer.MAX_VALUE, (long) Integer.MAX_VALUE + 1L); } @Test // DATAREDIS-531 diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConvertersUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConvertersUnitTests.java index 5febdd3a7..f3c5515c6 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConvertersUnitTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import redis.clients.jedis.params.SetParams; @@ -30,6 +27,7 @@ import java.util.List; import java.util.Map; import org.junit.Test; + import org.springframework.data.redis.connection.RedisServer; import org.springframework.data.redis.connection.RedisStringCommands.SetOption; import org.springframework.data.redis.connection.RedisZSetCommands.Range; @@ -45,13 +43,13 @@ public class JedisConvertersUnitTests { @Test // DATAREDIS-268 public void convertingEmptyStringToListOfRedisClientInfoShouldReturnEmptyList() { - assertThat(JedisConverters.toListOfRedisClientInformation(""), equalTo(Collections. emptyList())); + assertThat(JedisConverters.toListOfRedisClientInformation("")).isEqualTo(Collections. emptyList()); } @Test // DATAREDIS-268 public void convertingNullToListOfRedisClientInfoShouldReturnEmptyList() { - assertThat(JedisConverters.toListOfRedisClientInformation(null), - equalTo(Collections. emptyList())); + assertThat(JedisConverters.toListOfRedisClientInformation(null)) + .isEqualTo(Collections. emptyList()); } @Test // DATAREDIS-268 @@ -62,7 +60,7 @@ public class JedisConvertersUnitTests { sb.append("\r\n"); sb.append(CLIENT_ALL_SINGLE_LINE_RESPONSE); - assertThat(JedisConverters.toListOfRedisClientInformation(sb.toString()).size(), equalTo(2)); + assertThat(JedisConverters.toListOfRedisClientInformation(sb.toString()).size()).isEqualTo(2); } @Test // DATAREDIS-330 @@ -71,7 +69,7 @@ public class JedisConvertersUnitTests { Map values = getRedisServerInfoMap("mymaster", 23697); List servers = JedisConverters.toListOfRedisServer(Collections.singletonList(values)); - assertThat(servers.size(), is(1)); + assertThat(servers.size()).isEqualTo(1); verifyRedisServerInfo(servers.get(0), values); } @@ -82,7 +80,7 @@ public class JedisConvertersUnitTests { getRedisServerInfoMap("yourmaster", 23680)); List servers = JedisConverters.toListOfRedisServer(vals); - assertThat(servers.size(), is(vals.size())); + assertThat(servers.size()).isEqualTo(vals.size()); for (int i = 0; i < vals.size(); i++) { verifyRedisServerInfo(servers.get(i), vals.get(i)); } @@ -90,12 +88,12 @@ public class JedisConvertersUnitTests { @Test // DATAREDIS-330 public void convertsRedisServersCorrectlyWhenGivenAnEmptyList() { - assertThat(JedisConverters.toListOfRedisServer(Collections.> emptyList()), notNullValue()); + assertThat(JedisConverters.toListOfRedisServer(Collections.> emptyList())).isNotNull(); } @Test // DATAREDIS-330 public void convertsRedisServersCorrectlyWhenGivenNull() { - assertThat(JedisConverters.toListOfRedisServer(null), notNullValue()); + assertThat(JedisConverters.toListOfRedisServer(null)).isNotNull(); } /** @@ -105,7 +103,7 @@ public class JedisConvertersUnitTests { byte[] defaultValue = "tyrion".getBytes(); - assertThat(JedisConverters.boundaryToBytesForZRangeByLex(null, defaultValue), is(defaultValue)); + assertThat(JedisConverters.boundaryToBytesForZRangeByLex(null, defaultValue)).isEqualTo(defaultValue); } @Test // DATAREDIS-378 @@ -113,38 +111,38 @@ public class JedisConvertersUnitTests { byte[] defaultValue = "tyrion".getBytes(); - assertThat(JedisConverters.boundaryToBytesForZRangeByLex(Range.unbounded().getMax(), defaultValue), - is(defaultValue)); + assertThat(JedisConverters.boundaryToBytesForZRangeByLex(Range.unbounded().getMax(), defaultValue)) + .isEqualTo(defaultValue); } @Test // DATAREDIS-378 public void boundaryToBytesForZRangeByLexShouldReturnValueCorrectlyWhenBoundaryIsIncluing() { assertThat( - JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gte(JedisConverters.toBytes("a")).getMin(), null), - is(JedisConverters.toBytes("[a"))); + JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gte(JedisConverters.toBytes("a")).getMin(), null)) + .isEqualTo(JedisConverters.toBytes("[a")); } @Test // DATAREDIS-378 public void boundaryToBytesForZRangeByLexShouldReturnValueCorrectlyWhenBoundaryIsExcluding() { assertThat( - JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gt(JedisConverters.toBytes("a")).getMin(), null), - is(JedisConverters.toBytes("(a"))); + JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gt(JedisConverters.toBytes("a")).getMin(), null)) + .isEqualTo(JedisConverters.toBytes("(a")); } @Test // DATAREDIS-378 public void boundaryToBytesForZRangeByLexShouldReturnValueCorrectlyWhenBoundaryIsAString() { - assertThat(JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gt("a").getMin(), null), - is(JedisConverters.toBytes("(a"))); + assertThat(JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gt("a").getMin(), null)) + .isEqualTo(JedisConverters.toBytes("(a")); } @Test // DATAREDIS-378 public void boundaryToBytesForZRangeByLexShouldReturnValueCorrectlyWhenBoundaryIsANumber() { - assertThat(JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gt(1L).getMin(), null), - is(JedisConverters.toBytes("(1"))); + assertThat(JedisConverters.boundaryToBytesForZRangeByLex(Range.range().gt(1L).getMin(), null)) + .isEqualTo(JedisConverters.toBytes("(1")); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-378 @@ -157,7 +155,7 @@ public class JedisConvertersUnitTests { byte[] defaultValue = "tyrion".getBytes(); - assertThat(JedisConverters.boundaryToBytesForZRange(null, defaultValue), is(defaultValue)); + assertThat(JedisConverters.boundaryToBytesForZRange(null, defaultValue)).isEqualTo(defaultValue); } @Test // DATAREDIS-352 @@ -165,35 +163,36 @@ public class JedisConvertersUnitTests { byte[] defaultValue = "tyrion".getBytes(); - assertThat(JedisConverters.boundaryToBytesForZRange(Range.unbounded().getMax(), defaultValue), is(defaultValue)); + assertThat(JedisConverters.boundaryToBytesForZRange(Range.unbounded().getMax(), defaultValue)) + .isEqualTo(defaultValue); } @Test // DATAREDIS-352 public void boundaryToBytesForZRangeByShouldReturnValueCorrectlyWhenBoundaryIsIncluing() { - assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gte(JedisConverters.toBytes("a")).getMin(), null), - is(JedisConverters.toBytes("a"))); + assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gte(JedisConverters.toBytes("a")).getMin(), null)) + .isEqualTo(JedisConverters.toBytes("a")); } @Test // DATAREDIS-352 public void boundaryToBytesForZRangeByShouldReturnValueCorrectlyWhenBoundaryIsExcluding() { - assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gt(JedisConverters.toBytes("a")).getMin(), null), - is(JedisConverters.toBytes("(a"))); + assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gt(JedisConverters.toBytes("a")).getMin(), null)) + .isEqualTo(JedisConverters.toBytes("(a")); } @Test // DATAREDIS-352 public void boundaryToBytesForZRangeByShouldReturnValueCorrectlyWhenBoundaryIsAString() { - assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gt("a").getMin(), null), - is(JedisConverters.toBytes("(a"))); + assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gt("a").getMin(), null)) + .isEqualTo(JedisConverters.toBytes("(a")); } @Test // DATAREDIS-352 public void boundaryToBytesForZRangeByShouldReturnValueCorrectlyWhenBoundaryIsANumber() { - assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gt(1L).getMin(), null), - is(JedisConverters.toBytes("(1"))); + assertThat(JedisConverters.boundaryToBytesForZRange(Range.range().gt(1L).getMin(), null)) + .isEqualTo(JedisConverters.toBytes("(1")); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-352 @@ -203,33 +202,33 @@ public class JedisConvertersUnitTests { @Test // DATAREDIS-316, DATAREDIS-749 public void toSetCommandExPxOptionShouldReturnEXforSeconds() { - assertThat(toString(JedisConverters.toSetCommandExPxArgument(Expiration.seconds(100))), equalTo("ex 100")); + assertThat(toString(JedisConverters.toSetCommandExPxArgument(Expiration.seconds(100)))).isEqualTo("ex 100"); } @Test // DATAREDIS-316, DATAREDIS-749 public void toSetCommandExPxOptionShouldReturnEXforMilliseconds() { - assertThat(toString(JedisConverters.toSetCommandExPxArgument(Expiration.milliseconds(100))), equalTo("px 100")); + assertThat(toString(JedisConverters.toSetCommandExPxArgument(Expiration.milliseconds(100)))).isEqualTo("px 100"); } @Test // DATAREDIS-316, DATAREDIS-749 public void toSetCommandNxXxOptionShouldReturnNXforAbsent() { - assertThat(toString(JedisConverters.toSetCommandNxXxArgument(SetOption.ifAbsent())), equalTo("nx")); + assertThat(toString(JedisConverters.toSetCommandNxXxArgument(SetOption.ifAbsent()))).isEqualTo("nx"); } @Test // DATAREDIS-316, DATAREDIS-749 public void toSetCommandNxXxOptionShouldReturnXXforAbsent() { - assertThat(toString(JedisConverters.toSetCommandNxXxArgument(SetOption.ifPresent())), equalTo("xx")); + assertThat(toString(JedisConverters.toSetCommandNxXxArgument(SetOption.ifPresent()))).isEqualTo("xx"); } @Test // DATAREDIS-316, DATAREDIS-749 public void toSetCommandNxXxOptionShouldReturnEmptyArrayforUpsert() { - assertThat(toString(JedisConverters.toSetCommandNxXxArgument(SetOption.upsert())), equalTo("")); + assertThat(toString(JedisConverters.toSetCommandNxXxArgument(SetOption.upsert()))).isEqualTo(""); } private void verifyRedisServerInfo(RedisServer server, Map values) { for (Map.Entry entry : values.entrySet()) { - assertThat(server.get(entry.getKey()), equalTo(entry.getValue())); + assertThat(server.get(entry.getKey())).isEqualTo(entry.getValue()); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverterUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverterUnitTests.java index 485467f50..3a78952c2 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisExceptionConverterUnitTests.java @@ -15,21 +15,20 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsInstanceOf.*; -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.dao.DataAccessException; -import org.springframework.data.redis.ClusterRedirectException; -import org.springframework.data.redis.TooManyClusterRedirectionsException; +import static org.assertj.core.api.Assertions.*; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.exceptions.JedisAskDataException; import redis.clients.jedis.exceptions.JedisClusterMaxAttemptsException; import redis.clients.jedis.exceptions.JedisMovedDataException; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.dao.DataAccessException; +import org.springframework.data.redis.ClusterRedirectException; +import org.springframework.data.redis.TooManyClusterRedirectionsException; + /** * @author Christoph Strobl */ @@ -48,10 +47,10 @@ public class JedisExceptionConverterUnitTests { DataAccessException converted = converter.convert(new JedisMovedDataException("MOVED 3999 127.0.0.1:6381", new HostAndPort("127.0.0.1", 6381), 3999)); - assertThat(converted, instanceOf(ClusterRedirectException.class)); - assertThat(((ClusterRedirectException) converted).getSlot(), is(3999)); - assertThat(((ClusterRedirectException) converted).getTargetHost(), is("127.0.0.1")); - assertThat(((ClusterRedirectException) converted).getTargetPort(), is(6381)); + assertThat(converted).isInstanceOf(ClusterRedirectException.class); + assertThat(((ClusterRedirectException) converted).getSlot()).isEqualTo(3999); + assertThat(((ClusterRedirectException) converted).getTargetHost()).isEqualTo("127.0.0.1"); + assertThat(((ClusterRedirectException) converted).getTargetPort()).isEqualTo(6381); } @Test // DATAREDIS-315 @@ -60,10 +59,10 @@ public class JedisExceptionConverterUnitTests { DataAccessException converted = converter.convert(new JedisAskDataException("ASK 3999 127.0.0.1:6381", new HostAndPort("127.0.0.1", 6381), 3999)); - assertThat(converted, instanceOf(ClusterRedirectException.class)); - assertThat(((ClusterRedirectException) converted).getSlot(), is(3999)); - assertThat(((ClusterRedirectException) converted).getTargetHost(), is("127.0.0.1")); - assertThat(((ClusterRedirectException) converted).getTargetPort(), is(6381)); + assertThat(converted).isInstanceOf(ClusterRedirectException.class); + assertThat(((ClusterRedirectException) converted).getSlot()).isEqualTo(3999); + assertThat(((ClusterRedirectException) converted).getTargetHost()).isEqualTo("127.0.0.1"); + assertThat(((ClusterRedirectException) converted).getTargetPort()).isEqualTo(6381); } @Test // DATAREDIS-315 @@ -72,6 +71,6 @@ public class JedisExceptionConverterUnitTests { DataAccessException converted = converter .convert(new JedisClusterMaxAttemptsException("Too many redirections?")); - assertThat(converted, instanceOf(TooManyClusterRedirectionsException.class)); + assertThat(converted).isInstanceOf(TooManyClusterRedirectionsException.class); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelIntegrationTests.java index a44706af4..cbc6fe9b0 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisSentinelIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import redis.clients.jedis.Jedis; @@ -30,6 +29,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.redis.connection.AbstractConnectionIntegrationTests; import org.springframework.data.redis.connection.RedisSentinelConfiguration; @@ -136,8 +136,8 @@ public class JedisSentinelIntegrationTests extends AbstractConnectionIntegration public void shouldReadMastersCorrectly() { List servers = (List) connectionFactory.getSentinelConnection().masters(); - assertThat(servers.size(), is(1)); - assertThat(servers.get(0).getName(), is(MASTER_NAME)); + assertThat(servers.size()).isEqualTo(1); + assertThat(servers.get(0).getName()).isEqualTo(MASTER_NAME); } @Test // DATAREDIS-330 @@ -146,11 +146,11 @@ public class JedisSentinelIntegrationTests extends AbstractConnectionIntegration RedisSentinelConnection sentinelConnection = connectionFactory.getSentinelConnection(); List servers = (List) sentinelConnection.masters(); - assertThat(servers.size(), is(1)); + assertThat(servers.size()).isEqualTo(1); Collection slaves = sentinelConnection.slaves(servers.get(0)); - assertThat(slaves.size(), is(2)); - assertThat(slaves, hasItems(SLAVE_0, SLAVE_1)); + assertThat(slaves.size()).isEqualTo(2); + assertThat(slaves).contains(SLAVE_0, SLAVE_1); } @Test // DATAREDIS-552 @@ -159,7 +159,7 @@ public class JedisSentinelIntegrationTests extends AbstractConnectionIntegration RedisSentinelConnection sentinelConnection = connectionFactory.getSentinelConnection(); Jedis jedis = (Jedis) ReflectionTestUtils.getField(sentinelConnection, "jedis"); - assertThat(jedis.clientGetname(), is(equalTo("jedis-client"))); + assertThat(jedis.clientGetname()).isEqualTo("jedis-client"); } } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisSubscriptionTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisSubscriptionTests.java index 06bf3f0d9..b99789c98 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisSubscriptionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisSubscriptionTests.java @@ -15,23 +15,20 @@ */ package org.springframework.data.redis.connection.jedis; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import redis.clients.jedis.BinaryJedisPubSub; + import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.never; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertArrayEquals; + import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.connection.RedisInvalidSubscriptionException; -import redis.clients.jedis.BinaryJedisPubSub; - /** * Unit test of {@link JedisSubscription} * @@ -58,9 +55,9 @@ public class JedisSubscriptionTests { subscription.unsubscribe(); verify(jedisPubSub, times(1)).unsubscribe(); verify(jedisPubSub, never()).punsubscribe(); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -70,11 +67,11 @@ public class JedisSubscriptionTests { subscription.unsubscribe(); verify(jedisPubSub, times(1)).unsubscribe(); verify(jedisPubSub, never()).punsubscribe(); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -84,9 +81,9 @@ public class JedisSubscriptionTests { subscription.unsubscribe(channel); verify(jedisPubSub, times(1)).unsubscribe(channel); verify(jedisPubSub, never()).punsubscribe(); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -96,11 +93,11 @@ public class JedisSubscriptionTests { subscription.unsubscribe(new byte[][] { "a".getBytes() }); verify(jedisPubSub, times(1)).unsubscribe(new byte[][] { "a".getBytes() }); verify(jedisPubSub, never()).punsubscribe(); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection subChannels = subscription.getChannels(); - assertEquals(1, subChannels.size()); - assertArrayEquals("b".getBytes(), subChannels.iterator().next()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subChannels.size()).isEqualTo(1); + assertThat(subChannels.iterator().next()).isEqualTo("b".getBytes()); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -111,11 +108,11 @@ public class JedisSubscriptionTests { subscription.unsubscribe(channel); verify(jedisPubSub, times(1)).unsubscribe(channel); verify(jedisPubSub, never()).punsubscribe(); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -126,13 +123,13 @@ public class JedisSubscriptionTests { subscription.unsubscribe(channel); verify(jedisPubSub, times(1)).unsubscribe(channel); verify(jedisPubSub, never()).punsubscribe(); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("b".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("b".getBytes()); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -141,18 +138,18 @@ public class JedisSubscriptionTests { subscription.unsubscribe(); verify(jedisPubSub, never()).unsubscribe(); verify(jedisPubSub, never()).punsubscribe(); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test public void testUnsubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.unsubscribe(); verify(jedisPubSub, times(1)).unsubscribe(); verify(jedisPubSub, never()).punsubscribe(); @@ -162,7 +159,7 @@ public class JedisSubscriptionTests { public void testSubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.subscribe(new byte[][] { "s".getBytes() }); } @@ -172,9 +169,9 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(); verify(jedisPubSub, never()).unsubscribe(); verify(jedisPubSub, times(1)).punsubscribe(); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -184,11 +181,11 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(); verify(jedisPubSub, never()).unsubscribe(); verify(jedisPubSub, times(1)).punsubscribe(); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("a".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("a".getBytes()); } @Test @@ -198,9 +195,9 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(pattern); verify(jedisPubSub, never()).unsubscribe(); verify(jedisPubSub, times(1)).punsubscribe(pattern); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -210,11 +207,11 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(new byte[][] { "a*".getBytes() }); verify(jedisPubSub, times(1)).punsubscribe(new byte[][] { "a*".getBytes() }); verify(jedisPubSub, never()).unsubscribe(); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection subPatterns = subscription.getPatterns(); - assertEquals(1, subPatterns.size()); - assertArrayEquals("b*".getBytes(), subPatterns.iterator().next()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subPatterns.size()).isEqualTo(1); + assertThat(subPatterns.iterator().next()).isEqualTo("b*".getBytes()); + assertThat(subscription.getChannels().isEmpty()).isTrue(); } @Test @@ -225,11 +222,11 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(pattern); verify(jedisPubSub, times(1)).punsubscribe(pattern); verify(jedisPubSub, never()).unsubscribe(); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("a".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("a".getBytes()); } @Test @@ -240,13 +237,13 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(pattern); verify(jedisPubSub, never()).unsubscribe(); verify(jedisPubSub, times(1)).punsubscribe(pattern); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("a".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("a".getBytes()); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("b*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("b*".getBytes()); } @Test @@ -255,18 +252,18 @@ public class JedisSubscriptionTests { subscription.pUnsubscribe(); verify(jedisPubSub, never()).unsubscribe(); verify(jedisPubSub, never()).punsubscribe(); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("s".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("s".getBytes()); } @Test public void testPUnsubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.pUnsubscribe(); verify(jedisPubSub, times(1)).unsubscribe(); verify(jedisPubSub, never()).punsubscribe(); @@ -276,7 +273,7 @@ public class JedisSubscriptionTests { public void testPSubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.pSubscribe(new byte[][] { "s*".getBytes() }); } diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java index 76c810e16..3bc8e4af7 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/ScanTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.jedis; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.List; @@ -32,6 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -129,6 +129,6 @@ public class ScanTests { executor.shutdown(); - assertThat(exception.get(), is(nullValue())); + assertThat(exception.get()).isNull(); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolTests.java index 43379152a..1dc134af0 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.test.util.ReflectionTestUtils.*; import io.lettuce.core.RedisException; @@ -30,6 +29,7 @@ import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.junit.After; import org.junit.Ignore; import org.junit.Test; + import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.PoolException; import org.springframework.data.redis.connection.RedisSentinelConfiguration; @@ -66,7 +66,7 @@ public class DefaultLettucePoolTests { pool.setClientResources(LettuceTestClientResources.getSharedClientResources()); pool.afterPropertiesSet(); StatefulRedisConnection client = (StatefulRedisConnection) pool.getResource(); - assertNotNull(client); + assertThat(client).isNotNull(); client.sync().ping(); client.close(); } @@ -81,7 +81,7 @@ public class DefaultLettucePoolTests { pool.setClientResources(LettuceTestClientResources.getSharedClientResources()); pool.afterPropertiesSet(); StatefulRedisConnection client = (StatefulRedisConnection) pool.getResource(); - assertNotNull(client); + assertThat(client).isNotNull(); try { pool.getResource(); fail("PoolException should be thrown when pool exhausted"); @@ -99,7 +99,7 @@ public class DefaultLettucePoolTests { pool.setClientResources(LettuceTestClientResources.getSharedClientResources()); pool.afterPropertiesSet(); StatefulRedisConnection client = (StatefulRedisConnection) pool.getResource(); - assertNotNull(client); + assertThat(client).isNotNull(); client.close(); } @@ -122,9 +122,9 @@ public class DefaultLettucePoolTests { pool.setClientResources(LettuceTestClientResources.getSharedClientResources()); pool.afterPropertiesSet(); StatefulRedisConnection client = (StatefulRedisConnection) pool.getResource(); - assertNotNull(client); + assertThat(client).isNotNull(); pool.returnResource(client); - assertNotNull(pool.getResource()); + assertThat(pool.getResource()).isNotNull(); client.close(); } @@ -138,10 +138,10 @@ public class DefaultLettucePoolTests { pool.setClientResources(LettuceTestClientResources.getSharedClientResources()); pool.afterPropertiesSet(); StatefulRedisConnection client = (StatefulRedisConnection) pool.getResource(); - assertNotNull(client); + assertThat(client).isNotNull(); pool.returnBrokenResource(client); StatefulRedisConnection client2 = (StatefulRedisConnection) pool.getResource(); - assertNotSame(client, client2); + assertThat(client2).isNotSameAs(client); try { client.sync().ping(); fail("Broken resouce connection should be closed"); @@ -158,7 +158,7 @@ public class DefaultLettucePoolTests { pool.setClientResources(LettuceTestClientResources.getSharedClientResources()); pool.setDatabase(1); pool.afterPropertiesSet(); - assertNotNull(pool.getResource()); + assertThat(pool.getResource()).isNotNull(); } @Test(expected = PoolException.class) @@ -215,7 +215,7 @@ public class DefaultLettucePoolTests { RedisURI redisUri = (RedisURI) getField(pool.getClient(), "redisURI"); - assertThat(redisUri.getPassword(), is(equalTo(pool.getPassword().toCharArray()))); + assertThat(redisUri.getPassword()).isEqualTo(pool.getPassword().toCharArray()); } @Test // DATAREDIS-462 @@ -224,6 +224,6 @@ public class DefaultLettucePoolTests { pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort()); pool.setDatabase(1); pool.afterPropertiesSet(); - assertNotNull(pool.getResource()); + assertThat(pool.getResource()).isNotNull(); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java index ff3602ccd..8cc4ef61e 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java @@ -15,12 +15,11 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import static org.springframework.data.redis.connection.BitFieldSubCommands.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldIncrBy.Overflow.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType.*; -import static org.springframework.data.redis.connection.BitFieldSubCommands.Offset.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit.*; import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.*; @@ -42,6 +41,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; + import org.springframework.dao.DataAccessException; import org.springframework.data.domain.Range.Bound; import org.springframework.data.geo.Circle; @@ -135,7 +135,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { RedisConnection connection = factory.getConnection(); - assertThat(connection.ping(), is("PONG")); + assertThat(connection.ping()).isEqualTo("PONG"); connection.close(); factory.destroy(); @@ -149,7 +149,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { RedisClusterConnection clusterConnection = factory.getClusterConnection(); - assertThat(clusterConnection.ping(ClusterTestVariables.CLUSTER_NODE_1), is("PONG")); + assertThat(clusterConnection.ping(ClusterTestVariables.CLUSTER_NODE_1)).isEqualTo("PONG"); clusterConnection.close(); factory.destroy(); @@ -174,7 +174,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.append(KEY_1_BYTES, VALUE_1_BYTES); clusterConnection.append(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1.concat(VALUE_2))); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1.concat(VALUE_2)); } @Test // DATAREDIS-315 @@ -182,8 +182,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.bRPopLPush(0, KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(KEY_2), is(1L)); + assertThat(clusterConnection.bRPopLPush(0, KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(KEY_2)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -191,8 +191,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.bRPopLPush(0, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_2), is(1L)); + assertThat(clusterConnection.bRPopLPush(0, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_2)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -201,7 +201,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setbit(KEY_1, 0, 1); nativeConnection.setbit(KEY_1, 1, 0); - assertThat(clusterConnection.bitCount(KEY_1_BYTES), is(1L)); + assertThat(clusterConnection.bitCount(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -213,7 +213,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setbit(KEY_1, 3, 0); nativeConnection.setbit(KEY_1, 4, 1); - assertThat(clusterConnection.bitCount(KEY_1_BYTES, 0, 3), is(3L)); + assertThat(clusterConnection.bitCount(KEY_1_BYTES, 0, 3)).isEqualTo(3L); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -229,7 +229,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.bitOp(BitOperation.AND, SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.get(SAME_SLOT_KEY_3), is("bab")); + assertThat(nativeConnection.get(SAME_SLOT_KEY_3)).isEqualTo("bab"); } @Test // DATAREDIS-315 @@ -238,7 +238,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); nativeConnection.lpush(KEY_2, VALUE_3); - assertThat(clusterConnection.bLPop(100, KEY_1_BYTES, KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bLPop(100, KEY_1_BYTES, KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -247,7 +247,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); nativeConnection.lpush(SAME_SLOT_KEY_2, VALUE_3); - assertThat(clusterConnection.bLPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bLPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -256,7 +256,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); nativeConnection.lpush(KEY_2, VALUE_3); - assertThat(clusterConnection.bRPop(100, KEY_1_BYTES, KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bRPop(100, KEY_1_BYTES, KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -265,12 +265,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); nativeConnection.lpush(SAME_SLOT_KEY_2, VALUE_3); - assertThat(clusterConnection.bRPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bRPop(100, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 public void clientListShouldGetInfosForAllClients() { - assertThat(clusterConnection.getClientList().isEmpty(), is(false)); + assertThat(clusterConnection.getClientList().isEmpty()).isFalse(); } @Test // DATAREDIS-315 @@ -278,12 +278,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Map> masterSlaveMap = clusterConnection.clusterGetMasterSlaveMap(); - assertThat(masterSlaveMap, notNullValue()); - assertThat(masterSlaveMap.size(), is(3)); - assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT)), - hasItem(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT))); - assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT)).isEmpty(), is(true)); - assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_3_PORT)).isEmpty(), is(true)); + assertThat(masterSlaveMap).isNotNull(); + assertThat(masterSlaveMap.size()).isEqualTo(3); + assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT))) + .contains(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT)); + assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT)).isEmpty()).isTrue(); + assertThat(masterSlaveMap.get(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_3_PORT)).isEmpty()).isTrue(); } @Test // DATAREDIS-315 @@ -292,8 +292,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Set slaves = clusterConnection .clusterGetSlaves(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_1_PORT)); - assertThat(slaves.size(), is(1)); - assertThat(slaves, hasItem(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT))); + assertThat(slaves.size()).isEqualTo(1); + assertThat(slaves).contains(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT)); } @Test // DATAREDIS-315 @@ -302,7 +302,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1, VALUE_1); nativeConnection.set(SAME_SLOT_KEY_2, VALUE_2); - assertThat(clusterConnection.clusterCountKeysInSlot(ClusterSlotHashUtil.calculateSlot(SAME_SLOT_KEY_1)), is(2L)); + assertThat(clusterConnection.clusterCountKeysInSlot(ClusterSlotHashUtil.calculateSlot(SAME_SLOT_KEY_1))) + .isEqualTo(2L); } @Test // DATAREDIS-315 @@ -311,9 +312,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty())), is(1L)); - assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7380, SlotRange.empty())), is(1L)); - assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7381, SlotRange.empty())), is(0L)); + assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()))).isEqualTo(1L); + assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7380, SlotRange.empty()))).isEqualTo(1L); + assertThat(clusterConnection.dbSize(new RedisClusterNode("127.0.0.1", 7381, SlotRange.empty()))).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -322,7 +323,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.dbSize(), is(2L)); + assertThat(clusterConnection.dbSize()).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -330,7 +331,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "5"); - assertThat(clusterConnection.decrBy(KEY_1_BYTES, 4), is(1L)); + assertThat(clusterConnection.decrBy(KEY_1_BYTES, 4)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -338,7 +339,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "5"); - assertThat(clusterConnection.decr(KEY_1_BYTES), is(4L)); + assertThat(clusterConnection.decr(KEY_1_BYTES)).isEqualTo(4L); } @Test // DATAREDIS-315 @@ -350,8 +351,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.del(KEY_1_BYTES); clusterConnection.del(KEY_2_BYTES); - assertThat(nativeConnection.get(KEY_1), nullValue()); - assertThat(nativeConnection.get(KEY_2), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNull(); + assertThat(nativeConnection.get(KEY_2)).isNull(); } @Test // DATAREDIS-315 @@ -362,8 +363,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.del(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.get(SAME_SLOT_KEY_1), nullValue()); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), nullValue()); + assertThat(nativeConnection.get(SAME_SLOT_KEY_1)).isNull(); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isNull(); } @Test // DATAREDIS-315 @@ -373,7 +374,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.del(KEY_1_BYTES); - assertThat(nativeConnection.get(KEY_1), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNull(); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -389,7 +390,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { byte[] dumpedValue = clusterConnection.dump(KEY_1_BYTES); clusterConnection.restore(KEY_2_BYTES, 0, dumpedValue); - assertThat(nativeConnection.get(KEY_2), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-696 @@ -403,12 +404,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.keyCommands().restore(KEY_1_BYTES, 0, dumpedValue, true); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 public void echoShouldReturnInputCorrectly() { - assertThat(clusterConnection.echo(VALUE_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.echo(VALUE_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -421,13 +422,13 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "true"); - assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-529 public void existsWithMultipleKeysShouldConsiderAbsentKeys() { - assertThat(clusterConnection.keyCommands().exists("no-exist-1".getBytes(), "no-exist-2".getBytes()), is(0L)); + assertThat(clusterConnection.keyCommands().exists("no-exist-1".getBytes(), "no-exist-2".getBytes())).isEqualTo(0L); } @Test // DATAREDIS-529 @@ -437,8 +438,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_2, "true"); nativeConnection.set(KEY_3, "true"); - assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES, "nonexistent".getBytes()), - is(3L)); + assertThat(clusterConnection.keyCommands().exists(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES, "nonexistent".getBytes())) + .isEqualTo(3L); } @Test // DATAREDIS-315 @@ -448,7 +449,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.expireAt(KEY_1_BYTES, System.currentTimeMillis() / 1000 + 5000); - assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -458,7 +459,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.expire(KEY_1_BYTES, 5); - assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -469,8 +470,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.flushDb(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty())); - assertThat(nativeConnection.get(KEY_1), notNullValue()); - assertThat(nativeConnection.get(KEY_2), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNotNull(); + assertThat(nativeConnection.get(KEY_2)).isNull(); } @Test // DATAREDIS-315 @@ -481,21 +482,21 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.flushDb(); - assertThat(nativeConnection.get(KEY_1), nullValue()); - assertThat(nativeConnection.get(KEY_2), nullValue()); + assertThat(nativeConnection.get(KEY_1)).isNull(); + assertThat(nativeConnection.get(KEY_2)).isNull(); } @Test // DATAREDIS-438 @IfProfileValue(name = "redisVersion", value = "3.2+") public void geoAddMultipleGeoLocations() { assertThat(clusterConnection.geoAdd(KEY_1_BYTES, - Arrays.asList(PALERMO_BYTES, ARIGENTO_BYTES, CATANIA_BYTES, PALERMO_BYTES)), is(3L)); + Arrays.asList(PALERMO_BYTES, ARIGENTO_BYTES, CATANIA_BYTES, PALERMO_BYTES))).isEqualTo(3L); } @Test // DATAREDIS-438 @IfProfileValue(name = "redisVersion", value = "3.2+") public void geoAddSingleGeoLocation() { - assertThat(clusterConnection.geoAdd(KEY_1_BYTES, PALERMO_BYTES), is(1L)); + assertThat(clusterConnection.geoAdd(KEY_1_BYTES, PALERMO_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-438 @@ -507,8 +508,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); Distance distance = clusterConnection.geoDist(KEY_1_BYTES, PALERMO_BYTES.getName(), CATANIA_BYTES.getName()); - assertThat(distance.getValue(), is(closeTo(166274.15156960033D, 0.005))); - assertThat(distance.getUnit(), is("m")); + assertThat(distance.getValue()).isCloseTo(166274.15156960033D, offset(0.005)); + assertThat(distance.getUnit()).isEqualTo("m"); } @Test // DATAREDIS-438 @@ -521,8 +522,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Distance distance = clusterConnection.geoDist(KEY_1_BYTES, PALERMO_BYTES.getName(), CATANIA_BYTES.getName(), KILOMETERS); - assertThat(distance.getValue(), is(closeTo(166.27415156960033D, 0.005))); - assertThat(distance.getUnit(), is("km")); + assertThat(distance.getValue()).isCloseTo(166.27415156960033D, offset(0.005)); + assertThat(distance.getUnit()).isEqualTo("km"); } @@ -534,7 +535,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); List result = clusterConnection.geoHash(KEY_1_BYTES, PALERMO_BYTES.getName(), CATANIA_BYTES.getName()); - assertThat(result, contains("sqc8b49rny0", "sqdtr74hyu0")); + assertThat(result).containsExactly("sqc8b49rny0", "sqdtr74hyu0"); } @Test // DATAREDIS-438 @@ -546,7 +547,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { List result = clusterConnection.geoHash(KEY_1_BYTES, PALERMO_BYTES.getName(), ARIGENTO_BYTES.getName(), CATANIA_BYTES.getName()); - assertThat(result, contains("sqc8b49rny0", (String) null, "sqdtr74hyu0")); + assertThat(result).containsExactly("sqc8b49rny0", (String) null, "sqdtr74hyu0"); } @Test // DATAREDIS-438 @@ -558,11 +559,11 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { List positions = clusterConnection.geoPos(KEY_1_BYTES, PALERMO_BYTES.getName(), CATANIA_BYTES.getName()); - assertThat(positions.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(positions.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(positions.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(positions.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(positions.get(1).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(positions.get(1).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(positions.get(1).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(positions.get(1).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); } @Test // DATAREDIS-438 @@ -575,13 +576,13 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { List positions = clusterConnection.geoPos(KEY_1_BYTES, PALERMO_BYTES.getName(), ARIGENTO_BYTES.getName(), CATANIA_BYTES.getName()); - assertThat(positions.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(positions.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(positions.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(positions.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(positions.get(1), is(nullValue())); + assertThat(positions.get(1)).isNull(); - assertThat(positions.get(2).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(positions.get(2).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(positions.get(2).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(positions.get(2).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); } @Test // DATAREDIS-438 @@ -595,7 +596,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadiusByMember(KEY_1_BYTES, PALERMO_BYTES.getName(), new Distance(200, KILOMETERS), newGeoRadiusArgs().limit(2)); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -609,9 +610,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadiusByMember(KEY_1_BYTES, PALERMO_BYTES.getName(), new Distance(100, KILOMETERS), newGeoRadiusArgs().includeDistance()); - assertThat(result.getContent(), hasSize(2)); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(90.978D, 0.005))); - assertThat(result.getContent().get(0).getDistance().getUnit(), is("km")); + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(90.978D, offset(0.005)); + assertThat(result.getContent().get(0).getDistance().getUnit()).isEqualTo("km"); } @Test // DATAREDIS-438 @@ -625,8 +626,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadiusByMember(KEY_1_BYTES, PALERMO_BYTES.getName(), new Distance(100, KILOMETERS), newGeoRadiusArgs().sortAscending()); - assertThat(result.getContent().get(0).getContent().getName(), is(PALERMO_BYTES.getName())); - assertThat(result.getContent().get(1).getContent().getName(), is(ARIGENTO_BYTES.getName())); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(PALERMO_BYTES.getName()); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(ARIGENTO_BYTES.getName()); } @Test // DATAREDIS-438 @@ -640,7 +641,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadius(KEY_1_BYTES, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().limit(2)); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -654,9 +655,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadius(KEY_1_BYTES, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().includeDistance()); - assertThat(result.getContent(), hasSize(3)); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(130.423D, 0.005))); - assertThat(result.getContent().get(0).getDistance().getUnit(), is("km")); + assertThat(result.getContent()).hasSize(3); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(130.423D, offset(0.005)); + assertThat(result.getContent().get(0).getDistance().getUnit()).isEqualTo("km"); } @Test // DATAREDIS-438 @@ -669,7 +670,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { GeoResults> result = clusterConnection.geoRadius(KEY_1_BYTES, new Circle(new Point(15D, 37D), new Distance(150D, KILOMETERS))); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438 @@ -680,7 +681,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.geoadd(KEY_1, ARIGENTO.getPoint().getX(), ARIGENTO.getPoint().getY(), ARIGENTO.getName()); nativeConnection.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA.getName()); - assertThat(clusterConnection.geoRemove(KEY_1_BYTES, ARIGENTO_BYTES.getName()), is(1L)); + assertThat(clusterConnection.geoRemove(KEY_1_BYTES, ARIGENTO_BYTES.getName())).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -689,13 +690,14 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setbit(KEY_1, 0, 1); nativeConnection.setbit(KEY_1, 1, 0); - assertThat(clusterConnection.getBit(KEY_1_BYTES, 0), is(true)); - assertThat(clusterConnection.getBit(KEY_1_BYTES, 1), is(false)); + assertThat(clusterConnection.getBit(KEY_1_BYTES, 0)).isTrue(); + assertThat(clusterConnection.getBit(KEY_1_BYTES, 1)).isFalse(); } @Test // DATAREDIS-315 public void getClusterNodeForKeyShouldReturnNodeCorrectly() { - assertThat((RedisNode) clusterConnection.clusterGetNodeForKey(KEY_1_BYTES), is(new RedisNode("127.0.0.1", 7380))); + assertThat((RedisNode) clusterConnection.clusterGetNodeForKey(KEY_1_BYTES)) + .isEqualTo(new RedisNode("127.0.0.1", 7380)); } @Test // DATAREDIS-315, DATAREDIS-661 @@ -703,7 +705,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Properties result = clusterConnection.getConfig(new RedisClusterNode(CLUSTER_HOST, SLAVEOF_NODE_1_PORT), "*"); - assertThat(result.getProperty("slaveof"), endsWith("7379")); + assertThat(result.getProperty("slaveof")).endsWith("7379"); } @Test // DATAREDIS-315, DATAREDIS-661 @@ -713,12 +715,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { // config get *max-*-entries on redis 3.0.7 returns 8 entries per node while on 3.2.0-rc3 returns 6. // @link https://github.com/spring-projects/spring-data-redis/pull/187 - assertThat(result.size() % 3, is(0)); + assertThat(result.size() % 3).isEqualTo(0); for (Object key : result.keySet()) { - assertThat(key.toString(), startsWith(CLUSTER_HOST)); - assertThat(result.getProperty(key.toString()), not(startsWith(CLUSTER_HOST))); + assertThat(key.toString()).startsWith(CLUSTER_HOST); + assertThat(result.getProperty(key.toString())).doesNotStartWith(CLUSTER_HOST); } } @@ -727,7 +729,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.getRange(KEY_1_BYTES, 0, 2), is(LettuceConverters.toBytes("val"))); + assertThat(clusterConnection.getRange(KEY_1_BYTES, 0, 2)).isEqualTo(LettuceConverters.toBytes("val")); } @Test // DATAREDIS-315 @@ -737,8 +739,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { byte[] valueBeforeSet = clusterConnection.getSet(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(valueBeforeSet, is(VALUE_1_BYTES)); - assertThat(nativeConnection.get(KEY_1), is(VALUE_2)); + assertThat(valueBeforeSet).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -746,7 +748,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.get(KEY_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -757,8 +759,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hDel(KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.hexists(KEY_1, KEY_2), is(false)); - assertThat(nativeConnection.hexists(KEY_1, KEY_3), is(true)); + assertThat(nativeConnection.hexists(KEY_1, KEY_2)).isFalse(); + assertThat(nativeConnection.hexists(KEY_1, KEY_3)).isTrue(); } @Test // DATAREDIS-315 @@ -766,9 +768,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_1); - assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_2_BYTES), is(true)); - assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_3_BYTES), is(false)); - assertThat(clusterConnection.hExists(LettuceConverters.toBytes("foo"), KEY_2_BYTES), is(false)); + assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_2_BYTES)).isTrue(); + assertThat(clusterConnection.hExists(KEY_1_BYTES, KEY_3_BYTES)).isFalse(); + assertThat(clusterConnection.hExists(LettuceConverters.toBytes("foo"), KEY_2_BYTES)).isFalse(); } @Test // DATAREDIS-315 @@ -782,7 +784,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Map hGetAll = clusterConnection.hGetAll(KEY_1_BYTES); - assertThat(hGetAll.keySet(), hasItems(KEY_2_BYTES, KEY_3_BYTES)); + assertThat(hGetAll.keySet()).contains(KEY_2_BYTES, KEY_3_BYTES); } @Test // DATAREDIS-315 @@ -790,7 +792,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_1); - assertThat(clusterConnection.hGet(KEY_1_BYTES, KEY_2_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.hGet(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -801,7 +803,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hIncrBy(KEY_1_BYTES, KEY_3_BYTES, 3.5D); - assertThat(nativeConnection.hget(KEY_1, KEY_3), is("5.5")); + assertThat(nativeConnection.hget(KEY_1, KEY_3)).isEqualTo("5.5"); } @Test // DATAREDIS-315 @@ -812,7 +814,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hIncrBy(KEY_1_BYTES, KEY_3_BYTES, 3); - assertThat(nativeConnection.hget(KEY_1, KEY_3), is("5")); + assertThat(nativeConnection.hget(KEY_1, KEY_3)).isEqualTo("5"); } @Test // DATAREDIS-315 @@ -821,7 +823,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_1); nativeConnection.hset(KEY_1, KEY_3, VALUE_2); - assertThat(clusterConnection.hKeys(KEY_1_BYTES), hasItems(KEY_2_BYTES, KEY_3_BYTES)); + assertThat(clusterConnection.hKeys(KEY_1_BYTES)).contains(KEY_2_BYTES, KEY_3_BYTES); } @Test // DATAREDIS-315 @@ -830,7 +832,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_1); nativeConnection.hset(KEY_1, KEY_3, VALUE_2); - assertThat(clusterConnection.hLen(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.hLen(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -839,7 +841,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_1); nativeConnection.hset(KEY_1, KEY_3, VALUE_2); - assertThat(clusterConnection.hMGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.hMGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -851,7 +853,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hMSet(KEY_1_BYTES, hashes); - assertThat(clusterConnection.hMGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.hMGet(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test @@ -872,7 +874,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { i++; } - assertThat(i, is(nrOfValues)); + assertThat(i).isEqualTo(nrOfValues); } @Test // DATAREDIS-315 @@ -882,7 +884,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hSetNX(KEY_1_BYTES, KEY_2_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.hget(KEY_1, KEY_2), is(VALUE_1)); + assertThat(nativeConnection.hget(KEY_1, KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -890,7 +892,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hSetNX(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.hget(KEY_1, KEY_2), is(VALUE_1)); + assertThat(nativeConnection.hget(KEY_1, KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -898,7 +900,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.hSet(KEY_1_BYTES, KEY_2_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.hget(KEY_1, KEY_2), is(VALUE_1)); + assertThat(nativeConnection.hget(KEY_1, KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-698 @@ -906,7 +908,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_3); - assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_2_BYTES), is(Long.valueOf(VALUE_3.length()))); + assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_2_BYTES)) + .isEqualTo(Long.valueOf(VALUE_3.length())); } @Test // DATAREDIS-698 @@ -914,12 +917,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_3); - assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_3_BYTES), is(0L)); + assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_3_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-698 public void hStrLenReturnsZeroWhenKeyDoesNotExist() { - assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_1_BYTES), is(0L)); + assertThat(clusterConnection.hashCommands().hStrLen(KEY_1_BYTES, KEY_1_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -928,7 +931,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.hset(KEY_1, KEY_2, VALUE_1); nativeConnection.hset(KEY_1, KEY_3, VALUE_2); - assertThat(clusterConnection.hVals(KEY_1_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.hVals(KEY_1_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -936,7 +939,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1"); - assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5.5D), is(6.5D)); + assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5.5D)).isEqualTo(6.5D); } @Test // DATAREDIS-315 @@ -944,7 +947,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1"); - assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5), is(6L)); + assertThat(clusterConnection.incrBy(KEY_1_BYTES, 5)).isEqualTo(6L); } @Test // DATAREDIS-315 @@ -952,7 +955,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1"); - assertThat(clusterConnection.incr(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.incr(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -960,7 +963,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Properties properties = clusterConnection.info(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT)); - assertThat(properties.getProperty("tcp_port"), is(Integer.toString(MASTER_NODE_2_PORT))); + assertThat(properties.getProperty("tcp_port")).isEqualTo(Integer.toString(MASTER_NODE_2_PORT)); } @Test // DATAREDIS-315 @@ -968,16 +971,16 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Properties properties = clusterConnection.info(new RedisClusterNode(CLUSTER_HOST, MASTER_NODE_2_PORT), "server"); - assertThat(properties.getProperty("tcp_port"), is(Integer.toString(MASTER_NODE_2_PORT))); - assertThat(properties.getProperty("used_memory"), nullValue()); + assertThat(properties.getProperty("tcp_port")).isEqualTo(Integer.toString(MASTER_NODE_2_PORT)); + assertThat(properties.getProperty("used_memory")).isNull(); } @Test // DATAREDIS-315, DATAREDIS-685 public void infoShouldCollectionInfoFromAllClusterNodes() { Properties singleNodeInfo = clusterConnection.serverCommands().info(new RedisClusterNode("127.0.0.1", 7380)); - assertThat(Double.valueOf(clusterConnection.serverCommands().info().size()), - closeTo(singleNodeInfo.size() * 3, 12d)); + assertThat(Double.valueOf(clusterConnection.serverCommands().info().size())).isCloseTo(singleNodeInfo.size() * 3, + offset(12d)); } @Test // DATAREDIS-315 @@ -986,7 +989,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.keys(LettuceConverters.toBytes("*")), hasItems(KEY_1_BYTES, KEY_2_BYTES)); + assertThat(clusterConnection.keys(LettuceConverters.toBytes("*"))).contains(KEY_1_BYTES, KEY_2_BYTES); } @Test // DATAREDIS-315 @@ -998,8 +1001,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Set keysOnNode = clusterConnection.keys(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()), JedisConverters.toBytes("*")); - assertThat(keysOnNode, hasItems(KEY_2_BYTES)); - assertThat(keysOnNode, not(hasItems(KEY_1_BYTES))); + assertThat(keysOnNode).contains(KEY_2_BYTES); + assertThat(keysOnNode).doesNotContain(KEY_1_BYTES); } @Test // DATAREDIS-635 @@ -1012,7 +1015,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { List keys = new ArrayList<>(); scan.forEachRemaining(keys::add); - assertThat(keys, hasItems(KEY_1_BYTES, KEY_2_BYTES)); + assertThat(keys).contains(KEY_1_BYTES, KEY_2_BYTES); } @Test // DATAREDIS-635 @@ -1026,8 +1029,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { List keysOnNode = new ArrayList<>(); scan.forEachRemaining(keysOnNode::add); - assertThat(keysOnNode, hasItems(KEY_2_BYTES)); - assertThat(keysOnNode, not(hasItems(KEY_1_BYTES))); + assertThat(keysOnNode).contains(KEY_2_BYTES); + assertThat(keysOnNode).doesNotContain(KEY_1_BYTES); } @Test // DATAREDIS-315 @@ -1035,7 +1038,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.rpush(KEY_1, VALUE_1, VALUE_2, "foo", "bar"); - assertThat(clusterConnection.lIndex(KEY_1_BYTES, 1), is(VALUE_2_BYTES)); + assertThat(clusterConnection.lIndex(KEY_1_BYTES, 1)).isEqualTo(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1045,7 +1048,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lInsert(KEY_1_BYTES, Position.AFTER, VALUE_2_BYTES, LettuceConverters.toBytes("booh!")); - assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(2), is("booh!")); + assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(2)).isEqualTo("booh!"); } @Test // DATAREDIS-315 @@ -1053,7 +1056,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.lLen(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.lLen(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1061,7 +1064,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.rpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.lPop(KEY_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.lPop(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1069,7 +1072,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lPushX(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.exists(KEY_1), is(0L)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -1077,7 +1080,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lPush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.lrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1085,7 +1088,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.lRange(KEY_1_BYTES, 0L, -1L), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.lRange(KEY_1_BYTES, 0L, -1L)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1095,7 +1098,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lRem(KEY_1_BYTES, 1L, VALUE_1_BYTES); - assertThat(nativeConnection.llen(KEY_1), is(3L)); + assertThat(nativeConnection.llen(KEY_1)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1105,7 +1108,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lSet(KEY_1_BYTES, 1L, VALUE_1_BYTES); - assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(1), is(VALUE_1)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1).get(1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1115,7 +1118,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.lTrim(KEY_1_BYTES, 2, 3); - assertThat(nativeConnection.lrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1124,7 +1127,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES), contains(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES)).containsExactly(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-756 @@ -1133,8 +1136,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES, KEY_1_BYTES), - contains(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_1_BYTES)); + assertThat(clusterConnection.mGet(KEY_1_BYTES, KEY_2_BYTES, KEY_1_BYTES)).containsExactly(VALUE_1_BYTES, + VALUE_2_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1143,8 +1146,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1, VALUE_1); nativeConnection.set(SAME_SLOT_KEY_2, VALUE_2); - assertThat(clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), - contains(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).containsExactly(VALUE_1_BYTES, + VALUE_2_BYTES); } @Test // DATAREDIS-756 @@ -1153,8 +1156,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1, VALUE_1); nativeConnection.set(SAME_SLOT_KEY_2, VALUE_2); - assertThat(clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES, SAME_SLOT_KEY_1_BYTES), - contains(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_1_BYTES)); + assertThat(clusterConnection.mGet(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES, SAME_SLOT_KEY_1_BYTES)) + .containsExactly(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1165,10 +1168,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { map.put(KEY_1_BYTES, VALUE_1_BYTES); map.put(KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mSetNX(map), is(false)); + assertThat(clusterConnection.mSetNX(map)).isFalse(); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_3)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_3); } @Test // DATAREDIS-315 @@ -1178,10 +1181,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { map.put(KEY_1_BYTES, VALUE_1_BYTES); map.put(KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mSetNX(map), is(true)); + assertThat(clusterConnection.mSetNX(map)).isTrue(); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1191,10 +1194,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { map.put(SAME_SLOT_KEY_1_BYTES, VALUE_1_BYTES); map.put(SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES); - assertThat(clusterConnection.mSetNX(map), is(true)); + assertThat(clusterConnection.mSetNX(map)).isTrue(); - assertThat(nativeConnection.get(SAME_SLOT_KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(SAME_SLOT_KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1206,8 +1209,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.mSet(map); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1219,8 +1222,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.mSet(map); - assertThat(nativeConnection.get(SAME_SLOT_KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(SAME_SLOT_KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_2); } @Test(expected = UnsupportedOperationException.class) // DATAREDIS-315 @@ -1240,7 +1243,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pExpireAt(KEY_1_BYTES, System.currentTimeMillis() + 5000); - assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1250,7 +1253,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pExpire(KEY_1_BYTES, 5000); - assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1, is(true)); + assertThat(nativeConnection.ttl(LettuceConverters.toString(KEY_1_BYTES)) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1258,8 +1261,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pSetEx(KEY_1_BYTES, 5000, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.ttl(KEY_1) > 1, is(true)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.ttl(KEY_1) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1268,7 +1271,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.expire(KEY_1, 5); - assertThat(clusterConnection.pTtl(KEY_1_BYTES) > 1, is(true)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1276,17 +1279,17 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.pTtl(KEY_1_BYTES), is(-1L)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES)).isEqualTo(-1L); } @Test // DATAREDIS-315 public void pTtlShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.pTtl(KEY_1_BYTES), is(-2L)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES)).isEqualTo(-2L); } @Test // DATAREDIS-526 public void pTtlWithTimeUnitShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.pTtl(KEY_1_BYTES, TimeUnit.SECONDS), is(-2L)); + assertThat(clusterConnection.pTtl(KEY_1_BYTES, TimeUnit.SECONDS)).isEqualTo(-2L); } @Test // DATAREDIS-315 @@ -1294,8 +1297,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.setex(KEY_1, 10, VALUE_1); - assertThat(clusterConnection.persist(KEY_1_BYTES), is(Boolean.TRUE)); - assertThat(nativeConnection.ttl(KEY_1), is(-1L)); + assertThat(clusterConnection.persist(KEY_1_BYTES)).isEqualTo(Boolean.TRUE); + assertThat(nativeConnection.ttl(KEY_1)).isEqualTo(-1L); } @Test // DATAREDIS-315 @@ -1303,7 +1306,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.pfAdd(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES); - assertThat(((RedisHLLCommands) nativeConnection).pfcount(KEY_1), is(3L)); + assertThat(((RedisHLLCommands) nativeConnection).pfcount(KEY_1)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1312,7 +1315,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { ((RedisHLLCommands) nativeConnection).pfadd(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); ((RedisHLLCommands) nativeConnection).pfadd(SAME_SLOT_KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.pfCount(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(3L)); + assertThat(clusterConnection.pfCount(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1320,7 +1323,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { ((RedisHLLCommands) nativeConnection).pfadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(clusterConnection.pfCount(KEY_1_BYTES), is(3L)); + assertThat(clusterConnection.pfCount(KEY_1_BYTES)).isEqualTo(3L); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -1345,17 +1348,17 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { ((RedisHLLCommands) nativeConnection).pfmerge(SAME_SLOT_KEY_3, SAME_SLOT_KEY_1, SAME_SLOT_KEY_2); - assertThat(((RedisHLLCommands) nativeConnection).pfcount(SAME_SLOT_KEY_3), is(3L)); + assertThat(((RedisHLLCommands) nativeConnection).pfcount(SAME_SLOT_KEY_3)).isEqualTo(3L); } @Test // DATAREDIS-315 public void pingShouldRetrunPong() { - assertThat(clusterConnection.ping(), is("PONG")); + assertThat(clusterConnection.ping()).isEqualTo("PONG"); } @Test // DATAREDIS-315 public void pingShouldRetrunPongForExistingNode() { - assertThat(clusterConnection.ping(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty())), is("PONG")); + assertThat(clusterConnection.ping(new RedisClusterNode("127.0.0.1", 7379, SlotRange.empty()))).isEqualTo("PONG"); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 @@ -1369,7 +1372,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1, VALUE_2); nativeConnection.lpush(KEY_2, VALUE_3); - assertThat(clusterConnection.bLPop(100, KEY_1_BYTES, KEY_2_BYTES).size(), is(2)); + assertThat(clusterConnection.bLPop(100, KEY_1_BYTES, KEY_2_BYTES).size()).isEqualTo(2); } @Test // DATAREDIS-315 @@ -1377,8 +1380,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.rPopLPush(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(VALUE_1_BYTES)); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_2), is(1L)); + assertThat(clusterConnection.rPopLPush(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(VALUE_1_BYTES); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_2)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -1386,7 +1389,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.rpush(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.rPop(KEY_1_BYTES), is(VALUE_2_BYTES)); + assertThat(clusterConnection.rPop(KEY_1_BYTES)).isEqualTo(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1394,7 +1397,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rPushX(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.exists(KEY_1), is(0L)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -1402,7 +1405,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rPush(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.lrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.lrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1411,12 +1414,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.randomKey(), notNullValue()); + assertThat(clusterConnection.randomKey()).isNotNull(); } @Test // DATAREDIS-315 public void randomKeyShouldReturnNullWhenNoKeysAvailable() { - assertThat(clusterConnection.randomKey(), nullValue()); + assertThat(clusterConnection.randomKey()).isNull(); } @Test // DATAREDIS-315 @@ -1426,8 +1429,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rename(KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.exists(KEY_1), is(0L)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_1)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(0L); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1435,10 +1438,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(SAME_SLOT_KEY_1, VALUE_1); - assertThat(clusterConnection.renameNX(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), is(Boolean.TRUE)); + assertThat(clusterConnection.renameNX(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).isEqualTo(Boolean.TRUE); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_1), is(0L)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), is(VALUE_1)); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_1)).isEqualTo(0L); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1447,10 +1450,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_2); - assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES), is(Boolean.FALSE)); + assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(Boolean.FALSE); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_2)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-315 @@ -1458,10 +1461,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES), is(Boolean.TRUE)); + assertThat(clusterConnection.renameNX(KEY_1_BYTES, KEY_2_BYTES)).isEqualTo(Boolean.TRUE); - assertThat(nativeConnection.exists(KEY_1), is(0L)); - assertThat(nativeConnection.get(KEY_2), is(VALUE_1)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(0L); + assertThat(nativeConnection.get(KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1471,8 +1474,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.rename(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.exists(SAME_SLOT_KEY_1), is(0L)); - assertThat(nativeConnection.get(SAME_SLOT_KEY_2), is(VALUE_1)); + assertThat(nativeConnection.exists(SAME_SLOT_KEY_1)).isEqualTo(0L); + assertThat(nativeConnection.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1480,7 +1483,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sAdd(KEY_1_BYTES, VALUE_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.smembers(KEY_1), hasItems(VALUE_1, VALUE_2)); + assertThat(nativeConnection.smembers(KEY_1)).contains(VALUE_1, VALUE_2); } @Test // DATAREDIS-315 @@ -1488,7 +1491,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sCard(KEY_1_BYTES), is(2L)); + assertThat(clusterConnection.sCard(KEY_1_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1497,7 +1500,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); nativeConnection.sadd(SAME_SLOT_KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.sDiff(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), hasItems(VALUE_1_BYTES)); + assertThat(clusterConnection.sDiff(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315, DATAREDIS-647 @@ -1507,8 +1510,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_2, VALUE_2, VALUE_3); nativeConnection.sadd(KEY_3, VALUE_1, VALUE_3); - assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES), hasItems(VALUE_1_BYTES)); - assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), is(empty())); + assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES)).contains(VALUE_1_BYTES); + assertThat(clusterConnection.sDiff(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).isEmpty(); } @Test // DATAREDIS-315 @@ -1519,7 +1522,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sDiffStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3), hasItems(VALUE_1)); + assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3)).contains(VALUE_1); } @Test // DATAREDIS-315 @@ -1530,7 +1533,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sDiffStore(KEY_3_BYTES, KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.smembers(KEY_3), hasItems(VALUE_1)); + assertThat(nativeConnection.smembers(KEY_3)).contains(VALUE_1); } @Test // DATAREDIS-315 @@ -1539,7 +1542,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); nativeConnection.sadd(SAME_SLOT_KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.sInter(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), hasItem(VALUE_2_BYTES)); + assertThat(clusterConnection.sInter(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1548,7 +1551,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); nativeConnection.sadd(KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.sInter(KEY_1_BYTES, KEY_2_BYTES), hasItem(VALUE_2_BYTES)); + assertThat(clusterConnection.sInter(KEY_1_BYTES, KEY_2_BYTES)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1559,7 +1562,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sInterStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3), hasItem(VALUE_2)); + assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3)).contains(VALUE_2); } @Test // DATAREDIS-315 @@ -1570,7 +1573,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sInterStore(KEY_3_BYTES, KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.smembers(KEY_3), hasItem(VALUE_2)); + assertThat(nativeConnection.smembers(KEY_3)).contains(VALUE_2); } @Test // DATAREDIS-315 @@ -1578,7 +1581,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sIsMember(KEY_1_BYTES, LettuceConverters.toBytes("foo")), is(false)); + assertThat(clusterConnection.sIsMember(KEY_1_BYTES, LettuceConverters.toBytes("foo"))).isFalse(); } @Test // DATAREDIS-315 @@ -1586,7 +1589,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sIsMember(KEY_1_BYTES, VALUE_1_BYTES), is(true)); + assertThat(clusterConnection.sIsMember(KEY_1_BYTES, VALUE_1_BYTES)).isTrue(); } @Test // DATAREDIS-315 @@ -1594,7 +1597,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sMembers(KEY_1_BYTES), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.sMembers(KEY_1_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1605,8 +1608,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sMove(KEY_1_BYTES, KEY_2_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.sismember(KEY_1, VALUE_2), is(false)); - assertThat(nativeConnection.sismember(KEY_2, VALUE_2), is(true)); + assertThat(nativeConnection.sismember(KEY_1, VALUE_2)).isFalse(); + assertThat(nativeConnection.sismember(KEY_2, VALUE_2)).isTrue(); } @Test // DATAREDIS-315 @@ -1617,8 +1620,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sMove(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.sismember(SAME_SLOT_KEY_1, VALUE_2), is(false)); - assertThat(nativeConnection.sismember(SAME_SLOT_KEY_2, VALUE_2), is(true)); + assertThat(nativeConnection.sismember(SAME_SLOT_KEY_1, VALUE_2)).isFalse(); + assertThat(nativeConnection.sismember(SAME_SLOT_KEY_2, VALUE_2)).isTrue(); } @Test // DATAREDIS-315 @@ -1626,7 +1629,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sPop(KEY_1_BYTES), notNullValue()); + assertThat(clusterConnection.sPop(KEY_1_BYTES)).isNotNull(); } @Test // DATAREDIS-668 @@ -1634,8 +1637,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(clusterConnection.setCommands().sPop(KEY_1_BYTES, 2), hasSize(2)); - assertThat(nativeConnection.scard(KEY_1), is(1L)); + assertThat(clusterConnection.setCommands().sPop(KEY_1_BYTES, 2)).hasSize(2); + assertThat(nativeConnection.scard(KEY_1)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -1643,7 +1646,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sRandMember(KEY_1_BYTES), notNullValue()); + assertThat(clusterConnection.sRandMember(KEY_1_BYTES)).isNotNull(); } @Test // DATAREDIS-315 @@ -1651,7 +1654,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(clusterConnection.sRandMember(KEY_1_BYTES, 3), notNullValue()); + assertThat(clusterConnection.sRandMember(KEY_1_BYTES, 3)).isNotNull(); } @Test // DATAREDIS-315 @@ -1661,7 +1664,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sRem(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.smembers(KEY_1), hasItems(VALUE_1)); + assertThat(nativeConnection.smembers(KEY_1)).contains(VALUE_1); } @Test // DATAREDIS-315 @@ -1670,8 +1673,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(SAME_SLOT_KEY_1, VALUE_1, VALUE_2); nativeConnection.sadd(SAME_SLOT_KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.sUnion(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(clusterConnection.sUnion(SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES)).contains(VALUE_1_BYTES, + VALUE_2_BYTES, VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -1680,8 +1683,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.sadd(KEY_1, VALUE_1, VALUE_2); nativeConnection.sadd(KEY_2, VALUE_2, VALUE_3); - assertThat(clusterConnection.sUnion(KEY_1_BYTES, KEY_2_BYTES), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES, VALUE_3_BYTES)); + assertThat(clusterConnection.sUnion(KEY_1_BYTES, KEY_2_BYTES)).contains(VALUE_1_BYTES, VALUE_2_BYTES, + VALUE_3_BYTES); } @Test // DATAREDIS-315 @@ -1692,7 +1695,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sUnionStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3), hasItems(VALUE_1, VALUE_2, VALUE_3)); + assertThat(nativeConnection.smembers(SAME_SLOT_KEY_3)).contains(VALUE_1, VALUE_2, VALUE_3); } @Test // DATAREDIS-315 @@ -1703,7 +1706,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.sUnionStore(KEY_3_BYTES, KEY_1_BYTES, KEY_2_BYTES); - assertThat(nativeConnection.smembers(KEY_3), hasItems(VALUE_1, VALUE_2, VALUE_3)); + assertThat(nativeConnection.smembers(KEY_3)).contains(VALUE_1, VALUE_2, VALUE_3); } @Test // DATAREDIS-315 @@ -1722,8 +1725,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setBit(KEY_1_BYTES, 0, true); clusterConnection.setBit(KEY_1_BYTES, 1, false); - assertThat(nativeConnection.getbit(KEY_1, 0), is(1L)); - assertThat(nativeConnection.getbit(KEY_1, 1), is(0L)); + assertThat(nativeConnection.getbit(KEY_1, 0)).isEqualTo(1L); + assertThat(nativeConnection.getbit(KEY_1, 1)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -1731,8 +1734,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setEx(KEY_1_BYTES, 5, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); - assertThat(nativeConnection.ttl(KEY_1) > 1, is(true)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeConnection.ttl(KEY_1) > 1).isTrue(); } @Test // DATAREDIS-315 @@ -1742,7 +1745,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setNX(KEY_1_BYTES, VALUE_2_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1750,7 +1753,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setNX(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-315 @@ -1760,7 +1763,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.setRange(KEY_1_BYTES, LettuceConverters.toBytes("UE"), 3); - assertThat(nativeConnection.get(KEY_1), is("valUE1")); + assertThat(nativeConnection.get(KEY_1)).isEqualTo("valUE1"); } @Test // DATAREDIS-315 @@ -1768,7 +1771,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.get(KEY_1), is(VALUE_1)); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-316 @@ -1778,9 +1781,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_2_BYTES, Expiration.seconds(1), SetOption.ifAbsent()); - assertThat(nativeConnection.exists(KEY_1), is(1L)); - assertThat(nativeConnection.ttl(KEY_1), is(-1L)); - assertThat(nativeConnection.get(KEY_1), is(equalTo(VALUE_1))); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.ttl(KEY_1)).isEqualTo(-1L); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_1); } @@ -1789,8 +1792,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.seconds(1), SetOption.ifAbsent()); - assertThat(nativeConnection.exists(KEY_1), is(1L)); - assertThat(nativeConnection.ttl(KEY_1), is(1L)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.ttl(KEY_1)).isEqualTo(1L); } @Test // DATAREDIS-316 @@ -1798,7 +1801,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.seconds(1), SetOption.ifPresent()); - assertThat(nativeConnection.exists(KEY_1), is(0L)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(0L); } @Test // DATAREDIS-316 @@ -1808,9 +1811,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_2_BYTES, Expiration.seconds(1), SetOption.ifPresent()); - assertThat(nativeConnection.exists(KEY_1), is(1L)); - assertThat(nativeConnection.ttl(KEY_1), is(1L)); - assertThat(nativeConnection.get(KEY_1), is(equalTo(VALUE_2))); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.ttl(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.get(KEY_1)).isEqualTo(VALUE_2); } @@ -1819,8 +1822,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.milliseconds(500), SetOption.upsert()); - assertThat(nativeConnection.exists(KEY_1), is(1L)); - assertThat(nativeConnection.pttl(KEY_1).doubleValue(), is(closeTo(500d, 499d))); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.pttl(KEY_1).doubleValue()).isCloseTo(500d, offset(499d)); } @Test // DATAREDIS-316 @@ -1828,8 +1831,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.seconds(1), SetOption.upsert()); - assertThat(nativeConnection.exists(KEY_1), is(1L)); - assertThat(nativeConnection.ttl(KEY_1), is(1L)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.ttl(KEY_1)).isEqualTo(1L); } @Test // DATAREDIS-316 @@ -1837,8 +1840,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES, Expiration.persistent(), SetOption.ifAbsent()); - assertThat(nativeConnection.exists(KEY_1), is(1L)); - assertThat(nativeConnection.ttl(KEY_1), is(-1L)); + assertThat(nativeConnection.exists(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.ttl(KEY_1)).isEqualTo(-1L); } @Test // DATAREDIS-316 @@ -1852,7 +1855,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { public void shouldAllowSettingAndGettingValues() { clusterConnection.set(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(clusterConnection.get(KEY_1_BYTES), is(VALUE_1_BYTES)); + assertThat(clusterConnection.get(KEY_1_BYTES)).isEqualTo(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -1860,13 +1863,13 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_2, VALUE_1); - assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES), is(1L)); - assertThat(nativeConnection.exists(KEY_2), is(1L)); + assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES)).isEqualTo(1L); + assertThat(nativeConnection.exists(KEY_2)).isEqualTo(1L); } @Test // DATAREDIS-315 public void sortAndStoreShouldReturnZeroWhenListDoesNotExist() { - assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES), is(0L)); + assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha(), KEY_2_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -1874,8 +1877,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_2, VALUE_1); - assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha()), - hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.sort(KEY_1_BYTES, new DefaultSortParameters().alpha())).contains(VALUE_1_BYTES, + VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -1892,7 +1895,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { cursor.next(); } - assertThat(count, is(30)); + assertThat(count).isEqualTo(30); } @Test // DATAREDIS-315 @@ -1900,7 +1903,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.strLen(KEY_1_BYTES), is(6L)); + assertThat(clusterConnection.strLen(KEY_1_BYTES)).isEqualTo(6L); } @Test // DATAREDIS-315 @@ -1908,12 +1911,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.ttl(KEY_1_BYTES), is(-1L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES)).isEqualTo(-1L); } @Test // DATAREDIS-315 public void ttlShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.ttl(KEY_1_BYTES), is(-2L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES)).isEqualTo(-2L); } @Test // DATAREDIS-315 @@ -1922,7 +1925,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.expire(KEY_1, 5); - assertThat(clusterConnection.ttl(KEY_1_BYTES) > 1, is(true)); + assertThat(clusterConnection.ttl(KEY_1_BYTES) > 1).isTrue(); } @Test // DATAREDIS-526 @@ -1930,12 +1933,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); - assertThat(clusterConnection.ttl(KEY_1_BYTES, TimeUnit.SECONDS), is(-1L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES, TimeUnit.SECONDS)).isEqualTo(-1L); } @Test // DATAREDIS-526 public void ttlWithTimeUnitShouldReturnMinusTwoWhenKeyDoesNotExist() { - assertThat(clusterConnection.ttl(KEY_1_BYTES, TimeUnit.HOURS), is(-2L)); + assertThat(clusterConnection.ttl(KEY_1_BYTES, TimeUnit.HOURS)).isEqualTo(-2L); } @Test // DATAREDIS-315 @@ -1945,9 +1948,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_2, VALUE_2); nativeConnection.hmset(KEY_3, Collections.singletonMap(KEY_1, VALUE_1)); - assertThat(clusterConnection.type(KEY_1_BYTES), is(DataType.SET)); - assertThat(clusterConnection.type(KEY_2_BYTES), is(DataType.STRING)); - assertThat(clusterConnection.type(KEY_3_BYTES), is(DataType.HASH)); + assertThat(clusterConnection.type(KEY_1_BYTES)).isEqualTo(DataType.SET); + assertThat(clusterConnection.type(KEY_2_BYTES)).isEqualTo(DataType.STRING); + assertThat(clusterConnection.type(KEY_3_BYTES)).isEqualTo(DataType.HASH); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -1969,7 +1972,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zAdd(KEY_1_BYTES, tuples); - assertThat(nativeConnection.zcard(KEY_1), is(2L)); + assertThat(nativeConnection.zcard(KEY_1)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1978,7 +1981,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zAdd(KEY_1_BYTES, 10D, VALUE_1_BYTES); clusterConnection.zAdd(KEY_1_BYTES, 20D, VALUE_2_BYTES); - assertThat(nativeConnection.zcard(KEY_1), is(2L)); + assertThat(nativeConnection.zcard(KEY_1)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -1988,7 +1991,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zCard(KEY_1_BYTES), is(3L)); + assertThat(clusterConnection.zCard(KEY_1_BYTES)).isEqualTo(3L); } @Test // DATAREDIS-315 @@ -1998,7 +2001,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zCount(KEY_1_BYTES, 10, 20), is(2L)); + assertThat(clusterConnection.zCount(KEY_1_BYTES, 10, 20)).isEqualTo(2L); } @Test // DATAREDIS-315 @@ -2009,7 +2012,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zIncrBy(KEY_1_BYTES, 100D, VALUE_1_BYTES); - assertThat(nativeConnection.zrank(KEY_1, VALUE_1), is(1L)); + assertThat(nativeConnection.zrank(KEY_1, VALUE_1)).isEqualTo(1L); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -2028,7 +2031,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zInterStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3, 0, -1), hasItems(VALUE_2)); + assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3, 0, -1)).contains(VALUE_2); } @Test // DATAREDIS-315 @@ -2044,25 +2047,25 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { Set values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().lte("c")); - assertThat(values, - hasItems(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("b"), LettuceConverters.toBytes("c"))); - assertThat(values, not(hasItems(LettuceConverters.toBytes("d"), LettuceConverters.toBytes("e"), - LettuceConverters.toBytes("f"), LettuceConverters.toBytes("g")))); + assertThat(values).contains(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("b"), + LettuceConverters.toBytes("c")); + assertThat(values).doesNotContain(LettuceConverters.toBytes("d"), LettuceConverters.toBytes("e"), + LettuceConverters.toBytes("f"), LettuceConverters.toBytes("g")); values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().lt("c")); - assertThat(values, hasItems(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("b"))); - assertThat(values, not(hasItem(LettuceConverters.toBytes("c")))); + assertThat(values).contains(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("b")); + assertThat(values).doesNotContain(LettuceConverters.toBytes("c")); values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().gte("aaa").lt("g")); - assertThat(values, hasItems(LettuceConverters.toBytes("b"), LettuceConverters.toBytes("c"), - LettuceConverters.toBytes("d"), LettuceConverters.toBytes("e"), LettuceConverters.toBytes("f"))); - assertThat(values, not(hasItems(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("g")))); + assertThat(values).contains(LettuceConverters.toBytes("b"), LettuceConverters.toBytes("c"), + LettuceConverters.toBytes("d"), LettuceConverters.toBytes("e"), LettuceConverters.toBytes("f")); + assertThat(values).doesNotContain(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("g")); values = clusterConnection.zRangeByLex(KEY_1_BYTES, Range.range().gte("e")); - assertThat(values, - hasItems(LettuceConverters.toBytes("e"), LettuceConverters.toBytes("f"), LettuceConverters.toBytes("g"))); - assertThat(values, not(hasItems(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("b"), - LettuceConverters.toBytes("c"), LettuceConverters.toBytes("d")))); + assertThat(values).contains(LettuceConverters.toBytes("e"), LettuceConverters.toBytes("f"), + LettuceConverters.toBytes("g")); + assertThat(values).doesNotContain(LettuceConverters.toBytes("a"), LettuceConverters.toBytes("b"), + LettuceConverters.toBytes("c"), LettuceConverters.toBytes("d")); } @Test // DATAREDIS-315 @@ -2072,7 +2075,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10, 20), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10, 20)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2082,7 +2085,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L), hasItems(VALUE_1_BYTES)); + assertThat(clusterConnection.zRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L)).contains(VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2092,8 +2095,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10, 20), - hasItems((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D))); + assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10, 20)) + .contains((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D)); } @Test // DATAREDIS-315 @@ -2103,8 +2106,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L), - hasItems((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D))); + assertThat(clusterConnection.zRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L)) + .contains((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D)); } @Test // DATAREDIS-315 @@ -2114,7 +2117,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRange(KEY_1_BYTES, 1, 2), hasItems(VALUE_1_BYTES, VALUE_2_BYTES)); + assertThat(clusterConnection.zRange(KEY_1_BYTES, 1, 2)).contains(VALUE_1_BYTES, VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2124,8 +2127,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRangeWithScores(KEY_1_BYTES, 1, 2), - hasItems((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D))); + assertThat(clusterConnection.zRangeWithScores(KEY_1_BYTES, 1, 2)) + .contains((Tuple) new DefaultTuple(VALUE_1_BYTES, 10D), (Tuple) new DefaultTuple(VALUE_2_BYTES, 20D)); } @Test // DATAREDIS-315 @@ -2134,7 +2137,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 10D, VALUE_1); nativeConnection.zadd(KEY_1, 20D, VALUE_2); - assertThat(clusterConnection.zRank(KEY_1_BYTES, VALUE_2_BYTES), is(1L)); + assertThat(clusterConnection.zRank(KEY_1_BYTES, VALUE_2_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -2143,7 +2146,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 10D, VALUE_1); nativeConnection.zadd(KEY_1, 20D, VALUE_2); - assertThat(clusterConnection.zRevRank(KEY_1_BYTES, VALUE_2_BYTES), is(0L)); + assertThat(clusterConnection.zRevRank(KEY_1_BYTES, VALUE_2_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-315 @@ -2155,8 +2158,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zRemRangeByScore(KEY_1_BYTES, 15D, 25D); - assertThat(nativeConnection.zcard(KEY_1), is(2L)); - assertThat(nativeConnection.zrange(KEY_1, 0, -1), hasItems(VALUE_1, VALUE_3)); + assertThat(nativeConnection.zcard(KEY_1)).isEqualTo(2L); + assertThat(nativeConnection.zrange(KEY_1, 0, -1)).contains(VALUE_1, VALUE_3); } @Test // DATAREDIS-315 @@ -2168,8 +2171,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zRemRange(KEY_1_BYTES, 1, 2); - assertThat(nativeConnection.zcard(KEY_1), is(1L)); - assertThat(nativeConnection.zrange(KEY_1, 0, -1), hasItem(VALUE_1)); + assertThat(nativeConnection.zcard(KEY_1)).isEqualTo(1L); + assertThat(nativeConnection.zrange(KEY_1, 0, -1)).contains(VALUE_1); } @Test // DATAREDIS-315 @@ -2180,7 +2183,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zRem(KEY_1_BYTES, VALUE_1_BYTES); - assertThat(nativeConnection.zcard(KEY_1), is(1L)); + assertThat(nativeConnection.zcard(KEY_1)).isEqualTo(1L); } @Test // DATAREDIS-315 @@ -2190,7 +2193,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D), hasItems(VALUE_2_BYTES, VALUE_1_BYTES)); + assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D)).contains(VALUE_2_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2200,7 +2203,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L), hasItems(VALUE_2_BYTES)); + assertThat(clusterConnection.zRevRangeByScore(KEY_1_BYTES, 10D, 20D, 0L, 1L)).contains(VALUE_2_BYTES); } @Test // DATAREDIS-315 @@ -2210,8 +2213,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D), - hasItems((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D))); + assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D)) + .contains((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D)); } @Test // DATAREDIS-315 @@ -2221,8 +2224,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L), - hasItems((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D))); + assertThat(clusterConnection.zRevRangeByScoreWithScores(KEY_1_BYTES, 10D, 20D, 0L, 1L)) + .contains((Tuple) new DefaultTuple(VALUE_2_BYTES, 20D)); } @Test // DATAREDIS-315 @@ -2232,7 +2235,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRevRange(KEY_1_BYTES, 1, 2), hasItems(VALUE_3_BYTES, VALUE_1_BYTES)); + assertThat(clusterConnection.zRevRange(KEY_1_BYTES, 1, 2)).contains(VALUE_3_BYTES, VALUE_1_BYTES); } @Test // DATAREDIS-315 @@ -2242,8 +2245,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 20D, VALUE_2); nativeConnection.zadd(KEY_1, 5D, VALUE_3); - assertThat(clusterConnection.zRevRangeWithScores(KEY_1_BYTES, 1, 2), - hasItems((Tuple) new DefaultTuple(VALUE_3_BYTES, 5D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D))); + assertThat(clusterConnection.zRevRangeWithScores(KEY_1_BYTES, 1, 2)) + .contains((Tuple) new DefaultTuple(VALUE_3_BYTES, 5D), (Tuple) new DefaultTuple(VALUE_1_BYTES, 10D)); } @Test @@ -2263,7 +2266,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { count++; } - assertThat(count, equalTo(nrOfValues)); + assertThat(count).isEqualTo(nrOfValues); } @Test // DATAREDIS-315 @@ -2272,7 +2275,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.zadd(KEY_1, 10D, VALUE_1); nativeConnection.zadd(KEY_1, 20D, VALUE_2); - assertThat(clusterConnection.zScore(KEY_1_BYTES, VALUE_2_BYTES), is(20D)); + assertThat(clusterConnection.zScore(KEY_1_BYTES, VALUE_2_BYTES)).isEqualTo(20D); } @Test(expected = DataAccessException.class) // DATAREDIS-315 @@ -2289,7 +2292,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { clusterConnection.zUnionStore(SAME_SLOT_KEY_3_BYTES, SAME_SLOT_KEY_1_BYTES, SAME_SLOT_KEY_2_BYTES); - assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3, 0, -1), hasItems(VALUE_1, VALUE_2, VALUE_3)); + assertThat(nativeConnection.zrange(SAME_SLOT_KEY_3, 0, -1)).contains(VALUE_1, VALUE_2, VALUE_3); } @Test // DATAREDIS-694 @@ -2298,12 +2301,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_1); - assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), is(2L)); + assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-694 public void touchReturnsZeroIfNoKeysTouched() { - assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES), is(0L)); + assertThat(clusterConnection.keyCommands().touch(KEY_1_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-693 @@ -2312,12 +2315,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.set(KEY_2, VALUE_1); - assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES), is(2L)); + assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES)).isEqualTo(2L); } @Test // DATAREDIS-693 public void unlinkReturnsZeroIfNoKeysTouched() { - assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES), is(0L)); + assertThat(clusterConnection.keyCommands().unlink(KEY_1_BYTES)).isEqualTo(0L); } @Test // DATAREDIS-697 @@ -2325,7 +2328,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { binaryConnection.set(KEY_1_BYTES, HexStringUtils.hexToBytes("fff000")); - assertThat(clusterConnection.stringCommands().bitPos(KEY_1_BYTES, false), is(12L)); + assertThat(clusterConnection.stringCommands().bitPos(KEY_1_BYTES, false)).isEqualTo(12L); } @Test // DATAREDIS-697 @@ -2334,7 +2337,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { binaryConnection.set(KEY_1_BYTES, HexStringUtils.hexToBytes("fff0f0")); assertThat(clusterConnection.stringCommands().bitPos(KEY_1_BYTES, true, - org.springframework.data.domain.Range.of(Bound.inclusive(2L), Bound.unbounded())), is(16L)); + org.springframework.data.domain.Range.of(Bound.inclusive(2L), Bound.unbounded()))).isEqualTo(16L); } @Test // DATAREDIS-716 @@ -2342,12 +2345,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, "1000"); - assertThat(clusterConnection.keyCommands().encodingOf(KEY_1_BYTES), is(RedisValueEncoding.INT)); + assertThat(clusterConnection.keyCommands().encodingOf(KEY_1_BYTES)).isEqualTo(RedisValueEncoding.INT); } @Test // DATAREDIS-716 public void encodingReturnsVacantWhenKeyDoesNotExist() { - assertThat(clusterConnection.keyCommands().encodingOf(KEY_2_BYTES), is(RedisValueEncoding.VACANT)); + assertThat(clusterConnection.keyCommands().encodingOf(KEY_2_BYTES)).isEqualTo(RedisValueEncoding.VACANT); } @Test // DATAREDIS-716 @@ -2356,12 +2359,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.set(KEY_1, VALUE_1); nativeConnection.get(KEY_1); - assertThat(clusterConnection.keyCommands().idletime(KEY_1_BYTES), is(Duration.ofSeconds(0))); + assertThat(clusterConnection.keyCommands().idletime(KEY_1_BYTES)).isEqualTo(Duration.ofSeconds(0)); } @Test // DATAREDIS-716 public void idldetimeReturnsNullWhenKeyDoesNotExist() { - assertThat(clusterConnection.keyCommands().idletime(KEY_3_BYTES), is(nullValue())); + assertThat(clusterConnection.keyCommands().idletime(KEY_3_BYTES)).isNull(); } @Test // DATAREDIS-716 @@ -2369,12 +2372,12 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { nativeConnection.lpush(KEY_1, VALUE_1); - assertThat(clusterConnection.keyCommands().refcount(KEY_1_BYTES), is(1L)); + assertThat(clusterConnection.keyCommands().refcount(KEY_1_BYTES)).isEqualTo(1L); } @Test // DATAREDIS-716 public void refcountReturnsNullWhenKeyDoesNotExist() { - assertThat(clusterConnection.keyCommands().refcount(KEY_3_BYTES), is(nullValue())); + assertThat(clusterConnection.keyCommands().refcount(KEY_3_BYTES)).isNull(); } @Test // DATAREDIS-562 @@ -2382,9 +2385,9 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { public void bitFieldSetShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().set(INT_8).valueAt(offset(0L)).to(10L)), contains(0L)); + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)).to(10L))).containsExactly(0L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().set(INT_8).valueAt(offset(0L)).to(20L)), contains(10L)); + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)).to(20L))).containsExactly(10L); } @Test // DATAREDIS-562 @@ -2392,7 +2395,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { public void bitFieldGetShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().get(INT_8).valueAt(offset(0L))), contains(0L)); + create().get(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L)))).containsExactly(0L); } @Test // DATAREDIS-562 @@ -2400,7 +2403,7 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { public void bitFieldIncrByShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(INT_8).valueAt(offset(100L)).by(1L)), contains(1L)); + create().incr(INT_8).valueAt(BitFieldSubCommands.Offset.offset(100L)).by(1L))).containsExactly(1L); } @Test // DATAREDIS-562 @@ -2408,37 +2411,41 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { public void bitFieldIncrByWithOverflowShouldWorkCorrectly() { assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), contains(1L)); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))) + .containsExactly(1L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), contains(2L)); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))) + .containsExactly(2L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), contains(3L)); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))) + .containsExactly(3L); assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(unsigned(2)).valueAt(offset(102L)).overflow(FAIL).by(1L)), is(notNullValue())); + create().incr(unsigned(2)).valueAt(BitFieldSubCommands.Offset.offset(102L)).overflow(FAIL).by(1L))).isNotNull(); } @Test // DATAREDIS-562 @IfProfileValue(name = "redisVersion", value = "3.2+") public void bitfieldShouldAllowMultipleSubcommands() { - assertThat( - clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().incr(signed(5)).valueAt(offset(100L)).by(1L).get(unsigned(4)).valueAt(0L)), - contains(1L, 0L)); + assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), + create().incr(signed(5)).valueAt(BitFieldSubCommands.Offset.offset(100L)).by(1L).get(unsigned(4)).valueAt(0L))) + .containsExactly(1L, 0L); } @Test // DATAREDIS-562 @IfProfileValue(name = "redisVersion", value = "3.2+") public void bitfieldShouldWorkUsingNonZeroBasedOffset() { - assertThat(clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), - create().set(INT_8).valueAt(offset(0L).multipliedByTypeLength()).to(100L).set(INT_8) - .valueAt(offset(1L).multipliedByTypeLength()).to(200L)), - contains(0L, 0L)); + assertThat( + clusterConnection.stringCommands().bitField(JedisConverters.toBytes(KEY_1), + create().set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L).multipliedByTypeLength()).to(100L) + .set(INT_8).valueAt(BitFieldSubCommands.Offset.offset(1L).multipliedByTypeLength()).to(200L))) + .containsExactly(0L, 0L); assertThat( clusterConnection.stringCommands() - .bitField(JedisConverters.toBytes(KEY_1), create().get(INT_8) - .valueAt(offset(0L).multipliedByTypeLength()).get(INT_8).valueAt(offset(1L).multipliedByTypeLength())), - contains(100L, -56L)); + .bitField(JedisConverters.toBytes(KEY_1), + create().get(INT_8).valueAt(BitFieldSubCommands.Offset.offset(0L).multipliedByTypeLength()).get(INT_8) + .valueAt(BitFieldSubCommands.Offset.offset(1L).multipliedByTypeLength()))).containsExactly(100L, + -56L); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java index 94770850c..0e3aeeb58 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.AnyOf.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.data.redis.test.util.MockitoUtils.*; @@ -46,6 +43,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.redis.connection.ClusterCommandExecutor; import org.springframework.data.redis.connection.ClusterNodeResourceProvider; import org.springframework.data.redis.connection.ClusterTopologyProvider; @@ -185,11 +183,11 @@ public class LettuceClusterConnectionUnitTests { @Test // DATAREDIS-315 public void isClosedShouldReturnConnectionStateCorrectly() { - assertThat(connection.isClosed(), is(false)); + assertThat(connection.isClosed()).isFalse(); connection.close(); - assertThat(connection.isClosed(), is(true)); + assertThat(connection.isClosed()).isTrue(); } @Test // DATAREDIS-315 @@ -229,7 +227,7 @@ public class LettuceClusterConnectionUnitTests { when(clusterConnection2Mock.randomkey()).thenReturn(KEY_2_BYTES); when(clusterConnection3Mock.randomkey()).thenReturn(KEY_3_BYTES); - assertThat(connection.randomKey(), anyOf(is(KEY_1_BYTES), is(KEY_2_BYTES), is(KEY_3_BYTES))); + assertThat(connection.randomKey()).isIn(KEY_1_BYTES, KEY_2_BYTES, KEY_3_BYTES); verifyInvocationsAcross("randomkey", times(1), clusterConnection1Mock, clusterConnection2Mock, clusterConnection3Mock); } @@ -240,7 +238,7 @@ public class LettuceClusterConnectionUnitTests { when(clusterConnection3Mock.randomkey()).thenReturn(KEY_3_BYTES); for (int i = 0; i < 100; i++) { - assertThat(connection.randomKey(), is(KEY_3_BYTES)); + assertThat(connection.randomKey()).isEqualTo(KEY_3_BYTES); } } @@ -251,7 +249,7 @@ public class LettuceClusterConnectionUnitTests { when(clusterConnection2Mock.randomkey()).thenReturn(null); when(clusterConnection3Mock.randomkey()).thenReturn(null); - assertThat(connection.randomKey(), nullValue()); + assertThat(connection.randomKey()).isNull(); } @Test // DATAREDIS-315 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java index 244ba229b..3b6fc0a2e 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import io.lettuce.core.EpollProvider; @@ -37,6 +36,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.RedisConnectionFailureException; import org.springframework.data.redis.RedisSystemException; @@ -102,9 +102,9 @@ public class LettuceConnectionFactoryTests { // expected, shared conn is closed } DefaultStringRedisConnection conn2 = new DefaultStringRedisConnection(factory.getConnection()); - assertNotSame(nativeConn, conn2.getNativeConnection()); + assertThat(conn2.getNativeConnection()).isNotSameAs(nativeConn); conn2.set("anotherkey", "anothervalue"); - assertEquals("anothervalue", conn2.get("anotherkey")); + assertThat(conn2.get("anotherkey")).isEqualTo("anothervalue"); conn2.close(); } @@ -130,7 +130,7 @@ public class LettuceConnectionFactoryTests { public void testValidateNoError() { factory.setValidateConnection(true); RedisConnection conn2 = factory.getConnection(); - assertSame(connection.getNativeConnection(), conn2.getNativeConnection()); + assertThat(conn2.getNativeConnection()).isSameAs(connection.getNativeConnection()); } @Test // DATAREDIS-973 @@ -174,7 +174,7 @@ public class LettuceConnectionFactoryTests { try { // there should still be nothing in database 1 - assertEquals(Long.valueOf(0), separateDatabase.dbSize()); + assertThat(separateDatabase.dbSize()).isEqualTo(Long.valueOf(0)); } finally { separateDatabase.close(); factory2.destroy(); @@ -223,11 +223,11 @@ public class LettuceConnectionFactoryTests { public void testDisableSharedConnection() throws Exception { factory.setShareNativeConnection(false); RedisConnection conn2 = factory.getConnection(); - assertNotSame(connection.getNativeConnection(), conn2.getNativeConnection()); + assertThat(conn2.getNativeConnection()).isNotSameAs(connection.getNativeConnection()); // Give some time for native connection to asynchronously initialize, else close doesn't work Thread.sleep(100); conn2.close(); - assertTrue(conn2.isClosed()); + assertThat(conn2.isClosed()).isTrue(); // Give some time for native connection to asynchronously close Thread.sleep(100); try { @@ -244,7 +244,7 @@ public class LettuceConnectionFactoryTests { RedisAsyncCommands nativeConn = (RedisAsyncCommands) connection .getNativeConnection(); factory.resetConnection(); - assertNotSame(nativeConn, factory.getConnection().getNativeConnection()); + assertThat(factory.getConnection().getNativeConnection()).isNotSameAs(nativeConn); nativeConn.getStatefulConnection().close(); } @@ -255,7 +255,7 @@ public class LettuceConnectionFactoryTests { .getNativeConnection(); factory.initConnection(); RedisConnection newConnection = factory.getConnection(); - assertNotSame(nativeConn, newConnection.getNativeConnection()); + assertThat(newConnection.getNativeConnection()).isNotSameAs(nativeConn); newConnection.close(); } @@ -267,7 +267,7 @@ public class LettuceConnectionFactoryTests { factory.resetConnection(); factory.initConnection(); RedisConnection newConnection = factory.getConnection(); - assertNotSame(nativeConn, newConnection.getNativeConnection()); + assertThat(newConnection.getNativeConnection()).isNotSameAs(nativeConn); newConnection.close(); } @@ -295,7 +295,7 @@ public class LettuceConnectionFactoryTests { factory.setShareNativeConnection(false); factory.setHostName("fakeHost"); factory.afterPropertiesSet(); - assertNull(factory.getSharedConnection()); + assertThat(factory.getSharedConnection()).isNull(); } @Test @@ -363,8 +363,8 @@ public class LettuceConnectionFactoryTests { String key = "key-in-db-2"; connectionToDbIndex2.set(key, "the wheel of time"); - assertThat(connection.get(key), nullValue()); - assertThat(connectionToDbIndex2.get(key), notNullValue()); + assertThat(connection.get(key)).isNull(); + assertThat(connectionToDbIndex2.get(key)).isNotNull(); } finally { connectionToDbIndex2.close(); } @@ -382,7 +382,7 @@ public class LettuceConnectionFactoryTests { StringRedisConnection connection = new DefaultStringRedisConnection(factory.getConnection()); try { - assertThat(connection.ping(), is(equalTo("PONG"))); + assertThat(connection.ping()).isEqualTo("PONG"); } finally { connection.close(); } @@ -397,7 +397,7 @@ public class LettuceConnectionFactoryTests { ConnectionFactoryTracker.add(factory); - assertThat(factory.getReactiveConnection().execute(BaseRedisReactiveCommands::ping).blockFirst(), is("PONG")); + assertThat(factory.getReactiveConnection().execute(BaseRedisReactiveCommands::ping).blockFirst()).isEqualTo("PONG"); } @Test // DATAREDIS-667 @@ -424,7 +424,7 @@ public class LettuceConnectionFactoryTests { subsequent.close(); - assertThat(initialNativeConnection, is(subsequentNativeConnection)); + assertThat(initialNativeConnection).isEqualTo(subsequentNativeConnection); factory.destroy(); } @@ -442,7 +442,7 @@ public class LettuceConnectionFactoryTests { factory.afterPropertiesSet(); RedisConnection connection = factory.getConnection(); - assertThat(connection.ping(), is(equalTo("PONG"))); + assertThat(connection.ping()).isEqualTo("PONG"); connection.close(); factory.destroy(); @@ -451,8 +451,8 @@ public class LettuceConnectionFactoryTests { @Test // DATAREDIS-762, DATAREDIS-869 public void factoryUsesElastiCacheMasterReplicaConnections() { - assumeThat(String.format("No slaves connected to %s:%s.", SettingsUtils.getHost(), SettingsUtils.getPort()), - connection.info("replication").getProperty("connected_slaves", "0").compareTo("0") > 0, is(true)); + assumeTrue(String.format("No replicas connected to %s:%s.", SettingsUtils.getHost(), SettingsUtils.getPort()), + connection.info("replication").getProperty("connected_slaves", "0").compareTo("0") > 0); LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.SLAVE) .build(); @@ -466,8 +466,8 @@ public class LettuceConnectionFactoryTests { RedisConnection connection = factory.getConnection(); try { - assertThat(connection.ping(), is(equalTo("PONG"))); - assertThat(connection.info().getProperty("role"), is(equalTo("slave"))); + assertThat(connection.ping()).isEqualTo("PONG"); + assertThat(connection.info().getProperty("role")).isEqualTo("slave"); } finally { connection.close(); } @@ -478,8 +478,8 @@ public class LettuceConnectionFactoryTests { @Test // DATAREDIS-762, DATAREDIS-869 public void factoryUsesElastiCacheMasterWithoutMaster() { - assumeThat(String.format("No replicas connected to %s:%s.", SettingsUtils.getHost(), SettingsUtils.getPort()), - connection.info("replication").getProperty("connected_slaves", "0").compareTo("0") > 0, is(true)); + assumeTrue(String.format("No replicas connected to %s:%s.", SettingsUtils.getHost(), SettingsUtils.getPort()), + connection.info("replication").getProperty("connected_slaves", "0").compareTo("0") > 0); LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.MASTER) .build(); @@ -497,8 +497,8 @@ public class LettuceConnectionFactoryTests { fail("Expected RedisException: Master is currently unknown"); } catch (RedisSystemException e) { - assertThat(e.getCause(), is(instanceOf(RedisException.class))); - assertThat(e.getCause().getMessage(), containsString("Master is currently unknown")); + assertThat(e.getCause()).isInstanceOf(RedisException.class); + assertThat(e.getCause().getMessage()).contains("Master is currently unknown"); } finally { connection.close(); } @@ -509,8 +509,8 @@ public class LettuceConnectionFactoryTests { @Test // DATAREDIS-580, DATAREDIS-869 public void factoryUsesMasterReplicaConnections() { - assumeThat(String.format("No replicas connected to %s:%s.", SettingsUtils.getHost(), SettingsUtils.getPort()), - connection.info("replication").getProperty("connected_slaves", "0").compareTo("0") > 0, is(true)); + assumeTrue(String.format("No replicas connected to %s:%s.", SettingsUtils.getHost(), SettingsUtils.getPort()), + connection.info("replication").getProperty("connected_slaves", "0").compareTo("0") > 0); LettuceClientConfiguration configuration = LettuceTestClientConfiguration.builder().readFrom(ReadFrom.SLAVE) .build(); @@ -522,8 +522,8 @@ public class LettuceConnectionFactoryTests { RedisConnection connection = factory.getConnection(); try { - assertThat(connection.ping(), is(equalTo("PONG"))); - assertThat(connection.info().getProperty("role"), is(equalTo("slave"))); + assertThat(connection.ping()).isEqualTo("PONG"); + assertThat(connection.info().getProperty("role")).isEqualTo("slave"); } finally { connection.close(); } @@ -545,7 +545,7 @@ public class LettuceConnectionFactoryTests { RedisConnection connection = factory.getConnection(); - assertThat(connection.getClientName(), is(equalTo("clientName"))); + assertThat(connection.getClientName()).isEqualTo("clientName"); connection.close(); } @@ -560,7 +560,7 @@ public class LettuceConnectionFactoryTests { ConnectionFactoryTracker.add(factory); RedisConnection connection = factory.getConnection(); - assertThat(connection.getClientName(), equalTo("clientName")); + assertThat(connection.getClientName()).isEqualTo("clientName"); connection.close(); } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java index 6d7fbffb5..e5222999c 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; @@ -27,12 +26,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.hamcrest.core.AllOf; -import org.hamcrest.core.IsCollectionContaining; -import org.hamcrest.core.IsInstanceOf; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.dao.DataAccessException; import org.springframework.data.redis.RedisSystemException; import org.springframework.data.redis.RedisVersionUtils; @@ -79,7 +76,7 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra Thread.sleep(1000); connection.set("heythere", "hi"); th.join(); - assertEquals("hi", connection.get("heythere")); + assertThat(connection.get("heythere")).isEqualTo("hi"); } @Test @@ -92,14 +89,14 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra // We get immediate results executing command in separate conn (not part // of tx) conn2.set("txs2", "hi"); - assertEquals("hi", conn2.get("txs2")); + assertThat(conn2.get("txs2")).isEqualTo("hi"); // Transactional value not yet set - assertEquals("rightnow", conn2.get("txs1")); + assertThat(conn2.get("txs1")).isEqualTo("rightnow"); connection.exec(); // Now it should be set - assertEquals("delay", conn2.get("txs1")); + assertThat(conn2.get("txs1")).isEqualTo("delay"); conn2.closePipeline(); conn2.close(); } @@ -262,7 +259,7 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra th.start(); Thread.sleep(1000); connection.scriptKill(); - assertTrue(waitFor(scriptDead::get, 3000l)); + assertThat(waitFor(scriptDead::get, 3000l)).isTrue(); } @Test @@ -278,7 +275,7 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra factory2.afterPropertiesSet(); StringRedisConnection conn2 = new DefaultStringRedisConnection(factory2.getConnection()); try { - assertEquals("bar", conn2.get("foo")); + assertThat(conn2.get("foo")).isEqualTo("bar"); } finally { if (conn2.exists("foo")) { conn2.del("foo"); @@ -297,9 +294,9 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra connection.set("redis", "supercalifragilisticexpialidocious"); assertThat( - (Iterable) connection.execute("MGET", "spring".getBytes(), "data".getBytes(), "redis".getBytes()), - AllOf.allOf(IsInstanceOf.instanceOf(List.class), IsCollectionContaining.hasItems("awesome".getBytes(), - "cool".getBytes(), "supercalifragilisticexpialidocious".getBytes()))); + (Iterable) connection.execute("MGET", "spring".getBytes(), "data".getBytes(), "redis".getBytes())) + .isInstanceOf(List.class) + .contains("awesome".getBytes(), "cool".getBytes(), "supercalifragilisticexpialidocious".getBytes()); } @SuppressWarnings("unchecked") @@ -312,8 +309,8 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra actual.add(byteConnection.evalSha(sha1, ReturnType.MULTI, 1, "key1".getBytes(), "arg1".getBytes())); List results = getResults(); List scriptResults = (List) results.get(0); - assertEquals(Arrays.asList(new Object[] { "key1", "arg1" }), - Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })); + assertThat(Arrays.asList(new Object[] { new String(scriptResults.get(0)), new String(scriptResults.get(1)) })) + .isEqualTo(Arrays.asList(new Object[] { "key1", "arg1" })); } @Test // DATAREDIS-106 @@ -325,7 +322,7 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra Set zRangeByScore = connection.zRangeByScore("myzset", "(1", "2"); - assertEquals("two", zRangeByScore.iterator().next()); + assertThat(zRangeByScore.iterator().next()).isEqualTo("two"); } @Test // DATAREDIS-348 @@ -334,6 +331,6 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra ((LettuceConnection) byteConnection).setSentinelConfiguration( new RedisSentinelConfiguration().master("mymaster").sentinel("127.0.0.1", 26379).sentinel("127.0.0.1", 26380)); - assertThat(connection.getSentinelConnection(), notNullValue()); + assertThat(connection.getSentinelConnection()).isNotNull(); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java index 4ffcdca2a..6225984de 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.dao.DataAccessException; import org.springframework.data.redis.RedisVersionUtils; import org.springframework.data.redis.SettingsUtils; @@ -78,7 +79,7 @@ public class LettuceConnectionPipelineIntegrationTests extends AbstractConnectio Thread.sleep(1000); connection.scriptKill(); getResults(); - assertTrue(waitFor(scriptDead::get, 3000l)); + assertThat(waitFor(scriptDead::get, 3000l)).isTrue(); } @Test @@ -94,7 +95,7 @@ public class LettuceConnectionPipelineIntegrationTests extends AbstractConnectio factory2.afterPropertiesSet(); StringRedisConnection conn2 = new DefaultStringRedisConnection(factory2.getConnection()); try { - assertEquals("bar", conn2.get("foo")); + assertThat(conn2.get("foo")).isEqualTo("bar"); } finally { if (conn2.exists("foo")) { conn2.del("foo"); diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineTxIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineTxIntegrationTests.java index f829a4335..5e0620db1 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineTxIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineTxIntegrationTests.java @@ -15,11 +15,12 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; import org.junit.Test; + import org.springframework.data.redis.connection.RedisPipelineException; import org.springframework.test.annotation.IfProfileValue; @@ -74,10 +75,10 @@ public class LettuceConnectionPipelineTxIntegrationTests extends LettuceConnecti @SuppressWarnings("unchecked") protected List getResults() { - assertNull(connection.exec()); + assertThat(connection.exec()).isNull(); List pipelined = connection.closePipeline(); // We expect only the results of exec to be in the closed pipeline - assertEquals(1, pipelined.size()); + assertThat(pipelined.size()).isEqualTo(1); List txResults = (List) pipelined.get(0); // Return exec results and this test should behave exactly like its superclass return txResults; diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionTransactionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionTransactionIntegrationTests.java index 8f66ca2ab..bca09c78a 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionTransactionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionTransactionIntegrationTests.java @@ -15,12 +15,13 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.redis.connection.AbstractConnectionTransactionIntegrationTests; import org.springframework.data.redis.connection.DefaultStringRedisConnection; import org.springframework.data.redis.connection.StringRedisConnection; @@ -54,7 +55,7 @@ public class LettuceConnectionTransactionIntegrationTests extends AbstractConnec factory2.afterPropertiesSet(); StringRedisConnection conn2 = new DefaultStringRedisConnection(factory2.getConnection()); try { - assertEquals("bar", conn2.get("foo")); + assertThat(conn2.get("foo")).isEqualTo("bar"); } finally { if (conn2.exists("foo")) { conn2.del("foo"); diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java index 2f0ac103a..26553c08e 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTestSuite.java @@ -15,19 +15,14 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static org.mockito.Mockito.any; import io.lettuce.core.RedisClient; -import io.lettuce.core.RedisFuture; import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.api.async.RedisAsyncCommands; import io.lettuce.core.api.sync.RedisCommands; import io.lettuce.core.codec.RedisCodec; -import io.lettuce.core.protocol.RedisCommand; import java.lang.reflect.InvocationTargetException; @@ -35,7 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import org.mockito.Mockito; + import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.data.redis.connection.AbstractConnectionUnitTestBase; import org.springframework.data.redis.connection.RedisServerCommands.ShutdownOption; @@ -152,13 +147,8 @@ public class LettuceConnectionUnitTestSuite { when(syncCommandsMock.set(any(), any())).thenThrow(exception); connection = new LettuceConnection(null, 0, clientMock, null, 1); - try { - connection.set("foo".getBytes(), "bar".getBytes()); - } catch (Exception e) { - - assertThat(e.getMessage(), containsString(exception.getMessage())); - assertThat(e.getCause(), is((Throwable) exception)); - } + assertThatThrownBy(() -> connection.set("foo".getBytes(), "bar".getBytes())) + .hasMessageContaining(exception.getMessage()).hasRootCause(exception); } @Test // DATAREDIS-603 @@ -166,19 +156,12 @@ public class LettuceConnectionUnitTestSuite { IllegalArgumentException exception = new IllegalArgumentException("Aw, snap!"); - RedisCommand future = mock(RedisCommand.class, Mockito.withSettings().extraInterfaces(RedisFuture.class)); - - when(((RedisFuture) future).get()).thenThrow(exception); - when(asyncCommandsMock.set(any(byte[].class), any(byte[].class))).thenReturn((RedisFuture) future); + when(asyncCommandsMock.set(any(byte[].class), any(byte[].class))).thenThrow(exception); connection = new LettuceConnection(null, 0, clientMock, null, 1); connection.openPipeline(); - try { - connection.set("foo".getBytes(), "bar".getBytes()); - } catch (Exception e) { - assertThat(e.getMessage(), containsString(exception.getMessage())); - assertThat(e.getCause(), is((Throwable) exception)); - } + assertThatThrownBy(() -> connection.set("foo".getBytes(), "bar".getBytes())) + .hasMessageContaining(exception.getMessage()).hasRootCause(exception); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConvertersUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConvertersUnitTests.java index 9b042a2ce..59c21b753 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConvertersUnitTests.java @@ -15,11 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.connection.ClusterTestVariables.*; import static org.springframework.test.util.ReflectionTestUtils.*; @@ -35,6 +31,7 @@ import java.util.HashSet; import java.util.List; import org.junit.Test; + import org.springframework.data.redis.connection.RedisClusterNode; import org.springframework.data.redis.connection.RedisClusterNode.Flag; import org.springframework.data.redis.connection.RedisClusterNode.LinkState; @@ -52,14 +49,14 @@ public class LettuceConvertersUnitTests { @Test // DATAREDIS-268 public void convertingEmptyStringToListOfRedisClientInfoShouldReturnEmptyList() { - assertThat(LettuceConverters.toListOfRedisClientInformation(""), - equalTo(Collections. emptyList())); + assertThat(LettuceConverters.toListOfRedisClientInformation("")) + .isEqualTo(Collections. emptyList()); } @Test // DATAREDIS-268 public void convertingNullToListOfRedisClientInfoShouldReturnEmptyList() { - assertThat(LettuceConverters.toListOfRedisClientInformation(null), - equalTo(Collections. emptyList())); + assertThat(LettuceConverters.toListOfRedisClientInformation(null)) + .isEqualTo(Collections. emptyList()); } @Test // DATAREDIS-268 @@ -70,12 +67,12 @@ public class LettuceConvertersUnitTests { sb.append("\r\n"); sb.append(CLIENT_ALL_SINGLE_LINE_RESPONSE); - assertThat(LettuceConverters.toListOfRedisClientInformation(sb.toString()).size(), equalTo(2)); + assertThat(LettuceConverters.toListOfRedisClientInformation(sb.toString()).size()).isEqualTo(2); } @Test // DATAREDIS-315 public void partitionsToClusterNodesShouldReturnEmptyCollectionWhenPartionsDoesNotContainElements() { - assertThat(LettuceConverters.partitionsToClusterNodes(new Partitions()), notNullValue()); + assertThat(LettuceConverters.partitionsToClusterNodes(new Partitions())).isNotNull(); } @Test // DATAREDIS-315 @@ -93,15 +90,15 @@ public class LettuceConvertersUnitTests { partitions.add(partition); List nodes = LettuceConverters.partitionsToClusterNodes(partitions); - assertThat(nodes.size(), is(1)); + assertThat(nodes.size()).isEqualTo(1); RedisClusterNode node = nodes.get(0); - assertThat(node.getHost(), is(CLUSTER_HOST)); - assertThat(node.getPort(), is(MASTER_NODE_1_PORT)); - assertThat(node.getFlags(), hasItems(Flag.MASTER, Flag.MYSELF)); - assertThat(node.getId(), is(CLUSTER_NODE_1.getId())); - assertThat(node.getLinkState(), is(LinkState.CONNECTED)); - assertThat(node.getSlotRange().getSlots(), hasItems(1, 2, 3, 4, 5)); + assertThat(node.getHost()).isEqualTo(CLUSTER_HOST); + assertThat(node.getPort()).isEqualTo(MASTER_NODE_1_PORT); + assertThat(node.getFlags()).contains(Flag.MASTER, Flag.MYSELF); + assertThat(node.getId()).isEqualTo(CLUSTER_NODE_1.getId()); + assertThat(node.getLinkState()).isEqualTo(LinkState.CONNECTED); + assertThat(node.getSlotRange().getSlots()).contains(1, 2, 3, 4, 5); } @Test // DATAREDIS-316 @@ -109,10 +106,10 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(null, null); - assertThat(getField(args, "ex"), is(nullValue())); - assertThat(getField(args, "px"), is(nullValue())); - assertThat((Boolean) getField(args, "nx"), is(Boolean.FALSE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.FALSE)); + assertThat(getField(args, "ex")).isNull(); + assertThat(getField(args, "px")).isNull(); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.FALSE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.FALSE); } @Test // DATAREDIS-316 @@ -120,10 +117,10 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(Expiration.persistent(), null); - assertThat(getField(args, "ex"), is(nullValue())); - assertThat(getField(args, "px"), is(nullValue())); - assertThat((Boolean) getField(args, "nx"), is(Boolean.FALSE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.FALSE)); + assertThat(getField(args, "ex")).isNull(); + assertThat(getField(args, "px")).isNull(); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.FALSE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.FALSE); } @Test // DATAREDIS-316 @@ -131,10 +128,10 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(Expiration.seconds(10), null); - assertThat((Long) getField(args, "ex"), is(10L)); - assertThat(getField(args, "px"), is(nullValue())); - assertThat((Boolean) getField(args, "nx"), is(Boolean.FALSE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.FALSE)); + assertThat((Long) getField(args, "ex")).isEqualTo(10L); + assertThat(getField(args, "px")).isNull(); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.FALSE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.FALSE); } @Test // DATAREDIS-316 @@ -142,10 +139,10 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(Expiration.milliseconds(100), null); - assertThat(getField(args, "ex"), is(nullValue())); - assertThat((Long) getField(args, "px"), is(100L)); - assertThat((Boolean) getField(args, "nx"), is(Boolean.FALSE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.FALSE)); + assertThat(getField(args, "ex")).isNull(); + assertThat((Long) getField(args, "px")).isEqualTo(100L); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.FALSE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.FALSE); } @Test // DATAREDIS-316 @@ -153,10 +150,10 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(null, SetOption.ifAbsent()); - assertThat(getField(args, "ex"), is(nullValue())); - assertThat(getField(args, "px"), is(nullValue())); - assertThat((Boolean) getField(args, "nx"), is(Boolean.TRUE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.FALSE)); + assertThat(getField(args, "ex")).isNull(); + assertThat(getField(args, "px")).isNull(); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.TRUE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.FALSE); } @Test // DATAREDIS-316 @@ -164,10 +161,10 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(null, SetOption.ifPresent()); - assertThat(getField(args, "ex"), is(nullValue())); - assertThat(getField(args, "px"), is(nullValue())); - assertThat((Boolean) getField(args, "nx"), is(Boolean.FALSE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.TRUE)); + assertThat(getField(args, "ex")).isNull(); + assertThat(getField(args, "px")).isNull(); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.FALSE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.TRUE); } @Test // DATAREDIS-316 @@ -175,25 +172,25 @@ public class LettuceConvertersUnitTests { SetArgs args = LettuceConverters.toSetArgs(null, SetOption.upsert()); - assertThat(getField(args, "ex"), is(nullValue())); - assertThat(getField(args, "px"), is(nullValue())); - assertThat((Boolean) getField(args, "nx"), is(Boolean.FALSE)); - assertThat((Boolean) getField(args, "xx"), is(Boolean.FALSE)); + assertThat(getField(args, "ex")).isNull(); + assertThat(getField(args, "px")).isNull(); + assertThat((Boolean) getField(args, "nx")).isEqualTo(Boolean.FALSE); + assertThat((Boolean) getField(args, "xx")).isEqualTo(Boolean.FALSE); } @Test // DATAREDIS-981 public void toLimit() { Limit limit = LettuceConverters.toLimit(RedisZSetCommands.Limit.unlimited()); - assertThat(limit.isLimited(), is(false)); - assertThat(limit.getCount(), is(-1L)); + assertThat(limit.isLimited()).isFalse(); + assertThat(limit.getCount()).isEqualTo(-1L); limit = LettuceConverters.toLimit(RedisZSetCommands.Limit.limit().count(-1)); - assertThat(limit.isLimited(), is(true)); - assertThat(limit.getCount(), is(-1L)); + assertThat(limit.isLimited()).isTrue(); + assertThat(limit.getCount()).isEqualTo(-1L); limit = LettuceConverters.toLimit(RedisZSetCommands.Limit.limit().count(5)); - assertThat(limit.isLimited(), is(true)); - assertThat(limit.getCount(), is(5L)); + assertThat(limit.isLimited()).isTrue(); + assertThat(limit.getCount()).isEqualTo(5L); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterCommandsTestsBase.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterCommandsTestsBase.java index 361814f3e..1ef416f92 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterCommandsTestsBase.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterCommandsTestsBase.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; import io.lettuce.core.api.sync.RedisCommands; import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands; @@ -25,6 +24,7 @@ import io.lettuce.core.cluster.api.sync.RedisClusterCommands; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; + import org.springframework.data.redis.test.util.LettuceRedisClusterClientProvider; /** @@ -40,7 +40,9 @@ public abstract class LettuceReactiveClusterCommandsTestsBase { @Before public void before() { - assumeThat(clientProvider.test(), is(true)); + + assumeThat(clientProvider.test()).isTrue(); + nativeCommands = clientProvider.getClient().connect().sync(); connection = new LettuceReactiveRedisClusterConnection( new ClusterConnectionProvider(clientProvider.getClient(), LettuceReactiveRedisConnection.CODEC), diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommandsTests.java index 3b1ff9d68..8e5d3ed27 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterHyperLogLogCommandsTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.connection.lettuce.LettuceReactiveCommandsTestsBase.*; import java.util.Arrays; @@ -35,7 +34,7 @@ public class LettuceReactiveClusterHyperLogLogCommandsTests extends LettuceReact nativeCommands.pfadd(SAME_SLOT_KEY_2, new String[] { VALUE_2, VALUE_3 }); assertThat(connection.hyperLogLogCommands().pfCount(Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER)) - .block(), is(3L)); + .block()).isEqualTo(3L); } @Test // DATAREDIS-525 @@ -44,12 +43,11 @@ public class LettuceReactiveClusterHyperLogLogCommandsTests extends LettuceReact nativeCommands.pfadd(SAME_SLOT_KEY_1, new String[] { VALUE_1, VALUE_2 }); nativeCommands.pfadd(SAME_SLOT_KEY_2, new String[] { VALUE_2, VALUE_3 }); - assertThat( - connection.hyperLogLogCommands() - .pfMerge(SAME_SLOT_KEY_3_BBUFFER, Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER)).block(), - is(true)); + assertThat(connection.hyperLogLogCommands() + .pfMerge(SAME_SLOT_KEY_3_BBUFFER, Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER)).block()) + .isTrue(); - assertThat(nativeCommands.pfcount(new String[] { SAME_SLOT_KEY_3 }), is(3L)); + assertThat(nativeCommands.pfcount(new String[] { SAME_SLOT_KEY_3 })).isEqualTo(3L); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommandsTests.java index 966c00eef..fd5777b72 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterKeyCommandsTests.java @@ -15,21 +15,18 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.collection.IsCollectionWithSize.*; -import static org.hamcrest.collection.IsIterableContainingInOrder.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.connection.RedisClusterNode.*; import static org.springframework.data.redis.connection.lettuce.LettuceReactiveCommandsTestsBase.*; +import reactor.core.publisher.Mono; + import java.nio.ByteBuffer; import java.util.List; import org.junit.Test; -import org.springframework.data.redis.connection.RedisClusterNode; -import reactor.core.publisher.Mono; +import org.springframework.data.redis.connection.RedisClusterNode; /** * @author Christoph Strobl @@ -45,8 +42,8 @@ public class LettuceReactiveClusterKeyCommandsTests extends LettuceReactiveClust nativeCommands.set(KEY_2, VALUE_2); List result = connection.keyCommands().keys(NODE_1, ByteBuffer.wrap("*".getBytes())).block(); - assertThat(result, hasSize(1)); - assertThat(result, contains(KEY_1_BBUFFER)); + assertThat(result).hasSize(1); + assertThat(result).containsExactly(KEY_1_BBUFFER); } @Test // DATAREDIS-525 @@ -58,7 +55,7 @@ public class LettuceReactiveClusterKeyCommandsTests extends LettuceReactiveClust Mono randomkey = connection.keyCommands().randomKey(NODE_1); for (int i = 0; i < 10; i++) { - assertThat(randomkey.block(), is(equalTo(KEY_1_BBUFFER))); + assertThat(randomkey.block()).isEqualTo(KEY_1_BBUFFER); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommandsTests.java index e71763bce..4cbf61263 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterListCommandsTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.connection.lettuce.LettuceReactiveCommandsTestsBase.*; import java.nio.ByteBuffer; @@ -25,6 +23,7 @@ import java.time.Duration; import java.util.Arrays; import org.junit.Test; + import org.springframework.data.redis.connection.ReactiveListCommands; /** @@ -41,9 +40,9 @@ public class LettuceReactiveClusterListCommandsTests extends LettuceReactiveClus ByteBuffer result = connection.listCommands() .bRPopLPush(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER, Duration.ofSeconds(1)).block(); - assertThat(result, is(equalTo(VALUE_3_BBUFFER))); - assertThat(nativeCommands.llen(SAME_SLOT_KEY_2), is(2L)); - assertThat(nativeCommands.lindex(SAME_SLOT_KEY_2, 0), is(equalTo(VALUE_3))); + assertThat(result).isEqualTo(VALUE_3_BBUFFER); + assertThat(nativeCommands.llen(SAME_SLOT_KEY_2)).isEqualTo(2L); + assertThat(nativeCommands.lindex(SAME_SLOT_KEY_2, 0)).isEqualTo(VALUE_3); } @Test // DATAREDIS-525 @@ -53,8 +52,8 @@ public class LettuceReactiveClusterListCommandsTests extends LettuceReactiveClus ReactiveListCommands.PopResult result = connection.listCommands() .blPop(Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), Duration.ofSeconds(1L)).block(); - assertThat(result.getKey(), is(equalTo(SAME_SLOT_KEY_1_BBUFFER))); - assertThat(result.getValue(), is(equalTo(VALUE_1_BBUFFER))); + assertThat(result.getKey()).isEqualTo(SAME_SLOT_KEY_1_BBUFFER); + assertThat(result.getValue()).isEqualTo(VALUE_1_BBUFFER); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommandsTests.java index 524a8c22d..9c44e3a35 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterStringCommandsTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.connection.lettuce.LettuceReactiveCommandsTestsBase.*; import java.nio.ByteBuffer; @@ -26,6 +24,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.junit.Test; + import org.springframework.data.redis.connection.RedisStringCommands; /** @@ -43,8 +42,8 @@ public class LettuceReactiveClusterStringCommandsTests extends LettuceReactiveCl connection.stringCommands().mSetNX(map).block(); - assertThat(nativeCommands.get(SAME_SLOT_KEY_1), is(equalTo(VALUE_1))); - assertThat(nativeCommands.get(SAME_SLOT_KEY_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.get(SAME_SLOT_KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeCommands.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 @@ -56,10 +55,10 @@ public class LettuceReactiveClusterStringCommandsTests extends LettuceReactiveCl map.put(SAME_SLOT_KEY_1_BBUFFER, VALUE_1_BBUFFER); map.put(SAME_SLOT_KEY_2_BBUFFER, VALUE_2_BBUFFER); - assertThat(connection.stringCommands().mSetNX(map).block(), is(false)); + assertThat(connection.stringCommands().mSetNX(map).block()).isFalse(); - assertThat(nativeCommands.exists(SAME_SLOT_KEY_1), is(0L)); - assertThat(nativeCommands.get(SAME_SLOT_KEY_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.exists(SAME_SLOT_KEY_1)).isEqualTo(0L); + assertThat(nativeCommands.get(SAME_SLOT_KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 @@ -69,8 +68,8 @@ public class LettuceReactiveClusterStringCommandsTests extends LettuceReactiveCl nativeCommands.set(SAME_SLOT_KEY_2, VALUE_2); assertThat(connection.stringCommands().bitOp(Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), - RedisStringCommands.BitOperation.AND, SAME_SLOT_KEY_3_BBUFFER).block(), is(7L)); - assertThat(nativeCommands.get(SAME_SLOT_KEY_3), is(equalTo("value-0"))); + RedisStringCommands.BitOperation.AND, SAME_SLOT_KEY_3_BBUFFER).block()).isEqualTo(7L); + assertThat(nativeCommands.get(SAME_SLOT_KEY_3)).isEqualTo("value-0"); } @Test // DATAREDIS-525 @@ -80,8 +79,8 @@ public class LettuceReactiveClusterStringCommandsTests extends LettuceReactiveCl nativeCommands.set(SAME_SLOT_KEY_2, VALUE_2); assertThat(connection.stringCommands().bitOp(Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), - RedisStringCommands.BitOperation.OR, SAME_SLOT_KEY_3_BBUFFER).block(), is(7L)); - assertThat(nativeCommands.get(SAME_SLOT_KEY_3), is(equalTo(VALUE_3))); + RedisStringCommands.BitOperation.OR, SAME_SLOT_KEY_3_BBUFFER).block()).isEqualTo(7L); + assertThat(nativeCommands.get(SAME_SLOT_KEY_3)).isEqualTo(VALUE_3); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-525 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommandsTests.java index 363f0936b..bc2cac40f 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterZSetCommandsTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.data.redis.connection.lettuce.LettuceReactiveCommandsTestsBase.*; import java.util.Arrays; @@ -38,7 +37,7 @@ public class LettuceReactiveClusterZSetCommandsTests extends LettuceReactiveClus nativeCommands.zadd(SAME_SLOT_KEY_2, 3D, VALUE_3); assertThat(connection.zSetCommands().zUnionStore(SAME_SLOT_KEY_3_BBUFFER, - Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block(), is(3L)); + Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block()).isEqualTo(3L); } @@ -52,6 +51,6 @@ public class LettuceReactiveClusterZSetCommandsTests extends LettuceReactiveClus nativeCommands.zadd(SAME_SLOT_KEY_2, 3D, VALUE_3); assertThat(connection.zSetCommands().zInterStore(SAME_SLOT_KEY_3_BBUFFER, - Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block(), is(2L)); + Arrays.asList(SAME_SLOT_KEY_1_BBUFFER, SAME_SLOT_KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block()).isEqualTo(2L); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommandsTests.java index a7f13ac29..8f00b1b5f 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveGeoCommandsTests.java @@ -15,11 +15,8 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.collection.IsIterableContainingInOrder.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsNull.*; -import static org.hamcrest.number.IsCloseTo.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import static org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit.*; import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.*; @@ -31,6 +28,7 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; + import org.springframework.data.geo.Circle; import org.springframework.data.geo.Distance; import org.springframework.data.geo.Metrics; @@ -59,13 +57,13 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest @Test // DATAREDIS-525 public void geoAddShouldAddSingleGeoLocationCorrectly() { - assertThat(connection.geoCommands().geoAdd(KEY_1_BBUFFER, ARIGENTO).block(), is(1L)); + assertThat(connection.geoCommands().geoAdd(KEY_1_BBUFFER, ARIGENTO).block()).isEqualTo(1L); } @Test // DATAREDIS-525 public void geoAddShouldAddMultipleGeoLocationsCorrectly() { - assertThat(connection.geoCommands().geoAdd(KEY_1_BBUFFER, Arrays.asList(ARIGENTO, CATANIA, PALERMO)).block(), - is(3L)); + assertThat(connection.geoCommands().geoAdd(KEY_1_BBUFFER, Arrays.asList(ARIGENTO, CATANIA, PALERMO)).block()) + .isEqualTo(3L); } @Test // DATAREDIS-525 @@ -74,8 +72,8 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest nativeCommands.geoadd(KEY_1, PALERMO.getPoint().getX(), PALERMO.getPoint().getY(), PALERMO_MEMBER_NAME); nativeCommands.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA_MEMBER_NAME); - assertThat(connection.geoCommands().geoDist(KEY_1_BBUFFER, PALERMO.getName(), CATANIA.getName()).block().getValue(), - is(closeTo(166274.15156960033D, 0.005))); + assertThat(connection.geoCommands().geoDist(KEY_1_BBUFFER, PALERMO.getName(), CATANIA.getName()).block().getValue()) + .isCloseTo(166274.15156960033D, offset(0.005)); } @Test // DATAREDIS-525 @@ -85,7 +83,7 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest nativeCommands.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA_MEMBER_NAME); assertThat(connection.geoCommands().geoDist(KEY_1_BBUFFER, PALERMO.getName(), CATANIA.getName(), Metrics.KILOMETERS) - .block().getValue(), is(closeTo(166.27415156960033D, 0.005))); + .block().getValue()).isCloseTo(166.27415156960033D, offset(0.005)); } @Test // DATAREDIS-525 @@ -95,8 +93,8 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest nativeCommands.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA_MEMBER_NAME); assertThat( - connection.geoCommands().geoHash(KEY_1_BBUFFER, Arrays.asList(PALERMO.getName(), CATANIA.getName())).block(), - contains("sqc8b49rny0", "sqdtr74hyu0")); + connection.geoCommands().geoHash(KEY_1_BBUFFER, Arrays.asList(PALERMO.getName(), CATANIA.getName())).block()) + .containsExactly("sqc8b49rny0", "sqdtr74hyu0"); } @Test // DATAREDIS-525 @@ -105,10 +103,9 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest nativeCommands.geoadd(KEY_1, PALERMO.getPoint().getX(), PALERMO.getPoint().getY(), PALERMO_MEMBER_NAME); nativeCommands.geoadd(KEY_1, CATANIA.getPoint().getX(), CATANIA.getPoint().getY(), CATANIA_MEMBER_NAME); - assertThat( - connection.geoCommands() - .geoHash(KEY_1_BBUFFER, Arrays.asList(PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName())).block(), - contains("sqc8b49rny0", null, "sqdtr74hyu0")); + assertThat(connection.geoCommands() + .geoHash(KEY_1_BBUFFER, Arrays.asList(PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName())).block()) + .containsExactly("sqc8b49rny0", null, "sqdtr74hyu0"); } @Test // DATAREDIS-525 @@ -119,11 +116,11 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest List result = connection.geoCommands() .geoPos(KEY_1_BBUFFER, Arrays.asList(PALERMO.getName(), CATANIA.getName())).block(); - assertThat(result.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(result.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(result.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(result.get(1).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(result.get(1).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(result.get(1).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(result.get(1).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); } @Test // DATAREDIS-525 @@ -134,13 +131,13 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest List result = connection.geoCommands() .geoPos(KEY_1_BBUFFER, Arrays.asList(PALERMO.getName(), ARIGENTO.getName(), CATANIA.getName())).block(); - assertThat(result.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(result.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(result.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(result.get(1), is(nullValue())); + assertThat(result.get(1)).isNull(); - assertThat(result.get(2).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(result.get(2).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(result.get(2).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(result.get(2).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); } @Test // DATAREDIS-525 @@ -175,8 +172,8 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS)), newGeoRadiusArgs().includeDistance())) // .consumeNextWith(actual -> { - assertThat(actual.getDistance().getValue(), is(closeTo(130.423D, 0.005))); - assertThat(actual.getDistance().getUnit(), is("km")); + assertThat(actual.getDistance().getValue()).isCloseTo(130.423D, offset(0.005)); + assertThat(actual.getDistance().getUnit()).isEqualTo("km"); }) // .expectComplete(); } @@ -206,10 +203,10 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest .create(connection.geoCommands().geoRadiusByMember(KEY_1_BBUFFER, ARIGENTO.getName(), new Distance(100, KILOMETERS))) // .consumeNextWith(actual -> { - assertThat(actual.getContent().getName(), is(ARIGENTO.getName())); + assertThat(actual.getContent().getName()).isEqualTo(ARIGENTO.getName()); }) // .consumeNextWith(actual -> { - assertThat(actual.getContent().getName(), is(PALERMO.getName())); + assertThat(actual.getContent().getName()).isEqualTo(PALERMO.getName()); }) // .expectComplete(); } @@ -226,8 +223,8 @@ public class LettuceReactiveGeoCommandsTests extends LettuceReactiveCommandsTest new Distance(100, KILOMETERS), newGeoRadiusArgs().includeDistance())) // .consumeNextWith(actual -> { - assertThat(actual.getDistance().getValue(), is(closeTo(90.978D, 0.005))); - assertThat(actual.getDistance().getUnit(), is("km")); + assertThat(actual.getDistance().getValue()).isCloseTo(90.978D, offset(0.005)); + assertThat(actual.getDistance().getUnit()).isEqualTo("km"); }) // .expectNextCount(1) // .verifyComplete(); diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommandsTests.java index 8795ac765..6c9a46e99 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommandsTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import reactor.test.StepVerifier; @@ -28,6 +27,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.junit.Test; + import org.springframework.data.redis.core.ScanOptions; /** @@ -101,7 +101,7 @@ public class LettuceReactiveHashCommandsTests extends LettuceReactiveCommandsTes StepVerifier.create(connection.hashCommands().hMGet(KEY_1_BBUFFER, Arrays.asList(FIELD_1_BBUFFER, FIELD_3_BBUFFER))) .consumeNextWith(actual -> { - assertThat(actual, hasItems(VALUE_1_BBUFFER, VALUE_3_BBUFFER)); + assertThat(actual).contains(VALUE_1_BBUFFER, VALUE_3_BBUFFER); }).verifyComplete(); } @@ -126,8 +126,8 @@ public class LettuceReactiveHashCommandsTests extends LettuceReactiveCommandsTes fieldValues.put(FIELD_2_BBUFFER, VALUE_2_BBUFFER); StepVerifier.create(connection.hashCommands().hMSet(KEY_1_BBUFFER, fieldValues)).expectNext(true).verifyComplete(); - assertThat(nativeCommands.hget(KEY_1, FIELD_1), is(equalTo(VALUE_1))); - assertThat(nativeCommands.hget(KEY_1, FIELD_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.hget(KEY_1, FIELD_1)).isEqualTo(VALUE_1); + assertThat(nativeCommands.hget(KEY_1, FIELD_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-791 @@ -143,7 +143,7 @@ public class LettuceReactiveHashCommandsTests extends LettuceReactiveCommandsTes StepVerifier.create(connection.hashCommands().hMSet(KEY_1_BBUFFER, overwriteFieldValues)).expectNext(true) .verifyComplete(); - assertThat(nativeCommands.hget(KEY_1, FIELD_1), is(equalTo(VALUE_2))); + assertThat(nativeCommands.hget(KEY_1, FIELD_1)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 @@ -231,7 +231,7 @@ public class LettuceReactiveHashCommandsTests extends LettuceReactiveCommandsTes StepVerifier.create(connection.hashCommands().hGetAll(KEY_1_BBUFFER).buffer(3)) // .consumeNextWith(list -> { - assertTrue(list.containsAll(expected.entrySet())); + assertThat(list.containsAll(expected.entrySet())).isTrue(); }) // .verifyComplete(); } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommandsTests.java index 2e6f8e2bd..bc2dc904a 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHyperLogLogCommandsTests.java @@ -15,14 +15,12 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; -import static org.junit.Assume.assumeThat; +import static org.assertj.core.api.Assertions.*; +import static org.junit.Assume.*; import java.util.Arrays; import org.junit.Test; -import org.springframework.data.redis.test.util.LettuceRedisClientProvider; /** * @author Christoph Strobl @@ -34,7 +32,7 @@ public class LettuceReactiveHyperLogLogCommandsTests extends LettuceReactiveComm public void pfAddShouldAddToNonExistingKeyCorrectly() { assertThat(connection.hyperLogLogCommands() - .pfAdd(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_2_BBUFFER, VALUE_3_BBUFFER)).block(), is(1L)); + .pfAdd(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_2_BBUFFER, VALUE_3_BBUFFER)).block()).isEqualTo(1L); } @Test // DATAREDIS-525 @@ -43,7 +41,8 @@ public class LettuceReactiveHyperLogLogCommandsTests extends LettuceReactiveComm nativeCommands.pfadd(KEY_1, new String[] { VALUE_1, VALUE_2 }); nativeCommands.pfadd(KEY_1, new String[] { VALUE_3 }); - assertThat(connection.hyperLogLogCommands().pfAdd(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER)).block(), is(0L)); + assertThat(connection.hyperLogLogCommands().pfAdd(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER)).block()) + .isEqualTo(0L); } @Test // DATAREDIS-525 @@ -51,32 +50,33 @@ public class LettuceReactiveHyperLogLogCommandsTests extends LettuceReactiveComm nativeCommands.pfadd(KEY_1, new String[] { VALUE_1, VALUE_2 }); - assertThat(connection.hyperLogLogCommands().pfCount(KEY_1_BBUFFER).block(), is(2L)); + assertThat(connection.hyperLogLogCommands().pfCount(KEY_1_BBUFFER).block()).isEqualTo(2L); } @Test // DATAREDIS-525 public void pfCountWithMultipleKeysShouldReturnCorrectly() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.pfadd(KEY_1, new String[] { VALUE_1, VALUE_2 }); nativeCommands.pfadd(KEY_2, new String[] { VALUE_2, VALUE_3 }); - assertThat(connection.hyperLogLogCommands().pfCount(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block(), is(3L)); + assertThat(connection.hyperLogLogCommands().pfCount(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block()) + .isEqualTo(3L); } @Test // DATAREDIS-525 public void pfMergeShouldWorkCorrectly() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.pfadd(KEY_1, new String[] { VALUE_1, VALUE_2 }); nativeCommands.pfadd(KEY_2, new String[] { VALUE_2, VALUE_3 }); assertThat( - connection.hyperLogLogCommands().pfMerge(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block(), - is(true)); + connection.hyperLogLogCommands().pfMerge(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block()) + .isTrue(); - assertThat(nativeCommands.pfcount(new String[] { KEY_3 }), is(3L)); + assertThat(nativeCommands.pfcount(new String[] { KEY_3 })).isEqualTo(3L); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java index c9d8765c9..495528429 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsTests.java @@ -15,9 +15,8 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.*; import io.lettuce.core.SetArgs; import reactor.core.publisher.Flux; @@ -33,6 +32,7 @@ import java.util.List; import org.junit.Rule; import org.junit.Test; + import org.springframework.data.redis.RedisSystemException; import org.springframework.data.redis.connection.DataType; import org.springframework.data.redis.connection.ReactiveRedisConnection.KeyCommand; @@ -138,8 +138,8 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest StepVerifier.create(connection.keyCommands().rename(KEY_1_BBUFFER, KEY_2_BBUFFER)).expectNext(true) .verifyComplete(); - assertThat(nativeCommands.exists(KEY_2), is(1L)); - assertThat(nativeCommands.exists(KEY_1), is(0L)); + assertThat(nativeCommands.exists(KEY_2)).isEqualTo(1L); + assertThat(nativeCommands.exists(KEY_1)).isEqualTo(0L); } @Test // DATAREDIS-525 @@ -157,8 +157,8 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest StepVerifier.create(connection.keyCommands().renameNX(KEY_1_BBUFFER, KEY_2_BBUFFER)).expectNext(true) .verifyComplete(); - assertThat(nativeCommands.exists(KEY_2), is(1L)); - assertThat(nativeCommands.exists(KEY_1), is(0L)); + assertThat(nativeCommands.exists(KEY_2)).isEqualTo(1L); + assertThat(nativeCommands.exists(KEY_1)).isEqualTo(0L); } @Test // DATAREDIS-525 @@ -275,7 +275,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest .expectComplete() // .verify(); - assertThat(nativeCommands.ttl(KEY_1), is(greaterThan(8L))); + assertThat(nativeCommands.ttl(KEY_1)).isGreaterThan(8L); } @Test // DATAREDIS-602 @@ -288,7 +288,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest .expectComplete() // .verify(); - assertThat(nativeCommands.ttl(KEY_1), is(greaterThan(8L))); + assertThat(nativeCommands.ttl(KEY_1)).isGreaterThan(8L); } @Test // DATAREDIS-602 @@ -302,7 +302,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest .expectComplete() // .verify(); - assertThat(nativeCommands.ttl(KEY_1), is(greaterThan(8L))); + assertThat(nativeCommands.ttl(KEY_1)).isGreaterThan(8L); } @Test // DATAREDIS-602 @@ -316,7 +316,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest .expectComplete() // .verify(); - assertThat(nativeCommands.ttl(KEY_1), is(greaterThan(8L))); + assertThat(nativeCommands.ttl(KEY_1)).isGreaterThan(8L); } @Test // DATAREDIS-602 @@ -326,7 +326,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest StepVerifier.create(connection.keyCommands().ttl(KEY_1_BBUFFER)) // .expectNextMatches(actual -> { - assertThat(nativeCommands.ttl(KEY_1), is(greaterThan(8L))); + assertThat(nativeCommands.ttl(KEY_1)).isGreaterThan(8L); return true; }) // .expectComplete() // @@ -340,7 +340,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest StepVerifier.create(connection.keyCommands().pTtl(KEY_1_BBUFFER)) // .expectNextMatches(actual -> { - assertThat(actual, is(greaterThan(8000L))); + assertThat(actual).isGreaterThan(8000L); return true; }) // .expectComplete() // @@ -357,13 +357,13 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest .expectComplete() // .verify(); - assertThat(nativeCommands.ttl(KEY_1), is(-1L)); + assertThat(nativeCommands.ttl(KEY_1)).isEqualTo(-1L); } @Test // DATAREDIS-602 public void shouldMoveToDatabase() { - assumeThat(connection, is(not(instanceOf(LettuceReactiveRedisClusterConnection.class)))); + assumeThat(connection).isNotInstanceOf(LettuceReactiveRedisClusterConnection.class); nativeCommands.set(KEY_1, VALUE_1); @@ -371,7 +371,7 @@ public class LettuceReactiveKeyCommandsTests extends LettuceReactiveCommandsTest .expectNext(true) // .expectComplete() // .verify(); - assertThat(nativeCommands.exists(KEY_1), is(0L)); + assertThat(nativeCommands.exists(KEY_1)).isEqualTo(0L); } @Test // DATAREDIS-694 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommandTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommandTests.java index 0bd449e17..119a08cf0 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommandTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveListCommandTests.java @@ -15,11 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.collection.IsIterableContainingInOrder.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNot.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.domain.Range.Bound.*; @@ -31,6 +27,7 @@ import java.time.Duration; import java.util.Arrays; import org.junit.Test; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.domain.Range; import org.springframework.data.redis.connection.ReactiveListCommands.PopResult; @@ -52,9 +49,9 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.lpush(KEY_1, VALUE_1); - assertThat(connection.listCommands().rPush(KEY_1_BBUFFER, Arrays.asList(VALUE_2_BBUFFER, VALUE_3_BBUFFER)).block(), - is(3L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_2, VALUE_3)); + assertThat(connection.listCommands().rPush(KEY_1_BBUFFER, Arrays.asList(VALUE_2_BBUFFER, VALUE_3_BBUFFER)).block()) + .isEqualTo(3L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_2, VALUE_3); } @Test // DATAREDIS-525 @@ -62,9 +59,9 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.lpush(KEY_1, VALUE_1); - assertThat(connection.listCommands().lPush(KEY_1_BBUFFER, Arrays.asList(VALUE_2_BBUFFER, VALUE_3_BBUFFER)).block(), - is(3L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_3, VALUE_2, VALUE_1)); + assertThat(connection.listCommands().lPush(KEY_1_BBUFFER, Arrays.asList(VALUE_2_BBUFFER, VALUE_3_BBUFFER)).block()) + .isEqualTo(3L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_3, VALUE_2, VALUE_1); } @Test // DATAREDIS-525 @@ -72,8 +69,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.lpush(KEY_1, VALUE_1); - assertThat(connection.listCommands().rPushX(KEY_1_BBUFFER, VALUE_2_BBUFFER).block(), is(2L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_2)); + assertThat(connection.listCommands().rPushX(KEY_1_BBUFFER, VALUE_2_BBUFFER).block()).isEqualTo(2L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_2); } @Test // DATAREDIS-525 @@ -81,8 +78,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.lpush(KEY_1, VALUE_1); - assertThat(connection.listCommands().lPushX(KEY_1_BBUFFER, VALUE_2_BBUFFER).block(), is(2L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_2, VALUE_1)); + assertThat(connection.listCommands().lPushX(KEY_1_BBUFFER, VALUE_2_BBUFFER).block()).isEqualTo(2L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_2, VALUE_1); } @Test(expected = InvalidDataAccessApiUsageException.class) // DATAREDIS-525 @@ -99,7 +96,7 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.lpush(KEY_1, VALUE_1, VALUE_2); - assertThat(connection.listCommands().lLen(KEY_1_BBUFFER).block(), is(2L)); + assertThat(connection.listCommands().lLen(KEY_1_BBUFFER).block()).isEqualTo(2L); } @Test // DATAREDIS-525 @@ -107,8 +104,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.listCommands().lRange(KEY_1_BBUFFER, 1, 2).toIterable(), - contains(VALUE_2_BBUFFER, VALUE_3_BBUFFER)); + assertThat(connection.listCommands().lRange(KEY_1_BBUFFER, 1, 2).toIterable()).containsExactly(VALUE_2_BBUFFER, + VALUE_3_BBUFFER); } @Test // DATAREDIS-852 @@ -138,8 +135,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.listCommands().lTrim(KEY_1_BBUFFER, 1, 2).block(), is(true)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), not(contains(VALUE_1_BBUFFER))); + assertThat(connection.listCommands().lTrim(KEY_1_BBUFFER, 1, 2).block()).isTrue(); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).doesNotContain(VALUE_1); } @Test // DATAREDIS-852 @@ -171,7 +168,7 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.listCommands().lIndex(KEY_1_BBUFFER, 1).block(), is(equalTo(VALUE_2_BBUFFER))); + assertThat(connection.listCommands().lIndex(KEY_1_BBUFFER, 1).block()).isEqualTo(VALUE_2_BBUFFER); } @Test // DATAREDIS-525 @@ -180,9 +177,9 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2); assertThat( - connection.listCommands().lInsert(KEY_1_BBUFFER, Position.BEFORE, VALUE_2_BBUFFER, VALUE_3_BBUFFER).block(), - is(3L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_3, VALUE_2)); + connection.listCommands().lInsert(KEY_1_BBUFFER, Position.BEFORE, VALUE_2_BBUFFER, VALUE_3_BBUFFER).block()) + .isEqualTo(3L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_3, VALUE_2); } @Test // DATAREDIS-525 @@ -191,9 +188,9 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2); assertThat( - connection.listCommands().lInsert(KEY_1_BBUFFER, Position.AFTER, VALUE_2_BBUFFER, VALUE_3_BBUFFER).block(), - is(3L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_2, VALUE_3)); + connection.listCommands().lInsert(KEY_1_BBUFFER, Position.AFTER, VALUE_2_BBUFFER, VALUE_3_BBUFFER).block()) + .isEqualTo(3L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_2, VALUE_3); } @Test // DATAREDIS-525 @@ -201,9 +198,9 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2); - assertThat(connection.listCommands().lSet(KEY_1_BBUFFER, 1L, VALUE_3_BBUFFER).block(), is(true)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_3)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), not(contains(VALUE_2))); + assertThat(connection.listCommands().lSet(KEY_1_BBUFFER, 1L, VALUE_3_BBUFFER).block()).isTrue(); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_3); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).doesNotContain(VALUE_2); } @Test // DATAREDIS-525 @@ -211,9 +208,9 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_1, VALUE_3); - assertThat(connection.listCommands().lRem(KEY_1_BBUFFER, VALUE_1_BBUFFER).block(), is(2L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_2, VALUE_3)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), not(contains(VALUE_1))); + assertThat(connection.listCommands().lRem(KEY_1_BBUFFER, VALUE_1_BBUFFER).block()).isEqualTo(2L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_2, VALUE_3); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).doesNotContain(VALUE_1); } @Test // DATAREDIS-525 @@ -221,8 +218,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_1, VALUE_3); - assertThat(connection.listCommands().lRem(KEY_1_BBUFFER, 1L, VALUE_1_BBUFFER).block(), is(1L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_2, VALUE_1, VALUE_3)); + assertThat(connection.listCommands().lRem(KEY_1_BBUFFER, 1L, VALUE_1_BBUFFER).block()).isEqualTo(1L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_2, VALUE_1, VALUE_3); } @Test // DATAREDIS-525 @@ -230,8 +227,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_1, VALUE_3); - assertThat(connection.listCommands().lRem(KEY_1_BBUFFER, -1L, VALUE_1_BBUFFER).block(), is(1L)); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_2, VALUE_3)); + assertThat(connection.listCommands().lRem(KEY_1_BBUFFER, -1L, VALUE_1_BBUFFER).block()).isEqualTo(1L); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_2, VALUE_3); } @Test // DATAREDIS-525 @@ -239,8 +236,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.listCommands().lPop(KEY_1_BBUFFER).block(), is(equalTo(VALUE_1_BBUFFER))); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_2, VALUE_3)); + assertThat(connection.listCommands().lPop(KEY_1_BBUFFER).block()).isEqualTo(VALUE_1_BBUFFER); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_2, VALUE_3); } @Test // DATAREDIS-525 @@ -248,34 +245,34 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.listCommands().rPop(KEY_1_BBUFFER).block(), is(equalTo(VALUE_3_BBUFFER))); - assertThat(nativeCommands.lrange(KEY_1, 0, -1), contains(VALUE_1, VALUE_2)); + assertThat(connection.listCommands().rPop(KEY_1_BBUFFER).block()).isEqualTo(VALUE_3_BBUFFER); + assertThat(nativeCommands.lrange(KEY_1, 0, -1)).containsExactly(VALUE_1, VALUE_2); } @Test // DATAREDIS-525 public void blPopShouldReturnFirstAvailable() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); PopResult result = connection.listCommands() .blPop(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), Duration.ofSeconds(1L)).block(); - assertThat(result.getKey(), is(equalTo(KEY_1_BBUFFER))); - assertThat(result.getValue(), is(equalTo(VALUE_1_BBUFFER))); + assertThat(result.getKey()).isEqualTo(KEY_1_BBUFFER); + assertThat(result.getValue()).isEqualTo(VALUE_1_BBUFFER); } @Test // DATAREDIS-525 public void brPopShouldReturnLastAvailable() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); PopResult result = connection.listCommands() .brPop(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), Duration.ofSeconds(1L)).block(); - assertThat(result.getKey(), is(equalTo(KEY_1_BBUFFER))); - assertThat(result.getValue(), is(equalTo(VALUE_3_BBUFFER))); + assertThat(result.getKey()).isEqualTo(KEY_1_BBUFFER); + assertThat(result.getValue()).isEqualTo(VALUE_3_BBUFFER); } @Test // DATAREDIS-525 @@ -286,15 +283,15 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest ByteBuffer result = connection.listCommands().rPopLPush(KEY_1_BBUFFER, KEY_2_BBUFFER).block(); - assertThat(result, is(equalTo(VALUE_3_BBUFFER))); - assertThat(nativeCommands.llen(KEY_2), is(2L)); - assertThat(nativeCommands.lindex(KEY_2, 0), is(equalTo(VALUE_3))); + assertThat(result).isEqualTo(VALUE_3_BBUFFER); + assertThat(nativeCommands.llen(KEY_2)).isEqualTo(2L); + assertThat(nativeCommands.lindex(KEY_2, 0)).isEqualTo(VALUE_3); } @Test // DATAREDIS-525 public void brPopLPushShouldWorkCorrectly() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.rpush(KEY_1, VALUE_1, VALUE_2, VALUE_3); nativeCommands.rpush(KEY_2, VALUE_1); @@ -302,8 +299,8 @@ public class LettuceReactiveListCommandTests extends LettuceReactiveCommandsTest ByteBuffer result = connection.listCommands().bRPopLPush(KEY_1_BBUFFER, KEY_2_BBUFFER, Duration.ofSeconds(1)) .block(); - assertThat(result, is(equalTo(VALUE_3_BBUFFER))); - assertThat(nativeCommands.llen(KEY_2), is(2L)); - assertThat(nativeCommands.lindex(KEY_2, 0), is(equalTo(VALUE_3))); + assertThat(result).isEqualTo(VALUE_3_BBUFFER); + assertThat(nativeCommands.llen(KEY_2)).isEqualTo(2L); + assertThat(nativeCommands.lindex(KEY_2, 0)).isEqualTo(VALUE_3); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommandsTests.java index 26a7f19f1..e0333cd4f 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveNumberCommandsTests.java @@ -15,9 +15,8 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.number.IsCloseTo.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import org.junit.Test; @@ -28,22 +27,22 @@ public class LettuceReactiveNumberCommandsTests extends LettuceReactiveCommandsT @Test // DATAREDIS-525 public void incrByDoubleShouldIncreaseValueCorrectly() { - assertThat(connection.numberCommands().incrBy(KEY_1_BBUFFER, 1.5D).block(), is(closeTo(1.5D, 0D))); + assertThat(connection.numberCommands().incrBy(KEY_1_BBUFFER, 1.5D).block()).isCloseTo(1.5D, offset(0D)); } @Test // DATAREDIS-525 public void incrByIntegerShouldIncreaseValueCorrectly() { - assertThat(connection.numberCommands().incrBy(KEY_1_BBUFFER, 3).block(), is(3)); + assertThat(connection.numberCommands().incrBy(KEY_1_BBUFFER, 3).block()).isEqualTo(3); } @Test // DATAREDIS-525 public void decrByDoubleShouldDecreaseValueCorrectly() { - assertThat(connection.numberCommands().decrBy(KEY_1_BBUFFER, 1.5D).block(), is(closeTo(-1.5D, 0D))); + assertThat(connection.numberCommands().decrBy(KEY_1_BBUFFER, 1.5D).block()).isCloseTo(-1.5D, offset(0D)); } @Test // DATAREDIS-525 public void decrByIntegerShouldDecreaseValueCorrectly() { - assertThat(connection.numberCommands().decrBy(KEY_1_BBUFFER, 3).block(), is(-3)); + assertThat(connection.numberCommands().decrBy(KEY_1_BBUFFER, 3).block()).isEqualTo(-3); } @Test // DATAREDIS-525 @@ -51,7 +50,8 @@ public class LettuceReactiveNumberCommandsTests extends LettuceReactiveCommandsT nativeCommands.hset(KEY_1, KEY_1, "2"); - assertThat(connection.numberCommands().hIncrBy(KEY_1_BBUFFER, KEY_1_BBUFFER, 1.5D).block(), is(closeTo(3.5D, 0D))); + assertThat(connection.numberCommands().hIncrBy(KEY_1_BBUFFER, KEY_1_BBUFFER, 1.5D).block()).isCloseTo(3.5D, + offset(0D)); } @Test // DATAREDIS-525 @@ -59,6 +59,6 @@ public class LettuceReactiveNumberCommandsTests extends LettuceReactiveCommandsT nativeCommands.hset(KEY_1, KEY_1, "2"); - assertThat(connection.numberCommands().hIncrBy(KEY_1_BBUFFER, KEY_1_BBUFFER, 3).block(), is(5)); + assertThat(connection.numberCommands().hIncrBy(KEY_1_BBUFFER, KEY_1_BBUFFER, 3).block()).isEqualTo(5); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommandsTests.java index 88c4d3bd5..e432f7889 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveScriptingCommandsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; + import org.springframework.data.redis.RedisSystemException; import org.springframework.data.redis.connection.ReactiveRedisClusterConnection; import org.springframework.data.redis.connection.ReturnType; @@ -173,7 +174,7 @@ public class LettuceReactiveScriptingCommandsTests extends LettuceReactiveComman StepVerifier.create(connection.scriptingCommands().scriptKill()).expectNext("OK").verifyComplete(); - assertTrue(waitFor(scriptDead::get, 3000L)); + assertThat(waitFor(scriptDead::get, 3000L)).isTrue(); } private static ByteBuffer wrap(String content) { diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommandsTests.java index 9f96e26e0..b5e39de74 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSetCommandsTests.java @@ -15,18 +15,14 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.collection.IsIterableContainingInAnyOrder.*; -import static org.hamcrest.core.AnyOf.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import reactor.test.StepVerifier; import java.util.Arrays; import org.junit.Test; + import org.springframework.data.redis.core.ScanOptions; /** @@ -39,13 +35,13 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest @Test // DATAREDIS-525 public void sAddShouldAddSingleValue() { - assertThat(connection.setCommands().sAdd(KEY_1_BBUFFER, VALUE_1_BBUFFER).block(), is(1L)); + assertThat(connection.setCommands().sAdd(KEY_1_BBUFFER, VALUE_1_BBUFFER).block()).isEqualTo(1L); } @Test // DATAREDIS-525 public void sAddShouldAddValues() { - assertThat(connection.setCommands().sAdd(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_2_BBUFFER)).block(), - is(2L)); + assertThat(connection.setCommands().sAdd(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_2_BBUFFER)).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -53,8 +49,8 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sRem(KEY_1_BBUFFER, VALUE_1_BBUFFER).block(), is(1L)); - assertThat(nativeCommands.sismember(KEY_1, VALUE_1), is(false)); + assertThat(connection.setCommands().sRem(KEY_1_BBUFFER, VALUE_1_BBUFFER).block()).isEqualTo(1L); + assertThat(nativeCommands.sismember(KEY_1, VALUE_1)).isFalse(); } @Test // DATAREDIS-525 @@ -62,10 +58,10 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sRem(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_2_BBUFFER)).block(), - is(2L)); - assertThat(nativeCommands.sismember(KEY_1, VALUE_1), is(false)); - assertThat(nativeCommands.sismember(KEY_1, VALUE_2), is(false)); + assertThat(connection.setCommands().sRem(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_2_BBUFFER)).block()) + .isEqualTo(2L); + assertThat(nativeCommands.sismember(KEY_1, VALUE_1)).isFalse(); + assertThat(nativeCommands.sismember(KEY_1, VALUE_2)).isFalse(); } @Test // DATAREDIS-525 @@ -73,7 +69,7 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sPop(KEY_1_BBUFFER).block(), is(notNullValue())); + assertThat(connection.setCommands().sPop(KEY_1_BBUFFER).block()).isNotNull(); } @Test // DATAREDIS-668 @@ -86,7 +82,7 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest @Test // DATAREDIS-525 public void sPopShouldReturnNullWhenNotPresent() { - assertThat(connection.setCommands().sPop(KEY_1_BBUFFER).block(), is(nullValue())); + assertThat(connection.setCommands().sPop(KEY_1_BBUFFER).block()).isNull(); } @Test // DATAREDIS-525 @@ -95,8 +91,8 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); nativeCommands.sadd(KEY_2, VALUE_1); - assertThat(connection.setCommands().sMove(KEY_1_BBUFFER, KEY_2_BBUFFER, VALUE_3_BBUFFER).block(), is(true)); - assertThat(nativeCommands.sismember(KEY_2, VALUE_3), is(true)); + assertThat(connection.setCommands().sMove(KEY_1_BBUFFER, KEY_2_BBUFFER, VALUE_3_BBUFFER).block()).isTrue(); + assertThat(nativeCommands.sismember(KEY_2, VALUE_3)).isTrue(); } @Test // DATAREDIS-525 @@ -105,8 +101,8 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2); nativeCommands.sadd(KEY_2, VALUE_1); - assertThat(connection.setCommands().sMove(KEY_1_BBUFFER, KEY_2_BBUFFER, VALUE_3_BBUFFER).block(), is(false)); - assertThat(nativeCommands.sismember(KEY_2, VALUE_3), is(false)); + assertThat(connection.setCommands().sMove(KEY_1_BBUFFER, KEY_2_BBUFFER, VALUE_3_BBUFFER).block()).isFalse(); + assertThat(nativeCommands.sismember(KEY_2, VALUE_3)).isFalse(); } @Test // DATAREDIS-525 @@ -115,9 +111,9 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); nativeCommands.sadd(KEY_2, VALUE_1, VALUE_3); - assertThat(connection.setCommands().sMove(KEY_1_BBUFFER, KEY_2_BBUFFER, VALUE_3_BBUFFER).block(), is(true)); - assertThat(nativeCommands.sismember(KEY_1, VALUE_3), is(false)); - assertThat(nativeCommands.sismember(KEY_2, VALUE_3), is(true)); + assertThat(connection.setCommands().sMove(KEY_1_BBUFFER, KEY_2_BBUFFER, VALUE_3_BBUFFER).block()).isTrue(); + assertThat(nativeCommands.sismember(KEY_1, VALUE_3)).isFalse(); + assertThat(nativeCommands.sismember(KEY_2, VALUE_3)).isTrue(); } @Test // DATAREDIS-525 @@ -125,7 +121,7 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sCard(KEY_1_BBUFFER).block(), is(3L)); + assertThat(connection.setCommands().sCard(KEY_1_BBUFFER).block()).isEqualTo(3L); } @Test // DATAREDIS-525 @@ -133,7 +129,7 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(connection.setCommands().sIsMember(KEY_1_BBUFFER, VALUE_1_BBUFFER).block(), is(true)); + assertThat(connection.setCommands().sIsMember(KEY_1_BBUFFER, VALUE_1_BBUFFER).block()).isTrue(); } @Test // DATAREDIS-525 @@ -141,7 +137,7 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2); - assertThat(connection.setCommands().sIsMember(KEY_1_BBUFFER, VALUE_3_BBUFFER).block(), is(false)); + assertThat(connection.setCommands().sIsMember(KEY_1_BBUFFER, VALUE_3_BBUFFER).block()).isFalse(); } @Test // DATAREDIS-525, DATAREDIS-647 @@ -165,9 +161,9 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2); nativeCommands.sadd(KEY_2, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sInterStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block(), - is(1L)); - assertThat(nativeCommands.sismember(KEY_3, VALUE_2), is(true)); + assertThat(connection.setCommands().sInterStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block()) + .isEqualTo(1L); + assertThat(nativeCommands.sismember(KEY_3, VALUE_2)).isTrue(); } @Test // DATAREDIS-525 @@ -187,8 +183,8 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2); nativeCommands.sadd(KEY_2, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sUnionStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block(), - is(3L)); + assertThat(connection.setCommands().sUnionStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block()) + .isEqualTo(3L); } @Test // DATAREDIS-525, DATAREDIS-647 @@ -212,8 +208,8 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2); nativeCommands.sadd(KEY_2, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sDiffStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block(), - is(1L)); + assertThat(connection.setCommands().sDiffStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER)).block()) + .isEqualTo(1L); } @Test // DATAREDIS-525 @@ -222,8 +218,7 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); StepVerifier.create(connection.setCommands().sMembers(KEY_1_BBUFFER).buffer(3)) // - .consumeNextWith( - list -> assertThat(list, containsInAnyOrder(VALUE_1_BBUFFER, VALUE_2_BBUFFER, VALUE_3_BBUFFER))) // + .consumeNextWith(list -> assertThat(list).contains(VALUE_1_BBUFFER, VALUE_2_BBUFFER, VALUE_3_BBUFFER)) // .verifyComplete(); } @@ -247,8 +242,8 @@ public class LettuceReactiveSetCommandsTests extends LettuceReactiveCommandsTest nativeCommands.sadd(KEY_1, VALUE_1, VALUE_2, VALUE_3); - assertThat(connection.setCommands().sRandMember(KEY_1_BBUFFER).block(), - anyOf(equalTo(VALUE_1_BBUFFER), equalTo(VALUE_2_BBUFFER), equalTo(VALUE_3_BBUFFER))); + assertThat(connection.setCommands().sRandMember(KEY_1_BBUFFER).block()).isIn(VALUE_1_BBUFFER, VALUE_2_BBUFFER, + VALUE_3_BBUFFER); } @Test // DATAREDIS-525 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommandsTests.java index 5d564ebc8..8421c97c9 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStringCommandsTests.java @@ -15,15 +15,12 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldIncrBy.Overflow.*; import static org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType.*; -import static org.springframework.data.redis.connection.BitFieldSubCommands.Offset.*; +import static org.springframework.data.redis.connection.BitFieldSubCommands.Offset.offset; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -41,6 +38,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.Test; + import org.springframework.data.domain.Range; import org.springframework.data.domain.Range.Bound; import org.springframework.data.redis.connection.ReactiveRedisConnection; @@ -71,7 +69,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(VALUE_1_BBUFFER) // .verifyComplete(); - assertThat(nativeCommands.get(KEY_1), is(equalTo(VALUE_2))); + assertThat(nativeCommands.get(KEY_1)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525, DATAREDIS-645 @@ -79,7 +77,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT StepVerifier.create(connection.stringCommands().getSet(KEY_1_BBUFFER, VALUE_2_BBUFFER)).verifyComplete(); - assertThat(nativeCommands.get(KEY_1), is(equalTo(VALUE_2))); + assertThat(nativeCommands.get(KEY_1)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 @@ -89,7 +87,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(true) // .verifyComplete(); - assertThat(nativeCommands.get(KEY_1), is(equalTo(VALUE_1))); + assertThat(nativeCommands.get(KEY_1)).isEqualTo(VALUE_1); } @Test // DATAREDIS-525 @@ -102,8 +100,8 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNextCount(2) // .verifyComplete(); - assertThat(nativeCommands.get(KEY_1), is(equalTo(VALUE_1))); - assertThat(nativeCommands.get(KEY_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeCommands.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 @@ -156,7 +154,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT nativeCommands.set(KEY_2, VALUE_2); StepVerifier.create(connection.stringCommands().mGet(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER))) // - .consumeNextWith(byteBuffers -> assertThat(byteBuffers, contains(VALUE_1_BBUFFER, VALUE_2_BBUFFER)))// + .consumeNextWith(byteBuffers -> assertThat(byteBuffers).containsExactly(VALUE_1_BBUFFER, VALUE_2_BBUFFER))// .verifyComplete(); } @@ -170,7 +168,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT Mono> result = connection.stringCommands() .mGet(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER, KEY_3_BBUFFER)); - assertThat(result.block(), contains(VALUE_1_BBUFFER, ByteBuffer.allocate(0), VALUE_3_BBUFFER)); + assertThat(result.block()).containsExactly(VALUE_1_BBUFFER, ByteBuffer.allocate(0), VALUE_3_BBUFFER); } @Test // DATAREDIS-525 @@ -218,7 +216,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(true) // .verifyComplete(); - assertThat(nativeCommands.ttl(KEY_1) > 1, is(true)); + assertThat(nativeCommands.ttl(KEY_1) > 1).isTrue(); } @Test // DATAREDIS-525 @@ -229,7 +227,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(true) // .verifyComplete(); - assertThat(nativeCommands.pttl(KEY_1) > 1, is(true)); + assertThat(nativeCommands.pttl(KEY_1) > 1).isTrue(); } @Test // DATAREDIS-525 @@ -241,14 +239,14 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT StepVerifier.create(connection.stringCommands().mSet(map)).expectNext(true).verifyComplete(); - assertThat(nativeCommands.get(KEY_1), is(equalTo(VALUE_1))); - assertThat(nativeCommands.get(KEY_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeCommands.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 public void mSetNXShouldAddMultipleKeyValuePairs() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); Map map = new LinkedHashMap<>(); map.put(KEY_1_BBUFFER, VALUE_1_BBUFFER); @@ -256,14 +254,14 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT StepVerifier.create(connection.stringCommands().mSetNX(map)).expectNext(true).verifyComplete(); - assertThat(nativeCommands.get(KEY_1), is(equalTo(VALUE_1))); - assertThat(nativeCommands.get(KEY_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.get(KEY_1)).isEqualTo(VALUE_1); + assertThat(nativeCommands.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 public void mSetNXShouldNotAddMultipleKeyValuePairsWhenAlreadyExit() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.set(KEY_2, VALUE_2); @@ -273,8 +271,8 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT StepVerifier.create(connection.stringCommands().mSetNX(map)).expectNext(false).verifyComplete(); - assertThat(nativeCommands.exists(KEY_1), is(0L)); - assertThat(nativeCommands.get(KEY_2), is(equalTo(VALUE_2))); + assertThat(nativeCommands.exists(KEY_1)).isEqualTo(0L); + assertThat(nativeCommands.get(KEY_2)).isEqualTo(VALUE_2); } @Test // DATAREDIS-525 @@ -304,7 +302,8 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT nativeCommands.set(KEY_1, VALUE_1); - RangeCommand rangeCommand = RangeCommand.key(KEY_1_BBUFFER).within(Range.of(Bound.unbounded(), Bound.inclusive(2L))); + RangeCommand rangeCommand = RangeCommand.key(KEY_1_BBUFFER) + .within(Range.of(Bound.unbounded(), Bound.inclusive(2L))); StepVerifier.create(connection.stringCommands().getRange(Mono.just(rangeCommand))) // .expectNext(new ReactiveRedisConnection.ByteBufferResponse<>(rangeCommand, ByteBuffer.wrap("val".getBytes()))) @@ -316,7 +315,8 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT nativeCommands.set(KEY_1, VALUE_1); - RangeCommand rangeCommand = RangeCommand.key(KEY_1_BBUFFER).within(Range.of(Bound.inclusive(0L), Bound.unbounded())); + RangeCommand rangeCommand = RangeCommand.key(KEY_1_BBUFFER) + .within(Range.of(Bound.inclusive(0L), Bound.unbounded())); StepVerifier.create(connection.stringCommands().getRange(Mono.just(rangeCommand))) // .expectNext(new ReactiveRedisConnection.ByteBufferResponse<>(rangeCommand, ByteBuffer.wrap(VALUE_1.getBytes()))) @@ -356,7 +356,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(true) // .verifyComplete(); - assertThat(nativeCommands.getbit(KEY_1, 1), is(0L)); + assertThat(nativeCommands.getbit(KEY_1, 1)).isEqualTo(0L); } @Test // DATAREDIS-525 @@ -439,7 +439,7 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT @Test // DATAREDIS-525 public void bitOpAndShouldWorkAsExpected() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.set(KEY_1, VALUE_1); nativeCommands.set(KEY_2, VALUE_2); @@ -450,13 +450,13 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(7L) // .verifyComplete(); - assertThat(nativeCommands.get(KEY_3), is(equalTo("value-0"))); + assertThat(nativeCommands.get(KEY_3)).isEqualTo("value-0"); } @Test // DATAREDIS-525 public void bitOpOrShouldWorkAsExpected() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.set(KEY_1, VALUE_1); nativeCommands.set(KEY_2, VALUE_2); @@ -467,13 +467,13 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT .expectNext(7L) // .verifyComplete(); - assertThat(nativeCommands.get(KEY_3), is(equalTo(VALUE_3))); + assertThat(nativeCommands.get(KEY_3)).isEqualTo(VALUE_3); } @Test // DATAREDIS-525 public void bitNotShouldThrowExceptionWhenMoreThanOnSourceKey() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); StepVerifier .create(connection.stringCommands().bitOp(Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), BitOperation.NOT, @@ -505,8 +505,10 @@ public class LettuceReactiveStringCommandsTests extends LettuceReactiveCommandsT nativeBinaryCommands.set(KEY_1_BBUFFER, ByteBuffer.wrap(HexStringUtils.hexToBytes("fff0f0"))); - StepVerifier.create(connection.stringCommands().bitPos(KEY_1_BBUFFER, true, - org.springframework.data.domain.Range.of(Bound.inclusive(2L), Bound.unbounded()))).expectNext(16L).verifyComplete(); + StepVerifier + .create(connection.stringCommands().bitPos(KEY_1_BBUFFER, true, + org.springframework.data.domain.Range.of(Bound.inclusive(2L), Bound.unbounded()))) + .expectNext(16L).verifyComplete(); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommandsTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommandsTests.java index 52453d2ed..9d52c4f42 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommandsTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveZSetCommandsTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.domain.Range.Bound.*; @@ -25,8 +24,8 @@ import reactor.test.StepVerifier; import java.nio.ByteBuffer; import java.util.Arrays; -import org.hamcrest.collection.IsIterableContainingInOrder; import org.junit.Test; + import org.springframework.data.domain.Range; import org.springframework.data.redis.connection.DefaultTuple; import org.springframework.data.redis.core.ScanOptions; @@ -48,7 +47,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes @Test // DATAREDIS-525 public void zAddShouldAddValuesWithScores() { - assertThat(connection.zSetCommands().zAdd(KEY_1_BBUFFER, 3.5D, VALUE_1_BBUFFER).block(), is(1L)); + assertThat(connection.zSetCommands().zAdd(KEY_1_BBUFFER, 3.5D, VALUE_1_BBUFFER).block()).isEqualTo(1L); } @Test // DATAREDIS-525 @@ -58,8 +57,8 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRem(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_3_BBUFFER)).block(), - is(2L)); + assertThat(connection.zSetCommands().zRem(KEY_1_BBUFFER, Arrays.asList(VALUE_1_BBUFFER, VALUE_3_BBUFFER)).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -67,7 +66,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 1D, VALUE_1); - assertThat(connection.zSetCommands().zIncrBy(KEY_1_BBUFFER, 3.5D, VALUE_1_BBUFFER).block(), is(4.5D)); + assertThat(connection.zSetCommands().zIncrBy(KEY_1_BBUFFER, 3.5D, VALUE_1_BBUFFER).block()).isEqualTo(4.5D); } @Test // DATAREDIS-525 @@ -77,7 +76,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRank(KEY_1_BBUFFER, VALUE_3_BBUFFER).block(), is(2L)); + assertThat(connection.zSetCommands().zRank(KEY_1_BBUFFER, VALUE_3_BBUFFER).block()).isEqualTo(2L); } @Test // DATAREDIS-525 @@ -87,7 +86,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRevRank(KEY_1_BBUFFER, VALUE_3_BBUFFER).block(), is(0L)); + assertThat(connection.zSetCommands().zRevRank(KEY_1_BBUFFER, VALUE_3_BBUFFER).block()).isEqualTo(0L); } @Test // DATAREDIS-525 @@ -337,7 +336,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, TWO_TO_THREE_ALL_INCLUSIVE).block(), is(2L)); + assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, TWO_TO_THREE_ALL_INCLUSIVE).block()).isEqualTo(2L); } @Test // DATAREDIS-525 @@ -347,7 +346,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, TWO_EXCLUSIVE_TO_THREE_INCLUSIVE).block(), is(1L)); + assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, TWO_EXCLUSIVE_TO_THREE_INCLUSIVE).block()).isEqualTo(1L); } @Test // DATAREDIS-525 @@ -357,7 +356,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, TWO_INCLUSIVE_TO_THREE_EXCLUSIVE).block(), is(1L)); + assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, TWO_INCLUSIVE_TO_THREE_EXCLUSIVE).block()).isEqualTo(1L); } @Test // DATAREDIS-525 @@ -367,7 +366,8 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, Range.leftUnbounded(inclusive(2D))).block(), is(2L)); + assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, Range.leftUnbounded(inclusive(2D))).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -377,7 +377,8 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, Range.rightUnbounded(inclusive(2D))).block(), is(2L)); + assertThat(connection.zSetCommands().zCount(KEY_1_BBUFFER, Range.rightUnbounded(inclusive(2D))).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -387,7 +388,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zCard(KEY_1_BBUFFER).block(), is(3L)); + assertThat(connection.zSetCommands().zCard(KEY_1_BBUFFER).block()).isEqualTo(3L); } @Test // DATAREDIS-525 @@ -395,7 +396,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); - assertThat(connection.zSetCommands().zScore(KEY_1_BBUFFER, VALUE_2_BBUFFER).block(), is(2D)); + assertThat(connection.zSetCommands().zScore(KEY_1_BBUFFER, VALUE_2_BBUFFER).block()).isEqualTo(2D); } @Test // DATAREDIS-525 @@ -405,7 +406,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRemRangeByRank(KEY_1_BBUFFER, ONE_TO_TWO).block(), is(2L)); + assertThat(connection.zSetCommands().zRemRangeByRank(KEY_1_BBUFFER, ONE_TO_TWO).block()).isEqualTo(2L); } @Test // DATAREDIS-525 @@ -415,7 +416,7 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, Range.closed(1D, 2D)).block(), is(2L)); + assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, Range.closed(1D, 2D)).block()).isEqualTo(2L); } @Test // DATAREDIS-525 @@ -425,8 +426,8 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, Range.leftUnbounded(inclusive(2D))).block(), - is(2L)); + assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, Range.leftUnbounded(inclusive(2D))).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -436,8 +437,8 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, Range.rightUnbounded(inclusive(2D))).block(), - is(2L)); + assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, Range.rightUnbounded(inclusive(2D))).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -447,8 +448,8 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, TWO_EXCLUSIVE_TO_THREE_INCLUSIVE).block(), - is(1L)); + assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, TWO_EXCLUSIVE_TO_THREE_INCLUSIVE).block()) + .isEqualTo(1L); } @Test // DATAREDIS-525 @@ -458,14 +459,14 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 2D, VALUE_2); nativeCommands.zadd(KEY_1, 3D, VALUE_3); - assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, TWO_INCLUSIVE_TO_THREE_EXCLUSIVE).block(), - is(1L)); + assertThat(connection.zSetCommands().zRemRangeByScore(KEY_1_BBUFFER, TWO_INCLUSIVE_TO_THREE_EXCLUSIVE).block()) + .isEqualTo(1L); } @Test // DATAREDIS-525 public void zUnionStoreShouldWorkCorrectly() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.zadd(KEY_1, 1D, VALUE_1); nativeCommands.zadd(KEY_1, 2D, VALUE_2); @@ -473,16 +474,15 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_2, 2D, VALUE_2); nativeCommands.zadd(KEY_2, 3D, VALUE_3); - assertThat( - connection.zSetCommands() - .zUnionStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block(), - is(3L)); + assertThat(connection.zSetCommands() + .zUnionStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block()) + .isEqualTo(3L); } @Test // DATAREDIS-525 public void zInterStoreShouldWorkCorrectly() { - assumeThat(connectionProvider instanceof StandaloneConnectionProvider, is(true)); + assumeTrue(connectionProvider instanceof StandaloneConnectionProvider); nativeCommands.zadd(KEY_1, 1D, VALUE_1); nativeCommands.zadd(KEY_1, 2D, VALUE_2); @@ -490,10 +490,9 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_2, 2D, VALUE_2); nativeCommands.zadd(KEY_2, 3D, VALUE_3); - assertThat( - connection.zSetCommands() - .zInterStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block(), - is(2L)); + assertThat(connection.zSetCommands() + .zInterStore(KEY_3_BBUFFER, Arrays.asList(KEY_1_BBUFFER, KEY_2_BBUFFER), Arrays.asList(2D, 3D)).block()) + .isEqualTo(2L); } @Test // DATAREDIS-525 @@ -509,16 +508,15 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes Range emptyToC = Range.closed("", "c"); - assertThat(connection.zSetCommands().zRangeByLex(KEY_1_BBUFFER, emptyToC).collectList().block(), - IsIterableContainingInOrder.contains(ByteBuffer.wrap("a".getBytes()), ByteBuffer.wrap("b".getBytes()), - ByteBuffer.wrap("c".getBytes()))); + assertThat(connection.zSetCommands().zRangeByLex(KEY_1_BBUFFER, emptyToC).collectList().block()).containsExactly( + ByteBuffer.wrap("a".getBytes()), ByteBuffer.wrap("b".getBytes()), ByteBuffer.wrap("c".getBytes())); - assertThat(connection.zSetCommands().zRangeByLex(KEY_1_BBUFFER, Range.rightOpen("", "c")).collectList().block(), - IsIterableContainingInOrder.contains(ByteBuffer.wrap("a".getBytes()), ByteBuffer.wrap("b".getBytes()))); + assertThat(connection.zSetCommands().zRangeByLex(KEY_1_BBUFFER, Range.rightOpen("", "c")).collectList().block()) + .containsExactly(ByteBuffer.wrap("a".getBytes()), ByteBuffer.wrap("b".getBytes())); - assertThat(connection.zSetCommands().zRangeByLex(KEY_1_BBUFFER, Range.rightOpen("aaa", "g")).collectList().block(), - IsIterableContainingInOrder.contains(ByteBuffer.wrap("b".getBytes()), ByteBuffer.wrap("c".getBytes()), - ByteBuffer.wrap("d".getBytes()), ByteBuffer.wrap("e".getBytes()), ByteBuffer.wrap("f".getBytes()))); + assertThat(connection.zSetCommands().zRangeByLex(KEY_1_BBUFFER, Range.rightOpen("aaa", "g")).collectList().block()) + .containsExactly(ByteBuffer.wrap("b".getBytes()), ByteBuffer.wrap("c".getBytes()), + ByteBuffer.wrap("d".getBytes()), ByteBuffer.wrap("e".getBytes()), ByteBuffer.wrap("f".getBytes())); } @Test // DATAREDIS-525 @@ -532,17 +530,17 @@ public class LettuceReactiveZSetCommandsTests extends LettuceReactiveCommandsTes nativeCommands.zadd(KEY_1, 0D, "f"); nativeCommands.zadd(KEY_1, 0D, "g"); - assertThat(connection.zSetCommands().zRevRangeByLex(KEY_1_BBUFFER, Range.closed("", "c")).collectList().block(), - IsIterableContainingInOrder.contains(ByteBuffer.wrap("c".getBytes()), ByteBuffer.wrap("b".getBytes()), - ByteBuffer.wrap("a".getBytes()))); + assertThat(connection.zSetCommands().zRevRangeByLex(KEY_1_BBUFFER, Range.closed("", "c")).collectList().block()) + .containsExactly(ByteBuffer.wrap("c".getBytes()), ByteBuffer.wrap("b".getBytes()), + ByteBuffer.wrap("a".getBytes())); - assertThat(connection.zSetCommands().zRevRangeByLex(KEY_1_BBUFFER, Range.rightOpen("", "c")).collectList().block(), - IsIterableContainingInOrder.contains(ByteBuffer.wrap("b".getBytes()), ByteBuffer.wrap("a".getBytes()))); + assertThat(connection.zSetCommands().zRevRangeByLex(KEY_1_BBUFFER, Range.rightOpen("", "c")).collectList().block()) + .containsExactly(ByteBuffer.wrap("b".getBytes()), ByteBuffer.wrap("a".getBytes())); assertThat( - connection.zSetCommands().zRevRangeByLex(KEY_1_BBUFFER, Range.rightOpen("aaa", "g")).collectList().block(), - IsIterableContainingInOrder.contains(ByteBuffer.wrap("f".getBytes()), ByteBuffer.wrap("e".getBytes()), - ByteBuffer.wrap("d".getBytes()), ByteBuffer.wrap("c".getBytes()), ByteBuffer.wrap("b".getBytes()))); + connection.zSetCommands().zRevRangeByLex(KEY_1_BBUFFER, Range.rightOpen("aaa", "g")).collectList().block()) + .containsExactly(ByteBuffer.wrap("f".getBytes()), ByteBuffer.wrap("e".getBytes()), + ByteBuffer.wrap("d".getBytes()), ByteBuffer.wrap("c".getBytes()), ByteBuffer.wrap("b".getBytes())); } } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelIntegrationTests.java index e7474aeb3..ed92b6996 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSentinelIntegrationTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import io.lettuce.core.ReadFrom; import reactor.test.StepVerifier; @@ -128,8 +125,8 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati public void shouldReadMastersCorrectly() { List servers = (List) connectionFactory.getSentinelConnection().masters(); - assertThat(servers.size(), is(1)); - assertThat(servers.get(0).getName(), is(MASTER_NAME)); + assertThat(servers.size()).isEqualTo(1); + assertThat(servers.get(0).getName()).isEqualTo(MASTER_NAME); } @Test // DATAREDIS-842, DATAREDIS-973 @@ -149,10 +146,10 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati connectionFactory.afterPropertiesSet(); RedisConnection directConnection = connectionFactory.getConnection(); - assertThat(directConnection.exists("foo".getBytes()), is(true)); + assertThat(directConnection.exists("foo".getBytes())).isTrue(); directConnection.select(0); - assertThat(directConnection.exists("foo".getBytes()), is(false)); + assertThat(directConnection.exists("foo".getBytes())).isFalse(); directConnection.close(); connectionFactory.destroy(); } @@ -190,11 +187,11 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati RedisSentinelConnection sentinelConnection = connectionFactory.getSentinelConnection(); List servers = (List) sentinelConnection.masters(); - assertThat(servers.size(), is(1)); + assertThat(servers.size()).isEqualTo(1); Collection slaves = sentinelConnection.slaves(servers.get(0)); - assertThat(slaves.size(), is(2)); - assertThat(slaves, hasItems(SLAVE_0, SLAVE_1)); + assertThat(slaves.size()).isEqualTo(2); + assertThat(slaves).contains(SLAVE_0, SLAVE_1); } @Test // DATAREDIS-462 @@ -209,7 +206,7 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati StringRedisConnection connection = new DefaultStringRedisConnection(factory.getConnection()); try { - assertThat(connection.ping(), is(equalTo("PONG"))); + assertThat(connection.ping()).isEqualTo("PONG"); } finally { connection.close(); } @@ -229,7 +226,7 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati StringRedisConnection connection = new DefaultStringRedisConnection(factory.getConnection()); try { - assertThat(connection.getClientName(), is(equalTo("clientName"))); + assertThat(connection.getClientName()).isEqualTo("clientName"); } finally { connection.close(); } @@ -247,8 +244,8 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati StringRedisConnection connection = new DefaultStringRedisConnection(factory.getConnection()); try { - assertThat(connection.ping(), is(equalTo("PONG"))); - assertThat(connection.info().getProperty("role"), is(equalTo("master"))); + assertThat(connection.ping()).isEqualTo("PONG"); + assertThat(connection.info().getProperty("role")).isEqualTo("master"); } finally { connection.close(); } @@ -266,8 +263,8 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati StringRedisConnection connection = new DefaultStringRedisConnection(factory.getConnection()); try { - assertThat(connection.ping(), is(equalTo("PONG"))); - assertThat(connection.info().getProperty("role"), is(equalTo("slave"))); + assertThat(connection.ping()).isEqualTo("PONG"); + assertThat(connection.info().getProperty("role")).isEqualTo("slave"); } finally { connection.close(); } @@ -285,8 +282,8 @@ public class LettuceSentinelIntegrationTests extends AbstractConnectionIntegrati RedisConnection connection = factory.getConnection(); try { - assertThat(connection.ping(), is(equalTo("PONG"))); - assertThat(connection.info().getProperty("role"), is(equalTo("slave"))); + assertThat(connection.ping()).isEqualTo("PONG"); + assertThat(connection.info().getProperty("role")).isEqualTo("slave"); } finally { connection.close(); } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java index 0c4d70366..b90821e63 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceSubscriptionTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.connection.lettuce; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import io.lettuce.core.pubsub.StatefulRedisPubSubConnection; @@ -26,6 +26,7 @@ import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; + import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.connection.RedisInvalidSubscriptionException; @@ -70,9 +71,9 @@ public class LettuceSubscriptionTests { verify(asyncCommands, never()).punsubscribe(new byte[0]); verify(connectionProvider).release(pubsub); verify(pubsub).removeListener(any(LettuceMessageListener.class)); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -83,11 +84,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).unsubscribe(new byte[][] { "a".getBytes() }); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -100,9 +101,9 @@ public class LettuceSubscriptionTests { verify(asyncCommands, never()).punsubscribe(new byte[0]); verify(connectionProvider).release(pubsub); verify(pubsub).removeListener(any(LettuceMessageListener.class)); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -113,11 +114,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).unsubscribe(new byte[][] { "a".getBytes() }); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection subChannels = subscription.getChannels(); - assertEquals(1, subChannels.size()); - assertArrayEquals("b".getBytes(), subChannels.iterator().next()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subChannels.size()).isEqualTo(1); + assertThat(subChannels.iterator().next()).isEqualTo("b".getBytes()); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -129,11 +130,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).unsubscribe(channel); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -145,13 +146,13 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).unsubscribe(channel); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("b".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("b".getBytes()); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -160,11 +161,11 @@ public class LettuceSubscriptionTests { subscription.unsubscribe(); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("s*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("s*".getBytes()); } @Test @@ -173,7 +174,7 @@ public class LettuceSubscriptionTests { subscription.unsubscribe(); verify(connectionProvider, times(1)).release(pubsub); verify(pubsub, times(1)).removeListener(any(LettuceMessageListener.class)); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.unsubscribe(); verify(asyncCommands, times(1)).unsubscribe(new byte[][] { "a".getBytes() }); verify(asyncCommands, never()).unsubscribe(new byte[0]); @@ -184,7 +185,7 @@ public class LettuceSubscriptionTests { public void testSubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.subscribe(new byte[][] { "s".getBytes() }); } @@ -195,11 +196,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); verify(asyncCommands, times(1)).punsubscribe(new byte[][] { "a*".getBytes() }); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); verify(connectionProvider).release(pubsub); verify(pubsub).removeListener(any(LettuceMessageListener.class)); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -210,11 +211,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); verify(asyncCommands, times(1)).punsubscribe(new byte[][] { "s*".getBytes() }); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("a".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("a".getBytes()); } @Test @@ -227,9 +228,9 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).punsubscribe(pattern); verify(connectionProvider).release(pubsub); verify(pubsub).removeListener(any(LettuceMessageListener.class)); - assertFalse(subscription.isAlive()); - assertTrue(subscription.getChannels().isEmpty()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isFalse(); + assertThat(subscription.getChannels().isEmpty()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); } @Test @@ -240,11 +241,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).punsubscribe(new byte[][] { "a*".getBytes() }); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection subPatterns = subscription.getPatterns(); - assertEquals(1, subPatterns.size()); - assertArrayEquals("b*".getBytes(), subPatterns.iterator().next()); - assertTrue(subscription.getChannels().isEmpty()); + assertThat(subPatterns.size()).isEqualTo(1); + assertThat(subPatterns.iterator().next()).isEqualTo("b*".getBytes()); + assertThat(subscription.getChannels().isEmpty()).isTrue(); } @Test @@ -256,11 +257,11 @@ public class LettuceSubscriptionTests { verify(asyncCommands, times(1)).punsubscribe(pattern); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("a".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("a".getBytes()); } @Test @@ -272,13 +273,13 @@ public class LettuceSubscriptionTests { verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); verify(asyncCommands, times(1)).punsubscribe(pattern); - assertTrue(subscription.isAlive()); + assertThat(subscription.isAlive()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("a".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("a".getBytes()); Collection patterns = subscription.getPatterns(); - assertEquals(1, patterns.size()); - assertArrayEquals("b*".getBytes(), patterns.iterator().next()); + assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns.iterator().next()).isEqualTo("b*".getBytes()); } @Test @@ -287,18 +288,18 @@ public class LettuceSubscriptionTests { subscription.pUnsubscribe(); verify(asyncCommands, never()).unsubscribe(new byte[0]); verify(asyncCommands, never()).punsubscribe(new byte[0]); - assertTrue(subscription.isAlive()); - assertTrue(subscription.getPatterns().isEmpty()); + assertThat(subscription.isAlive()).isTrue(); + assertThat(subscription.getPatterns().isEmpty()).isTrue(); Collection channels = subscription.getChannels(); - assertEquals(1, channels.size()); - assertArrayEquals("s".getBytes(), channels.iterator().next()); + assertThat(channels.size()).isEqualTo(1); + assertThat(channels.iterator().next()).isEqualTo("s".getBytes()); } @Test public void testPUnsubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.pUnsubscribe(); verify(connectionProvider, times(1)).release(pubsub); verify(pubsub, times(1)).removeListener(any(LettuceMessageListener.class)); @@ -311,7 +312,7 @@ public class LettuceSubscriptionTests { public void testPSubscribeNotAlive() { subscription.subscribe(new byte[][] { "a".getBytes() }); subscription.unsubscribe(); - assertFalse(subscription.isAlive()); + assertThat(subscription.isAlive()).isFalse(); subscription.pSubscribe(new byte[][] { "s*".getBytes() }); } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java index a0763280c..381da5bf0 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -32,6 +29,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots; import org.springframework.data.redis.connection.RedisClusterConnection; import org.springframework.data.redis.connection.RedisClusterNode; @@ -84,7 +82,7 @@ public class DefaultClusterOperationsUnitTests { Set keys = new HashSet<>(Arrays.asList(serializer.serialize("key-1"), serializer.serialize("key-2"))); when(connection.keys(any(RedisClusterNode.class), any(byte[].class))).thenReturn(keys); - assertThat(clusterOps.keys(NODE_1, "*"), hasItems("key-1", "key-2")); + assertThat(clusterOps.keys(NODE_1, "*")).contains("key-1", "key-2"); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 @@ -97,7 +95,7 @@ public class DefaultClusterOperationsUnitTests { when(connection.keys(any(RedisClusterNode.class), any(byte[].class))).thenReturn(null); - assertThat(clusterOps.keys(NODE_1, "*"), notNullValue()); + assertThat(clusterOps.keys(NODE_1, "*")).isNotNull(); } @Test // DATAREDIS-315 @@ -105,7 +103,7 @@ public class DefaultClusterOperationsUnitTests { when(connection.randomKey(any(RedisClusterNode.class))).thenReturn(serializer.serialize("key-1")); - assertThat(clusterOps.randomKey(NODE_1), is("key-1")); + assertThat(clusterOps.randomKey(NODE_1)).isEqualTo("key-1"); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 @@ -118,7 +116,7 @@ public class DefaultClusterOperationsUnitTests { when(connection.randomKey(any(RedisClusterNode.class))).thenReturn(null); - assertThat(clusterOps.randomKey(NODE_1), nullValue()); + assertThat(clusterOps.randomKey(NODE_1)).isNull(); } @Test // DATAREDIS-315 @@ -126,7 +124,7 @@ public class DefaultClusterOperationsUnitTests { when(connection.ping(any(RedisClusterNode.class))).thenReturn("PONG"); - assertThat(clusterOps.ping(NODE_1), is("PONG")); + assertThat(clusterOps.ping(NODE_1)).isEqualTo("PONG"); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-315 diff --git a/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java index e1e1f1b26..84bf8317c 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultGeoOperationsTests.java @@ -15,12 +15,8 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.collection.IsCollectionWithSize.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNull.*; -import static org.hamcrest.number.IsCloseTo.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import static org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit.*; import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.*; @@ -37,6 +33,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.geo.Circle; import org.springframework.data.geo.Distance; import org.springframework.data.geo.GeoResults; @@ -45,8 +42,6 @@ import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.connection.RedisGeoCommands.DistanceUnit; import org.springframework.data.redis.connection.RedisGeoCommands.GeoLocation; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.data.redis.test.util.MinimumRedisVersionRule; import org.springframework.test.annotation.IfProfileValue; @@ -116,7 +111,7 @@ public class DefaultGeoOperationsTests { Long numAdded = geoOperations.add(keyFactory.instance(), POINT_PALERMO, valueFactory.instance()); - assertThat(numAdded, is(1L)); + assertThat(numAdded).isEqualTo(1L); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -128,7 +123,7 @@ public class DefaultGeoOperationsTests { Long numAdded = geoOperations.add(keyFactory.instance(), memberCoordinateMap); - assertThat(numAdded, is(2L)); + assertThat(numAdded).isEqualTo(2L); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -142,8 +137,8 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_CATANIA, member2); Distance dist = geoOperations.distance(key, member1, member2); - assertThat(dist.getValue(), closeTo(DISTANCE_PALERMO_CATANIA_METERS, 0.005)); - assertThat(dist.getUnit(), is(equalTo("m"))); + assertThat(dist.getValue()).isCloseTo(DISTANCE_PALERMO_CATANIA_METERS, offset(0.005)); + assertThat(dist.getUnit()).isEqualTo("m"); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -157,8 +152,8 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_CATANIA, member2); Distance dist = geoOperations.distance(key, member1, member2, KILOMETERS); - assertThat(dist.getValue(), closeTo(DISTANCE_PALERMO_CATANIA_KILOMETERS, 0.005)); - assertThat(dist.getUnit(), is(equalTo("km"))); + assertThat(dist.getValue()).isCloseTo(DISTANCE_PALERMO_CATANIA_KILOMETERS, offset(0.005)); + assertThat(dist.getUnit()).isEqualTo("km"); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -172,8 +167,8 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_CATANIA, member2); Distance dist = geoOperations.distance(key, member1, member2, DistanceUnit.MILES); - assertThat(dist.getValue(), closeTo(DISTANCE_PALERMO_CATANIA_MILES, 0.005)); - assertThat(dist.getUnit(), is(equalTo("mi"))); + assertThat(dist.getValue()).isCloseTo(DISTANCE_PALERMO_CATANIA_MILES, offset(0.005)); + assertThat(dist.getUnit()).isEqualTo("mi"); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -187,8 +182,8 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_CATANIA, member2); Distance dist = geoOperations.distance(key, member1, member2, DistanceUnit.FEET); - assertThat(dist.getValue(), closeTo(DISTANCE_PALERMO_CATANIA_FEET, 0.005)); - assertThat(dist.getUnit(), is(equalTo("ft"))); + assertThat(dist.getValue()).isCloseTo(DISTANCE_PALERMO_CATANIA_FEET, offset(0.005)); + assertThat(dist.getUnit()).isEqualTo("ft"); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -202,10 +197,10 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_CATANIA, v2); List result = geoOperations.hash(key, v1, v2); - assertThat(result, hasSize(2)); + assertThat(result).hasSize(2); - assertThat(result.get(0), is(equalTo("sqc8b49rny0"))); - assertThat(result.get(1), is(equalTo("sqdtr74hyu0"))); + assertThat(result.get(0)).isEqualTo("sqc8b49rny0"); + assertThat(result.get(1)).isEqualTo("sqdtr74hyu0"); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -220,15 +215,15 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_CATANIA, v2); List result = geoOperations.position(key, v1, v2, v3);// v3 is nonexisting - assertThat(result, hasSize(3)); + assertThat(result).hasSize(3); - assertThat(result.get(0).getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.get(0).getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); + assertThat(result.get(0).getX()).isCloseTo(POINT_PALERMO.getX(), offset(0.005)); + assertThat(result.get(0).getY()).isCloseTo(POINT_PALERMO.getY(), offset(0.005)); - assertThat(result.get(1).getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(result.get(1).getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); + assertThat(result.get(1).getX()).isCloseTo(POINT_CATANIA.getX(), offset(0.005)); + assertThat(result.get(1).getY()).isCloseTo(POINT_CATANIA.getY(), offset(0.005)); - assertThat(result.get(2), is(nullValue())); + assertThat(result.get(2)).isNull(); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -244,7 +239,7 @@ public class DefaultGeoOperationsTests { GeoResults> result = geoOperations.radius(key, new Circle(new Point(15D, 37D), new Distance(200D, KILOMETERS))); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -261,14 +256,14 @@ public class DefaultGeoOperationsTests { new Circle(new Point(15, 37), new Distance(200, KILOMETERS)), newGeoRadiusArgs().includeDistance().sortDescending()); - assertThat(result.getContent(), hasSize(2)); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(190.4424d, 0.005))); - assertThat(result.getContent().get(0).getDistance().getUnit(), is(equalTo("km"))); - assertThat(result.getContent().get(0).getContent().getName(), is(member1)); + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(190.4424d, offset(0.005)); + assertThat(result.getContent().get(0).getDistance().getUnit()).isEqualTo("km"); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(member1); - assertThat(result.getContent().get(1).getDistance().getValue(), is(closeTo(56.4413d, 0.005))); - assertThat(result.getContent().get(1).getDistance().getUnit(), is(equalTo("km"))); - assertThat(result.getContent().get(1).getContent().getName(), is(member2)); + assertThat(result.getContent().get(1).getDistance().getValue()).isCloseTo(56.4413d, offset(0.005)); + assertThat(result.getContent().get(1).getDistance().getUnit()).isEqualTo("km"); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(member2); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -285,14 +280,18 @@ public class DefaultGeoOperationsTests { new Circle(new Point(15, 37), new Distance(200, KILOMETERS)), newGeoRadiusArgs().includeCoordinates().sortAscending()); - assertThat(result.getContent(), hasSize(2)); - assertThat(result.getContent().get(0).getContent().getPoint().getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(result.getContent().get(0).getContent().getPoint().getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); - assertThat(result.getContent().get(0).getContent().getName(), is(member2)); + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).getContent().getPoint().getX()).isCloseTo(POINT_CATANIA.getX(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getPoint().getY()).isCloseTo(POINT_CATANIA.getY(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(member2); - assertThat(result.getContent().get(1).getContent().getPoint().getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.getContent().get(1).getContent().getPoint().getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); - assertThat(result.getContent().get(1).getContent().getName(), is(member1)); + assertThat(result.getContent().get(1).getContent().getPoint().getX()).isCloseTo(POINT_PALERMO.getX(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getPoint().getY()).isCloseTo(POINT_PALERMO.getY(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(member1); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -308,19 +307,23 @@ public class DefaultGeoOperationsTests { GeoResults> result = geoOperations.radius(key, new Circle(new Point(15, 37), new Distance(200, KILOMETERS)), newGeoRadiusArgs().includeCoordinates().includeDistance().sortAscending()); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(56.4413d, 0.005))); - assertThat(result.getContent().get(0).getDistance().getUnit(), is(equalTo("km"))); - assertThat(result.getContent().get(0).getContent().getPoint().getX(), is(closeTo(POINT_CATANIA.getX(), 0.005))); - assertThat(result.getContent().get(0).getContent().getPoint().getY(), is(closeTo(POINT_CATANIA.getY(), 0.005))); - assertThat(result.getContent().get(0).getContent().getName(), is(member2)); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(56.4413d, offset(0.005)); + assertThat(result.getContent().get(0).getDistance().getUnit()).isEqualTo("km"); + assertThat(result.getContent().get(0).getContent().getPoint().getX()).isCloseTo(POINT_CATANIA.getX(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getPoint().getY()).isCloseTo(POINT_CATANIA.getY(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(member2); - assertThat(result.getContent().get(1).getDistance().getValue(), is(closeTo(190.4424d, 0.005))); - assertThat(result.getContent().get(1).getDistance().getUnit(), is(equalTo("km"))); - assertThat(result.getContent().get(1).getContent().getPoint().getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.getContent().get(1).getContent().getPoint().getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); - assertThat(result.getContent().get(1).getContent().getName(), is(member1)); + assertThat(result.getContent().get(1).getDistance().getValue()).isCloseTo(190.4424d, offset(0.005)); + assertThat(result.getContent().get(1).getDistance().getUnit()).isEqualTo("km"); + assertThat(result.getContent().get(1).getContent().getPoint().getX()).isCloseTo(POINT_PALERMO.getX(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getPoint().getY()).isCloseTo(POINT_PALERMO.getY(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(member1); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -336,7 +339,7 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_ARIGENTO, member3); GeoResults> result = geoOperations.radius(key, member3, new Distance(200, KILOMETERS)); - assertThat(result.getContent(), hasSize(3)); + assertThat(result.getContent()).hasSize(3); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -354,11 +357,11 @@ public class DefaultGeoOperationsTests { GeoResults> result = geoOperations.radius(key, member3, new Distance(100, KILOMETERS), newGeoRadiusArgs().includeDistance().sortDescending()); - assertThat(result.getContent(), hasSize(2)); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(90.9778d, 0.005))); - assertThat(result.getContent().get(0).getContent().getName(), is(member1)); - assertThat(result.getContent().get(1).getDistance().getValue(), is(closeTo(0.0d, 0.005))); // itself - assertThat(result.getContent().get(1).getContent().getName(), is(member3)); + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(90.9778d, offset(0.005)); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(member1); + assertThat(result.getContent().get(1).getDistance().getValue()).isCloseTo(0.0d, offset(0.005)); // itself + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(member3); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -376,14 +379,18 @@ public class DefaultGeoOperationsTests { GeoResults> result = geoOperations.radius(key, member3, new Distance(100, DistanceUnit.KILOMETERS), newGeoRadiusArgs().includeCoordinates().sortAscending()); - assertThat(result.getContent(), hasSize(2)); - assertThat(result.getContent().get(0).getContent().getPoint().getX(), is(closeTo(POINT_ARIGENTO.getX(), 0.005))); - assertThat(result.getContent().get(0).getContent().getPoint().getY(), is(closeTo(POINT_ARIGENTO.getY(), 0.005))); - assertThat(result.getContent().get(0).getContent().getName(), is(member3)); + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).getContent().getPoint().getX()).isCloseTo(POINT_ARIGENTO.getX(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getPoint().getY()).isCloseTo(POINT_ARIGENTO.getY(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(member3); - assertThat(result.getContent().get(1).getContent().getPoint().getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.getContent().get(1).getContent().getPoint().getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); - assertThat(result.getContent().get(1).getContent().getName(), is(member1)); + assertThat(result.getContent().get(1).getContent().getPoint().getX()).isCloseTo(POINT_PALERMO.getX(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getPoint().getY()).isCloseTo(POINT_PALERMO.getY(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(member1); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -401,17 +408,21 @@ public class DefaultGeoOperationsTests { // with coord and dist, ascending GeoResults> result = geoOperations.radius(key, member1, new Distance(100, KILOMETERS), newGeoRadiusArgs().includeCoordinates().includeDistance().sortAscending()); - assertThat(result.getContent(), hasSize(2)); + assertThat(result.getContent()).hasSize(2); - assertThat(result.getContent().get(0).getDistance().getValue(), is(closeTo(0.0d, 0.005))); - assertThat(result.getContent().get(0).getContent().getPoint().getX(), is(closeTo(POINT_PALERMO.getX(), 0.005))); - assertThat(result.getContent().get(0).getContent().getPoint().getY(), is(closeTo(POINT_PALERMO.getY(), 0.005))); - assertThat(result.getContent().get(0).getContent().getName(), is(member1)); + assertThat(result.getContent().get(0).getDistance().getValue()).isCloseTo(0.0d, offset(0.005)); + assertThat(result.getContent().get(0).getContent().getPoint().getX()).isCloseTo(POINT_PALERMO.getX(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getPoint().getY()).isCloseTo(POINT_PALERMO.getY(), + offset(0.005)); + assertThat(result.getContent().get(0).getContent().getName()).isEqualTo(member1); - assertThat(result.getContent().get(1).getDistance().getValue(), is(closeTo(90.9778d, 0.005))); - assertThat(result.getContent().get(1).getContent().getPoint().getX(), is(closeTo(POINT_ARIGENTO.getX(), 0.005))); - assertThat(result.getContent().get(1).getContent().getPoint().getY(), is(closeTo(POINT_ARIGENTO.getY(), 0.005))); - assertThat(result.getContent().get(1).getContent().getName(), is(member3)); + assertThat(result.getContent().get(1).getDistance().getValue()).isCloseTo(90.9778d, offset(0.005)); + assertThat(result.getContent().get(1).getContent().getPoint().getX()).isCloseTo(POINT_ARIGENTO.getX(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getPoint().getY()).isCloseTo(POINT_ARIGENTO.getY(), + offset(0.005)); + assertThat(result.getContent().get(1).getContent().getName()).isEqualTo(member3); } @Test // DATAREDIS-438, DATAREDIS-614 @@ -422,6 +433,6 @@ public class DefaultGeoOperationsTests { geoOperations.add(key, POINT_PALERMO, member1); - assertThat(geoOperations.remove(key, member1), is(1L)); + assertThat(geoOperations.remove(key, member1)).isEqualTo(1L); } } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultHashOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultHashOperationsTests.java index c07923824..7a9ce5531 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultHashOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultHashOperationsTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import java.io.IOException; @@ -32,6 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.RawObjectFactory; @@ -128,8 +128,8 @@ public class DefaultHashOperationsTests { hashOps.put(key, key2, val2); for (Map.Entry entry : hashOps.entries(key).entrySet()) { - assertThat(entry.getKey(), anyOf(equalTo(key1), equalTo(key2))); - assertThat(entry.getValue(), anyOf(equalTo(val1), equalTo(val2))); + assertThat(entry.getKey()).isIn(key1, key2); + assertThat(entry.getValue()).isIn(val1, val2); } } @@ -143,8 +143,8 @@ public class DefaultHashOperationsTests { hashOps.put(key, key1, val1); hashOps.put(key, key2, val2); Long numDeleted = hashOps.delete(key, key1, key2); - assertTrue(hashOps.keys(key).isEmpty()); - assertEquals(2L, numDeleted.longValue()); + assertThat(hashOps.keys(key).isEmpty()).isTrue(); + assertThat(numDeleted.longValue()).isEqualTo(2L); } @Test // DATAREDIS-305 @@ -164,20 +164,20 @@ public class DefaultHashOperationsTests { long count = 0; while (it.hasNext()) { Map.Entry entry = it.next(); - assertThat(entry.getKey(), anyOf(equalTo(key1), equalTo(key2))); - assertThat(entry.getValue(), anyOf(equalTo(val1), equalTo(val2))); + assertThat(entry.getKey()).isIn(key1, key2); + assertThat(entry.getValue()).isIn(val1, val2); count++; } it.close(); - assertThat(count, is(hashOps.size(key))); + assertThat(count).isEqualTo(hashOps.size(key)); } @Test // DATAREDIS-698 @IfProfileValue(name = "redisVersion", value = "3.0.3+") public void lengthOfValue() throws IOException { - assumeThat(hashValueFactory instanceof StringObjectFactory, is(true)); + assumeTrue(hashValueFactory instanceof StringObjectFactory); K key = keyFactory.instance(); HK key1 = hashKeyFactory.instance(); @@ -188,7 +188,7 @@ public class DefaultHashOperationsTests { hashOps.put(key, key1, val1); hashOps.put(key, key2, val2); - assertThat(hashOps.lengthOfValue(key, key1), is(Long.valueOf(val1.toString().length()))); + assertThat(hashOps.lengthOfValue(key, key1)).isEqualTo(Long.valueOf(val1.toString().length())); } } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultHyperLogLogOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultHyperLogLogOperationsTests.java index ec4fd9594..f2b92fbfd 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultHyperLogLogOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultHyperLogLogOperationsTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; @@ -28,6 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.test.util.MinimumRedisVersionRule; @@ -92,7 +92,7 @@ public class DefaultHyperLogLogOperationsTests { V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - assertThat(hyperLogLogOps.add(key, v1, v2, v3), equalTo(1L)); + assertThat(hyperLogLogOps.add(key, v1, v2, v3)).isEqualTo(1L); } @Test // DATAREDIS-308 @@ -105,7 +105,7 @@ public class DefaultHyperLogLogOperationsTests { V v3 = valueFactory.instance(); hyperLogLogOps.add(key, v1, v2, v3); - assertThat(hyperLogLogOps.add(key, v2), equalTo(0L)); + assertThat(hyperLogLogOps.add(key, v2)).isEqualTo(0L); } @Test // DATAREDIS-308 @@ -118,7 +118,7 @@ public class DefaultHyperLogLogOperationsTests { V v3 = valueFactory.instance(); hyperLogLogOps.add(key, v1, v2, v3); - assertThat(hyperLogLogOps.size(key), equalTo(3L)); + assertThat(hyperLogLogOps.size(key)).isEqualTo(3L); } @Test // DATAREDIS-308 @@ -135,7 +135,7 @@ public class DefaultHyperLogLogOperationsTests { hyperLogLogOps.add(key, v1, v2, v3); hyperLogLogOps.add(key2, v4); - assertThat(hyperLogLogOps.size(key, key2), equalTo(4L)); + assertThat(hyperLogLogOps.size(key, key2)).isEqualTo(4L); } @Test // DATAREDIS-308 @@ -159,6 +159,6 @@ public class DefaultHyperLogLogOperationsTests { hyperLogLogOps.union(desinationKey, sourceKey_1, sourceKey_2); Thread.sleep(10); // give redis a little time to catch up - assertThat(hyperLogLogOps.size(desinationKey), equalTo(4L)); + assertThat(hyperLogLogOps.size(desinationKey)).isEqualTo(4L); } } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java index d2de2d8a7..9a276fa59 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultListOperationsTests.java @@ -15,9 +15,8 @@ */ package org.springframework.data.redis.core; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; import java.util.Arrays; import java.util.Collection; @@ -31,6 +30,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.RedisTestProfileValueSource; @@ -90,97 +90,110 @@ public class DefaultListOperationsTests { @Test public void testLeftPushWithPivot() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - System.out.println("Value1" + v1); - System.out.println("Value2" + v2); - System.out.println("Value3" + v3); - assertEquals(Long.valueOf(1), listOps.leftPush(key, v1)); - assertEquals(Long.valueOf(2), listOps.leftPush(key, v2)); - assertEquals(Long.valueOf(3), listOps.leftPush(key, v1, v3)); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v2, v3, v1 }))); + + assertThat(listOps.leftPush(key, v1)).isEqualTo(Long.valueOf(1)); + assertThat(listOps.leftPush(key, v2)).isEqualTo(Long.valueOf(2)); + assertThat(listOps.leftPush(key, v1, v3)).isEqualTo(Long.valueOf(3)); + assertThat(listOps.range(key, 0, -1)).containsSequence(v2, v3, v1); } @Test public void testLeftPushIfPresent() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); - assertEquals(Long.valueOf(0), listOps.leftPushIfPresent(key, v1)); - assertEquals(Long.valueOf(1), listOps.leftPush(key, v1)); - assertEquals(Long.valueOf(2), listOps.leftPushIfPresent(key, v2)); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v2, v1 }))); + + assertThat(listOps.leftPushIfPresent(key, v1)).isEqualTo(Long.valueOf(0)); + assertThat(listOps.leftPush(key, v1)).isEqualTo(Long.valueOf(1)); + assertThat(listOps.leftPushIfPresent(key, v2)).isEqualTo(Long.valueOf(2)); + assertThat(listOps.range(key, 0, -1)).contains(v2, v1); } @SuppressWarnings("unchecked") @Test public void testLeftPushAll() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - assertEquals(Long.valueOf(2), listOps.leftPushAll(key, v1, v2)); - assertEquals(Long.valueOf(3), listOps.leftPush(key, v3)); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v3, v2, v1 }))); + + assertThat(listOps.leftPushAll(key, v1, v2)).isEqualTo(Long.valueOf(2)); + assertThat(listOps.leftPush(key, v3)).isEqualTo(Long.valueOf(3)); + assertThat(listOps.range(key, 0, -1)).contains(v3, v2, v1); } @Test public void testRightPopAndLeftPushTimeout() { // 1 ms timeout gets upgraded to 1 sec timeout at the moment assumeTrue(RedisTestProfileValueSource.matches("runLongTests", "true")); + K key = keyFactory.instance(); K key2 = keyFactory.instance(); V v1 = valueFactory.instance(); - assertNull(listOps.rightPopAndLeftPush(key, key2, 1, TimeUnit.MILLISECONDS)); + + assertThat(listOps.rightPopAndLeftPush(key, key2, 1, TimeUnit.MILLISECONDS)).isNull(); listOps.leftPush(key, v1); - assertThat(listOps.rightPopAndLeftPush(key, key2, 1, TimeUnit.MILLISECONDS), isEqual(v1)); + assertThat(listOps.rightPopAndLeftPush(key, key2, 1, TimeUnit.MILLISECONDS)).isEqualTo(v1); } @Test public void testRightPopAndLeftPush() { + K key = keyFactory.instance(); K key2 = keyFactory.instance(); V v1 = valueFactory.instance(); - assertNull(listOps.rightPopAndLeftPush(key, key2)); + + assertThat(listOps.rightPopAndLeftPush(key, key2)).isNull(); listOps.leftPush(key, v1); - assertThat(listOps.rightPopAndLeftPush(key, key2), isEqual(v1)); + assertThat(listOps.rightPopAndLeftPush(key, key2)).isEqualTo(v1); } @Test public void testRightPushWithPivot() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - assertEquals(Long.valueOf(1), listOps.rightPush(key, v1)); - assertEquals(Long.valueOf(2), listOps.rightPush(key, v2)); - assertEquals(Long.valueOf(3), listOps.rightPush(key, v1, v3)); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v1, v3, v2 }))); + + assertThat(listOps.rightPush(key, v1)).isEqualTo(Long.valueOf(1)); + assertThat(listOps.rightPush(key, v2)).isEqualTo(Long.valueOf(2)); + assertThat(listOps.rightPush(key, v1, v3)).isEqualTo(Long.valueOf(3)); + assertThat(listOps.range(key, 0, -1)).containsSequence(v1, v3, v2); } @Test public void testRightPushIfPresent() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); - assertEquals(Long.valueOf(0), listOps.rightPushIfPresent(key, v1)); - assertEquals(Long.valueOf(1), listOps.rightPush(key, v1)); - assertEquals(Long.valueOf(2), listOps.rightPushIfPresent(key, v2)); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v1, v2 }))); + + assertThat(listOps.rightPushIfPresent(key, v1)).isEqualTo(Long.valueOf(0)); + assertThat(listOps.rightPush(key, v1)).isEqualTo(Long.valueOf(1)); + assertThat(listOps.rightPushIfPresent(key, v2)).isEqualTo(Long.valueOf(2)); + assertThat(listOps.range(key, 0, -1)).containsSequence(v1, v2); } @SuppressWarnings("unchecked") @Test public void testRightPushAll() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - assertEquals(Long.valueOf(2), listOps.rightPushAll(key, v1, v2)); - assertEquals(Long.valueOf(3), listOps.rightPush(key, v3)); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v1, v2, v3 }))); + + assertThat(listOps.rightPushAll(key, v1, v2)).isEqualTo(Long.valueOf(2)); + assertThat(listOps.rightPush(key, v3)).isEqualTo(Long.valueOf(3)); + assertThat(listOps.range(key, 0, -1)).containsSequence(v1, v2, v3); } @Test // DATAREDIS-288 @@ -193,8 +206,8 @@ public class DefaultListOperationsTests { V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - assertEquals(Long.valueOf(3), listOps.rightPushAll(key, Arrays. asList(v1, v2, v3))); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v1, v2, v3 }))); + assertThat(listOps.rightPushAll(key, Arrays. asList(v1, v2, v3))).isEqualTo(Long.valueOf(3)); + assertThat(listOps.range(key, 0, -1)).containsSequence(v1, v2, v3); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-288 @@ -223,8 +236,8 @@ public class DefaultListOperationsTests { V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); - assertEquals(Long.valueOf(3), listOps.leftPushAll(key, Arrays. asList(v1, v2, v3))); - assertThat(listOps.range(key, 0, -1), isEqual(Arrays.asList(new Object[] { v3, v2, v1 }))); + assertThat(listOps.leftPushAll(key, Arrays. asList(v1, v2, v3))).isEqualTo(Long.valueOf(3)); + assertThat(listOps.range(key, 0, -1)).containsSequence(v3, v2, v1); } @Test(expected = IllegalArgumentException.class) // DATAREDIS-288 @@ -232,7 +245,6 @@ public class DefaultListOperationsTests { listOps.leftPushAll(keyFactory.instance(), Collections. emptyList()); } - @SuppressWarnings("unchecked") @Test(expected = IllegalArgumentException.class) // DATAREDIS-288 public void leftPushAllShouldThrowExceptionWhenCollectionContainsNullValue() { listOps.leftPushAll(keyFactory.instance(), Arrays.asList(valueFactory.instance(), null)); diff --git a/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java index 4ca52d0f7..c3034f379 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java @@ -15,21 +15,15 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -38,6 +32,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.RedisTestProfileValueSource; @@ -53,6 +48,7 @@ import org.springframework.test.annotation.IfProfileValue; * @author Mark Paluch */ @RunWith(Parameterized.class) +@SuppressWarnings("unchecked") public class DefaultSetOperationsTests { private RedisTemplate redisTemplate; @@ -101,41 +97,43 @@ public class DefaultSetOperationsTests { @SuppressWarnings("unchecked") @Test public void testDistinctRandomMembers() { + assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); + K setKey = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); + setOps.add(setKey, v1); setOps.add(setKey, v2); setOps.add(setKey, v3); + Set members = setOps.distinctRandomMembers(setKey, 2); - assertEquals(2, members.size()); - Set expected = new HashSet<>(); - expected.add(v1); - expected.add(v2); - expected.add(v3); - assertThat(expected, hasItems((V[]) members.toArray())); + assertThat(members).hasSize(2).contains(v1, v2, v3); } - @SuppressWarnings("unchecked") @Test public void testRandomMembersWithDuplicates() { + assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); + K setKey = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); + setOps.add(setKey, v1); setOps.add(setKey, v2); - List members = setOps.randomMembers(setKey, 2); - assertEquals(2, members.size()); - assertThat(members, CoreMatchers.> either(hasItem(v1)).or(hasItem(v2))); + List members = setOps.randomMembers(setKey, 2); + assertThat(members).hasSize(2).contains(v1, v2); } @Test public void testRandomMembersNegative() { + assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); + try { setOps.randomMembers(keyFactory.instance(), -1); fail("IllegalArgumentException should be thrown"); @@ -144,7 +142,9 @@ public class DefaultSetOperationsTests { @Test public void testDistinctRandomMembersNegative() { + assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); + try { setOps.distinctRandomMembers(keyFactory.instance(), -2); fail("IllegalArgumentException should be thrown"); @@ -154,25 +154,31 @@ public class DefaultSetOperationsTests { @SuppressWarnings("unchecked") @Test public void testMove() { + K key1 = keyFactory.instance(); K key2 = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); + setOps.add(key1, v1); setOps.add(key1, v2); setOps.move(key1, v1, key2); - assertThat(setOps.members(key1), isEqual(new HashSet<>(Collections.singletonList(v2)))); - assertThat(setOps.members(key2), isEqual(new HashSet<>(Collections.singletonList(v1)))); + + assertThat(setOps.members(key1)).containsOnly(v2); + assertThat(setOps.members(key2)).containsOnly(v1); } @SuppressWarnings("unchecked") @Test public void testPop() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); + setOps.add(key, v1); - assertThat(setOps.pop(key), isEqual(v1)); - assertTrue(setOps.members(key).isEmpty()); + + assertThat(setOps.pop(key)).isEqualTo(v1); + assertThat(setOps.members(key)).isEmpty(); } @Test // DATAREDIS-668 @@ -182,46 +188,50 @@ public class DefaultSetOperationsTests { V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); + setOps.add(key, v1, v2, v3); List result = setOps.pop(key, 2); - assertThat(result, hasSize(2)); - assertThat(result.get(0), instanceOf(v1.getClass())); + assertThat(result).hasSize(2); + assertThat(result.get(0)).isInstanceOf(v1.getClass()); } - @SuppressWarnings("unchecked") @Test public void testRandomMember() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); + setOps.add(key, v1); - assertThat(setOps.randomMember(key), isEqual(v1)); + + assertThat(setOps.randomMember(key)).isEqualTo(v1); } - @SuppressWarnings("unchecked") @Test public void testAdd() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); - assertEquals(Long.valueOf(2), setOps.add(key, v1, v2)); - Set expected = new HashSet<>(); - expected.add(v1); - expected.add(v2); - assertThat(setOps.members(key), isEqual(expected)); + + assertThat(setOps.add(key, v1, v2)).isEqualTo(Long.valueOf(2)); + assertThat(setOps.members(key)).containsOnly(v1, v2); } @SuppressWarnings("unchecked") @Test public void testRemove() { + K key = keyFactory.instance(); V v1 = valueFactory.instance(); V v2 = valueFactory.instance(); V v3 = valueFactory.instance(); V v4 = valueFactory.instance(); + setOps.add(key, v1, v2, v3); - assertEquals(Long.valueOf(2), setOps.remove(key, v1, v2, v4)); - assertThat(setOps.members(key), isEqual(Collections.singleton(v3))); + assertThat(setOps.remove(key, v1, v2, v4)).isEqualTo(Long.valueOf(2)); + + assertThat(setOps.members(key)).containsOnly(v3); } @Test // DATAREDIS-304 @@ -238,11 +248,11 @@ public class DefaultSetOperationsTests { Cursor it = setOps.scan(key, ScanOptions.scanOptions().count(1).build()); long count = 0; while (it.hasNext()) { - assertThat(it.next(), anyOf(equalTo(v1), equalTo(v2), equalTo(v3))); + assertThat(it.next()).isIn(v1, v2, v3); count++; } it.close(); - assertThat(count, is(setOps.size(key))); + assertThat(count).isEqualTo(setOps.size(key)); } @Test // DATAREDIS-873 @@ -259,7 +269,7 @@ public class DefaultSetOperationsTests { setOps.add(sourceKey1, v1, v2, v3); setOps.add(sourceKey2, v2, v3, v4); - assertThat(setOps.difference(Arrays.asList(sourceKey1, sourceKey2)), hasItems(v1)); + assertThat(setOps.difference(Arrays.asList(sourceKey1, sourceKey2))).contains(v1); } @Test // DATAREDIS-873 @@ -277,7 +287,7 @@ public class DefaultSetOperationsTests { setOps.add(sourceKey1, v1, v2, v3); setOps.add(sourceKey2, v2, v3, v4); - assertThat(setOps.differenceAndStore(Arrays.asList(sourceKey1, sourceKey2), destinationKey), isEqual(1L)); + assertThat(setOps.differenceAndStore(Arrays.asList(sourceKey1, sourceKey2), destinationKey)).isEqualTo(1L); } @Test // DATAREDIS-873 @@ -294,7 +304,7 @@ public class DefaultSetOperationsTests { setOps.add(sourceKey1, v1, v2, v3); setOps.add(sourceKey2, v2, v3, v4); - assertThat(setOps.union(Arrays.asList(sourceKey1, sourceKey2)), hasItems(v1, v2, v3, v4)); + assertThat(setOps.union(Arrays.asList(sourceKey1, sourceKey2))).contains(v1, v2, v3, v4); } @Test // DATAREDIS-873 @@ -312,7 +322,7 @@ public class DefaultSetOperationsTests { setOps.add(sourceKey1, v1, v2, v3); setOps.add(sourceKey2, v2, v3, v4); - assertThat(setOps.unionAndStore(Arrays.asList(sourceKey1, sourceKey2), destinationKey), isEqual(4L)); + assertThat(setOps.unionAndStore(Arrays.asList(sourceKey1, sourceKey2), destinationKey)).isEqualTo(4L); } @Test // DATAREDIS-873 @@ -329,7 +339,7 @@ public class DefaultSetOperationsTests { setOps.add(sourceKey1, v1, v2, v3); setOps.add(sourceKey2, v2, v3, v4); - assertThat(setOps.intersect(Arrays.asList(sourceKey1, sourceKey2)), hasSize(2)); + assertThat(setOps.intersect(Arrays.asList(sourceKey1, sourceKey2))).hasSize(2); } @Test // DATAREDIS-448, DATAREDIS-873 @@ -347,7 +357,7 @@ public class DefaultSetOperationsTests { setOps.add(sourceKey1, v1, v2, v3); setOps.add(sourceKey2, v2, v3, v4); - assertThat(setOps.intersectAndStore(sourceKey1, sourceKey2, destinationKey), is(2L)); - assertThat(setOps.intersectAndStore(Arrays.asList(sourceKey1, sourceKey2), destinationKey), is(2L)); + assertThat(setOps.intersectAndStore(sourceKey1, sourceKey2, destinationKey)).isEqualTo(2L); + assertThat(setOps.intersectAndStore(Arrays.asList(sourceKey1, sourceKey2), destinationKey)).isEqualTo(2L); } } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultTypedTupleUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultTypedTupleUnitTests.java index c027d2452..273c5a641 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultTypedTupleUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultTypedTupleUnitTests.java @@ -15,10 +15,10 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; + import org.springframework.data.redis.core.ZSetOperations.TypedTuple; /** @@ -34,22 +34,22 @@ public class DefaultTypedTupleUnitTests { @Test // DATAREDIS-294 public void compareToShouldUseScore() { - assertThat(WITH_SCORE_1.compareTo(WITH_SCORE_2), equalTo(-1)); - assertThat(WITH_SCORE_2.compareTo(WITH_SCORE_1), equalTo(1)); - assertThat(WITH_SCORE_1.compareTo(ANOTHER_ONE_WITH_SCORE_1), equalTo(0)); + assertThat(WITH_SCORE_1.compareTo(WITH_SCORE_2)).isEqualTo(-1); + assertThat(WITH_SCORE_2.compareTo(WITH_SCORE_1)).isEqualTo(1); + assertThat(WITH_SCORE_1.compareTo(ANOTHER_ONE_WITH_SCORE_1)).isEqualTo(0); } @Test // DATAREDIS-294 public void compareToShouldConsiderGivenNullAsZeroScore() { - assertThat(WITH_SCORE_1.compareTo(null), equalTo(1)); - assertThat(WITH_SCORE_NULL.compareTo(null), equalTo(0)); + assertThat(WITH_SCORE_1.compareTo(null)).isEqualTo(1); + assertThat(WITH_SCORE_NULL.compareTo(null)).isEqualTo(0); } @Test // DATAREDIS-294 public void compareToShouldConsiderNullScoreAsZeroScore() { - assertThat(WITH_SCORE_1.compareTo(WITH_SCORE_NULL), equalTo(1)); - assertThat(WITH_SCORE_NULL.compareTo(WITH_SCORE_1), equalTo(-1)); + assertThat(WITH_SCORE_1.compareTo(WITH_SCORE_NULL)).isEqualTo(1); + assertThat(WITH_SCORE_NULL.compareTo(WITH_SCORE_1)).isEqualTo(-1); } } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsTests.java index 3a9dbde99..55b7c571c 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsTests.java @@ -15,15 +15,13 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.assumeThat; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; import java.text.DecimalFormat; import java.time.Duration; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -38,6 +36,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.RedisTestProfileValueSource; @@ -102,12 +101,12 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); V value = valueFactory.instance(); - assumeTrue(value instanceof Long); + assumeThat(value).isInstanceOf(Long.class); valueOps.set(key, value); - assertEquals(Long.valueOf((Long) value + 1), valueOps.increment(key)); - assertEquals(Long.valueOf((Long) value + 1), valueOps.get(key)); + assertThat(valueOps.increment(key)).isEqualTo(Long.valueOf((Long) value + 1)); + assertThat(valueOps.get(key)).isEqualTo(Long.valueOf((Long) value + 1)); } @Test @@ -116,15 +115,15 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); V value = valueFactory.instance(); - assumeTrue(value instanceof Long); + assumeThat(value).isInstanceOf(Long.class); valueOps.set(key, value); - assertEquals(Long.valueOf((Long) value - 10), valueOps.increment(key, -10)); - assertEquals(Long.valueOf((Long) value - 10), valueOps.get(key)); + assertThat(valueOps.increment(key, -10)).isEqualTo(Long.valueOf((Long) value - 10)); + assertThat(valueOps.get(key)).isEqualTo(Long.valueOf((Long) value - 10)); valueOps.increment(key, -10); - assertEquals(Long.valueOf((Long) value - 20), valueOps.get(key)); + assertThat(valueOps.get(key)).isEqualTo(Long.valueOf((Long) value - 20)); } @Test // DATAREDIS-247 @@ -141,11 +140,11 @@ public class DefaultValueOperationsTests { DecimalFormat twoDForm = (DecimalFormat) DecimalFormat.getInstance(Locale.US); - assertEquals(Double.valueOf(twoDForm.format((Double) value + 1.4)), valueOps.increment(key, 1.4)); - assertEquals(Double.valueOf(twoDForm.format((Double) value + 1.4)), valueOps.get(key)); + assertThat(valueOps.increment(key, 1.4)).isEqualTo(Double.valueOf(twoDForm.format((Double) value + 1.4))); + assertThat(valueOps.get(key)).isEqualTo(Double.valueOf(twoDForm.format((Double) value + 1.4))); valueOps.increment(key, -10d); - assertEquals(Double.valueOf(twoDForm.format((Double) value + 1.4 - 10d)), valueOps.get(key)); + assertThat(valueOps.get(key)).isEqualTo(Double.valueOf(twoDForm.format((Double) value + 1.4 - 10d))); } @Test // DATAREDIS-784 @@ -154,12 +153,12 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); V value = valueFactory.instance(); - assumeTrue(value instanceof Long); + assumeThat(value).isInstanceOf(Long.class); valueOps.set(key, value); - assertEquals(Long.valueOf((Long) value - 1), valueOps.decrement(key)); - assertEquals(Long.valueOf((Long) value - 1), valueOps.get(key)); + assertThat(valueOps.decrement(key)).isEqualTo(Long.valueOf((Long) value - 1)); + assertThat(valueOps.get(key)).isEqualTo(Long.valueOf((Long) value - 1)); } @Test // DATAREDIS-784 @@ -168,12 +167,12 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); V value = valueFactory.instance(); - assumeTrue(value instanceof Long); + assumeThat(value).isInstanceOf(Long.class); valueOps.set(key, value); - assertEquals(Long.valueOf((Long) value - 5), valueOps.decrement(key, 5)); - assertEquals(Long.valueOf((Long) value - 5), valueOps.get(key)); + assertThat(valueOps.decrement(key, 5)).isEqualTo(Long.valueOf((Long) value - 5)); + assertThat(valueOps.get(key)).isEqualTo(Long.valueOf((Long) value - 5)); } @Test @@ -188,8 +187,8 @@ public class DefaultValueOperationsTests { keysAndValues.put(key1, value1); keysAndValues.put(key2, value2); - assertTrue(valueOps.multiSetIfAbsent(keysAndValues)); - assertThat(valueOps.multiGet(keysAndValues.keySet()), isEqual(new ArrayList<>(keysAndValues.values()))); + assertThat(valueOps.multiSetIfAbsent(keysAndValues)).isTrue(); + assertThat(valueOps.multiGet(keysAndValues.keySet())).containsExactlyElementsOf(keysAndValues.values()); } @Test @@ -207,7 +206,7 @@ public class DefaultValueOperationsTests { keysAndValues.put(key1, value2); keysAndValues.put(key2, value3); - assertFalse(valueOps.multiSetIfAbsent(keysAndValues)); + assertThat(valueOps.multiSetIfAbsent(keysAndValues)).isFalse(); } @Test @@ -224,7 +223,7 @@ public class DefaultValueOperationsTests { valueOps.multiSet(keysAndValues); - assertThat(valueOps.multiGet(keysAndValues.keySet()), isEqual(new ArrayList<>(keysAndValues.values()))); + assertThat(valueOps.multiGet(keysAndValues.keySet())).containsExactlyElementsOf(keysAndValues.values()); } @Test @@ -235,7 +234,7 @@ public class DefaultValueOperationsTests { valueOps.set(key, value); - assertThat(valueOps.get(key), isEqual(value)); + assertThat(valueOps.get(key)).isEqualTo(value); } @Test @@ -247,7 +246,7 @@ public class DefaultValueOperationsTests { valueOps.set(key, value1); - assertThat(valueOps.getAndSet(key, value2), isEqual(value1)); + assertThat(valueOps.getAndSet(key, value2)).isEqualTo(value1); } @Test @@ -260,8 +259,7 @@ public class DefaultValueOperationsTests { Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); } @Test // DATAREDIS-815 @@ -274,8 +272,7 @@ public class DefaultValueOperationsTests { Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); } @Test // DATAREDIS-815 @@ -288,14 +285,14 @@ public class DefaultValueOperationsTests { Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)); + assertThat(expire).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); } @Test // DATAREDIS-271 public void testSetWithExpirationWithTimeUnitMilliseconds() { - assumeTrue(RedisTestProfileValueSource.matches("runLongTests", "true")); + assumeThat(RedisTestProfileValueSource.matches("runLongTests", "true")).isTrue(); K key = keyFactory.instance(); V value = valueFactory.instance(); @@ -311,12 +308,12 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); V value = valueFactory.instance(); - assumeTrue(redisTemplate instanceof StringRedisTemplate); + assumeThat(redisTemplate).isInstanceOf(StringRedisTemplate.class); valueOps.set(key, value); - assertEquals(Integer.valueOf(((String) value).length() + 3), valueOps.append(key, "aaa")); - assertEquals((String) value + "aaa", valueOps.get(key)); + assertThat(valueOps.append(key, "aaa")).isEqualTo(Integer.valueOf(((String) value).length() + 3)); + assertThat(valueOps.get(key)).isEqualTo(value + "aaa"); } @Test @@ -325,11 +322,11 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); V value = valueFactory.instance(); - assumeTrue(value instanceof String); + assumeThat(value).isInstanceOf(String.class); valueOps.set(key, value); - assertEquals(2, valueOps.get(key, 0, 1).length()); + assertThat(valueOps.get(key, 0, 1)).hasSize(2); } @Test @@ -339,12 +336,12 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assumeTrue(value1 instanceof String); + assumeThat(value1).isInstanceOf(String.class); valueOps.set(key, value1); valueOps.set(key, value2, 0); - assertEquals(value2, valueOps.get(key)); + assertThat(valueOps.get(key)).isEqualTo(value2); } @Test @@ -354,8 +351,8 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertTrue(valueOps.setIfAbsent(key, value1)); - assertFalse(valueOps.setIfAbsent(key, value2)); + assertThat(valueOps.setIfAbsent(key, value1)).isTrue(); + assertThat(valueOps.setIfAbsent(key, value2)).isFalse(); } @Test // DATAREDIS-782 @@ -365,13 +362,12 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertTrue(valueOps.setIfAbsent(key, value1, 5, TimeUnit.SECONDS)); - assertFalse(valueOps.setIfAbsent(key, value2, 5, TimeUnit.SECONDS)); + assertThat(valueOps.setIfAbsent(key, value1, 5, TimeUnit.SECONDS)).isTrue(); + assertThat(valueOps.setIfAbsent(key, value2, 5, TimeUnit.SECONDS)).isFalse(); Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); } @Test // DATAREDIS-815 @@ -381,13 +377,12 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertTrue(valueOps.setIfAbsent(key, value1, Duration.ofSeconds(5))); - assertFalse(valueOps.setIfAbsent(key, value2, Duration.ofSeconds(5))); + assertThat(valueOps.setIfAbsent(key, value1, Duration.ofSeconds(5))).isTrue(); + assertThat(valueOps.setIfAbsent(key, value2, Duration.ofSeconds(5))).isFalse(); Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); } @Test // DATAREDIS-815 @@ -397,13 +392,12 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertTrue(valueOps.setIfAbsent(key, value1, Duration.ofMillis(5500))); - assertFalse(valueOps.setIfAbsent(key, value2, Duration.ofMillis(5500))); + assertThat(valueOps.setIfAbsent(key, value1, Duration.ofMillis(5500))).isTrue(); + assertThat(valueOps.setIfAbsent(key, value2, Duration.ofMillis(5500))).isFalse(); Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); } @Test // DATAREDIS-786 @@ -415,13 +409,13 @@ public class DefaultValueOperationsTests { valueOps.set(key, value1); - assertTrue(valueOps.setIfPresent(key, value2)); - assertThat(valueOps.get(key), is(value2)); + assertThat(valueOps.setIfPresent(key, value2)).isTrue(); + assertThat(valueOps.get(key)).isEqualTo(value2); } @Test // DATAREDIS-786 public void setIfPresentReturnsFalseWhenKeyDoesNotExist() { - assertFalse(valueOps.setIfPresent(keyFactory.instance(), valueFactory.instance())); + assertThat(valueOps.setIfPresent(keyFactory.instance(), valueFactory.instance())).isFalse(); } @Test // DATAREDIS-786 @@ -431,15 +425,14 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertFalse(valueOps.setIfPresent(key, value1, 5, TimeUnit.SECONDS)); + assertThat(valueOps.setIfPresent(key, value1, 5, TimeUnit.SECONDS)).isFalse(); valueOps.set(key, value1); - assertTrue(valueOps.setIfPresent(key, value2, 5, TimeUnit.SECONDS)); + assertThat(valueOps.setIfPresent(key, value2, 5, TimeUnit.SECONDS)).isTrue(); Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); - assertThat(valueOps.get(key), is(value2)); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); + assertThat(valueOps.get(key)).isEqualTo(value2); } @Test // DATAREDIS-815 @@ -449,15 +442,14 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertFalse(valueOps.setIfPresent(key, value1, Duration.ofSeconds(5))); + assertThat(valueOps.setIfPresent(key, value1, Duration.ofSeconds(5))).isFalse(); valueOps.set(key, value1); - assertTrue(valueOps.setIfPresent(key, value2, Duration.ofSeconds(5))); + assertThat(valueOps.setIfPresent(key, value2, Duration.ofSeconds(5))).isTrue(); Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); - assertThat(valueOps.get(key), is(value2)); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); + assertThat(valueOps.get(key)).isEqualTo(value2); } @Test // DATAREDIS-815 @@ -467,15 +459,14 @@ public class DefaultValueOperationsTests { V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); - assertFalse(valueOps.setIfPresent(key, value1, Duration.ofMillis(5500))); + assertThat(valueOps.setIfPresent(key, value1, Duration.ofMillis(5500))).isFalse(); valueOps.set(key, value1); - assertTrue(valueOps.setIfPresent(key, value2, Duration.ofMillis(5500))); + assertThat(valueOps.setIfPresent(key, value2, Duration.ofMillis(5500))).isTrue(); Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertThat(expire, is(lessThan(TimeUnit.SECONDS.toMillis(6)))); - assertThat(expire, is(greaterThan(TimeUnit.MILLISECONDS.toMillis(1)))); - assertThat(valueOps.get(key), is(value2)); + assertThat(expire).isLessThan(TimeUnit.SECONDS.toMillis(6)).isGreaterThan(TimeUnit.MILLISECONDS.toMillis(1)); + assertThat(valueOps.get(key)).isEqualTo(value2); } @Test @@ -486,7 +477,7 @@ public class DefaultValueOperationsTests { valueOps.set(key, value); - assertTrue(valueOps.size(key) > 0); + assertThat(valueOps.size(key) > 0).isTrue(); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -498,7 +489,7 @@ public class DefaultValueOperationsTests { byte[][] rawKeys = ((DefaultValueOperations) valueOps).rawKeys(key1, key2); - assertEquals(2, rawKeys.length); + assertThat(rawKeys.length).isEqualTo(2); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -510,7 +501,7 @@ public class DefaultValueOperationsTests { byte[][] rawKeys = ((DefaultValueOperations) valueOps).rawKeys(Arrays.asList(new Object[] { key1, key2 })); - assertEquals(2, rawKeys.length); + assertThat(rawKeys.length).isEqualTo(2); } @SuppressWarnings("rawtypes") @@ -519,20 +510,20 @@ public class DefaultValueOperationsTests { K key = keyFactory.instance(); - assumeTrue(key instanceof byte[]); + assumeThat(key).isInstanceOf(byte[].class); - assertNotNull(((DefaultValueOperations) valueOps).deserializeKey((byte[]) key)); + assertThat(((DefaultValueOperations) valueOps).deserializeKey((byte[]) key)).isNotNull(); } @Test // DATAREDIS-197 public void testSetAndGetBit() { - assumeTrue(redisTemplate instanceof StringRedisTemplate); + assumeThat(redisTemplate).isInstanceOf(StringRedisTemplate.class); K key = keyFactory.instance(); int bitOffset = 65; valueOps.setBit(key, bitOffset, true); - assertEquals(true, valueOps.getBit(key, bitOffset)); + assertThat(valueOps.getBit(key, bitOffset)).isTrue(); } } diff --git a/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsUnitTests.java index 55908c7d8..10fe57191 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultValueOperationsUnitTests.java @@ -22,7 +22,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.redis.connection.BitFieldSubCommands; import org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldType; import org.springframework.data.redis.connection.RedisConnection; diff --git a/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java index eefd9c59a..1c15990c3 100644 --- a/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java +++ b/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java @@ -15,16 +15,14 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.junit.Assume.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.*; +import static org.assertj.core.data.Offset.offset; import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.Set; import org.junit.After; @@ -35,6 +33,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.DoubleAsStringObjectFactory; import org.springframework.data.redis.DoubleObjectFactory; @@ -57,6 +56,7 @@ import org.springframework.test.annotation.IfProfileValue; * @param Key type * @param Value type */ +@SuppressWarnings("unchecked") @RunWith(Parameterized.class) public class DefaultZSetOperationsTests { @@ -105,86 +105,100 @@ public class DefaultZSetOperationsTests { @Test public void testCount() { + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); + zSetOps.add(key1, value1, 2.5); zSetOps.add(key1, value2, 5.5); - assertEquals(Long.valueOf(1), zSetOps.count(key1, 2.7, 5.7)); + + assertThat(zSetOps.count(key1, 2.7, 5.7)).isEqualTo(Long.valueOf(1)); } @Test public void testIncrementScore() { + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); + zSetOps.add(key1, value1, 2.5); - assertEquals(Double.valueOf(5.7), zSetOps.incrementScore(key1, value1, 3.2)); + + assertThat(zSetOps.incrementScore(key1, value1, 3.2)).isEqualTo(Double.valueOf(5.7)); Set> values = zSetOps.rangeWithScores(key1, 0, -1); - assertEquals(1, values.size()); + assertThat(values).hasSize(1); TypedTuple tuple = values.iterator().next(); - assertEquals(new DefaultTypedTuple<>(value1, 5.7), tuple); + assertThat(tuple).isEqualTo(new DefaultTypedTuple<>(value1, 5.7)); } @Test public void testRangeByScoreOffsetCount() { + K key = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); V value3 = valueFactory.instance(); - System.out.println(value1 + "*" + value2 + "*" + value3); + zSetOps.add(key, value1, 1.9); zSetOps.add(key, value2, 3.7); zSetOps.add(key, value3, 5.8); - assertThat(zSetOps.rangeByScore(key, 1.5, 4.7, 0, 1), isEqual(Collections.singleton(value1))); + + assertThat(zSetOps.rangeByScore(key, 1.5, 4.7, 0, 1)).containsOnly(value1); } @Test public void testRangeByScoreWithScoresOffsetCount() { + K key = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); V value3 = valueFactory.instance(); + zSetOps.add(key, value1, 1.9); zSetOps.add(key, value2, 3.7); zSetOps.add(key, value3, 5.8); + Set> tuples = zSetOps.rangeByScoreWithScores(key, 1.5, 4.7, 0, 1); - assertEquals(1, tuples.size()); - TypedTuple tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(new DefaultTypedTuple<>(value1, 1.9))); + assertThat(tuples).hasSize(1).contains(new DefaultTypedTuple<>(value1, 1.9)); } @Test public void testReverseRangeByScoreOffsetCount() { + K key = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); V value3 = valueFactory.instance(); + zSetOps.add(key, value1, 1.9); zSetOps.add(key, value2, 3.7); zSetOps.add(key, value3, 5.8); - assertThat(zSetOps.reverseRangeByScore(key, 1.5, 4.7, 0, 1), isEqual(Collections.singleton(value2))); + + assertThat(zSetOps.reverseRangeByScore(key, 1.5, 4.7, 0, 1)).containsOnly(value2); } @Test public void testReverseRangeByScoreWithScoresOffsetCount() { + K key = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); V value3 = valueFactory.instance(); + zSetOps.add(key, value1, 1.9); zSetOps.add(key, value2, 3.7); zSetOps.add(key, value3, 5.8); + Set> tuples = zSetOps.reverseRangeByScoreWithScores(key, 1.5, 4.7, 0, 1); - assertEquals(1, tuples.size()); - TypedTuple tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(new DefaultTypedTuple<>(value2, 3.7))); + + assertThat(tuples).hasSize(1).contains(new DefaultTypedTuple<>(value2, 3.7)); } @Test // DATAREDIS-407 public void testRangeByLexUnbounded() { - assumeThat(valueFactory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(valueFactory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); K key = keyFactory.instance(); V value1 = valueFactory.instance(); @@ -196,16 +210,14 @@ public class DefaultZSetOperationsTests { zSetOps.add(key, value3, 5.8); Set tuples = zSetOps.rangeByLex(key, RedisZSetCommands.Range.unbounded()); - assertEquals(3, tuples.size()); - V tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(value1)); + assertThat(tuples).hasSize(3).contains(value1); } @Test // DATAREDIS-407 public void testRangeByLexBounded() { - assumeThat(valueFactory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(valueFactory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); K key = keyFactory.instance(); V value1 = valueFactory.instance(); @@ -217,16 +229,14 @@ public class DefaultZSetOperationsTests { zSetOps.add(key, value3, 5.8); Set tuples = zSetOps.rangeByLex(key, RedisZSetCommands.Range.range().gt(value1).lt(value3)); - assertEquals(1, tuples.size()); - V tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(value2)); + assertThat(tuples).hasSize(1).contains(value2); } @Test // DATAREDIS-407 public void testRangeByLexUnboundedWithLimit() { - assumeThat(valueFactory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(valueFactory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); K key = keyFactory.instance(); V value1 = valueFactory.instance(); @@ -239,16 +249,14 @@ public class DefaultZSetOperationsTests { Set tuples = zSetOps.rangeByLex(key, RedisZSetCommands.Range.unbounded(), RedisZSetCommands.Limit.limit().count(1).offset(1)); - assertEquals(1, tuples.size()); - V tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(value2)); + assertThat(tuples).hasSize(1).startsWith(value2); } @Test // DATAREDIS-407 public void testRangeByLexBoundedWithLimit() { - assumeThat(valueFactory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(valueFactory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); K key = keyFactory.instance(); V value1 = valueFactory.instance(); @@ -261,44 +269,42 @@ public class DefaultZSetOperationsTests { Set tuples = zSetOps.rangeByLex(key, RedisZSetCommands.Range.range().gte(value1), RedisZSetCommands.Limit.limit().count(1).offset(1)); - assertEquals(1, tuples.size()); - V tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(value2)); + assertThat(tuples).hasSize(1).startsWith(value2); } @Test public void testAddMultiple() { + K key = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); V value3 = valueFactory.instance(); + Set> values = new HashSet<>(); values.add(new DefaultTypedTuple<>(value1, 1.7)); values.add(new DefaultTypedTuple<>(value2, 3.2)); values.add(new DefaultTypedTuple<>(value3, 0.8)); - assertEquals(Long.valueOf(3), zSetOps.add(key, values)); - Set expected = new LinkedHashSet<>(); - expected.add(value3); - expected.add(value1); - expected.add(value2); - assertThat(zSetOps.range(key, 0, -1), isEqual(expected)); + + assertThat(zSetOps.add(key, values)).isEqualTo(Long.valueOf(3)); + assertThat(zSetOps.range(key, 0, -1)).containsExactly(value3, value1, value2); } @Test public void testRemove() { + K key = keyFactory.instance(); V value1 = valueFactory.instance(); V value2 = valueFactory.instance(); V value3 = valueFactory.instance(); + Set> values = new HashSet<>(); values.add(new DefaultTypedTuple<>(value1, 1.7)); values.add(new DefaultTypedTuple<>(value2, 3.2)); values.add(new DefaultTypedTuple<>(value3, 0.8)); - assertEquals(Long.valueOf(3), zSetOps.add(key, values)); - assertEquals(Long.valueOf(2), zSetOps.remove(key, value1, value3)); - Set expected = new LinkedHashSet<>(); - expected.add(value2); - assertThat(zSetOps.range(key, 0, -1), isEqual(expected)); + + assertThat(zSetOps.add(key, values)).isEqualTo(Long.valueOf(3)); + assertThat(zSetOps.remove(key, value1, value3)).isEqualTo(Long.valueOf(2)); + assertThat(zSetOps.range(key, 0, -1)).containsOnly(value2); } @Test @@ -315,7 +321,7 @@ public class DefaultZSetOperationsTests { values.add(new DefaultTypedTuple<>(value3, 0.8)); zSetOps.add(key, values); - assertThat(zSetOps.zCard(key), equalTo(3L)); + assertThat(zSetOps.zCard(key)).isEqualTo(3L); } @Test @@ -332,7 +338,7 @@ public class DefaultZSetOperationsTests { values.add(new DefaultTypedTuple<>(value3, 0.8)); zSetOps.add(key, values); - assertThat(zSetOps.size(key), equalTo(3L)); + assertThat(zSetOps.size(key)).isEqualTo(3L); } @Test // DATAREDIS-306 @@ -358,12 +364,12 @@ public class DefaultZSetOperationsTests { int count = 0; Cursor> it = zSetOps.scan(key, ScanOptions.scanOptions().count(2).build()); while (it.hasNext()) { - assertThat(it.next(), anyOf(equalTo(tuple1), equalTo(tuple2), equalTo(tuple3))); + assertThat(it.next()).isIn(tuple1, tuple2, tuple3); count++; } it.close(); - assertThat(count, equalTo(3)); + assertThat(count).isEqualTo(3); } @Test // DATAREDIS-746 @@ -381,7 +387,7 @@ public class DefaultZSetOperationsTests { zSetOps.unionAndStore(key1, Collections.singletonList(key2), key1, RedisZSetCommands.Aggregate.MIN); - assertThat(zSetOps.score(key1, value2), closeTo(2.0, 0.1)); + assertThat(zSetOps.score(key1, value2)).isCloseTo(2.0, offset(0.1)); } @Test // DATAREDIS-746 @@ -397,7 +403,7 @@ public class DefaultZSetOperationsTests { zSetOps.unionAndStore(key1, Collections.singletonList(key2), key1, RedisZSetCommands.Aggregate.MAX, Weights.of(1, 2)); - assertThat(zSetOps.score(key1, value1), closeTo(6.0, 0.1)); + assertThat(zSetOps.score(key1, value1)).isCloseTo(6.0, offset(0.1)); } @Test // DATAREDIS-746 @@ -415,7 +421,7 @@ public class DefaultZSetOperationsTests { zSetOps.intersectAndStore(key1, Collections.singletonList(key2), key1, RedisZSetCommands.Aggregate.MIN); - assertThat(zSetOps.score(key1, value2), closeTo(2.0, 0.1)); + assertThat(zSetOps.score(key1, value2)).isCloseTo(2.0, offset(0.1)); } @Test // DATAREDIS-746 @@ -431,6 +437,6 @@ public class DefaultZSetOperationsTests { zSetOps.intersectAndStore(key1, Collections.singletonList(key2), key1, RedisZSetCommands.Aggregate.MAX, Weights.of(1, 2)); - assertThat(zSetOps.score(key1, value1), closeTo(6.0, 0.1)); + assertThat(zSetOps.score(key1, value1)).isCloseTo(6.0, offset(0.1)); } } diff --git a/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java b/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java index f671bc3ee..c30aa4887 100644 --- a/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.nio.charset.Charset; @@ -30,6 +29,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.dao.InvalidDataAccessApiUsageException; @@ -127,7 +127,7 @@ public class IndexWriterUnitTests { ArgumentCaptor captor = ArgumentCaptor.forClass(byte[].class); verify(connectionMock, times(1)).del(captor.capture()); - assertThat(captor.getAllValues(), hasItems(indexKey1, indexKey2)); + assertThat(captor.getAllValues()).contains(indexKey1, indexKey2); } @Test(expected = InvalidDataAccessApiUsageException.class) // DATAREDIS-425 diff --git a/src/test/java/org/springframework/data/redis/core/MultithreadedRedisTemplateTests.java b/src/test/java/org/springframework/data/redis/core/MultithreadedRedisTemplateTests.java index 0cfb5b387..81669b276 100644 --- a/src/test/java/org/springframework/data/redis/core/MultithreadedRedisTemplateTests.java +++ b/src/test/java/org/springframework/data/redis/core/MultithreadedRedisTemplateTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collection; @@ -28,6 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; @@ -83,7 +84,7 @@ public class MultithreadedRedisTemplateTests { } executor.shutdown(); - assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS)); + assertThat(executor.awaitTermination(10, TimeUnit.SECONDS)).isTrue(); } } diff --git a/src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java b/src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java index 011b5f614..d58376495 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisClusterTemplateTests.java @@ -23,6 +23,7 @@ import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; import org.junit.runners.Parameterized.Parameters; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.redis.LongObjectFactory; import org.springframework.data.redis.ObjectFactory; diff --git a/src/test/java/org/springframework/data/redis/core/RedisCommandUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisCommandUnitTests.java index 163517ff2..bd31ebfbb 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisCommandUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisCommandUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Rule; import org.junit.Test; @@ -36,32 +35,32 @@ public class RedisCommandUnitTests { @Test // DATAREDIS-73 public void shouldIdentifyAliasCorrectly() { - assertThat(RedisCommand.CONFIG_SET.isRepresentedBy("setconfig"), equalTo(true)); + assertThat(RedisCommand.CONFIG_SET.isRepresentedBy("setconfig")).isTrue(); } @Test // DATAREDIS-73 public void shouldIdentifyAliasCorrectlyWhenNamePassedInMixedCase() { - assertThat(RedisCommand.CONFIG_SET.isRepresentedBy("SetConfig"), equalTo(true)); + assertThat(RedisCommand.CONFIG_SET.isRepresentedBy("SetConfig")).isTrue(); } @Test // DATAREDIS-73 public void shouldNotThrowExceptionWhenUsingNullKeyForRepresentationCheck() { - assertThat(RedisCommand.CONFIG_SET.isRepresentedBy(null), equalTo(false)); + assertThat(RedisCommand.CONFIG_SET.isRepresentedBy(null)).isFalse(); } @Test // DATAREDIS-73 public void shouldIdentifyAliasCorrectlyViaLookup() { - assertThat(RedisCommand.failsafeCommandLookup("setconfig"), is(RedisCommand.CONFIG_SET)); + assertThat(RedisCommand.failsafeCommandLookup("setconfig")).isEqualTo(RedisCommand.CONFIG_SET); } @Test // DATAREDIS-73 public void shouldIdentifyAliasCorrectlyWhenNamePassedInMixedCaseViaLookup() { - assertThat(RedisCommand.failsafeCommandLookup("SetConfig"), is(RedisCommand.CONFIG_SET)); + assertThat(RedisCommand.failsafeCommandLookup("SetConfig")).isEqualTo(RedisCommand.CONFIG_SET); } @Test // DATAREDIS-73 public void shouldReturnUnknownCommandForUnknownCommandString() { - assertThat(RedisCommand.failsafeCommandLookup("strangecommand"), is(RedisCommand.UNKNOWN)); + assertThat(RedisCommand.failsafeCommandLookup("strangecommand")).isEqualTo(RedisCommand.UNKNOWN); } @Test // DATAREDIS-73, DATAREDIS-972 diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java index 2ea8bbfdc..94bbcc7a6 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -30,17 +29,16 @@ public class RedisKeyExpiredEventUnitTests { @Test // DATAREDIS-744 public void shouldReturnKeyspace() { - assertThat(new RedisKeyExpiredEvent("foo".getBytes(), "").getKeyspace(), is(nullValue())); - assertThat(new RedisKeyExpiredEvent("foo:bar".getBytes(), "").getKeyspace(), is(equalTo("foo"))); - assertThat(new RedisKeyExpiredEvent("foo:bar:baz".getBytes(), "").getKeyspace(), is(equalTo("foo"))); + assertThat(new RedisKeyExpiredEvent("foo".getBytes(), "").getKeyspace()).isNull(); + assertThat(new RedisKeyExpiredEvent("foo:bar".getBytes(), "").getKeyspace()).isEqualTo("foo"); + assertThat(new RedisKeyExpiredEvent("foo:bar:baz".getBytes(), "").getKeyspace()).isEqualTo("foo"); } @Test // DATAREDIS-744 public void shouldReturnId() { - assertThat(new RedisKeyExpiredEvent("foo".getBytes(), "").getId(), is(equalTo("foo".getBytes()))); - assertThat(new RedisKeyExpiredEvent("foo:bar".getBytes(), "").getId(), is(equalTo("bar".getBytes()))); - assertThat(new RedisKeyExpiredEvent("foo:bar:baz".getBytes(), "").getId(), - is(equalTo("bar:baz".getBytes()))); + assertThat(new RedisKeyExpiredEvent("foo".getBytes(), "").getId()).isEqualTo("foo".getBytes()); + assertThat(new RedisKeyExpiredEvent("foo:bar".getBytes(), "").getId()).isEqualTo("bar".getBytes()); + assertThat(new RedisKeyExpiredEvent("foo:bar:baz".getBytes(), "").getId()).isEqualTo("bar:baz".getBytes()); } } diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterTests.java index 4bf07151a..eb1fd4031 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import static org.junit.Assume.*; import java.util.Arrays; @@ -37,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.beans.factory.InitializingBean; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Reference; @@ -140,10 +141,10 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.keys("persons*"), hasItems("persons", "persons:1")); - assertThat(template.opsForSet().size("persons"), is(1L)); - assertThat(template.opsForSet().members("persons"), hasItems("1")); - assertThat(template.opsForHash().entries("persons:1").size(), is(2)); + assertThat(template.keys("persons*")).contains("persons", "persons:1"); + assertThat(template.opsForSet().size("persons")).isEqualTo(1L); + assertThat(template.opsForSet().members("persons")).contains("1"); + assertThat(template.opsForHash().entries("persons:1").size()).isEqualTo(2); } @Test // DATAREDIS-744 @@ -154,10 +155,10 @@ public class RedisKeyValueAdapterTests { adapter.put("1:a", rand, "persons"); - assertThat(template.keys("persons*"), hasItems("persons", "persons:1:a")); - assertThat(template.opsForSet().size("persons"), is(1L)); - assertThat(template.opsForSet().members("persons"), hasItems("1:a")); - assertThat(template.opsForHash().entries("persons:1:a").size(), is(2)); + assertThat(template.keys("persons*")).contains("persons", "persons:1:a"); + assertThat(template.opsForSet().size("persons")).isEqualTo(1L); + assertThat(template.opsForSet().members("persons")).contains("1:a"); + assertThat(template.opsForHash().entries("persons:1:a").size()).isEqualTo(2); } @Test // DATAREDIS-425 @@ -168,8 +169,8 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.keys("persons*"), hasItem("persons:firstname:rand")); - assertThat(template.opsForSet().members("persons:firstname:rand"), hasItems("1")); + assertThat(template.keys("persons*")).contains("persons:firstname:rand"); + assertThat(template.opsForSet().members("persons:firstname:rand")).contains("1"); } @Test // DATAREDIS-744 @@ -180,8 +181,8 @@ public class RedisKeyValueAdapterTests { adapter.put("1:a", rand, "persons"); - assertThat(template.keys("persons*"), hasItem("persons:firstname:rand")); - assertThat(template.opsForSet().members("persons:firstname:rand"), hasItems("1:a")); + assertThat(template.keys("persons*")).contains("persons:firstname:rand"); + assertThat(template.opsForSet().members("persons:firstname:rand")).contains("1:a"); } @Test // DATAREDIS-425 @@ -193,8 +194,8 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.keys("persons*"), hasItems("persons", "persons:1")); - assertThat(template.opsForHash().entries("persons:1").size(), is(2)); + assertThat(template.keys("persons*")).contains("persons", "persons:1"); + assertThat(template.opsForHash().entries("persons:1").size()).isEqualTo(2); } @Test // DATAREDIS-425 @@ -206,8 +207,8 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.keys("persons*"), hasItem("persons:address.country:Andor")); - assertThat(template.opsForSet().members("persons:address.country:Andor"), hasItems("1")); + assertThat(template.keys("persons*")).contains("persons:address.country:Andor"); + assertThat(template.opsForSet().members("persons:address.country:Andor")).contains("1"); } @Test // DATAREDIS-425 @@ -220,8 +221,8 @@ public class RedisKeyValueAdapterTests { Object loaded = adapter.get("load-1", "persons"); - assertThat(loaded, instanceOf(Person.class)); - assertThat(((Person) loaded).age, is(24)); + assertThat(loaded).isInstanceOf(Person.class); + assertThat(((Person) loaded).age).isEqualTo(24); } @Test // DATAREDIS-744 @@ -234,8 +235,8 @@ public class RedisKeyValueAdapterTests { Object loaded = adapter.get("load-1:a", "persons"); - assertThat(loaded, instanceOf(Person.class)); - assertThat(((Person) loaded).age, is(24)); + assertThat(loaded).isInstanceOf(Person.class); + assertThat(((Person) loaded).age).isEqualTo(24); } @Test // DATAREDIS-425 @@ -248,8 +249,8 @@ public class RedisKeyValueAdapterTests { Object loaded = adapter.get("load-1", "persons"); - assertThat(loaded, instanceOf(Person.class)); - assertThat(((Person) loaded).address.country, is("Andor")); + assertThat(loaded).isInstanceOf(Person.class); + assertThat(((Person) loaded).address.country).isEqualTo("Andor"); } @Test // DATAREDIS-425 @@ -262,7 +263,7 @@ public class RedisKeyValueAdapterTests { template.opsForSet().add("persons", "1", "2", "3"); - assertThat(adapter.count("persons"), is(3L)); + assertThat(adapter.count("persons")).isEqualTo(3L); } @Test // DATAREDIS-425 @@ -276,8 +277,8 @@ public class RedisKeyValueAdapterTests { adapter.delete("1", "persons"); - assertThat(template.opsForSet().members("persons"), not(hasItem("1"))); - assertThat(template.hasKey("persons:1"), is(false)); + assertThat(template.opsForSet().members("persons")).doesNotContain("1"); + assertThat(template.hasKey("persons:1")).isFalse(); } @Test // DATAREDIS-425 @@ -294,7 +295,7 @@ public class RedisKeyValueAdapterTests { adapter.delete("1", "persons"); - assertThat(template.opsForSet().members("persons:firstname:rand"), not(hasItem("1"))); + assertThat(template.opsForSet().members("persons:firstname:rand")).doesNotContain("1"); } @Test // DATAREDIS-425 @@ -319,10 +320,11 @@ public class RedisKeyValueAdapterTests { waitUntilKeyIsGone(template, "persons:1:phantom"); waitUntilKeyIsGone(template, "persons:firstname:rand"); - assertThat(template.hasKey("persons:1"), is(false)); - assertThat(template.hasKey("persons:firstname:rand"), is(false)); - assertThat(template.hasKey("persons:1:idx"), is(false)); - assertThat(template.opsForSet().members("persons"), not(hasItem("1"))); + assertThat(template.hasKey("persons:1")).isFalse(); + assertThat(template.hasKey("persons:firstname:rand")).isFalse(); + assertThat(template.hasKey("persons:1:idx")).isFalse(); + assertThat(template.opsForSet().members("persons")).doesNotContain("1"); + ; } @Test // DATAREDIS-744 @@ -347,10 +349,10 @@ public class RedisKeyValueAdapterTests { waitUntilKeyIsGone(template, "persons:1:b:phantom"); waitUntilKeyIsGone(template, "persons:firstname:rand"); - assertThat(template.hasKey("persons:1"), is(false)); - assertThat(template.hasKey("persons:firstname:rand"), is(false)); - assertThat(template.hasKey("persons:1:b:idx"), is(false)); - assertThat(template.opsForSet().members("persons"), not(hasItem("1:b"))); + assertThat(template.hasKey("persons:1")).isFalse(); + assertThat(template.hasKey("persons:firstname:rand")).isFalse(); + assertThat(template.hasKey("persons:1:b:idx")).isFalse(); + assertThat(template.opsForSet().members("persons")).doesNotContain("1:b"); } @Test // DATAREDIS-589 @@ -374,10 +376,10 @@ public class RedisKeyValueAdapterTests { waitUntilKeyIsGone(template, "1"); - assertThat(template.hasKey("persons:1"), is(true)); - assertThat(template.hasKey("persons:firstname:rand"), is(true)); - assertThat(template.hasKey("persons:1:idx"), is(true)); - assertThat(template.opsForSet().members("persons"), hasItem("1")); + assertThat(template.hasKey("persons:1")).isTrue(); + assertThat(template.hasKey("persons:firstname:rand")).isTrue(); + assertThat(template.hasKey("persons:1:idx")).isTrue(); + assertThat(template.opsForSet().members("persons")).contains("1"); } @Test // DATAREDIS-512 @@ -389,31 +391,31 @@ public class RedisKeyValueAdapterTests { adapter.put("rand", rand, "persons"); - assertThat(template.hasKey("persons:firstname:rand"), is(true)); - assertThat(template.hasKey("persons:rand:idx"), is(true)); - assertThat(template.opsForSet().isMember("persons:rand:idx", "persons:firstname:rand"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isTrue(); + assertThat(template.hasKey("persons:rand:idx")).isTrue(); + assertThat(template.opsForSet().isMember("persons:rand:idx", "persons:firstname:rand")).isTrue(); Person mat = new Person(); mat.age = 22; mat.firstname = "mat"; adapter.put("mat", mat, "persons"); - assertThat(template.hasKey("persons:firstname:rand"), is(true)); - assertThat(template.hasKey("persons:firstname:mat"), is(true)); - assertThat(template.hasKey("persons:rand:idx"), is(true)); - assertThat(template.hasKey("persons:mat:idx"), is(true)); - assertThat(template.opsForSet().isMember("persons:rand:idx", "persons:firstname:rand"), is(true)); - assertThat(template.opsForSet().isMember("persons:mat:idx", "persons:firstname:mat"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isTrue(); + assertThat(template.hasKey("persons:firstname:mat")).isTrue(); + assertThat(template.hasKey("persons:rand:idx")).isTrue(); + assertThat(template.hasKey("persons:mat:idx")).isTrue(); + assertThat(template.opsForSet().isMember("persons:rand:idx", "persons:firstname:rand")).isTrue(); + assertThat(template.opsForSet().isMember("persons:mat:idx", "persons:firstname:mat")).isTrue(); rand.firstname = "frodo"; adapter.put("rand", rand, "persons"); - assertThat(template.hasKey("persons:firstname:rand"), is(false)); - assertThat(template.hasKey("persons:firstname:mat"), is(true)); - assertThat(template.hasKey("persons:firstname:frodo"), is(true)); - assertThat(template.hasKey("persons:rand:idx"), is(true)); - assertThat(template.opsForSet().isMember("persons:rand:idx", "persons:firstname:frodo"), is(true)); - assertThat(template.opsForSet().isMember("persons:mat:idx", "persons:firstname:mat"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isFalse(); + assertThat(template.hasKey("persons:firstname:mat")).isTrue(); + assertThat(template.hasKey("persons:firstname:frodo")).isTrue(); + assertThat(template.hasKey("persons:rand:idx")).isTrue(); + assertThat(template.opsForSet().isMember("persons:rand:idx", "persons:firstname:frodo")).isTrue(); + assertThat(template.opsForSet().isMember("persons:mat:idx", "persons:firstname:mat")).isTrue(); } @Test // DATAREDIS-471 @@ -424,15 +426,15 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.hasKey("persons:firstname:rand"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isTrue(); PartialUpdate update = new PartialUpdate("1", Person.class) // .set("firstname", "mat"); adapter.update(update); - assertThat(template.hasKey("persons:firstname:rand"), is(false)); - assertThat(template.hasKey("persons:firstname:mat"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isFalse(); + assertThat(template.hasKey("persons:firstname:mat")).isTrue(); } @Test // DATAREDIS-744 @@ -443,15 +445,15 @@ public class RedisKeyValueAdapterTests { adapter.put("1:a", rand, "persons"); - assertThat(template.hasKey("persons:firstname:rand"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isTrue(); PartialUpdate update = new PartialUpdate<>("1:a", Person.class) // .set("firstname", "mat"); adapter.update(update); - assertThat(template.hasKey("persons:firstname:rand"), is(false)); - assertThat(template.hasKey("persons:firstname:mat"), is(true)); + assertThat(template.hasKey("persons:firstname:rand")).isFalse(); + assertThat(template.hasKey("persons:firstname:mat")).isTrue(); } @Test // DATAREDIS-471 @@ -463,7 +465,7 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.hasKey("persons:address.country:andor"), is(true)); + assertThat(template.hasKey("persons:address.country:andor")).isTrue(); PartialUpdate update = new PartialUpdate<>("1", Person.class); Address addressUpdate = new Address(); @@ -473,8 +475,8 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.hasKey("persons:address.country:andor"), is(false)); - assertThat(template.hasKey("persons:address.country:tear"), is(true)); + assertThat(template.hasKey("persons:address.country:andor")).isFalse(); + assertThat(template.hasKey("persons:address.country:tear")).isTrue(); } @Test // DATAREDIS-471 @@ -486,15 +488,15 @@ public class RedisKeyValueAdapterTests { adapter.put("1", rand, "persons"); - assertThat(template.hasKey("persons:address.country:andor"), is(true)); + assertThat(template.hasKey("persons:address.country:andor")).isTrue(); PartialUpdate update = new PartialUpdate<>("1", Person.class) // .set("address.country", "tear"); adapter.update(update); - assertThat(template.hasKey("persons:address.country:andor"), is(false)); - assertThat(template.hasKey("persons:address.country:tear"), is(true)); + assertThat(template.hasKey("persons:address.country:andor")).isFalse(); + assertThat(template.hasKey("persons:address.country:tear")).isTrue(); } @Test // DATAREDIS-471 @@ -512,9 +514,9 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForHash().hasKey("persons:1", "address.country"), is(false)); - assertThat(template.opsForHash().hasKey("persons:1", "address.city"), is(false)); - assertThat(template.opsForSet().isMember("persons:address.country:andor", "1"), is(false)); + assertThat(template.opsForHash().hasKey("persons:1", "address.country")).isFalse(); + assertThat(template.opsForHash().hasKey("persons:1", "address.city")).isFalse(); + assertThat(template.opsForSet().isMember("persons:address.country:andor", "1")).isFalse(); } @Test // DATAREDIS-471 @@ -530,8 +532,8 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForHash().hasKey("persons:1", "nicknames.[0]"), is(false)); - assertThat(template.opsForHash().hasKey("persons:1", "nicknames.[1]"), is(false)); + assertThat(template.opsForHash().hasKey("persons:1", "nicknames.[0]")).isFalse(); + assertThat(template.opsForHash().hasKey("persons:1", "nicknames.[1]")).isFalse(); } @Test // DATAREDIS-471 @@ -555,10 +557,10 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[0].firstname"), is(false)); - assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[0].nicknames.[0]"), is(false)); - assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[1].firstname"), is(false)); - assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[1].nicknames.[0]"), is(false)); + assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[0].firstname")).isFalse(); + assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[0].nicknames.[0]")).isFalse(); + assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[1].firstname")).isFalse(); + assertThat(template.opsForHash().hasKey("persons:1", "coworkers.[1].nicknames.[0]")).isFalse(); } @Test // DATAREDIS-471 @@ -574,7 +576,7 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForHash().hasKey("persons:1", "physicalAttributes.[eye-color]"), is(false)); + assertThat(template.opsForHash().hasKey("persons:1", "physicalAttributes.[eye-color]")).isFalse(); } @Test // DATAREDIS-471 @@ -593,7 +595,7 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForHash().hasKey("persons:1", "relatives.[stepfather].firstname"), is(false)); + assertThat(template.opsForHash().hasKey("persons:1", "relatives.[stepfather].firstname")).isFalse(); } @Test // DATAREDIS-533 @@ -607,7 +609,7 @@ public class RedisKeyValueAdapterTests { adapter.put("1", tam, "persons"); - assertThat(template.opsForZSet().score("persons:address:location", "1"), is(notNullValue())); + assertThat(template.opsForZSet().score("persons:address:location", "1")).isNotNull(); } @Test // DATAREDIS-533 @@ -623,7 +625,7 @@ public class RedisKeyValueAdapterTests { adapter.delete("1", "persons", Person.class); - assertThat(template.opsForZSet().score("persons:address:location", "1"), is(nullValue())); + assertThat(template.opsForZSet().score("persons:address:location", "1")).isNull(); } @Test // DATAREDIS-533 @@ -642,7 +644,7 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForZSet().score("persons:address:location", "1"), is(nullValue())); + assertThat(template.opsForZSet().score("persons:address:location", "1")).isNull(); } @Test // DATAREDIS-533, DATAREDIS-614 @@ -661,11 +663,11 @@ public class RedisKeyValueAdapterTests { adapter.update(update); - assertThat(template.opsForZSet().score("persons:address:location", "1"), is(notNullValue())); + assertThat(template.opsForZSet().score("persons:address:location", "1")).isNotNull(); Point updatedLocation = template.opsForGeo().position("persons:address:location", "1").iterator().next(); - assertThat(updatedLocation.getX(), is(closeTo(17D, 0.005))); - assertThat(updatedLocation.getY(), is(closeTo(18D, 0.005))); + assertThat(updatedLocation.getX()).isCloseTo(17D, offset(0.005)); + assertThat(updatedLocation.getY()).isCloseTo(18D, offset(0.005)); } /** diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java index 528d32418..2c4749d26 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java @@ -16,10 +16,8 @@ package org.springframework.data.redis.core; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static org.mockito.Mockito.any; import static org.springframework.test.util.ReflectionTestUtils.*; import java.util.Arrays; @@ -35,6 +33,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.annotation.Id; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; @@ -138,7 +137,7 @@ public class RedisKeyValueAdapterUnitTests { KeyExpirationEventMessageListener listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, notNullValue()); + assertThat(listener).isNotNull(); } @Test // DATAREDIS-491 @@ -152,17 +151,17 @@ public class RedisKeyValueAdapterUnitTests { KeyExpirationEventMessageListener listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, nullValue()); + assertThat(listener).isNull(); adapter.put("should-NOT-start-listener", new WithoutTimeToLive(), "keyspace"); listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, nullValue()); + assertThat(listener).isNull(); adapter.put("should-start-listener", new WithTimeToLive(), "keyspace"); listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, notNullValue()); + assertThat(listener).isNotNull(); } @Test // DATAREDIS-491 @@ -175,17 +174,17 @@ public class RedisKeyValueAdapterUnitTests { KeyExpirationEventMessageListener listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, nullValue()); + assertThat(listener).isNull(); adapter.put("should-NOT-start-listener", new WithoutTimeToLive(), "keyspace"); listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, nullValue()); + assertThat(listener).isNull(); adapter.put("should-start-listener", new WithTimeToLive(), "keyspace"); listener = ((AtomicReference) getField(adapter, "expirationListener")).get(); - assertThat(listener, nullValue()); + assertThat(listener).isNull(); } static class WithoutTimeToLive { diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyValueTemplateTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyValueTemplateTests.java index 23997ec6f..76255cb49 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyValueTemplateTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyValueTemplateTests.java @@ -15,9 +15,8 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.number.IsCloseTo.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.data.Offset.offset; import lombok.AllArgsConstructor; import lombok.Data; @@ -39,6 +38,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.annotation.Id; import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -124,7 +124,7 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.exists(("template-test-person:" + rand.id).getBytes()), is(true)); + assertThat(connection.exists(("template-test-person:" + rand.id).getBytes())).isTrue(); return null; }); } @@ -143,8 +143,8 @@ public class RedisKeyValueTemplateTests { List result = template.find(connection -> mat.id.getBytes(), Person.class); - assertThat(result.size(), is(1)); - assertThat(result, hasItems(mat)); + assertThat(result.size()).isEqualTo(1); + assertThat(result).contains(mat); } @Test // DATAREDIS-425 @@ -162,8 +162,8 @@ public class RedisKeyValueTemplateTests { List result = template.find(connection -> Arrays.asList(rand.id.getBytes(), mat.id.getBytes()), Person.class); - assertThat(result.size(), is(2)); - assertThat(result, hasItems(rand, mat)); + assertThat(result.size()).isEqualTo(2); + assertThat(result).contains(rand, mat); } @Test // DATAREDIS-425 @@ -180,7 +180,7 @@ public class RedisKeyValueTemplateTests { List result = template.find(connection -> null, Person.class); - assertThat(result.size(), is(0)); + assertThat(result.size()).isEqualTo(0); } @Test // DATAREDIS-471 @@ -199,14 +199,13 @@ public class RedisKeyValueTemplateTests { template.insert(update); - assertThat(template.findById(rand.id, Person.class), is(equalTo(Optional.of(new Person(rand.id, "rand", "al-thor"))))); + assertThat(template.findById(rand.id, Person.class)).isEqualTo(Optional.of(new Person(rand.id, "rand", "al-thor"))); nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.hGet(("template-test-person:" + rand.id).getBytes(), "firstname".getBytes()), - is(equalTo("rand".getBytes()))); - assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(true)); - assertThat(connection.sIsMember("template-test-person:lastname:al-thor".getBytes(), rand.id.getBytes()), - is(true)); + assertThat(connection.hGet(("template-test-person:" + rand.id).getBytes(), "firstname".getBytes())) + .isEqualTo("rand".getBytes()); + assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes())).isTrue(); + assertThat(connection.sIsMember("template-test-person:lastname:al-thor".getBytes(), rand.id.getBytes())).isTrue(); return null; }); @@ -217,12 +216,12 @@ public class RedisKeyValueTemplateTests { template.update(update); - assertThat(template.findById(rand.id, Person.class), is(equalTo(Optional.of(new Person(rand.id, "frodo", "al-thor"))))); + assertThat(template.findById(rand.id, Person.class)) + .isEqualTo(Optional.of(new Person(rand.id, "frodo", "al-thor"))); nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(true)); - assertThat(connection.sIsMember("template-test-person:lastname:al-thor".getBytes(), rand.id.getBytes()), - is(true)); + assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes())).isTrue(); + assertThat(connection.sIsMember("template-test-person:lastname:al-thor".getBytes(), rand.id.getBytes())).isTrue(); return null; }); @@ -234,13 +233,12 @@ public class RedisKeyValueTemplateTests { template.doPartialUpdate(update); - assertThat(template.findById(rand.id, Person.class), is(equalTo(Optional.of(new Person(rand.id, null, "baggins"))))); + assertThat(template.findById(rand.id, Person.class)).isEqualTo(Optional.of(new Person(rand.id, null, "baggins"))); nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(false)); - assertThat(connection.exists("template-test-person:lastname:baggins".getBytes()), is(true)); - assertThat(connection.sIsMember("template-test-person:lastname:baggins".getBytes(), rand.id.getBytes()), - is(true)); + assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes())).isFalse(); + assertThat(connection.exists("template-test-person:lastname:baggins".getBytes())).isTrue(); + assertThat(connection.sIsMember("template-test-person:lastname:baggins".getBytes(), rand.id.getBytes())).isTrue(); return null; }); @@ -252,10 +250,10 @@ public class RedisKeyValueTemplateTests { template.doPartialUpdate(update); - assertThat(template.findById(rand.id, Person.class), is(equalTo(Optional.of(new Person(rand.id, null, null))))); + assertThat(template.findById(rand.id, Person.class)).isEqualTo(Optional.of(new Person(rand.id, null, null))); nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.keys("template-test-person:lastname:*".getBytes()).size(), is(0)); + assertThat(connection.keys("template-test-person:lastname:*".getBytes()).size()).isEqualTo(0); return null; }); } @@ -275,10 +273,10 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "stringValue".getBytes()), - is("hooya!".getBytes())); + assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "stringValue".getBytes())) + .isEqualTo("hooya!".getBytes()); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "simpleTypedMap._class".getBytes()), is(false)); + "simpleTypedMap._class".getBytes())).isFalse(); return null; }); } @@ -310,15 +308,15 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "complexValue.name".getBytes()), - is("Portal Stone".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "complexValue.name".getBytes())) + .isEqualTo("Portal Stone".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexValue.dimension.height".getBytes()), is("350".getBytes())); + "complexValue.dimension.height".getBytes())).isEqualTo("350".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexValue.dimension.width".getBytes()), is("70".getBytes())); + "complexValue.dimension.width".getBytes())).isEqualTo("70".getBytes()); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexValue.dimension.length".getBytes()), is(false)); + "complexValue.dimension.length".getBytes())).isFalse(); return null; }); } @@ -350,17 +348,17 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "objectValue._class".getBytes()), - is(Item.class.getName().getBytes())); - assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "objectValue.name".getBytes()), - is("Portal Stone".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "objectValue._class".getBytes())) + .isEqualTo(Item.class.getName().getBytes()); + assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "objectValue.name".getBytes())) + .isEqualTo("Portal Stone".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "objectValue.dimension.height".getBytes()), is("350".getBytes())); + "objectValue.dimension.height".getBytes())).isEqualTo("350".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "objectValue.dimension.width".getBytes()), is("70".getBytes())); + "objectValue.dimension.width".getBytes())).isEqualTo("70".getBytes()); - assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "objectValue".getBytes()), - is(false)); + assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "objectValue".getBytes())) + .isFalse(); return null; }); } @@ -384,14 +382,14 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedMap.[spring]".getBytes()), - is("data".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedMap.[spring]".getBytes())) + .isEqualTo("data".getBytes()); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "simpleTypedMap.[key-1]".getBytes()), is(false)); + "simpleTypedMap.[key-1]".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "simpleTypedMap.[key-2]".getBytes()), is(false)); + "simpleTypedMap.[key-2]".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "simpleTypedMap.[key-2]".getBytes()), is(false)); + "simpleTypedMap.[key-2]".getBytes())).isFalse(); return null; }); } @@ -432,25 +430,25 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[horn-of-valere].name".getBytes()), is("Horn of Valere".getBytes())); + "complexTypedMap.[horn-of-valere].name".getBytes())).isEqualTo("Horn of Valere".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[horn-of-valere].dimension.height".getBytes()), is("70".getBytes())); + "complexTypedMap.[horn-of-valere].dimension.height".getBytes())).isEqualTo("70".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[horn-of-valere].dimension.width".getBytes()), is("25".getBytes())); + "complexTypedMap.[horn-of-valere].dimension.width".getBytes())).isEqualTo("25".getBytes()); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[callandor].name".getBytes()), is(false)); + "complexTypedMap.[callandor].name".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[callandor].dimension.height".getBytes()), is(false)); + "complexTypedMap.[callandor].dimension.height".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[callandor].dimension.width".getBytes()), is(false)); + "complexTypedMap.[callandor].dimension.width".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[portal-stone].name".getBytes()), is(false)); + "complexTypedMap.[portal-stone].name".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[portal-stone].dimension.height".getBytes()), is(false)); + "complexTypedMap.[portal-stone].dimension.height".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[portal-stone].dimension.width".getBytes()), is(false)); + "complexTypedMap.[portal-stone].dimension.width".getBytes())).isFalse(); return null; }); } @@ -497,36 +495,36 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[horn-of-valere].name".getBytes()), is("Horn of Valere".getBytes())); + "untypedMap.[horn-of-valere].name".getBytes())).isEqualTo("Horn of Valere".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[horn-of-valere].dimension.height".getBytes()), is("70".getBytes())); + "untypedMap.[horn-of-valere].dimension.height".getBytes())).isEqualTo("70".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[horn-of-valere].dimension.width".getBytes()), is("25".getBytes())); + "untypedMap.[horn-of-valere].dimension.width".getBytes())).isEqualTo("25".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[spring]._class".getBytes()), is("java.lang.String".getBytes())); + "untypedMap.[spring]._class".getBytes())).isEqualTo("java.lang.String".getBytes()); assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedMap.[spring]".getBytes()), - is("data".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedMap.[spring]".getBytes())) + .isEqualTo("data".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[some-number]._class".getBytes()), is("java.lang.Long".getBytes())); + "untypedMap.[some-number]._class".getBytes())).isEqualTo("java.lang.Long".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[some-number]".getBytes()), is("100".getBytes())); + "untypedMap.[some-number]".getBytes())).isEqualTo("100".getBytes()); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[callandor].name".getBytes()), is(false)); + "untypedMap.[callandor].name".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[callandor].dimension.height".getBytes()), is(false)); + "untypedMap.[callandor].dimension.height".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[callandor].dimension.width".getBytes()), is(false)); + "untypedMap.[callandor].dimension.width".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[portal-stone].name".getBytes()), is(false)); + "untypedMap.[portal-stone].name".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[portal-stone].dimension.height".getBytes()), is(false)); + "untypedMap.[portal-stone].dimension.height".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "untypedMap.[portal-stone].dimension.width".getBytes()), is(false)); + "untypedMap.[portal-stone].dimension.width".getBytes())).isFalse(); return null; }); } @@ -550,17 +548,17 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[0]".getBytes()), - is("spring".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[0]".getBytes())) + .isEqualTo("spring".getBytes()); assertThat( - connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[1]".getBytes()), - is(false)); + connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[1]".getBytes())) + .isFalse(); assertThat( - connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[2]".getBytes()), - is(false)); + connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[2]".getBytes())) + .isFalse(); assertThat( - connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[3]".getBytes()), - is(false)); + connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), "simpleTypedList.[3]".getBytes())) + .isFalse(); return null; }); } @@ -601,18 +599,18 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedList.[0].name".getBytes()), is("Horn of Valere".getBytes())); + "complexTypedList.[0].name".getBytes())).isEqualTo("Horn of Valere".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedList.[0].dimension.height".getBytes()), is("70".getBytes())); + "complexTypedList.[0].dimension.height".getBytes())).isEqualTo("70".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedList.[0].dimension.width".getBytes()), is("25".getBytes())); + "complexTypedList.[0].dimension.width".getBytes())).isEqualTo("25".getBytes()); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[1].name".getBytes()), is(false)); + "complexTypedMap.[1].name".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[1].dimension.height".getBytes()), is(false)); + "complexTypedMap.[1].dimension.height".getBytes())).isFalse(); assertThat(connection.hExists(("template-test-type-mapping:" + source.id).getBytes(), - "complexTypedMap.[1].dimension.width".getBytes()), is(false)); + "complexTypedMap.[1].dimension.width".getBytes())).isFalse(); return null; }); } @@ -659,24 +657,24 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[0]._class".getBytes()), - is("java.lang.String".getBytes())); - assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[0]".getBytes()), - is("spring".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[0]._class".getBytes())) + .isEqualTo("java.lang.String".getBytes()); + assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[0]".getBytes())) + .isEqualTo("spring".getBytes()); assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[1].name".getBytes()), - is("Horn of Valere".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[1].name".getBytes())) + .isEqualTo("Horn of Valere".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedList.[1].dimension.height".getBytes()), is("70".getBytes())); + "untypedList.[1].dimension.height".getBytes())).isEqualTo("70".getBytes()); assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), - "untypedList.[1].dimension.width".getBytes()), is("25".getBytes())); + "untypedList.[1].dimension.width".getBytes())).isEqualTo("25".getBytes()); assertThat( - connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[2]._class".getBytes()), - is("java.lang.Long".getBytes())); - assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[2]".getBytes()), - is("100".getBytes())); + connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[2]._class".getBytes())) + .isEqualTo("java.lang.Long".getBytes()); + assertThat(connection.hGet(("template-test-type-mapping:" + source.id).getBytes(), "untypedList.[2]".getBytes())) + .isEqualTo("100".getBytes()); return null; }); @@ -701,11 +699,11 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.hGet(("template-test-person:" + rand.id).getBytes(), "lastname".getBytes()), - is(equalTo("doe".getBytes()))); - assertThat(connection.exists("template-test-person:email:rand@twof.com".getBytes()), is(true)); - assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(false)); - assertThat(connection.sIsMember("template-test-person:lastname:doe".getBytes(), rand.id.getBytes()), is(true)); + assertThat(connection.hGet(("template-test-person:" + rand.id).getBytes(), "lastname".getBytes())) + .isEqualTo("doe".getBytes()); + assertThat(connection.exists("template-test-person:email:rand@twof.com".getBytes())).isTrue(); + assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes())).isFalse(); + assertThat(connection.sIsMember("template-test-person:lastname:doe".getBytes(), rand.id.getBytes())).isTrue(); return null; }); } @@ -722,8 +720,8 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.exists("template-test-person:email:rand@twof.com".getBytes()), is(true)); - assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(true)); + assertThat(connection.exists("template-test-person:email:rand@twof.com".getBytes())).isTrue(); + assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes())).isTrue(); return null; }); @@ -733,8 +731,8 @@ public class RedisKeyValueTemplateTests { nativeTemplate.execute((RedisCallback) connection -> { - assertThat(connection.exists("template-test-person:email:rand@twof.com".getBytes()), is(true)); - assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes()), is(false)); + assertThat(connection.exists("template-test-person:email:rand@twof.com".getBytes())).isTrue(); + assertThat(connection.exists("template-test-person:lastname:al-thor".getBytes())).isFalse(); return null; }); } @@ -752,8 +750,8 @@ public class RedisKeyValueTemplateTests { Thread.sleep(1100); Optional target = template.findById(source.id, WithTtl.class); - assertThat(target.get().ttl, is(notNullValue())); - assertThat(target.get().ttl.doubleValue(), is(closeTo(3D, 1D))); + assertThat(target.get().ttl).isNotNull(); + assertThat(target.get().ttl.doubleValue()).isCloseTo(3D, offset(1D)); } @Test // DATAREDIS-523 @@ -769,7 +767,7 @@ public class RedisKeyValueTemplateTests { Thread.sleep(1100); Optional target = template.findById(source.id, WithPrimitiveTtl.class); - assertThat((double) target.get().ttl, is(closeTo(3D, 1D))); + assertThat((double) target.get().ttl).isCloseTo(3D, offset(1D)); } @Test // DATAREDIS-523 @@ -786,8 +784,8 @@ public class RedisKeyValueTemplateTests { WithTtl target = template.findAll(WithTtl.class).iterator().next(); - assertThat(target.ttl, is(notNullValue())); - assertThat(target.ttl.doubleValue(), is(closeTo(3D, 1D))); + assertThat(target.ttl).isNotNull(); + assertThat(target.ttl.doubleValue()).isCloseTo(3D, offset(1D)); } @Test // DATAREDIS-523 @@ -804,7 +802,7 @@ public class RedisKeyValueTemplateTests { (RedisCallback) connection -> connection.persist((WithTtl.class.getName() + ":ttl-1").getBytes())); Optional target = template.findById(source.id, WithTtl.class); - assertThat(target.get().ttl, is(-1L)); + assertThat(target.get().ttl).isEqualTo(-1L); } @Test // DATAREDIS-849 @@ -814,8 +812,8 @@ public class RedisKeyValueTemplateTests { ImmutableObject inserted = template.insert(source); - assertThat(source.id, is(nullValue())); - assertThat(inserted.id, is(notNullValue())); + assertThat(source.id).isNull(); + assertThat(inserted.id).isNotNull(); } @Test // DATAREDIS-849 @@ -826,12 +824,12 @@ public class RedisKeyValueTemplateTests { Optional loaded = template.findById(inserted.id, ImmutableObject.class); - assertThat(loaded.isPresent(), is(true)); + assertThat(loaded.isPresent()).isTrue(); ImmutableObject immutableObject = loaded.get(); - assertThat(immutableObject.id, is(inserted.id)); - assertThat(immutableObject.ttl, is(notNullValue())); - assertThat(immutableObject.value, is(inserted.value)); + assertThat(immutableObject.id).isEqualTo(inserted.id); + assertThat(immutableObject.ttl).isNotNull(); + assertThat(immutableObject.value).isEqualTo(inserted.value); } @EqualsAndHashCode diff --git a/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java b/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java index 6fe9bded4..f53637916 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java @@ -15,22 +15,21 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.assumeThat; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.hamcrest.core.IsNot; import org.junit.After; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; @@ -51,6 +50,7 @@ import org.springframework.data.redis.serializer.GenericToStringSerializer; import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; +import org.springframework.data.redis.test.util.CollectionAwareComparator; /** * Integration test of {@link RedisTemplate} @@ -100,28 +100,28 @@ public class RedisTemplateTests { @Test public void testDumpAndRestoreNoTtl() { - assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); + assumeThat(RedisTestProfileValueSource.matches("redisVersion", "2.6")).isTrue(); K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); byte[] serializedValue = redisTemplate.dump(key1); - assertNotNull(serializedValue); + assertThat(serializedValue).isNotNull(); redisTemplate.delete(key1); redisTemplate.restore(key1, serializedValue, 0, TimeUnit.SECONDS); - assertThat(redisTemplate.boundValueOps(key1).get(), isEqual(value1)); + assertThat(redisTemplate.boundValueOps(key1).get()).isEqualTo(value1); } @Test public void testRestoreTtl() { assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); byte[] serializedValue = redisTemplate.dump(key1); - assertNotNull(serializedValue); + assertThat(serializedValue).isNotNull(); redisTemplate.delete(key1); redisTemplate.restore(key1, serializedValue, 200, TimeUnit.MILLISECONDS); - assertThat(redisTemplate.boundValueOps(key1).get(), isEqual(value1)); + assertThat(redisTemplate.boundValueOps(key1).get()).isEqualTo(value1); waitFor(() -> (!redisTemplate.hasKey(key1)), 400); } @@ -133,7 +133,7 @@ public class RedisTemplateTests { assumeTrue(key1 instanceof String || key1 instanceof byte[]); redisTemplate.opsForValue().set(key1, value1); K keyPattern = key1 instanceof String ? (K) "*" : (K) "*".getBytes(); - assertNotNull(redisTemplate.keys(keyPattern)); + assertThat(redisTemplate.keys(keyPattern)).isNotNull(); } @SuppressWarnings("rawtypes") @@ -152,19 +152,19 @@ public class RedisTemplateTests { stringConn.set("test", "it"); return stringConn.get("test"); }); - assertEquals(value, "it"); + assertThat("it").isEqualTo(value); } @Test public void testExec() { - final K key1 = keyFactory.instance(); - final V value1 = valueFactory.instance(); - final K listKey = keyFactory.instance(); - final V listValue = valueFactory.instance(); - final K setKey = keyFactory.instance(); - final V setValue = valueFactory.instance(); - final K zsetKey = keyFactory.instance(); - final V zsetValue = valueFactory.instance(); + K key1 = keyFactory.instance(); + V value1 = valueFactory.instance(); + K listKey = keyFactory.instance(); + V listValue = valueFactory.instance(); + K setKey = keyFactory.instance(); + V setValue = valueFactory.instance(); + K zsetKey = keyFactory.instance(); + V zsetValue = valueFactory.instance(); List results = redisTemplate.execute(new SessionCallback>() { @SuppressWarnings({ "rawtypes", "unchecked" }) public List execute(RedisOperations operations) throws DataAccessException { @@ -172,11 +172,11 @@ public class RedisTemplateTests { operations.opsForValue().set(key1, value1); operations.opsForValue().get(key1); operations.opsForList().leftPush(listKey, listValue); - operations.opsForList().range(listKey, 0l, 1l); + operations.opsForList().range(listKey, 0L, 1L); operations.opsForSet().add(setKey, setValue); operations.opsForSet().members(setKey); operations.opsForZSet().add(zsetKey, zsetValue, 1d); - operations.opsForZSet().rangeWithScores(zsetKey, 0l, -1l); + operations.opsForZSet().rangeWithScores(zsetKey, 0L, -1L); return operations.exec(); } }); @@ -184,14 +184,16 @@ public class RedisTemplateTests { Set set = new HashSet<>(Collections.singletonList(setValue)); Set> tupleSet = new LinkedHashSet<>( Collections.singletonList(new DefaultTypedTuple<>(zsetValue, 1d))); - assertThat(results, isEqual(Arrays.asList(new Object[] { true, value1, 1l, list, 1l, set, true, tupleSet }))); + + assertThat(results).usingElementComparator(CollectionAwareComparator.INSTANCE).containsExactly(true, value1, 1L, + list, 1L, set, true, tupleSet); } @Test public void testDiscard() { - final K key1 = keyFactory.instance(); - final V value1 = valueFactory.instance(); - final V value2 = valueFactory.instance(); + K key1 = keyFactory.instance(); + V value1 = valueFactory.instance(); + V value2 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); redisTemplate.execute(new SessionCallback>() { @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -202,7 +204,7 @@ public class RedisTemplateTests { return null; } }); - assertThat(redisTemplate.boundValueOps(key1).get(), isEqual(value1)); + assertThat(redisTemplate.boundValueOps(key1).get()).isEqualTo(value1); } @Test @@ -216,11 +218,11 @@ public class RedisTemplateTests { operations.opsForValue().get("foo"); operations.opsForValue().append("foo1", "5"); operations.opsForList().leftPush("foolist", "6"); - operations.opsForList().range("foolist", 0l, 1l); + operations.opsForList().range("foolist", 0L, 1L); operations.opsForSet().add("fooset", "7"); operations.opsForSet().members("fooset"); operations.opsForZSet().add("foozset", "9", 1d); - operations.opsForZSet().rangeWithScores("foozset", 0l, -1l); + operations.opsForZSet().rangeWithScores("foozset", 0L, -1L); operations.opsForZSet().range("foozset", 0, -1); operations.opsForHash().put("foomap", "10", "11"); operations.opsForHash().entries("foomap"); @@ -228,14 +230,14 @@ public class RedisTemplateTests { } }); // Everything should be converted to Longs - List list = Collections.singletonList(6l); - Set longSet = new HashSet<>(Collections.singletonList(7l)); - Set> tupleSet = new LinkedHashSet<>(Collections.singletonList(new DefaultTypedTuple<>(9l, 1d))); - Set zSet = new LinkedHashSet<>(Collections.singletonList(9l)); + List list = Collections.singletonList(6L); + Set longSet = new HashSet<>(Collections.singletonList(7L)); + Set> tupleSet = new LinkedHashSet<>(Collections.singletonList(new DefaultTypedTuple<>(9L, 1d))); + Set zSet = new LinkedHashSet<>(Collections.singletonList(9L)); Map map = new LinkedHashMap<>(); - map.put(10l, 11l); - assertThat(results, - isEqual(Arrays.asList(new Object[] { true, 5l, 1L, 1l, list, 1l, longSet, true, tupleSet, zSet, true, map }))); + map.put(10L, 11L); + + assertThat(results).containsExactly(true, 5L, 1L, 1L, list, 1L, longSet, true, tupleSet, zSet, true, map); } @Test @@ -260,17 +262,17 @@ public class RedisTemplateTests { } }); // first value is "OK" from set call, results should still be in byte[] - assertEquals("bar", new String((byte[]) results.get(1))); + assertThat(new String((byte[]) results.get(1))).isEqualTo("bar"); } @SuppressWarnings("rawtypes") @Test public void testExecutePipelined() { - final K key1 = keyFactory.instance(); - final V value1 = valueFactory.instance(); - final K listKey = keyFactory.instance(); - final V listValue = valueFactory.instance(); - final V listValue2 = valueFactory.instance(); + K key1 = keyFactory.instance(); + V value1 = valueFactory.instance(); + K listKey = keyFactory.instance(); + V listValue = valueFactory.instance(); + V listValue2 = valueFactory.instance(); List results = redisTemplate.executePipelined((RedisCallback) connection -> { byte[] rawKey = serialize(key1, redisTemplate.getKeySerializer()); byte[] rawListKey = serialize(listKey, redisTemplate.getKeySerializer()); @@ -281,8 +283,8 @@ public class RedisTemplateTests { connection.lRange(rawListKey, 0, -1); return null; }); - assertThat(results, - isEqual(Arrays.asList(new Object[] { true, value1, 1l, 2l, Arrays.asList(new Object[] { listValue, listValue2 }) }))); + assertThat(results).usingElementComparator(CollectionAwareComparator.INSTANCE).containsExactly(true, value1, 1L, 2L, + Arrays.asList(listValue, listValue2)); } @SuppressWarnings("rawtypes") @@ -301,7 +303,7 @@ public class RedisTemplateTests { return null; }, new GenericToStringSerializer<>(Long.class)); - assertEquals(Arrays.asList(new Object[] { true, 5l, 1l, 2l, Arrays.asList(new Long[] { 10l, 11l }) }), results); + assertThat(results).containsExactly(true, 5L, 1L, 2L, Arrays.asList(10L, 11L)); } @Test // DATAREDIS-500 @@ -322,7 +324,7 @@ public class RedisTemplateTests { return null; }); - assertEquals(((Map) results.get(0)).get(1L), person); + assertThat(person).isEqualTo(((Map) results.get(0)).get(1L)); } @Test(expected = InvalidDataAccessApiUsageException.class) @@ -333,8 +335,8 @@ public class RedisTemplateTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testExecutePipelinedTx() { - final K key1 = keyFactory.instance(); - final V value1 = valueFactory.instance(); + K key1 = keyFactory.instance(); + V value1 = valueFactory.instance(); List pipelinedResults = redisTemplate.executePipelined(new SessionCallback() { public Object execute(RedisOperations operations) throws DataAccessException { operations.multi(); @@ -353,8 +355,8 @@ public class RedisTemplateTests { } }); // Should contain the List of deserialized exec results and the result of the last call to get() - assertThat(pipelinedResults, - isEqual(Arrays.asList(new Object[] { Arrays.asList(new Object[] { 1l, value1, 0l }), true, value1 }))); + assertThat(pipelinedResults).usingElementComparator(CollectionAwareComparator.INSTANCE) + .containsExactly(Arrays.asList(1L, value1, 0L), true, value1); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -374,7 +376,7 @@ public class RedisTemplateTests { } }, new GenericToStringSerializer<>(Long.class)); // Should contain the List of deserialized exec results and the result of the last call to get() - assertEquals(Arrays.asList(new Object[] { Arrays.asList(new Object[] { 1l, 5l, 0l }), true, 2l }), pipelinedResults); + assertThat(pipelinedResults).isEqualTo(Arrays.asList(Arrays.asList(1L, 5L, 0L), true, 2L)); } @Test(expected = InvalidDataAccessApiUsageException.class) @@ -395,9 +397,9 @@ public class RedisTemplateTests { redisTemplate.opsForValue().set(key1, value1); - assertTrue(redisTemplate.hasKey(key1)); - assertTrue(redisTemplate.delete(key1)); - assertFalse(redisTemplate.hasKey(key1)); + assertThat(redisTemplate.hasKey(key1)).isTrue(); + assertThat(redisTemplate.delete(key1)).isTrue(); + assertThat(redisTemplate.hasKey(key1)).isFalse(); } @Test // DATAREDIS-688 @@ -411,9 +413,9 @@ public class RedisTemplateTests { redisTemplate.opsForValue().set(key1, value1); redisTemplate.opsForValue().set(key2, value2); - assertEquals(2L, redisTemplate.delete(Arrays.asList(key1, key2)).longValue()); - assertFalse(redisTemplate.hasKey(key1)); - assertFalse(redisTemplate.hasKey(key2)); + assertThat(redisTemplate.delete(Arrays.asList(key1, key2)).longValue()).isEqualTo(2L); + assertThat(redisTemplate.hasKey(key1)).isFalse(); + assertThat(redisTemplate.hasKey(key2)).isFalse(); } @Test @@ -427,7 +429,7 @@ public class RedisTemplateTests { redisTemplate.opsForList().rightPush(key1, value1); List results = redisTemplate.sort(SortQueryBuilder.sort(key1).build()); - assertEquals(Collections.singletonList(value1), results); + assertThat(results).isEqualTo(Collections.singletonList(value1)); } @Test @@ -437,8 +439,8 @@ public class RedisTemplateTests { V value1 = valueFactory.instance(); assumeTrue(value1 instanceof Number); redisTemplate.opsForList().rightPush(key1, value1); - assertEquals(Long.valueOf(1), redisTemplate.sort(SortQueryBuilder.sort(key1).build(), key2)); - assertEquals(Collections.singletonList(value1), redisTemplate.boundListOps(key2).range(0, -1)); + assertThat(redisTemplate.sort(SortQueryBuilder.sort(key1).build(), key2)).isEqualTo(Long.valueOf(1)); + assertThat(redisTemplate.boundListOps(key2).range(0, -1)).isEqualTo(Collections.singletonList(value1)); } @Test @@ -448,47 +450,47 @@ public class RedisTemplateTests { assumeTrue(value1 instanceof Number); redisTemplate.opsForList().rightPush(key1, value1); List results = redisTemplate.sort(SortQueryBuilder.sort(key1).get("#").build(), tuple -> "FOO"); - assertEquals(Collections.singletonList("FOO"), results); + assertThat(results).isEqualTo(Collections.singletonList("FOO")); } @Test public void testExpireAndGetExpireMillis() { - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); redisTemplate.expire(key1, 500, TimeUnit.MILLISECONDS); - assertTrue(redisTemplate.getExpire(key1, TimeUnit.MILLISECONDS) > 0l); + assertThat(redisTemplate.getExpire(key1, TimeUnit.MILLISECONDS) > 0L).isTrue(); // Timeout is longer because expire will be 1 sec if pExpire not supported - waitFor(() -> (!redisTemplate.hasKey(key1)), 1500l); + waitFor(() -> (!redisTemplate.hasKey(key1)), 1500L); } @Test public void testGetExpireNoTimeUnit() { - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); redisTemplate.expire(key1, 2, TimeUnit.SECONDS); Long expire = redisTemplate.getExpire(key1); // Default behavior is to return seconds - assertTrue(expire > 0l && expire <= 2l); + assertThat(expire > 0L && expire <= 2L).isTrue(); } @Test public void testGetExpireSeconds() { - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); redisTemplate.expire(key1, 1500, TimeUnit.MILLISECONDS); - assertEquals(Long.valueOf(1), redisTemplate.getExpire(key1, TimeUnit.SECONDS)); + assertThat(redisTemplate.getExpire(key1, TimeUnit.SECONDS)).isEqualTo(Long.valueOf(1)); } @Test // DATAREDIS-526 public void testGetExpireSecondsForKeyDoesNotExist() { Long expire = redisTemplate.getExpire(keyFactory.instance(), TimeUnit.SECONDS); - assertTrue(expire < 0L); + assertThat(expire < 0L).isTrue(); } @Test // DATAREDIS-526 @@ -497,7 +499,7 @@ public class RedisTemplateTests { K key = keyFactory.instance(); Long expire = redisTemplate.getExpire(key, TimeUnit.SECONDS); - assertTrue(expire < 0L); + assertThat(expire < 0L).isTrue(); } @Test // DATAREDIS-526 @@ -505,7 +507,7 @@ public class RedisTemplateTests { Long expire = redisTemplate.getExpire(keyFactory.instance(), TimeUnit.MILLISECONDS); - assertTrue(expire < 0L); + assertThat(expire < 0L).isTrue(); } @Test // DATAREDIS-526 @@ -516,7 +518,7 @@ public class RedisTemplateTests { Long expire = redisTemplate.getExpire(key, TimeUnit.MILLISECONDS); - assertTrue(expire < 0L); + assertThat(expire < 0L).isTrue(); } @Test // DATAREDIS-526 @@ -525,14 +527,14 @@ public class RedisTemplateTests { assumeTrue(redisTemplate.getConnectionFactory() instanceof JedisConnectionFactory || redisTemplate.getConnectionFactory() instanceof LettuceConnectionFactory); - final K key = keyFactory.instance(); + K key = keyFactory.instance(); redisTemplate.boundValueOps(key).set(valueFactory.instance()); redisTemplate.expire(key, 1, TimeUnit.DAYS); Long ttl = redisTemplate.getExpire(key, TimeUnit.HOURS); - assertThat(ttl, greaterThanOrEqualTo(23L)); - assertThat(ttl, lessThan(25L)); + assertThat(ttl).isGreaterThanOrEqualTo(23L); + assertThat(ttl).isLessThan(25L); } @Test // DATAREDIS-526 @@ -542,7 +544,7 @@ public class RedisTemplateTests { assumeTrue(redisTemplate.getConnectionFactory() instanceof JedisConnectionFactory || redisTemplate.getConnectionFactory() instanceof LettuceConnectionFactory); - final K key = keyFactory.instance(); + K key = keyFactory.instance(); List result = redisTemplate.execute(new SessionCallback>() { @Override @@ -557,9 +559,9 @@ public class RedisTemplateTests { } }); - assertThat(result, hasSize(3)); - assertThat(((Long) result.get(2)), greaterThanOrEqualTo(23L)); - assertThat(((Long) result.get(2)), lessThan(25L)); + assertThat(result).hasSize(3); + assertThat(((Long) result.get(2))).isGreaterThanOrEqualTo(23L); + assertThat(((Long) result.get(2))).isLessThan(25L); } @Test // DATAREDIS-526 @@ -569,7 +571,7 @@ public class RedisTemplateTests { assumeTrue(redisTemplate.getConnectionFactory() instanceof JedisConnectionFactory || redisTemplate.getConnectionFactory() instanceof LettuceConnectionFactory); - final K key = keyFactory.instance(); + K key = keyFactory.instance(); List result = redisTemplate.executePipelined(new SessionCallback() { @Override @@ -583,9 +585,9 @@ public class RedisTemplateTests { } }); - assertThat(result, hasSize(3)); - assertThat(((Long) result.get(2)), greaterThanOrEqualTo(23L)); - assertThat(((Long) result.get(2)), lessThan(25L)); + assertThat(result).hasSize(3); + assertThat(((Long) result.get(2))).isGreaterThanOrEqualTo(23L); + assertThat(((Long) result.get(2))).isLessThan(25L); } @Test @@ -593,26 +595,26 @@ public class RedisTemplateTests { assumeTrue(redisTemplate.getConnectionFactory() instanceof JedisConnectionFactory); - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); assumeTrue(key1 instanceof String && value1 instanceof String); - final StringRedisTemplate template2 = new StringRedisTemplate(redisTemplate.getConnectionFactory()); + StringRedisTemplate template2 = new StringRedisTemplate(redisTemplate.getConnectionFactory()); template2.boundValueOps((String) key1).set((String) value1); template2.expire((String) key1, 5, TimeUnit.SECONDS); long expire = template2.getExpire((String) key1, TimeUnit.MILLISECONDS); // we should still get expire in milliseconds if requested - assertTrue(expire > 1000 && expire <= 5000); + assertThat(expire > 1000 && expire <= 5000).isTrue(); } @Test public void testExpireAt() { - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.boundValueOps(key1).set(value1); - redisTemplate.expireAt(key1, new Date(System.currentTimeMillis() + 5l)); - waitFor(() -> (!redisTemplate.hasKey(key1)), 5l); + redisTemplate.expireAt(key1, new Date(System.currentTimeMillis() + 5L)); + waitFor(() -> (!redisTemplate.hasKey(key1)), 5L); } @Test @@ -621,29 +623,29 @@ public class RedisTemplateTests { assumeTrue(RedisTestProfileValueSource.matches("runLongTests", "true")); assumeTrue(redisTemplate.getConnectionFactory() instanceof JedisConnectionFactory); - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); assumeTrue(key1 instanceof String && value1 instanceof String); - final StringRedisTemplate template2 = new StringRedisTemplate(redisTemplate.getConnectionFactory()); + StringRedisTemplate template2 = new StringRedisTemplate(redisTemplate.getConnectionFactory()); template2.boundValueOps((String) key1).set((String) value1); - template2.expireAt((String) key1, new Date(System.currentTimeMillis() + 5l)); + template2.expireAt((String) key1, new Date(System.currentTimeMillis() + 5L)); // Just ensure this works as expected, pExpireAt just adds some precision over expireAt - waitFor(() -> (!template2.hasKey((String) key1)), 5l); + waitFor(() -> (!template2.hasKey((String) key1)), 5L); } @Test public void testPersist() throws Exception { // Test is meaningless in Redis 2.4 because key won't expire after 10 ms assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); redisTemplate.expire(key1, 10, TimeUnit.MILLISECONDS); redisTemplate.persist(key1); Thread.sleep(10); - assertTrue(redisTemplate.hasKey(key1)); + assertThat(redisTemplate.hasKey(key1)).isTrue(); } @Test @@ -651,7 +653,7 @@ public class RedisTemplateTests { K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); - assertThat(redisTemplate.randomKey(), isEqual(key1)); + assertThat(redisTemplate.randomKey()).isEqualTo(key1); } @Test @@ -661,7 +663,7 @@ public class RedisTemplateTests { V value1 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); redisTemplate.rename(key1, key2); - assertThat(redisTemplate.opsForValue().get(key2), isEqual(value1)); + assertThat(redisTemplate.opsForValue().get(key2)).isEqualTo(value1); } @Test @@ -671,7 +673,7 @@ public class RedisTemplateTests { V value1 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); redisTemplate.renameIfAbsent(key1, key2); - assertTrue(redisTemplate.hasKey(key2)); + assertThat(redisTemplate.hasKey(key2)).isTrue(); } @Test @@ -679,18 +681,18 @@ public class RedisTemplateTests { K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); - assertEquals(DataType.STRING, redisTemplate.type(key1)); + assertThat(redisTemplate.type(key1)).isEqualTo(DataType.STRING); } @Test // DATAREDIS-506 public void testWatch() { - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); - final V value2 = valueFactory.instance(); - final V value3 = valueFactory.instance(); + V value2 = valueFactory.instance(); + V value3 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); - final Thread th = new Thread(() -> redisTemplate.opsForValue().set(key1, value2)); + Thread th = new Thread(() -> redisTemplate.opsForValue().set(key1, value2)); List results = redisTemplate.execute(new SessionCallback>() { @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -709,20 +711,20 @@ public class RedisTemplateTests { } }); - assertThat(results, is(empty())); + assertThat(results).isEmpty(); - assertThat(redisTemplate.opsForValue().get(key1), isEqual(value2)); + assertThat(redisTemplate.opsForValue().get(key1)).isEqualTo(value2); } @Test public void testUnwatch() { - final K key1 = keyFactory.instance(); + K key1 = keyFactory.instance(); V value1 = valueFactory.instance(); - final V value2 = valueFactory.instance(); - final V value3 = valueFactory.instance(); + V value2 = valueFactory.instance(); + V value3 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); - final Thread th = new Thread(() -> redisTemplate.opsForValue().set(key1, value2)); + Thread th = new Thread(() -> redisTemplate.opsForValue().set(key1, value2)); List results = redisTemplate.execute(new SessionCallback>() { @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -742,21 +744,21 @@ public class RedisTemplateTests { } }); - assertTrue(results.size() == 1); - assertThat(redisTemplate.opsForValue().get(key1), isEqual(value3)); + assertThat(results.size() == 1).isTrue(); + assertThat(redisTemplate.opsForValue().get(key1)).isEqualTo(value3); } @Test // DATAREDIS-506 public void testWatchMultipleKeys() { - final K key1 = keyFactory.instance(); - final K key2 = keyFactory.instance(); + K key1 = keyFactory.instance(); + K key2 = keyFactory.instance(); V value1 = valueFactory.instance(); - final V value2 = valueFactory.instance(); - final V value3 = valueFactory.instance(); + V value2 = valueFactory.instance(); + V value3 = valueFactory.instance(); redisTemplate.opsForValue().set(key1, value1); - final Thread th = new Thread(() -> redisTemplate.opsForValue().set(key1, value2)); + Thread th = new Thread(() -> redisTemplate.opsForValue().set(key1, value2)); List results = redisTemplate.execute(new SessionCallback>() { @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -778,9 +780,9 @@ public class RedisTemplateTests { } }); - assertThat(results, is(empty())); + assertThat(results).isEmpty(); - assertThat(redisTemplate.opsForValue().get(key1), isEqual(value2)); + assertThat(redisTemplate.opsForValue().get(key1)).isEqualTo(value2); } @Test @@ -794,16 +796,16 @@ public class RedisTemplateTests { public void testExecuteScriptCustomSerializers() { assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6")); K key1 = keyFactory.instance(); - final DefaultRedisScript script = new DefaultRedisScript<>(); + DefaultRedisScript script = new DefaultRedisScript<>(); script.setScriptText("return 'Hey'"); script.setResultType(String.class); - assertEquals("Hey", redisTemplate.execute(script, redisTemplate.getValueSerializer(), StringRedisSerializer.UTF_8, - Collections.singletonList(key1))); + assertThat(redisTemplate.execute(script, redisTemplate.getValueSerializer(), StringRedisSerializer.UTF_8, + Collections.singletonList(key1))).isEqualTo("Hey"); } @Test public void clientListShouldReturnCorrectly() { - assertThat(redisTemplate.getClientList().size(), IsNot.not(0)); + assertThat(redisTemplate.getClientList().size()).isNotEqualTo(0); } @Test // DATAREDIS-529 @@ -816,7 +818,7 @@ public class RedisTemplateTests { redisTemplate.opsForValue().multiSet(source); - assertThat(redisTemplate.countExistingKeys(source.keySet()), is(3L)); + assertThat(redisTemplate.countExistingKeys(source.keySet())).isEqualTo(3L); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java index c2f55d197..2ddf1ed43 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsNull.*; -import static org.hamcrest.core.IsSame.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.Serializable; @@ -90,8 +87,8 @@ public class RedisTemplateUnitTests { .thenReturn(new JdkSerializationRedisSerializer().serialize(new SomeArbitrarySerializableObject())); Object deserialized = template.opsForValue().get("spring"); - assertThat(deserialized, notNullValue()); - assertThat(deserialized.getClass().getClassLoader(), is((ClassLoader) scl)); + assertThat(deserialized).isNotNull(); + assertThat(deserialized.getClass().getClassLoader()).isEqualTo((ClassLoader) scl); } @Test // DATAREDIS-531 @@ -100,7 +97,7 @@ public class RedisTemplateUnitTests { CapturingCallback callback = new CapturingCallback(); template.executeWithStickyConnection(callback); - assertThat(callback.getConnection(), sameInstance(redisConnectionMock)); + assertThat(callback.getConnection()).isSameAs(redisConnectionMock); verify(redisConnectionMock, never()).close(); } diff --git a/src/test/java/org/springframework/data/redis/core/ScanCursorUnitTests.java b/src/test/java/org/springframework/data/redis/core/ScanCursorUnitTests.java index 397a83dc0..a5b8e9dc4 100644 --- a/src/test/java/org/springframework/data/redis/core/ScanCursorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/ScanCursorUnitTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.core; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.ArrayList; @@ -32,6 +30,7 @@ import java.util.Stack; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.dao.InvalidDataAccessApiUsageException; /** @@ -45,7 +44,7 @@ public class ScanCursorUnitTests { public void cursorShouldNotLoopWhenNoValuesFound() { CapturingCursorDummy cursor = initCursor(new LinkedList<>()); - assertThat(cursor.hasNext(), is(false)); + assertThat(cursor.hasNext()).isFalse(); } @Test(expected = NoSuchElementException.class) // DATAREDIS-290 @@ -60,17 +59,17 @@ public class ScanCursorUnitTests { values.add(createIteration(0, "spring", "data", "redis")); CapturingCursorDummy cursor = initCursor(values); - assertThat(cursor.next(), is("spring")); - assertThat(cursor.getCursorId(), is(0L)); - assertThat(cursor.hasNext(), is(true)); + assertThat(cursor.next()).isEqualTo("spring"); + assertThat(cursor.getCursorId()).isEqualTo(0L); + assertThat(cursor.hasNext()).isTrue(); - assertThat(cursor.next(), is("data")); - assertThat(cursor.getCursorId(), is(0L)); - assertThat(cursor.hasNext(), is(true)); + assertThat(cursor.next()).isEqualTo("data"); + assertThat(cursor.getCursorId()).isEqualTo(0L); + assertThat(cursor.hasNext()).isTrue(); - assertThat(cursor.next(), is("redis")); - assertThat(cursor.getCursorId(), is(0L)); - assertThat(cursor.hasNext(), is(false)); + assertThat(cursor.next()).isEqualTo("redis"); + assertThat(cursor.getCursorId()).isEqualTo(0L); + assertThat(cursor.hasNext()).isFalse(); } @Test // DATAREDIS-290 @@ -82,17 +81,17 @@ public class ScanCursorUnitTests { values.add(createIteration(0, "redis")); CapturingCursorDummy cursor = initCursor(values); - assertThat(cursor.next(), is("spring")); - assertThat(cursor.getCursorId(), is(1L)); - assertThat(cursor.hasNext(), is(true)); + assertThat(cursor.next()).isEqualTo("spring"); + assertThat(cursor.getCursorId()).isEqualTo(1L); + assertThat(cursor.hasNext()).isTrue(); - assertThat(cursor.next(), is("data")); - assertThat(cursor.getCursorId(), is(2L)); - assertThat(cursor.hasNext(), is(true)); + assertThat(cursor.next()).isEqualTo("data"); + assertThat(cursor.getCursorId()).isEqualTo(2L); + assertThat(cursor.hasNext()).isTrue(); - assertThat(cursor.next(), is("redis")); - assertThat(cursor.getCursorId(), is(0L)); - assertThat(cursor.hasNext(), is(false)); + assertThat(cursor.next()).isEqualTo("redis"); + assertThat(cursor.getCursorId()).isEqualTo(0L); + assertThat(cursor.hasNext()).isFalse(); } @Test // DATAREDIS-290 @@ -100,7 +99,7 @@ public class ScanCursorUnitTests { CapturingCursorDummy cursor = new CapturingCursorDummy(null); - assertThat(cursor.isClosed(), is(false)); + assertThat(cursor.isClosed()).isFalse(); exception.expect(InvalidDataAccessApiUsageException.class); exception.expectMessage("closed cursor"); @@ -117,12 +116,12 @@ public class ScanCursorUnitTests { values.add(createIteration(0, "redis")); Cursor cursor = initCursor(values).open(); - assertThat(cursor.next(), is("spring")); - assertThat(cursor.getCursorId(), is(1L)); + assertThat(cursor.next()).isEqualTo("spring"); + assertThat(cursor.getCursorId()).isEqualTo(1L); // close the cursor cursor.close(); - assertThat(cursor.isClosed(), is(true)); + assertThat(cursor.isClosed()).isTrue(); // reopen cursor at last position cursor.open(); @@ -137,13 +136,13 @@ public class ScanCursorUnitTests { values.add(createIteration(0, "redis")); Cursor cursor = initCursor(values); - assertThat(cursor.getPosition(), is(0L)); + assertThat(cursor.getPosition()).isEqualTo(0L); cursor.next(); - assertThat(cursor.getPosition(), is(1L)); + assertThat(cursor.getPosition()).isEqualTo(1L); cursor.next(); - assertThat(cursor.getPosition(), is(2L)); + assertThat(cursor.getPosition()).isEqualTo(2L); } @Test // DATAREDIS-417 @@ -163,8 +162,8 @@ public class ScanCursorUnitTests { result.add(cursor.next()); } - assertThat(result.size(), is(2)); - assertThat(result, hasItems("spring", "redis")); + assertThat(result.size()).isEqualTo(2); + assertThat(result).contains("spring", "redis"); } @Test // DATAREDIS-417 @@ -186,8 +185,8 @@ public class ScanCursorUnitTests { result.add(cursor.next()); } - assertThat(result.size(), is(2)); - assertThat(result, hasItems("spring", "data")); + assertThat(result.size()).isEqualTo(2); + assertThat(result).contains("spring", "data"); } @Test // DATAREDIS-417 @@ -202,7 +201,7 @@ public class ScanCursorUnitTests { values.add(createIteration(0)); Cursor cursor = initCursor(values); - assertThat(cursor.getPosition(), is(0L)); + assertThat(cursor.getPosition()).isEqualTo(0L); int loops = 0; while (cursor.hasNext()) { @@ -210,8 +209,8 @@ public class ScanCursorUnitTests { loops++; } - assertThat(loops, is(0)); - assertThat(cursor.getCursorId(), is(0L)); + assertThat(loops).isEqualTo(0); + assertThat(cursor.getCursorId()).isEqualTo(0L); } private CapturingCursorDummy initCursor(Queue> values) { diff --git a/src/test/java/org/springframework/data/redis/core/SessionTest.java b/src/test/java/org/springframework/data/redis/core/SessionTest.java index ec34ee087..448602c17 100644 --- a/src/test/java/org/springframework/data/redis/core/SessionTest.java +++ b/src/test/java/org/springframework/data/redis/core/SessionTest.java @@ -15,10 +15,11 @@ */ package org.springframework.data.redis.core; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; + import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.StringRedisConnection; @@ -42,7 +43,7 @@ public class SessionTest { public Object execute(RedisOperations operations) { checkConnection(template, stringConn); template.discard(); - assertSame(template, operations); + assertThat(operations).isSameAs(template); checkConnection(template, stringConn); return null; } @@ -51,7 +52,7 @@ public class SessionTest { private void checkConnection(RedisTemplate template, final RedisConnection expectedConnection) { template.execute(connection -> { - assertSame(expectedConnection, connection); + assertThat(connection).isSameAs(expectedConnection); return null; }, true); } diff --git a/src/test/java/org/springframework/data/redis/core/convert/BinaryKeyspaceIdentifierUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/BinaryKeyspaceIdentifierUnitTests.java index 5145fd08a..6c553fb80 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/BinaryKeyspaceIdentifierUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/BinaryKeyspaceIdentifierUnitTests.java @@ -15,10 +15,10 @@ */ package org.springframework.data.redis.core.convert; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; + import org.springframework.data.redis.core.convert.MappingRedisConverter.BinaryKeyspaceIdentifier; /** @@ -31,37 +31,35 @@ public class BinaryKeyspaceIdentifierUnitTests { @Test // DATAREDIS-744 public void shouldReturnIfKeyIsValid() { - assertThat(BinaryKeyspaceIdentifier.isValid(null), is(false)); - assertThat(BinaryKeyspaceIdentifier.isValid("foo".getBytes()), is(false)); - assertThat(BinaryKeyspaceIdentifier.isValid("".getBytes()), is(false)); - assertThat(BinaryKeyspaceIdentifier.isValid("foo:bar".getBytes()), is(true)); - assertThat(BinaryKeyspaceIdentifier.isValid("foo:bar:baz".getBytes()), is(true)); - assertThat(BinaryKeyspaceIdentifier.isValid("foo:bar:baz:phantom".getBytes()), is(true)); + assertThat(BinaryKeyspaceIdentifier.isValid(null)).isFalse(); + assertThat(BinaryKeyspaceIdentifier.isValid("foo".getBytes())).isFalse(); + assertThat(BinaryKeyspaceIdentifier.isValid("".getBytes())).isFalse(); + assertThat(BinaryKeyspaceIdentifier.isValid("foo:bar".getBytes())).isTrue(); + assertThat(BinaryKeyspaceIdentifier.isValid("foo:bar:baz".getBytes())).isTrue(); + assertThat(BinaryKeyspaceIdentifier.isValid("foo:bar:baz:phantom".getBytes())).isTrue(); } @Test // DATAREDIS-744 public void shouldReturnKeyspace() { - assertThat(BinaryKeyspaceIdentifier.of("foo:bar".getBytes()).getKeyspace(), is(equalTo("foo".getBytes()))); - assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz".getBytes()).getKeyspace(), is(equalTo("foo".getBytes()))); - assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz:phantom".getBytes()).getKeyspace(), - is(equalTo("foo".getBytes()))); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar".getBytes()).getKeyspace()).isEqualTo("foo".getBytes()); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz".getBytes()).getKeyspace()).isEqualTo("foo".getBytes()); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz:phantom".getBytes()).getKeyspace()).isEqualTo("foo".getBytes()); } @Test // DATAREDIS-744 public void shouldReturnId() { - assertThat(BinaryKeyspaceIdentifier.of("foo:bar".getBytes()).getId(), is(equalTo("bar".getBytes()))); - assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz".getBytes()).getId(), is(equalTo("bar:baz".getBytes()))); - assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz:phantom".getBytes()).getId(), - is(equalTo("bar:baz".getBytes()))); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar".getBytes()).getId()).isEqualTo("bar".getBytes()); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz".getBytes()).getId()).isEqualTo("bar:baz".getBytes()); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz:phantom".getBytes()).getId()).isEqualTo("bar:baz".getBytes()); } @Test // DATAREDIS-744 public void shouldReturnPhantomKey() { - assertThat(BinaryKeyspaceIdentifier.of("foo:bar".getBytes()).isPhantomKey(), is(false)); - assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz".getBytes()).isPhantomKey(), is(false)); - assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz:phantom".getBytes()).isPhantomKey(), is(true)); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar".getBytes()).isPhantomKey()).isFalse(); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz".getBytes()).isPhantomKey()).isFalse(); + assertThat(BinaryKeyspaceIdentifier.of("foo:bar:baz:phantom".getBytes()).isPhantomKey()).isTrue(); } } diff --git a/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java index 9c5eba0ff..c7d16538b 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core.convert; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -26,6 +25,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.util.TypeInformation; /** @@ -58,6 +58,6 @@ public class CompositeIndexResolverUnitTests { CompositeIndexResolver resolver = new CompositeIndexResolver(Arrays.asList(resolver1, resolver2)); - assertThat(resolver.resolveIndexesFor(typeInfoMock, "o.O").size(), equalTo(2)); + assertThat(resolver.resolveIndexesFor(typeInfoMock, "o.O").size()).isEqualTo(2); } } diff --git a/src/test/java/org/springframework/data/redis/core/convert/KeyspaceIdentifierUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/KeyspaceIdentifierUnitTests.java index 934d7a7b7..6246bfce0 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/KeyspaceIdentifierUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/KeyspaceIdentifierUnitTests.java @@ -15,10 +15,10 @@ */ package org.springframework.data.redis.core.convert; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; + import org.springframework.data.redis.core.convert.MappingRedisConverter.KeyspaceIdentifier; /** @@ -31,35 +31,35 @@ public class KeyspaceIdentifierUnitTests { @Test // DATAREDIS-744 public void shouldReturnIfKeyIsValid() { - assertThat(KeyspaceIdentifier.isValid(null), is(false)); - assertThat(KeyspaceIdentifier.isValid("foo"), is(false)); - assertThat(KeyspaceIdentifier.isValid(""), is(false)); - assertThat(KeyspaceIdentifier.isValid("foo:bar"), is(true)); - assertThat(KeyspaceIdentifier.isValid("foo:bar:baz"), is(true)); - assertThat(KeyspaceIdentifier.isValid("foo:bar:baz:phantom"), is(true)); + assertThat(KeyspaceIdentifier.isValid(null)).isFalse(); + assertThat(KeyspaceIdentifier.isValid("foo")).isFalse(); + assertThat(KeyspaceIdentifier.isValid("")).isFalse(); + assertThat(KeyspaceIdentifier.isValid("foo:bar")).isTrue(); + assertThat(KeyspaceIdentifier.isValid("foo:bar:baz")).isTrue(); + assertThat(KeyspaceIdentifier.isValid("foo:bar:baz:phantom")).isTrue(); } @Test // DATAREDIS-744 public void shouldReturnKeyspace() { - assertThat(KeyspaceIdentifier.of("foo:bar").getKeyspace(), is("foo")); - assertThat(KeyspaceIdentifier.of("foo:bar:baz").getKeyspace(), is("foo")); - assertThat(KeyspaceIdentifier.of("foo:bar:baz:phantom").getKeyspace(), is("foo")); + assertThat(KeyspaceIdentifier.of("foo:bar").getKeyspace()).isEqualTo("foo"); + assertThat(KeyspaceIdentifier.of("foo:bar:baz").getKeyspace()).isEqualTo("foo"); + assertThat(KeyspaceIdentifier.of("foo:bar:baz:phantom").getKeyspace()).isEqualTo("foo"); } @Test // DATAREDIS-744 public void shouldReturnId() { - assertThat(KeyspaceIdentifier.of("foo:bar").getId(), is("bar")); - assertThat(KeyspaceIdentifier.of("foo:bar:baz").getId(), is("bar:baz")); - assertThat(KeyspaceIdentifier.of("foo:bar:baz:phantom").getId(), is("bar:baz")); + assertThat(KeyspaceIdentifier.of("foo:bar").getId()).isEqualTo("bar"); + assertThat(KeyspaceIdentifier.of("foo:bar:baz").getId()).isEqualTo("bar:baz"); + assertThat(KeyspaceIdentifier.of("foo:bar:baz:phantom").getId()).isEqualTo("bar:baz"); } @Test // DATAREDIS-744 public void shouldReturnPhantomKey() { - assertThat(KeyspaceIdentifier.of("foo:bar").isPhantomKey(), is(false)); - assertThat(KeyspaceIdentifier.of("foo:bar:baz").isPhantomKey(), is(false)); - assertThat(KeyspaceIdentifier.of("foo:bar:baz:phantom").isPhantomKey(), is(true)); + assertThat(KeyspaceIdentifier.of("foo:bar").isPhantomKey()).isFalse(); + assertThat(KeyspaceIdentifier.of("foo:bar:baz").isPhantomKey()).isFalse(); + assertThat(KeyspaceIdentifier.of("foo:bar:baz:phantom").isPhantomKey()).isTrue(); } } 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 365bf535a..4455cc95d 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 @@ -15,14 +15,10 @@ */ package org.springframework.data.redis.core.convert; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.contains; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.data.redis.core.convert.ConversionTestEntities.*; -import static org.springframework.data.redis.test.util.IsBucketMatcher.*; -import java.io.Serializable; import java.nio.charset.Charset; import java.time.Duration; import java.time.Instant; @@ -32,9 +28,16 @@ import java.time.LocalTime; import java.time.Period; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; -import org.hamcrest.core.IsEqual; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,6 +45,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.ReadingConverter; import org.springframework.data.convert.WritingConverter; @@ -51,6 +55,7 @@ import org.springframework.data.redis.core.convert.KeyspaceConfiguration.Keyspac import org.springframework.data.redis.core.convert.ConversionTestEntities.*; import org.springframework.data.redis.core.mapping.RedisMappingContext; import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.test.util.RedisTestData; import org.springframework.util.StringUtils; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; @@ -82,7 +87,7 @@ public class MappingRedisConverterUnitTests { @Test // DATAREDIS-425 public void writeAppendsTypeHintForRootCorrectly() { - assertThat(write(rand).getBucket(), isBucket().containingTypeHint("_class", Person.class)); + assertThat(write(rand)).containingTypeHint("_class", Person.class); } @Test // DATAREDIS-543 @@ -91,7 +96,7 @@ public class MappingRedisConverterUnitTests { converter = new MappingRedisConverter(new RedisMappingContext(), null, resolverMock); converter.afterPropertiesSet(); - assertThat(write(rand).getBucket(), isBucket().containingTypeHint("_class", Person.class)); + assertThat(write(rand)).containingTypeHint("_class", Person.class); } @Test // DATAREDIS-425 @@ -99,7 +104,7 @@ public class MappingRedisConverterUnitTests { rand.id = "1"; - assertThat(write(rand).getId(), is("1")); + assertThat(write(rand).getId()).isEqualTo("1"); } @Test // DATAREDIS-425 @@ -112,10 +117,10 @@ public class MappingRedisConverterUnitTests { rand.id = "1"; rand.address = address; - RedisData data = write(rand); + RedisTestData data = write(rand); - assertThat(data.getId(), is((Serializable) "1")); - assertThat(data.getBucket(), isBucket().containingUtf8String("address.id", "tear")); + assertThat(data.getId()).isEqualTo("1"); + assertThat(data).containsEntry("address.id", "tear"); } @Test // DATAREDIS-425 @@ -123,7 +128,7 @@ public class MappingRedisConverterUnitTests { rand.firstname = "rand"; - assertThat(write(rand).getBucket(), isBucket().without("lastname")); + assertThat(write(rand)).without("lastname"); } @Test // DATAREDIS-425 @@ -131,7 +136,7 @@ public class MappingRedisConverterUnitTests { rand.firstname = "rand"; - assertThat(write(rand).getBucket(), isBucket().without("nicknames")); + assertThat(write(rand)).without("nicknames"); } @Test // DATAREDIS-425 @@ -139,7 +144,7 @@ public class MappingRedisConverterUnitTests { rand.firstname = "nynaeve"; - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("firstname", "nynaeve")); + assertThat(write(rand)).containsEntry("firstname", "nynaeve"); } @Test // DATAREDIS-425 @@ -147,10 +152,9 @@ public class MappingRedisConverterUnitTests { rand.nicknames = Arrays.asList("dragon reborn", "lews therin"); - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().containingUtf8String("nicknames.[0]", "dragon reborn") - .containingUtf8String("nicknames.[1]", "lews therin")); + assertThat(target).containsEntry("nicknames.[0]", "dragon reborn").containsEntry("nicknames.[1]", "lews therin"); } @Test // DATAREDIS-425 @@ -161,10 +165,9 @@ public class MappingRedisConverterUnitTests { address.country = "andora"; rand.address = address; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().containingUtf8String("address.city", "two rivers") - .containingUtf8String("address.country", "andora")); + assertThat(target).containsEntry("address.city", "two rivers").containsEntry("address.country", "andora"); } @Test // DATAREDIS-425 @@ -172,7 +175,7 @@ public class MappingRedisConverterUnitTests { Person mat = new Person(); mat.firstname = "mat"; - mat.nicknames = Arrays.asList("prince of the ravens"); + mat.nicknames = Collections.singletonList("prince of the ravens"); Person perrin = new Person(); perrin.firstname = "perrin"; @@ -183,13 +186,12 @@ public class MappingRedisConverterUnitTests { rand.id = UUID.randomUUID().toString(); rand.firstname = "rand"; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), - isBucket().containingUtf8String("coworkers.[0].firstname", "mat") // - .containingUtf8String("coworkers.[0].nicknames.[0]", "prince of the ravens") // - .containingUtf8String("coworkers.[1].firstname", "perrin") // - .containingUtf8String("coworkers.[1].address.city", "two rivers")); + assertThat(target).containsEntry("coworkers.[0].firstname", "mat") // + .containsEntry("coworkers.[0].nicknames.[0]", "prince of the ravens") // + .containsEntry("coworkers.[1].firstname", "perrin") // + .containsEntry("coworkers.[1].address.city", "two rivers"); } @Test // DATAREDIS-425 @@ -200,9 +202,9 @@ public class MappingRedisConverterUnitTests { rand.address = address; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().without("address._class")); + assertThat(target).without("address._class"); } @Test // DATAREDIS-425, DATAREDIS-543 @@ -214,9 +216,9 @@ public class MappingRedisConverterUnitTests { rand.address = address; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().containingUtf8String("address._class", "with-post-code")); + assertThat(target).containsEntry("address._class", "with-post-code"); } @Test // DATAREDIS-425 @@ -228,7 +230,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.address, instanceOf(AddressWithPostcode.class)); + assertThat(target.address).isInstanceOf(AddressWithPostcode.class); } @Test // DATAREDIS-544 @@ -246,14 +248,14 @@ public class MappingRedisConverterUnitTests { RecursiveConstructorPerson target = converter.read(RecursiveConstructorPerson.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.id, is("bart")); - assertThat(target.firstname, is("Bart")); - assertThat(target.lastname, is("Simpson")); - assertThat(target.father, is(notNullValue())); - assertThat(target.father.id, is("homer")); - assertThat(target.father.firstname, is("Homer")); - assertThat(target.father.lastname, is("Simpson")); - assertThat(target.father.father, is(nullValue())); + assertThat(target.id).isEqualTo("bart"); + assertThat(target.firstname).isEqualTo("Bart"); + assertThat(target.lastname).isEqualTo("Simpson"); + assertThat(target.father).isNotNull(); + assertThat(target.father.id).isEqualTo("homer"); + assertThat(target.father.firstname).isEqualTo("Homer"); + assertThat(target.father.lastname).isEqualTo("Simpson"); + assertThat(target.father.father).isNull(); } @Test // DATAREDIS-425 @@ -262,11 +264,11 @@ public class MappingRedisConverterUnitTests { Person mat = new TaVeren(); mat.firstname = "mat"; - rand.coworkers = Arrays.asList(mat); + rand.coworkers = Collections.singletonList(mat); - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().containingTypeHint("coworkers.[0]._class", TaVeren.class)); + assertThat(target).containingTypeHint("coworkers.[0]._class", TaVeren.class); } @Test // DATAREDIS-425 @@ -274,7 +276,7 @@ public class MappingRedisConverterUnitTests { RedisData rdo = new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("firstname", "rand"))); - assertThat(converter.read(Person.class, rdo).firstname, is("rand")); + assertThat(converter.read(Person.class, rdo).firstname).isEqualTo("rand"); } @Test // DATAREDIS-425 @@ -285,7 +287,7 @@ public class MappingRedisConverterUnitTests { map.put("nicknames.[1]", "lews therin"); RedisData rdo = new RedisData(Bucket.newBucketFromStringMap(map)); - assertThat(converter.read(Person.class, rdo).nicknames, contains("dragon reborn", "lews therin")); + assertThat(converter.read(Person.class, rdo).nicknames).containsExactly("dragon reborn", "lews therin"); } @Test // DATAREDIS-425 @@ -297,7 +299,8 @@ public class MappingRedisConverterUnitTests { map.put("nicknames.[1]", "dragon reborn"); RedisData rdo = new RedisData(Bucket.newBucketFromStringMap(map)); - assertThat(converter.read(Person.class, rdo).nicknames, contains("dragon reborn", "car'a'carn", "lews therin")); + assertThat(converter.read(Person.class, rdo).nicknames).containsExactly("dragon reborn", "car'a'carn", + "lews therin"); } @Test // DATAREDIS-768 @@ -309,7 +312,7 @@ public class MappingRedisConverterUnitTests { map.put("positions.[1]", "2"); RedisData rdo = new RedisData(Bucket.newBucketFromStringMap(map)); - assertThat(converter.read(Person.class, rdo).positions, contains(2, 0, 1)); + assertThat(converter.read(Person.class, rdo).positions).containsExactly(2, 0, 1); } @Test // DATAREDIS-425 @@ -322,9 +325,9 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, rdo); - assertThat(target.address, notNullValue()); - assertThat(target.address.city, is("two rivers")); - assertThat(target.address.country, is("andor")); + assertThat(target.address).isNotNull(); + assertThat(target.address.city).isEqualTo("two rivers"); + assertThat(target.address.country).isEqualTo("andor"); } @Test // DATAREDIS-425 @@ -340,14 +343,14 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, rdo); - assertThat(target.coworkers, notNullValue()); - assertThat(target.coworkers.get(0).firstname, is("mat")); - assertThat(target.coworkers.get(0).nicknames, notNullValue()); - assertThat(target.coworkers.get(0).nicknames.get(0), is("prince of the ravens")); - assertThat(target.coworkers.get(0).nicknames.get(1), is("gambler")); + assertThat(target.coworkers).isNotNull(); + assertThat(target.coworkers.get(0).firstname).isEqualTo("mat"); + assertThat(target.coworkers.get(0).nicknames).isNotNull(); + assertThat(target.coworkers.get(0).nicknames.get(0)).isEqualTo("prince of the ravens"); + assertThat(target.coworkers.get(0).nicknames.get(1)).isEqualTo("gambler"); - assertThat(target.coworkers.get(1).firstname, is("perrin")); - assertThat(target.coworkers.get(1).address.city, is("two rivers")); + assertThat(target.coworkers.get(1).firstname).isEqualTo("perrin"); + assertThat(target.coworkers.get(1).address.city).isEqualTo("two rivers"); } @Test // DATAREDIS-425 @@ -364,14 +367,14 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, rdo); - assertThat(target.coworkers, notNullValue()); - assertThat(target.coworkers.get(0).firstname, is("mat")); - assertThat(target.coworkers.get(0).nicknames, notNullValue()); - assertThat(target.coworkers.get(0).nicknames.get(0), is("prince of the ravens")); - assertThat(target.coworkers.get(0).nicknames.get(1), is("gambler")); + assertThat(target.coworkers).isNotNull(); + assertThat(target.coworkers.get(0).firstname).isEqualTo("mat"); + assertThat(target.coworkers.get(0).nicknames).isNotNull(); + assertThat(target.coworkers.get(0).nicknames.get(0)).isEqualTo("prince of the ravens"); + assertThat(target.coworkers.get(0).nicknames.get(1)).isEqualTo("gambler"); - assertThat(target.coworkers.get(1).firstname, is("perrin")); - assertThat(target.coworkers.get(1).address.city, is("two rivers")); + assertThat(target.coworkers.get(1).firstname).isEqualTo("perrin"); + assertThat(target.coworkers.get(1).address.city).isEqualTo("two rivers"); } @Test // DATAREDIS-425 @@ -385,9 +388,9 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, rdo); - assertThat(target.coworkers, notNullValue()); - assertThat(target.coworkers.get(0), instanceOf(TaVeren.class)); - assertThat(target.coworkers.get(0).firstname, is("mat")); + assertThat(target.coworkers).isNotNull(); + assertThat(target.coworkers.get(0)).isInstanceOf(TaVeren.class); + assertThat(target.coworkers.get(0).firstname).isEqualTo("mat"); } @Test // DATAREDIS-425 @@ -399,10 +402,10 @@ public class MappingRedisConverterUnitTests { rand.physicalAttributes = map; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().containingUtf8String("physicalAttributes.[hair-color]", "red") // - .containingUtf8String("physicalAttributes.[eye-color]", "grey")); + assertThat(target).containsEntry("physicalAttributes.[hair-color]", "red") // + .containsEntry("physicalAttributes.[eye-color]", "grey"); } @Test // DATAREDIS-425 @@ -416,11 +419,10 @@ public class MappingRedisConverterUnitTests { rand.coworkers.add(new Person()); rand.coworkers.get(0).physicalAttributes = map; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), - isBucket().containingUtf8String("coworkers.[0].physicalAttributes.[hair-color]", "red") // - .containingUtf8String("coworkers.[0].physicalAttributes.[eye-color]", "grey")); + assertThat(target).containsEntry("coworkers.[0].physicalAttributes.[hair-color]", "red") // + .containsEntry("coworkers.[0].physicalAttributes.[eye-color]", "grey"); } @Test // DATAREDIS-425 @@ -434,9 +436,9 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, rdo); - assertThat(target.physicalAttributes, notNullValue()); - assertThat(target.physicalAttributes.get("hair-color"), is("red")); - assertThat(target.physicalAttributes.get("eye-color"), is("grey")); + assertThat(target.physicalAttributes).isNotNull(); + assertThat(target.physicalAttributes.get("hair-color")).isEqualTo("red"); + assertThat(target.physicalAttributes.get("eye-color")).isEqualTo("grey"); } @Test // DATAREDIS-768 @@ -450,9 +452,9 @@ public class MappingRedisConverterUnitTests { TypeWithMaps target = converter.read(TypeWithMaps.class, rdo); - assertThat(target.integerMapKeyMapping, notNullValue()); - assertThat(target.integerMapKeyMapping.get(1), is(2)); - assertThat(target.integerMapKeyMapping.get(3), is(4)); + assertThat(target.integerMapKeyMapping).isNotNull(); + assertThat(target.integerMapKeyMapping.get(1)).isEqualTo(2); + assertThat(target.integerMapKeyMapping.get(3)).isEqualTo(4); } @Test // DATAREDIS-768 @@ -466,9 +468,9 @@ public class MappingRedisConverterUnitTests { TypeWithMaps target = converter.read(TypeWithMaps.class, rdo); - assertThat(target.decimalMapKeyMapping, notNullValue()); - assertThat(target.decimalMapKeyMapping.get(1.7D), is("2")); - assertThat(target.decimalMapKeyMapping.get(3.1D), is("4")); + assertThat(target.decimalMapKeyMapping).isNotNull(); + assertThat(target.decimalMapKeyMapping.get(1.7D)).isEqualTo("2"); + assertThat(target.decimalMapKeyMapping.get(3.1D)).isEqualTo("4"); } @Test // DATAREDIS-768 @@ -479,10 +481,10 @@ public class MappingRedisConverterUnitTests { source.decimalMapKeyMapping.put(1.7D, "2"); source.decimalMapKeyMapping.put(3.1D, "4"); - RedisData target = write(source); + RedisTestData target = write(source); - assertThat(target.getBucket(), isBucket().containingUtf8String("decimalMapKeyMapping.[1.7]", "2") // - .containingUtf8String("decimalMapKeyMapping.[3.1]", "4")); + assertThat(target).containsEntry("decimalMapKeyMapping.[1.7]", "2") // + .containsEntry("decimalMapKeyMapping.[3.1]", "4"); } @Test // DATAREDIS-768 @@ -497,8 +499,8 @@ public class MappingRedisConverterUnitTests { TypeWithMaps target = converter.read(TypeWithMaps.class, rdo); - assertThat(target.dateMapKeyMapping, notNullValue()); - assertThat(target.dateMapKeyMapping.get(judgmentDay), is("skynet")); + assertThat(target.dateMapKeyMapping).isNotNull(); + assertThat(target.dateMapKeyMapping.get(judgmentDay)).isEqualTo("skynet"); } @Test // DATAREDIS-768 @@ -509,8 +511,7 @@ public class MappingRedisConverterUnitTests { TypeWithMaps source = new TypeWithMaps(); source.dateMapKeyMapping = Collections.singletonMap(judgmentDay, "skynet"); - assertThat(write(source).getBucket(), - isBucket().containingUtf8String("dateMapKeyMapping.[" + judgmentDay.getTime() + "]", "skynet")); + assertThat(write(source)).containsEntry("dateMapKeyMapping.[" + judgmentDay.getTime() + "]", "skynet"); } @Test // DATAREDIS-425 @@ -526,10 +527,10 @@ public class MappingRedisConverterUnitTests { rand.relatives = map; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), isBucket().containingUtf8String("relatives.[father].firstname", "janduin") // - .containingUtf8String("relatives.[step-father].firstname", "tam")); + assertThat(target).containsEntry("relatives.[father].firstname", "janduin") // + .containsEntry("relatives.[step-father].firstname", "tam"); } @Test // DATAREDIS-425 @@ -541,11 +542,11 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.relatives, notNullValue()); - assertThat(target.relatives.get("father"), notNullValue()); - assertThat(target.relatives.get("father").firstname, is("janduin")); - assertThat(target.relatives.get("step-father"), notNullValue()); - assertThat(target.relatives.get("step-father").firstname, is("tam")); + assertThat(target.relatives).isNotNull(); + assertThat(target.relatives.get("father")).isNotNull(); + assertThat(target.relatives.get("father").firstname).isEqualTo("janduin"); + assertThat(target.relatives.get("step-father")).isNotNull(); + assertThat(target.relatives.get("step-father").firstname).isEqualTo("tam"); } @Test // DATAREDIS-768 @@ -557,11 +558,11 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.favoredRelatives, notNullValue()); - assertThat(target.favoredRelatives.get(1), notNullValue()); - assertThat(target.favoredRelatives.get(1).firstname, is("janduin")); - assertThat(target.favoredRelatives.get(2), notNullValue()); - assertThat(target.favoredRelatives.get(2).firstname, is("tam")); + assertThat(target.favoredRelatives).isNotNull(); + assertThat(target.favoredRelatives.get(1)).isNotNull(); + assertThat(target.favoredRelatives.get(1).firstname).isEqualTo("janduin"); + assertThat(target.favoredRelatives.get(2)).isNotNull(); + assertThat(target.favoredRelatives.get(2).firstname).isEqualTo("tam"); } @Test // DATAREDIS-425 @@ -574,10 +575,9 @@ public class MappingRedisConverterUnitTests { rand.relatives = map; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), - isBucket().containingTypeHint("relatives.[previous-incarnation]._class", TaVeren.class)); + assertThat(target).containingTypeHint("relatives.[previous-incarnation]._class", TaVeren.class); } @Test // DATAREDIS-425 @@ -589,9 +589,9 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.relatives.get("previous-incarnation"), notNullValue()); - assertThat(target.relatives.get("previous-incarnation"), instanceOf(TaVeren.class)); - assertThat(target.relatives.get("previous-incarnation").firstname, is("lews")); + assertThat(target.relatives.get("previous-incarnation")).isNotNull(); + assertThat(target.relatives.get("previous-incarnation")).isInstanceOf(TaVeren.class); + assertThat(target.relatives.get("previous-incarnation").firstname).isEqualTo("lews"); } @Test // DATAREDIS-425 @@ -599,7 +599,7 @@ public class MappingRedisConverterUnitTests { rand.age = 20; - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("age", "20")); + assertThat(write(rand)).containsEntry("age", "20"); } @Test // DATAREDIS-425 @@ -607,7 +607,7 @@ public class MappingRedisConverterUnitTests { rand.localDateTime = LocalDateTime.parse("2016-02-19T10:18:01"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("localDateTime", "2016-02-19T10:18:01")); + assertThat(write(rand)).containsEntry("localDateTime", "2016-02-19T10:18:01"); } @Test // DATAREDIS-425 @@ -616,7 +616,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("localDateTime", "2016-02-19T10:18:01")))); - assertThat(target.localDateTime, is(LocalDateTime.parse("2016-02-19T10:18:01"))); + assertThat(target.localDateTime).isEqualTo(LocalDateTime.parse("2016-02-19T10:18:01")); } @Test // DATAREDIS-425 @@ -624,7 +624,7 @@ public class MappingRedisConverterUnitTests { rand.localDate = LocalDate.parse("2016-02-19"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("localDate", "2016-02-19")); + assertThat(write(rand)).containsEntry("localDate", "2016-02-19"); } @Test // DATAREDIS-425 @@ -633,7 +633,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("localDate", "2016-02-19")))); - assertThat(target.localDate, is(LocalDate.parse("2016-02-19"))); + assertThat(target.localDate).isEqualTo(LocalDate.parse("2016-02-19")); } @Test // DATAREDIS-425 @@ -641,7 +641,7 @@ public class MappingRedisConverterUnitTests { rand.localTime = LocalTime.parse("11:12:13"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("localTime", "11:12:13")); + assertThat(write(rand)).containsEntry("localTime", "11:12:13"); } @Test // DATAREDIS-425 @@ -650,7 +650,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("localTime", "11:12")))); - assertThat(target.localTime, is(LocalTime.parse("11:12:00"))); + assertThat(target.localTime).isEqualTo(LocalTime.parse("11:12:00")); } @Test // DATAREDIS-425 @@ -658,8 +658,7 @@ public class MappingRedisConverterUnitTests { rand.zonedDateTime = ZonedDateTime.parse("2007-12-03T10:15:30+01:00[Europe/Paris]"); - assertThat(write(rand).getBucket(), - isBucket().containingUtf8String("zonedDateTime", "2007-12-03T10:15:30+01:00[Europe/Paris]")); + assertThat(write(rand)).containsEntry("zonedDateTime", "2007-12-03T10:15:30+01:00[Europe/Paris]"); } @Test // DATAREDIS-425 @@ -668,7 +667,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket .newBucketFromStringMap(Collections.singletonMap("zonedDateTime", "2007-12-03T10:15:30+01:00[Europe/Paris]")))); - assertThat(target.zonedDateTime, is(ZonedDateTime.parse("2007-12-03T10:15:30+01:00[Europe/Paris]"))); + assertThat(target.zonedDateTime).isEqualTo(ZonedDateTime.parse("2007-12-03T10:15:30+01:00[Europe/Paris]")); } @Test // DATAREDIS-425 @@ -676,7 +675,7 @@ public class MappingRedisConverterUnitTests { rand.instant = Instant.parse("2007-12-03T10:15:30.01Z"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("instant", "2007-12-03T10:15:30.010Z")); + assertThat(write(rand)).containsEntry("instant", "2007-12-03T10:15:30.010Z"); } @Test // DATAREDIS-425 @@ -685,7 +684,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("instant", "2007-12-03T10:15:30.01Z")))); - assertThat(target.instant, is(Instant.parse("2007-12-03T10:15:30.01Z"))); + assertThat(target.instant).isEqualTo(Instant.parse("2007-12-03T10:15:30.01Z")); } @Test // DATAREDIS-425 @@ -693,7 +692,7 @@ public class MappingRedisConverterUnitTests { rand.zoneId = ZoneId.of("Europe/Paris"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("zoneId", "Europe/Paris")); + assertThat(write(rand)).containsEntry("zoneId", "Europe/Paris"); } @Test // DATAREDIS-425 @@ -702,7 +701,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("zoneId", "Europe/Paris")))); - assertThat(target.zoneId, is(ZoneId.of("Europe/Paris"))); + assertThat(target.zoneId).isEqualTo(ZoneId.of("Europe/Paris")); } @Test // DATAREDIS-425 @@ -710,7 +709,7 @@ public class MappingRedisConverterUnitTests { rand.duration = Duration.parse("P2DT3H4M"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("duration", "PT51H4M")); + assertThat(write(rand)).containsEntry("duration", "PT51H4M"); } @Test // DATAREDIS-425 @@ -719,7 +718,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("duration", "PT51H4M")))); - assertThat(target.duration, is(Duration.parse("P2DT3H4M"))); + assertThat(target.duration).isEqualTo(Duration.parse("P2DT3H4M")); } @Test // DATAREDIS-425 @@ -727,7 +726,7 @@ public class MappingRedisConverterUnitTests { rand.period = Period.parse("P1Y2M25D"); - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("period", "P1Y2M25D")); + assertThat(write(rand)).containsEntry("period", "P1Y2M25D"); } @Test // DATAREDIS-425 @@ -736,7 +735,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("period", "P1Y2M25D")))); - assertThat(target.period, is(Period.parse("P1Y2M25D"))); + assertThat(target.period).isEqualTo(Period.parse("P1Y2M25D")); } @Test // DATAREDIS-425, DATAREDIS-593 @@ -744,7 +743,7 @@ public class MappingRedisConverterUnitTests { rand.gender = Gender.FEMALE; - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("gender", "FEMALE")); + assertThat(write(rand)).containsEntry("gender", "FEMALE"); } @Test // DATAREDIS-425, DATAREDIS-593 @@ -753,7 +752,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("gender", "FEMALE")))); - assertThat(target.gender, is(Gender.FEMALE)); + assertThat(target.gender).isEqualTo(Gender.FEMALE); } @Test // DATAREDIS-425 @@ -761,7 +760,7 @@ public class MappingRedisConverterUnitTests { rand.alive = Boolean.TRUE; - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("alive", "1")); + assertThat(write(rand)).containsEntry("alive", "1"); } @Test // DATAREDIS-425 @@ -770,7 +769,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("alive", "1")))); - assertThat(target.alive, is(Boolean.TRUE)); + assertThat(target.alive).isEqualTo(Boolean.TRUE); } @Test // DATAREDIS-425 @@ -779,7 +778,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(Collections.singletonMap("alive", "true")))); - assertThat(target.alive, is(Boolean.TRUE)); + assertThat(target.alive).isEqualTo(Boolean.TRUE); } @Test // DATAREDIS-425 @@ -790,7 +789,7 @@ public class MappingRedisConverterUnitTests { rand.birthdate = cal.getTime(); - assertThat(write(rand).getBucket(), isBucket().containingDateAsMsec("birthdate", rand.birthdate)); + assertThat(write(rand)).containsEntry("birthdate", rand.birthdate); } @Test // DATAREDIS-425 @@ -804,7 +803,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData( Bucket.newBucketFromStringMap(Collections.singletonMap("birthdate", Long.valueOf(date.getTime()).toString())))); - assertThat(target.birthdate, is(date)); + assertThat(target.birthdate).isEqualTo(date); } @Test // DATAREDIS-425 @@ -816,12 +815,11 @@ public class MappingRedisConverterUnitTests { rand.location = location; - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), - isBucket().containingUtf8String("location", "locations:1") // - .without("location.id") // - .without("location.name")); + assertThat(target).containsEntry("location", "locations:1") // + .without("location.id") // + .without("location.name"); } @Test // DATAREDIS-425 @@ -843,7 +841,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.location, is(location)); + assertThat(target.location).isEqualTo(location); } @Test // DATAREDIS-425 @@ -858,12 +856,9 @@ public class MappingRedisConverterUnitTests { rand.coworkers = Collections.singletonList(egwene); - RedisData target = write(rand); - - assertThat(target.getBucket(), - isBucket().containingUtf8String("coworkers.[0].location", "locations:1") // - .without("coworkers.[0].location.id") // - .without("coworkers.[0].location.name")); + assertThat(write(rand)).containsEntry("coworkers.[0].location", "locations:1") // + .without("coworkers.[0].location.id") // + .without("coworkers.[0].location.name"); } @Test // DATAREDIS-425 @@ -885,7 +880,7 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.coworkers.get(0).location, is(location)); + assertThat(target.coworkers.get(0).location).isEqualTo(location); } @Test // DATAREDIS-425 @@ -905,12 +900,11 @@ public class MappingRedisConverterUnitTests { rand.visited = Arrays.asList(tarValon, falme, tear); - RedisData target = write(rand); + RedisTestData target = write(rand); - assertThat(target.getBucket(), - isBucket().containingUtf8String("visited.[0]", "locations:1") // - .containingUtf8String("visited.[1]", "locations:2") // - .containingUtf8String("visited.[2]", "locations:3")); + assertThat(target).containsEntry("visited.[0]", "locations:1") // + .containsEntry("visited.[1]", "locations:2") // + .containsEntry("visited.[2]", "locations:3"); } @Test // DATAREDIS-425 @@ -956,9 +950,9 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.visited.get(0), is(tarValon)); - assertThat(target.visited.get(1), is(falme)); - assertThat(target.visited.get(2), is(tear)); + assertThat(target.visited.get(0)).isEqualTo(tarValon); + assertThat(target.visited.get(1)).isEqualTo(falme); + assertThat(target.visited.get(2)).isEqualTo(tear); } @Test // DATAREDIS-425 @@ -968,7 +962,7 @@ public class MappingRedisConverterUnitTests { birgitte.id = "birgitte"; birgitte.name = "Birgitte Silverbow"; - assertThat(write(birgitte).getTimeToLive(), is(5L)); + assertThat(write(birgitte).getRedisData().getTimeToLive()).isEqualTo(5L); } @Test // DATAREDIS-425 @@ -978,7 +972,7 @@ public class MappingRedisConverterUnitTests { tear.id = "tear"; tear.name = "Tear"; - assertThat(write(tear).getTimeToLive(), nullValue()); + assertThat(write(tear).getRedisData().getTimeToLive()).isNull(); } @Test // DATAREDIS-425 @@ -990,7 +984,7 @@ public class MappingRedisConverterUnitTests { Address address = new Address(); address.city = "Tear"; - assertThat(write(address).getKeyspace(), is("o_O")); + assertThat(write(address).getRedisData().getKeyspace()).isEqualTo("o_O"); } @Test // DATAREDIS-425 @@ -1005,7 +999,7 @@ public class MappingRedisConverterUnitTests { Address address = new Address(); address.city = "Tear"; - assertThat(write(address).getTimeToLive(), is(5L)); + assertThat(write(address).getRedisData().getTimeToLive()).isEqualTo(5L); } @Test // DATAREDIS-425, DATAREDIS-634 @@ -1025,8 +1019,7 @@ public class MappingRedisConverterUnitTests { address.country = "Tel'aran'rhiod"; address.city = "unknown"; - assertThat(write(address).getBucket(), - isBucket().containingUtf8String("_raw", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}")); + assertThat(write(address)).containsEntry("_raw", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"); } @Test // DATAREDIS-425, DATAREDIS-634 @@ -1047,8 +1040,7 @@ public class MappingRedisConverterUnitTests { address.city = "unknown"; rand.address = address; - assertThat(write(rand).getBucket(), - isBucket().containingUtf8String("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}")); + assertThat(write(rand)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"); } @Test // DATAREDIS-425 @@ -1063,8 +1055,8 @@ public class MappingRedisConverterUnitTests { address.country = "andor"; rand.address = address; - assertThat(write(rand).getIndexedData(), - hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "address.country", "andor"))); + assertThat(write(rand).getRedisData().getIndexedData()) + .contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "address.country", "andor")); } @Test // DATAREDIS-425 @@ -1080,7 +1072,7 @@ public class MappingRedisConverterUnitTests { address.city = "unknown"; rand.address = address; - assertThat(write(rand).getIndexedData().isEmpty(), is(false)); + assertThat(write(rand).getRedisData().getIndexedData().isEmpty()).isFalse(); } @Test // DATAREDIS-425 @@ -1096,8 +1088,8 @@ public class MappingRedisConverterUnitTests { Address target = converter.read(Address.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.city, is("unknown")); - assertThat(target.country, is("Tel'aran'rhiod")); + assertThat(target.city).isEqualTo("unknown"); + assertThat(target.country).isEqualTo("Tel'aran'rhiod"); } @Test // DATAREDIS-425 @@ -1113,9 +1105,9 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.address, notNullValue()); - assertThat(target.address.city, is("unknown")); - assertThat(target.address.country, is("Tel'aran'rhiod")); + assertThat(target.address).isNotNull(); + assertThat(target.address.city).isEqualTo("unknown"); + assertThat(target.address.country).isEqualTo("Tel'aran'rhiod"); } @Test // DATAREDIS-544 @@ -1132,9 +1124,9 @@ public class MappingRedisConverterUnitTests { PersonWithConstructorAndAddress target = converter.read(PersonWithConstructorAndAddress.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target.address, notNullValue()); - assertThat(target.address.city, is("unknown")); - assertThat(target.address.country, is("Tel'aran'rhiod")); + assertThat(target.address).isNotNull(); + assertThat(target.address.city).isEqualTo("unknown"); + assertThat(target.address.country).isEqualTo("Tel'aran'rhiod"); } @Test // DATAREDIS-425 @@ -1144,7 +1136,7 @@ public class MappingRedisConverterUnitTests { aviendha.id = "aviendha"; aviendha.ttl = 2L; - assertThat(write(aviendha).getTimeToLive(), is(120L)); + assertThat(write(aviendha).getRedisData().getTimeToLive()).isEqualTo(120L); } @Test // DATAREDIS-425 @@ -1153,7 +1145,7 @@ public class MappingRedisConverterUnitTests { ExipringPersonWithExplicitProperty aviendha = new ExipringPersonWithExplicitProperty(); aviendha.id = "aviendha"; - assertThat(write(aviendha).getTimeToLive(), is(5L)); + assertThat(write(aviendha).getRedisData().getTimeToLive()).isEqualTo(5L); } @Test // DATAREDIS-425 @@ -1168,8 +1160,8 @@ public class MappingRedisConverterUnitTests { myrddraal.name = "myrddraal"; myrddraal.alsoKnownAs = Arrays.asList("halfmen", "fades", "neverborn"); - assertThat(write(myrddraal).getBucket(), isBucket().containingUtf8String("species-name", "myrddraal") - .containingUtf8String("species-nicknames", "halfmen,fades,neverborn")); + assertThat(write(myrddraal)).containsEntry("species-name", "myrddraal").containsEntry("species-nicknames", + "halfmen,fades,neverborn"); } @Test // DATAREDIS-425 @@ -1183,7 +1175,7 @@ public class MappingRedisConverterUnitTests { rand.species = new Species(); rand.species.name = "human"; - assertThat(write(rand).getBucket(), isBucket().containingUtf8String("species.species-name", "human")); + assertThat(write(rand)).containsEntry("species.species-name", "human"); } @Test // DATAREDIS-425 @@ -1198,8 +1190,8 @@ public class MappingRedisConverterUnitTests { Species target = converter.read(Species.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target, notNullValue()); - assertThat(target.name, is("trolloc")); + assertThat(target).isNotNull(); + assertThat(target.name).isEqualTo("trolloc"); } @Test // DATAREDIS-425 @@ -1215,8 +1207,8 @@ public class MappingRedisConverterUnitTests { Person target = converter.read(Person.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target, notNullValue()); - assertThat(target.species.name, is("trolloc")); + assertThat(target).isNotNull(); + assertThat(target.species.name).isEqualTo("trolloc"); } @Test // DATAREDIS-425 @@ -1235,8 +1227,8 @@ public class MappingRedisConverterUnitTests { myrddraal.alsoKnownAs = Arrays.asList("halfmen", "fades", "neverborn"); twot.species.add(myrddraal); - assertThat(write(twot).getBucket(), isBucket().containingUtf8String("species.[0].species-name", "myrddraal") - .containingUtf8String("species.[0].species-nicknames", "halfmen,fades,neverborn")); + assertThat(write(twot)).containsEntry("species.[0].species-name", "myrddraal") + .containsEntry("species.[0].species-nicknames", "halfmen,fades,neverborn"); } @Test // DATAREDIS-425 @@ -1252,10 +1244,10 @@ public class MappingRedisConverterUnitTests { TheWheelOfTime target = converter.read(TheWheelOfTime.class, new RedisData(Bucket.newBucketFromStringMap(map))); - assertThat(target, notNullValue()); - assertThat(target.species, notNullValue()); - assertThat(target.species.get(0), notNullValue()); - assertThat(target.species.get(0).name, is("trolloc")); + assertThat(target).isNotNull(); + assertThat(target.species).isNotNull(); + assertThat(target.species.get(0)).isNotNull(); + assertThat(target.species.get(0).name).isEqualTo("trolloc"); } @Test // DATAREDIS-492 @@ -1264,10 +1256,8 @@ public class MappingRedisConverterUnitTests { WithArrays source = new WithArrays(); source.arrayOfSimpleTypes = new String[] { "rand", "mat", "perrin" }; - assertThat(write(source).getBucket(), - isBucket().containingUtf8String("arrayOfSimpleTypes.[0]", "rand") - .containingUtf8String("arrayOfSimpleTypes.[1]", "mat") - .containingUtf8String("arrayOfSimpleTypes.[2]", "perrin")); + assertThat(write(source)).containsEntry("arrayOfSimpleTypes.[0]", "rand") + .containsEntry("arrayOfSimpleTypes.[1]", "mat").containsEntry("arrayOfSimpleTypes.[2]", "perrin"); } @Test // DATAREDIS-492 @@ -1280,7 +1270,7 @@ public class MappingRedisConverterUnitTests { WithArrays target = read(WithArrays.class, source); - assertThat(target.arrayOfSimpleTypes, IsEqual.equalTo(new String[] { "rand", "mat", "perrin" })); + assertThat(target.arrayOfSimpleTypes).isEqualTo(new String[] { "rand", "mat", "perrin" }); } @Test // DATAREDIS-492 @@ -1297,12 +1287,11 @@ public class MappingRedisConverterUnitTests { source.arrayOfCompexTypes = new Species[] { trolloc, myrddraal }; - assertThat(write(source).getBucket(), - isBucket().containingUtf8String("arrayOfCompexTypes.[0].name", "trolloc") // - .containingUtf8String("arrayOfCompexTypes.[1].name", "myrddraal") // - .containingUtf8String("arrayOfCompexTypes.[1].alsoKnownAs.[0]", "halfmen") // - .containingUtf8String("arrayOfCompexTypes.[1].alsoKnownAs.[1]", "fades") // - .containingUtf8String("arrayOfCompexTypes.[1].alsoKnownAs.[2]", "neverborn")); + assertThat(write(source)).containsEntry("arrayOfCompexTypes.[0].name", "trolloc") // + .containsEntry("arrayOfCompexTypes.[1].name", "myrddraal") // + .containsEntry("arrayOfCompexTypes.[1].alsoKnownAs.[0]", "halfmen") // + .containsEntry("arrayOfCompexTypes.[1].alsoKnownAs.[1]", "fades") // + .containsEntry("arrayOfCompexTypes.[1].alsoKnownAs.[2]", "neverborn"); } @Test // DATAREDIS-492 @@ -1317,11 +1306,11 @@ public class MappingRedisConverterUnitTests { WithArrays target = read(WithArrays.class, source); - assertThat(target.arrayOfCompexTypes[0], notNullValue()); - assertThat(target.arrayOfCompexTypes[0].name, is("trolloc")); - assertThat(target.arrayOfCompexTypes[1], notNullValue()); - assertThat(target.arrayOfCompexTypes[1].name, is("myrddraal")); - assertThat(target.arrayOfCompexTypes[1].alsoKnownAs, contains("halfmen", "fades", "neverborn")); + assertThat(target.arrayOfCompexTypes[0]).isNotNull(); + assertThat(target.arrayOfCompexTypes[0].name).isEqualTo("trolloc"); + assertThat(target.arrayOfCompexTypes[1]).isNotNull(); + assertThat(target.arrayOfCompexTypes[1].name).isEqualTo("myrddraal"); + assertThat(target.arrayOfCompexTypes[1].alsoKnownAs).containsExactly("halfmen", "fades", "neverborn"); } @Test // DATAREDIS-489 @@ -1333,13 +1322,12 @@ public class MappingRedisConverterUnitTests { WithArrays source = new WithArrays(); source.arrayOfObject = new Object[] { "rand", trolloc, 100L }; - assertThat(write(source).getBucket(), - isBucket().containingUtf8String("arrayOfObject.[0]", "rand") // - .containingUtf8String("arrayOfObject.[0]._class", "java.lang.String") - .containingUtf8String("arrayOfObject.[1]._class", Species.class.getName()) // - .containingUtf8String("arrayOfObject.[1].name", "trolloc") // - .containingUtf8String("arrayOfObject.[2]._class", "java.lang.Long") // - .containingUtf8String("arrayOfObject.[2]", "100")); + assertThat(write(source)).containsEntry("arrayOfObject.[0]", "rand") // + .containsEntry("arrayOfObject.[0]._class", "java.lang.String") + .containsEntry("arrayOfObject.[1]._class", Species.class.getName()) // + .containsEntry("arrayOfObject.[1].name", "trolloc") // + .containsEntry("arrayOfObject.[2]._class", "java.lang.Long") // + .containsEntry("arrayOfObject.[2]", "100"); } @Test // DATAREDIS-489 @@ -1355,12 +1343,12 @@ public class MappingRedisConverterUnitTests { WithArrays target = read(WithArrays.class, source); - assertThat(target.arrayOfObject[0], notNullValue()); - assertThat(target.arrayOfObject[0], instanceOf(String.class)); - assertThat(target.arrayOfObject[1], notNullValue()); - assertThat(target.arrayOfObject[1], instanceOf(Species.class)); - assertThat(target.arrayOfObject[2], notNullValue()); - assertThat(target.arrayOfObject[2], instanceOf(Long.class)); + assertThat(target.arrayOfObject[0]).isNotNull(); + assertThat(target.arrayOfObject[0]).isInstanceOf(String.class); + assertThat(target.arrayOfObject[1]).isNotNull(); + assertThat(target.arrayOfObject[1]).isInstanceOf(Species.class); + assertThat(target.arrayOfObject[2]).isNotNull(); + assertThat(target.arrayOfObject[2]).isInstanceOf(Long.class); } @Test // DATAREDIS-489 @@ -1369,10 +1357,9 @@ public class MappingRedisConverterUnitTests { TypeWithObjectValueTypes sample = new TypeWithObjectValueTypes(); sample.object = "bar"; - Bucket bucket = write(sample).getBucket(); + RedisTestData bucket = write(sample); - assertThat(bucket, - isBucket().containingUtf8String("object", "bar").containingUtf8String("object._class", "java.lang.String")); + assertThat(bucket).containsEntry("object", "bar").containsEntry("object._class", "java.lang.String"); } @Test // DATAREDIS-489 @@ -1381,11 +1368,10 @@ public class MappingRedisConverterUnitTests { TypeWithObjectValueTypes di = new TypeWithObjectValueTypes(); di.object = "foo"; - RedisData rd = write(di); - System.out.println(rd.getBucket().toString()); + RedisTestData rd = write(di); - TypeWithObjectValueTypes result = converter.read(TypeWithObjectValueTypes.class, rd); - assertThat(result.object, instanceOf(String.class)); + TypeWithObjectValueTypes result = converter.read(TypeWithObjectValueTypes.class, rd.getRedisData()); + assertThat(result.object).isInstanceOf(String.class); } @Test // DATAREDIS-489 @@ -1396,13 +1382,11 @@ public class MappingRedisConverterUnitTests { sample.map.put("long", 1L); sample.map.put("date", new Date()); - Bucket bucket = write(sample).getBucket(); + RedisTestData bucket = write(sample); - assertThat(bucket, isBucket().containingUtf8String("map.[string]", "bar") - .containingUtf8String("map.[string]._class", "java.lang.String")); - assertThat(bucket, - isBucket().containingUtf8String("map.[long]", "1").containingUtf8String("map.[long]._class", "java.lang.Long")); - assertThat(bucket, isBucket().containingUtf8String("map.[date]._class", "java.util.Date")); + assertThat(bucket).containsEntry("map.[string]", "bar").containsEntry("map.[string]._class", "java.lang.String"); + assertThat(bucket).containsEntry("map.[long]", "1").containsEntry("map.[long]._class", "java.lang.Long"); + assertThat(bucket).containsEntry("map.[date]._class", "java.util.Date"); } @Test // DATAREDIS-489 @@ -1413,12 +1397,12 @@ public class MappingRedisConverterUnitTests { sample.map.put("long", 1L); sample.map.put("date", new Date()); - RedisData rd = write(sample); + RedisTestData rd = write(sample); - TypeWithObjectValueTypes result = converter.read(TypeWithObjectValueTypes.class, rd); - assertThat(result.map.get("string"), instanceOf(String.class)); - assertThat(result.map.get("long"), instanceOf(Long.class)); - assertThat(result.map.get("date"), instanceOf(Date.class)); + TypeWithObjectValueTypes result = converter.read(TypeWithObjectValueTypes.class, rd.getRedisData()); + assertThat(result.map.get("string")).isInstanceOf(String.class); + assertThat(result.map.get("long")).isInstanceOf(Long.class); + assertThat(result.map.get("date")).isInstanceOf(Date.class); } @Test // DATAREDIS-489 @@ -1429,13 +1413,11 @@ public class MappingRedisConverterUnitTests { sample.list.add(1L); sample.list.add(new Date()); - Bucket bucket = write(sample).getBucket(); + RedisTestData bucket = write(sample); - assertThat(bucket, isBucket().containingUtf8String("list.[0]", "string").containingUtf8String("list.[0]._class", - "java.lang.String")); - assertThat(bucket, - isBucket().containingUtf8String("list.[1]", "1").containingUtf8String("list.[1]._class", "java.lang.Long")); - assertThat(bucket, isBucket().containingUtf8String("list.[2]._class", "java.util.Date")); + assertThat(bucket).containsEntry("list.[0]", "string").containsEntry("list.[0]._class", "java.lang.String"); + assertThat(bucket).containsEntry("list.[1]", "1").containsEntry("list.[1]._class", "java.lang.Long"); + assertThat(bucket).containsEntry("list.[2]._class", "java.util.Date"); } @Test // DATAREDIS-489 @@ -1446,12 +1428,12 @@ public class MappingRedisConverterUnitTests { sample.list.add(1L); sample.list.add(new Date()); - RedisData rd = write(sample); + RedisTestData rd = write(sample); - TypeWithObjectValueTypes result = converter.read(TypeWithObjectValueTypes.class, rd); - assertThat(result.list.get(0), instanceOf(String.class)); - assertThat(result.list.get(1), instanceOf(Long.class)); - assertThat(result.list.get(2), instanceOf(Date.class)); + TypeWithObjectValueTypes result = converter.read(TypeWithObjectValueTypes.class, rd.getRedisData()); + assertThat(result.list.get(0)).isInstanceOf(String.class); + assertThat(result.list.get(1)).isInstanceOf(Long.class); + assertThat(result.list.get(2)).isInstanceOf(Date.class); } @Test // DATAREDIS-909 @@ -1459,11 +1441,11 @@ public class MappingRedisConverterUnitTests { Device sample = new Device(Instant.now(), Collections.singleton("foo")); - RedisData rd = write(sample); + RedisTestData rd = write(sample); - Device result = converter.read(Device.class, rd); - assertThat(result.now, equalTo(sample.now)); - assertThat(result.profiles, equalTo(sample.profiles)); + Device result = converter.read(Device.class, rd.getRedisData()); + assertThat(result.now).isEqualTo(sample.now); + assertThat(result.profiles).isEqualTo(sample.profiles); } @Test // DATAREDIS-509 @@ -1476,9 +1458,9 @@ public class MappingRedisConverterUnitTests { WithArrays target = read(WithArrays.class, source); - assertThat(target.arrayOfPrimitives[0], is(1)); - assertThat(target.arrayOfPrimitives[1], is(2)); - assertThat(target.arrayOfPrimitives[2], is(3)); + assertThat(target.arrayOfPrimitives[0]).isEqualTo(1); + assertThat(target.arrayOfPrimitives[1]).isEqualTo(2); + assertThat(target.arrayOfPrimitives[2]).isEqualTo(3); } @Test // DATAREDIS-509 @@ -1486,8 +1468,8 @@ public class MappingRedisConverterUnitTests { WithArrays source = new WithArrays(); source.arrayOfPrimitives = new int[] { 1, 2, 3 }; - assertThat(write(source).getBucket(), isBucket().containingUtf8String("arrayOfPrimitives.[0]", "1") - .containingUtf8String("arrayOfPrimitives.[1]", "2").containingUtf8String("arrayOfPrimitives.[2]", "3")); + assertThat(write(source)).containsEntry("arrayOfPrimitives.[0]", "1").containsEntry("arrayOfPrimitives.[1]", "2") + .containsEntry("arrayOfPrimitives.[2]", "3"); } @Test // DATAREDIS-471 @@ -1499,7 +1481,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", value); - assertThat(write(update).getBucket().get("_class"), is(nullValue())); + assertThat(write(update).getBucket().get("_class")).isNull(); } @Test // DATAREDIS-471 @@ -1511,8 +1493,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", value); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("firstname", "rand").containingUtf8String("age", "24")); + assertThat(write(update)).containsEntry("firstname", "rand").containsEntry("age", "24"); } @Test // DATAREDIS-471 @@ -1520,8 +1501,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("firstname", "rand").set("age", 24); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("firstname", "rand").containingUtf8String("age", "24")); + assertThat(write(update)).containsEntry("firstname", "rand").containsEntry("age", "24"); } @Test // DATAREDIS-471 @@ -1529,7 +1509,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("address.city", "two rivers"); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("address.city", "two rivers")); + assertThat(write(update)).containsEntry("address.city", "two rivers"); } @Test // DATAREDIS-471 @@ -1541,8 +1521,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("address", address); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("address.city", "two rivers").containingUtf8String("address.country", "andor")); + assertThat(write(update)).containsEntry("address.city", "two rivers").containsEntry("address.country", "andor"); } @Test // DATAREDIS-471 @@ -1551,8 +1530,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("nicknames", Arrays.asList("dragon", "lews")); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("nicknames.[0]", "dragon").containingUtf8String("nicknames.[1]", "lews")); + assertThat(write(update)).containsEntry("nicknames.[0]", "dragon").containsEntry("nicknames.[1]", "lews"); } @Test // DATAREDIS-471 @@ -1568,8 +1546,8 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("coworkers", Arrays.asList(mat, perrin)); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("coworkers.[0].firstname", "mat") - .containingUtf8String("coworkers.[0].age", "24").containingUtf8String("coworkers.[1].firstname", "perrin")); + assertThat(write(update)).containsEntry("coworkers.[0].firstname", "mat").containsEntry("coworkers.[0].age", "24") + .containsEntry("coworkers.[1].firstname", "perrin"); } @Test // DATAREDIS-471 @@ -1577,7 +1555,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("nicknames", "dragon"); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("nicknames.[0]", "dragon")); + assertThat(write(update)).containsEntry("nicknames.[0]", "dragon"); } @Test // DATAREDIS-471 @@ -1589,8 +1567,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("coworkers", mat); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("coworkers.[0].firstname", "mat") - .containingUtf8String("coworkers.[0].age", "24")); + assertThat(write(update)).containsEntry("coworkers.[0].firstname", "mat").containsEntry("coworkers.[0].age", "24"); } @Test // DATAREDIS-471 @@ -1598,7 +1575,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("nicknames.[5]", "dragon"); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("nicknames.[5]", "dragon")); + assertThat(write(update)).containsEntry("nicknames.[5]", "dragon"); } @Test // DATAREDIS-471 @@ -1610,8 +1587,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("coworkers.[5]", mat); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("coworkers.[5].firstname", "mat") - .containingUtf8String("coworkers.[5].age", "24")); + assertThat(write(update)).containsEntry("coworkers.[5].firstname", "mat").containsEntry("coworkers.[5].age", "24"); } @Test // DATAREDIS-471 @@ -1620,7 +1596,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("physicalAttributes", Collections.singletonMap("eye-color", "grey")); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("physicalAttributes.[eye-color]", "grey")); + assertThat(write(update)).containsEntry("physicalAttributes.[eye-color]", "grey"); } @Test // DATAREDIS-471 @@ -1633,8 +1609,8 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("relatives", Collections.singletonMap("father", tam)); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("relatives.[father].firstname", "tam") - .containingUtf8String("relatives.[father].alive", "0")); + assertThat(write(update)).containsEntry("relatives.[father].firstname", "tam") + .containsEntry("relatives.[father].alive", "0"); } @Test // DATAREDIS-471 @@ -1643,7 +1619,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("physicalAttributes", Collections.singletonMap("eye-color", "grey").entrySet().iterator().next()); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("physicalAttributes.[eye-color]", "grey")); + assertThat(write(update)).containsEntry("physicalAttributes.[eye-color]", "grey"); } @Test // DATAREDIS-471 @@ -1656,8 +1632,8 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("relatives", Collections.singletonMap("father", tam).entrySet().iterator().next()); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("relatives.[father].firstname", "tam") - .containingUtf8String("relatives.[father].alive", "0")); + assertThat(write(update)).containsEntry("relatives.[father].firstname", "tam") + .containsEntry("relatives.[father].alive", "0"); } @Test // DATAREDIS-471 @@ -1666,7 +1642,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("physicalAttributes.[eye-color]", "grey"); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("physicalAttributes.[eye-color]", "grey")); + assertThat(write(update)).containsEntry("physicalAttributes.[eye-color]", "grey"); } @Test // DATAREDIS-471 @@ -1674,7 +1650,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("relatives.[father].firstname", "tam"); - assertThat(write(update).getBucket(), isBucket().containingUtf8String("relatives.[father].firstname", "tam")); + assertThat(write(update)).containsEntry("relatives.[father].firstname", "tam"); } @Test(expected = MappingException.class) // DATAREDIS-471 @@ -1699,8 +1675,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("address", address); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}")); + assertThat(write(update)).containsEntry("address", "{\"city\":\"unknown\",\"country\":\"Tel'aran'rhiod\"}"); } @Test // DATAREDIS-471 @@ -1716,10 +1691,9 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class).set("visited", Arrays.asList(tar, tear)); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("visited.[0]", "locations:1").containingUtf8String("visited.[1]", "locations:2") // - .without("visited.id") // - .without("visited.name")); + assertThat(write(update)).containsEntry("visited.[0]", "locations:1").containsEntry("visited.[1]", "locations:2") // + .without("visited.id") // + .without("visited.name"); } @Test // DATAREDIS-471 @@ -1732,10 +1706,9 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class) // .set("location", location); - assertThat(write(update).getBucket(), - isBucket().containingUtf8String("location", "locations:1") // - .without("location.id") // - .without("location.name")); + assertThat(write(update)).containsEntry("location", "locations:1") // + .without("location.id") // + .without("location.name"); } @Test // DATAREDIS-471 @@ -1749,7 +1722,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class) // .set("age", "twenty-four"); - assertThat(write(update).getBucket().get("_class"), is(nullValue())); + assertThat(write(update).getBucket().get("_class")).isNull(); } @Test // DATAREDIS-471 @@ -1763,7 +1736,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class) // .set("coworkers.[0]", "buh buh the bear"); - assertThat(write(update).getBucket().get("_class"), is(nullValue())); + assertThat(write(update).getBucket().get("_class")).isNull(); } @Test // DATAREDIS-471 @@ -1777,7 +1750,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class) // .set("coworkers", Collections.singletonList("foo")); - assertThat(write(update).getBucket().get("_class"), is(nullValue())); + assertThat(write(update).getBucket().get("_class")).isNull(); } @Test // DATAREDIS-471 @@ -1791,7 +1764,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class) // .set("relatives.[father]", "buh buh the bear"); - assertThat(write(update).getBucket().get("_class"), is(nullValue())); + assertThat(write(update).getBucket().get("_class")).isNull(); } @Test // DATAREDIS-471 @@ -1805,7 +1778,7 @@ public class MappingRedisConverterUnitTests { PartialUpdate update = new PartialUpdate<>("123", Person.class) // .set("relatives", Collections.singletonMap("father", "buh buh the bear")); - assertThat(write(update).getBucket().get("_class"), is(nullValue())); + assertThat(write(update).getBucket().get("_class")).isNull(); } @Test // DATAREDIS-875 @@ -1814,7 +1787,7 @@ public class MappingRedisConverterUnitTests { Size source = new Size(); source.height = 1; - assertThat(write(source).getBucket().get("height._class"), is(nullValue())); + assertThat(write(source).getBucket().get("height._class")).isNull(); } @Test // DATAREDIS-875 @@ -1823,7 +1796,7 @@ public class MappingRedisConverterUnitTests { Map source = new LinkedHashMap<>(); source.put("height", "1000"); - assertThat(read(Size.class, source).height, is(equalTo(1000))); + assertThat(read(Size.class, source).height).isEqualTo(1000); } @Test // DATAREDIS-925 @@ -1833,7 +1806,7 @@ public class MappingRedisConverterUnitTests { Map source = new LinkedHashMap<>(); source.put("uuid", uuid.toString()); - assertThat(read(JustSomeDifferentPropertyTypes.class, source).uuid, is(equalTo(uuid))); + assertThat(read(JustSomeDifferentPropertyTypes.class, source).uuid).isEqualTo(uuid); } @Test // DATAREDIS-925 @@ -1842,7 +1815,7 @@ public class MappingRedisConverterUnitTests { JustSomeDifferentPropertyTypes source = new JustSomeDifferentPropertyTypes(); source.uuid = UUID.randomUUID(); - assertThat(write(source).getBucket(), isBucket().containingUtf8String("uuid", source.uuid.toString())); + assertThat(write(source)).containsEntry("uuid", source.uuid.toString()); } @Test // DATAREDIS-955 @@ -1856,8 +1829,8 @@ public class MappingRedisConverterUnitTests { Outer outer = read(Outer.class, source); - assertThat(outer.values, is(equalTo(Arrays.asList("o-1", "o-2")))); - assertThat(outer.inners.get(0).values, is(equalTo(Arrays.asList("i-1", "i-2")))); + assertThat(outer.values).isEqualTo(Arrays.asList("o-1", "o-2")); + assertThat(outer.inners.get(0).values).isEqualTo(Arrays.asList("i-1", "i-2")); } @Test // DATAREDIS-955 @@ -1869,15 +1842,15 @@ public class MappingRedisConverterUnitTests { Outer outer = read(Outer.class, source); - assertThat(outer.values, is(nullValue())); - assertThat(outer.inners.get(0).values, is(equalTo(Arrays.asList("i-1", "i-2")))); + assertThat(outer.values).isNull(); + assertThat(outer.inners.get(0).values).isEqualTo(Arrays.asList("i-1", "i-2")); } - private RedisData write(Object source) { + private RedisTestData write(Object source) { RedisData rdo = new RedisData(); converter.write(source, rdo); - return rdo; + return RedisTestData.from(rdo); } private T read(Class type, Map source) { diff --git a/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java index 5656a1b92..ed16fedcb 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/PathIndexResolverUnitTests.java @@ -15,11 +15,7 @@ */ package org.springframework.data.redis.core.convert; -import static org.hamcrest.collection.IsEmptyCollection.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.data.redis.core.convert.ConversionTestEntities.*; @@ -30,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hamcrest.core.IsCollectionContaining; -import org.hamcrest.core.IsInstanceOf; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -39,6 +33,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.geo.Point; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.redis.core.convert.ConversionTestEntities.*; @@ -84,8 +79,8 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Address.class), address); - assertThat(indexes.size(), is(1)); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(Address.class.getName(), "country", "andor"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(Address.class.getName(), "country", "andor")); } @Test // DATAREDIS-425 @@ -96,7 +91,7 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Address.class), address); - assertThat(indexes.size(), is(0)); + assertThat(indexes.size()).isEqualTo(0); } @Test // DATAREDIS-425 @@ -108,8 +103,8 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Person.class), person); - assertThat(indexes.size(), is(1)); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "address.country", "andor"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "address.country", "andor")); } @Test // DATAREDIS-425 @@ -131,11 +126,10 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TheWheelOfTime.class), twot); - assertThat(indexes.size(), is(2)); - assertThat(indexes, - IsCollectionContaining. hasItems( - new SimpleIndexedPropertyValue(KEYSPACE_TWOT, "mainCharacters.address.country", "andor"), - new SimpleIndexedPropertyValue(KEYSPACE_TWOT, "mainCharacters.address.country", "saldaea"))); + assertThat(indexes.size()).isEqualTo(2); + assertThat(indexes).contains( + new SimpleIndexedPropertyValue(KEYSPACE_TWOT, "mainCharacters.address.country", "andor"), + new SimpleIndexedPropertyValue(KEYSPACE_TWOT, "mainCharacters.address.country", "saldaea")); } @Test // DATAREDIS-425 @@ -154,9 +148,9 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TheWheelOfTime.class), twot); - assertThat(indexes.size(), is(1)); - assertThat(indexes, - hasItem(new SimpleIndexedPropertyValue(KEYSPACE_TWOT, "places.stone-of-tear.address.country", "illian"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes) + .contains(new SimpleIndexedPropertyValue(KEYSPACE_TWOT, "places.stone-of-tear.address.country", "illian")); } @Test // DATAREDIS-425 @@ -170,9 +164,9 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Person.class), rand); - assertThat(indexes.size(), is(1)); - assertThat(indexes, - hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "physicalAttributes.eye-color", "grey"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes) + .contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "physicalAttributes.eye-color", "grey")); } @Test // DATAREDIS-425 @@ -190,9 +184,9 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Person.class), rand); - assertThat(indexes.size(), is(1)); - assertThat(indexes, - hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "relatives.father.firstname", "janduin"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes) + .contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "relatives.father.firstname", "janduin")); } @Test // DATAREDIS-425, DATAREDIS-471 @@ -206,8 +200,8 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Person.class), rand); - assertThat(indexes.size(), is(1)); - assertThat(indexes.iterator().next(), IsInstanceOf.instanceOf(RemoveIndexedData.class)); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes.iterator().next()).isInstanceOf(RemoveIndexedData.class); } @Test // DATAREDIS-425 @@ -221,14 +215,14 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver .resolveIndexesFor(ClassTypeInformation.from(PersonWithAddressReference.class), rand); - assertThat(indexes.size(), is(0)); + assertThat(indexes.size()).isEqualTo(0); } @Test // DATAREDIS-425 public void resolveIndexShouldReturnNullWhenNoIndexConfigured() { when(propertyMock.isAnnotationPresent(eq(Indexed.class))).thenReturn(false); - assertThat(resolve("foo", "rand"), nullValue()); + assertThat(resolve("foo", "rand")).isNull(); } @Test // DATAREDIS-425 @@ -237,7 +231,7 @@ public class PathIndexResolverUnitTests { when(propertyMock.isAnnotationPresent(eq(Indexed.class))).thenReturn(false); indexConfig.addIndexDefinition(new SimpleIndexDefinition(KEYSPACE_PERSON, "foo")); - assertThat(resolve("foo", "rand"), notNullValue()); + assertThat(resolve("foo", "rand")).isNotNull(); } @Test // DATAREDIS-425 @@ -246,7 +240,7 @@ public class PathIndexResolverUnitTests { when(propertyMock.isAnnotationPresent(eq(Indexed.class))).thenReturn(true); when(propertyMock.findAnnotation(eq(Indexed.class))).thenReturn(createIndexedInstance()); - assertThat(resolve("foo", "rand"), notNullValue()); + assertThat(resolve("foo", "rand")).isNotNull(); } @Test // DATAREDIS-425 @@ -258,7 +252,7 @@ public class PathIndexResolverUnitTests { IndexedData index = resolve("list.[0].name", "rand"); - assertThat(index.getIndexName(), is("list.name")); + assertThat(index.getIndexName()).isEqualTo("list.name"); } @Test // DATAREDIS-425 @@ -270,7 +264,7 @@ public class PathIndexResolverUnitTests { IndexedData index = resolve("map.[foo].name", "rand"); - assertThat(index.getIndexName(), is("map.foo.name")); + assertThat(index.getIndexName()).isEqualTo("map.foo.name"); } @Test // DATAREDIS-425 @@ -282,7 +276,7 @@ public class PathIndexResolverUnitTests { IndexedData index = resolve("map.[0].name", "rand"); - assertThat(index.getIndexName(), is("map.0.name")); + assertThat(index.getIndexName()).isEqualTo("map.0.name"); } @Test // DATAREDIS-425 @@ -296,8 +290,8 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TaVeren.class), mat); - assertThat(indexes.size(), is(1)); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "feature.type", "hat"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "feature.type", "hat")); } @Test // DATAREDIS-425 @@ -311,7 +305,7 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TaVeren.class), mat); - assertThat(indexes.size(), is(0)); + assertThat(indexes.size()).isEqualTo(0); } @Test // DATAREDIS-425 @@ -327,9 +321,9 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TaVeren.class), mat); - assertThat(indexes.size(), is(1)); - assertThat(indexes, - hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "characteristics.clothing.type", "hat"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes) + .contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "characteristics.clothing.type", "hat")); } @Test // DATAREDIS-425 @@ -345,8 +339,8 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TaVeren.class), mat); - assertThat(indexes.size(), is(1)); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "items.type", "hat"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "items.type", "hat")); } @Test // DATAREDIS-425 @@ -364,8 +358,8 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(TaVeren.class), mat); - assertThat(indexes.size(), is(1)); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "itemsType", "hat"))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(KEYSPACE_PERSON, "itemsType", "hat")); } @Test // DATAREDIS-425 @@ -377,7 +371,7 @@ public class PathIndexResolverUnitTests { size.width = 30; Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(Size.class), size); - assertThat(indexes, is(empty())); + assertThat(indexes).isEmpty(); } @Test // DATAREDIS-425 @@ -392,11 +386,10 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(IndexedOnMapField.class), source); - assertThat(indexes.size(), is(2)); - assertThat(indexes, - IsCollectionContaining. hasItems( - new SimpleIndexedPropertyValue(IndexedOnMapField.class.getName(), "values.jon", "snow"), - new SimpleIndexedPropertyValue(IndexedOnMapField.class.getName(), "values.arya", "stark"))); + assertThat(indexes.size()).isEqualTo(2); + assertThat(indexes).contains( + new SimpleIndexedPropertyValue(IndexedOnMapField.class.getName(), "values.jon", "snow"), + new SimpleIndexedPropertyValue(IndexedOnMapField.class.getName(), "values.arya", "stark")); } @Test // DATAREDIS-425 @@ -411,11 +404,9 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(IndexedOnListField.class), source); - assertThat(indexes.size(), is(2)); - assertThat(indexes, - IsCollectionContaining. hasItems( - new SimpleIndexedPropertyValue(IndexedOnListField.class.getName(), "values", "jon"), - new SimpleIndexedPropertyValue(IndexedOnListField.class.getName(), "values", "arya"))); + assertThat(indexes.size()).isEqualTo(2); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(IndexedOnListField.class.getName(), "values", "jon"), + new SimpleIndexedPropertyValue(IndexedOnListField.class.getName(), "values", "arya")); } @Test // DATAREDIS-509 @@ -427,12 +418,11 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver .resolveIndexesFor(ClassTypeInformation.from(IndexedOnPrimitiveArrayField.class), source); - assertThat(indexes.size(), is(3)); - assertThat(indexes, - IsCollectionContaining. hasItems( - new SimpleIndexedPropertyValue(IndexedOnPrimitiveArrayField.class.getName(), "values", 1), - new SimpleIndexedPropertyValue(IndexedOnPrimitiveArrayField.class.getName(), "values", 2), - new SimpleIndexedPropertyValue(IndexedOnPrimitiveArrayField.class.getName(), "values", 3))); + assertThat(indexes.size()).isEqualTo(3); + assertThat(indexes).contains( + new SimpleIndexedPropertyValue(IndexedOnPrimitiveArrayField.class.getName(), "values", 1), + new SimpleIndexedPropertyValue(IndexedOnPrimitiveArrayField.class.getName(), "values", 2), + new SimpleIndexedPropertyValue(IndexedOnPrimitiveArrayField.class.getName(), "values", 3)); } @Test // DATAREDIS-533 @@ -444,7 +434,7 @@ public class PathIndexResolverUnitTests { IndexedData index = resolve("location", new Point(1D, 2D)); - assertThat(index.getIndexName(), is("location")); + assertThat(index.getIndexName()).isEqualTo("location"); } @Test // DATAREDIS-533 @@ -456,7 +446,7 @@ public class PathIndexResolverUnitTests { IndexedData index = resolve("property.location", new Point(1D, 2D)); - assertThat(index.getIndexName(), is("property:location")); + assertThat(index.getIndexName()).isEqualTo("property:location"); } @Test // DATAREDIS-533 @@ -468,9 +458,9 @@ public class PathIndexResolverUnitTests { Set indexes = indexResolver.resolveIndexesFor(ClassTypeInformation.from(GeoIndexedOnPoint.class), source); - assertThat(indexes.size(), is(1)); - assertThat(indexes, IsCollectionContaining. hasItems( - new GeoIndexedPropertyValue(GeoIndexedOnPoint.class.getName(), "location", source.location))); + assertThat(indexes.size()).isEqualTo(1); + assertThat(indexes) + .contains(new GeoIndexedPropertyValue(GeoIndexedOnPoint.class.getName(), "location", source.location)); } @Test // DATAREDIS-533 @@ -493,7 +483,7 @@ public class PathIndexResolverUnitTests { return null; } - assertThat(data.size(), is(1)); + assertThat(data.size()).isEqualTo(1); return data.iterator().next(); } diff --git a/src/test/java/org/springframework/data/redis/core/convert/SpelIndexResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/convert/SpelIndexResolverUnitTests.java index f9b4dbb12..56888f7e8 100644 --- a/src/test/java/org/springframework/data/redis/core/convert/SpelIndexResolverUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/convert/SpelIndexResolverUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core.convert; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.HashMap; import java.util.Map; @@ -24,6 +23,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.core.convert.KeyspaceConfiguration.KeyspaceSettings; import org.springframework.data.redis.core.index.IndexConfiguration; import org.springframework.data.redis.core.index.SpelIndexDefinition; @@ -87,7 +87,7 @@ public class SpelIndexResolverUnitTests { Set indexes = resolver.resolveIndexesFor(typeInformation, null); - assertThat(indexes.size(), equalTo(0)); + assertThat(indexes.size()).isEqualTo(0); } @Test // DATAREDIS-425 @@ -96,7 +96,7 @@ public class SpelIndexResolverUnitTests { typeInformation = ClassTypeInformation.from(String.class); Set indexes = resolver.resolveIndexesFor(typeInformation, ""); - assertThat(indexes.size(), equalTo(0)); + assertThat(indexes.size()).isEqualTo(0); } @Test // DATAREDIS-425 @@ -105,7 +105,7 @@ public class SpelIndexResolverUnitTests { session = new Session(); Set indexes = resolver.resolveIndexesFor(typeInformation, session); - assertThat(indexes.size(), equalTo(0)); + assertThat(indexes.size()).isEqualTo(0); } @Test // DATAREDIS-425 @@ -113,7 +113,7 @@ public class SpelIndexResolverUnitTests { Set indexes = resolver.resolveIndexesFor(typeInformation, session); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(keyspace, indexName, username))); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(keyspace, indexName, username)); } @Test(expected = SpelEvaluationException.class) // DATAREDIS-425 @@ -137,7 +137,7 @@ public class SpelIndexResolverUnitTests { Set indexes = resolver.resolveIndexesFor(typeInformation, session); - assertThat(indexes, hasItem(new SimpleIndexedPropertyValue(keyspace, indexName, session))); + assertThat(indexes).contains(new SimpleIndexedPropertyValue(keyspace, indexName, session)); } private SpelIndexResolver createWithExpression(String expression) { diff --git a/src/test/java/org/springframework/data/redis/core/index/IndexConfigurationUnitTests.java b/src/test/java/org/springframework/data/redis/core/index/IndexConfigurationUnitTests.java index 38cb7b121..ea16d32cc 100644 --- a/src/test/java/org/springframework/data/redis/core/index/IndexConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/index/IndexConfigurationUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.core.index; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -31,7 +30,7 @@ public class IndexConfigurationUnitTests { String path = "path"; SimpleIndexDefinition setting = new SimpleIndexDefinition("keyspace", path); - assertThat(setting.getIndexName(), equalTo(path)); + assertThat(setting.getIndexName()).isEqualTo(path); } @Test // DATAREDIS-425 @@ -39,7 +38,7 @@ public class IndexConfigurationUnitTests { String indexName = "indexName"; SimpleIndexDefinition setting = new SimpleIndexDefinition("keyspace", "index", indexName); - assertThat(setting.getIndexName(), equalTo(indexName)); + assertThat(setting.getIndexName()).isEqualTo(indexName); } @Test // DATAREDIS-425 @@ -49,7 +48,7 @@ public class IndexConfigurationUnitTests { SimpleIndexDefinition setting2 = new SimpleIndexDefinition(setting1.getKeyspace(), "path", setting1.getIndexName() + "other"); - assertThat(setting1, not(equalTo(setting2))); + assertThat(setting1).isNotEqualTo(setting2); } @Test // DATAREDIS-425 @@ -59,6 +58,6 @@ public class IndexConfigurationUnitTests { SimpleIndexDefinition setting2 = new SimpleIndexDefinition(setting1.getKeyspace(), "path", setting1.getIndexName() + "other"); - assertThat(setting1.hashCode(), not(equalTo(setting2.hashCode()))); + assertThat(setting1.hashCode()).isNotEqualTo(setting2.hashCode()); } } diff --git a/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java index e9cda4f02..e85bcee57 100644 --- a/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntityUnitTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.core.mapping; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Before; @@ -27,6 +25,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver; import org.springframework.data.mapping.MappingException; import org.springframework.data.redis.core.TimeToLiveAccessor; @@ -109,6 +108,6 @@ public class BasicRedisPersistentEntityUnitTests { entity.addPersistentProperty(property1); entity.addPersistentProperty(property2); - assertThat(entity.getIdProperty(), is(equalTo(property2))); + assertThat(entity.getIdProperty()).isEqualTo(property2); } } diff --git a/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java b/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java index 8eec45912..874a63fd0 100644 --- a/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareKeySpaceResolverUnitTests.java @@ -15,11 +15,11 @@ */ package org.springframework.data.redis.core.mapping; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.core.convert.KeyspaceConfiguration; import org.springframework.data.redis.core.convert.KeyspaceConfiguration.KeyspaceSettings; import org.springframework.data.redis.core.mapping.RedisMappingContext.ConfigAwareKeySpaceResolver; @@ -45,14 +45,15 @@ public class ConfigAwareKeySpaceResolverUnitTests { @Test // DATAREDIS-425 public void resolveShouldUseClassNameAsDefaultKeyspace() { - assertThat(resolver.resolveKeySpace(TypeWithoutAnySettings.class), is(TypeWithoutAnySettings.class.getName())); + assertThat(resolver.resolveKeySpace(TypeWithoutAnySettings.class)) + .isEqualTo(TypeWithoutAnySettings.class.getName()); } @Test // DATAREDIS-425 public void resolveShouldFavorConfiguredNameOverClassName() { config.addKeyspaceSettings(new KeyspaceSettings(TypeWithoutAnySettings.class, "ji'e'toh")); - assertThat(resolver.resolveKeySpace(TypeWithoutAnySettings.class), is("ji'e'toh")); + assertThat(resolver.resolveKeySpace(TypeWithoutAnySettings.class)).isEqualTo("ji'e'toh"); } static class TypeWithoutAnySettings { diff --git a/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareTimeToLiveAccessorUnitTests.java b/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareTimeToLiveAccessorUnitTests.java index b5aae9474..bbc770c10 100644 --- a/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareTimeToLiveAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/mapping/ConfigAwareTimeToLiveAccessorUnitTests.java @@ -15,11 +15,11 @@ */ package org.springframework.data.redis.core.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.core.PartialUpdate; import org.springframework.data.redis.core.RedisHash; import org.springframework.data.redis.core.TimeToLive; @@ -49,7 +49,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { @Test // DATAREDIS-425 public void getTimeToLiveShouldReturnNullIfNothingConfiguredOrAnnotated() { - assertThat(accessor.getTimeToLive(new SimpleType()), nullValue()); + assertThat(accessor.getTimeToLive(new SimpleType())).isNull(); } @Test // DATAREDIS-425 @@ -59,12 +59,12 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { setting.setTimeToLive(10L); config.addKeyspaceSettings(setting); - assertThat(accessor.getTimeToLive(new SimpleType()), is(10L)); + assertThat(accessor.getTimeToLive(new SimpleType())).isEqualTo(10L); } @Test // DATAREDIS-425 public void getTimeToLiveShouldReturnValueWhenTypeIsAnnotated() { - assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotation()), is(5L)); + assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotation())).isEqualTo(5L); } @Test // DATAREDIS-425 @@ -74,22 +74,22 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { setting.setTimeToLive(10L); config.addKeyspaceSettings(setting); - assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotation()), is(5L)); + assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotation())).isEqualTo(5L); } @Test // DATAREDIS-425 public void getTimeToLiveShouldReturnValueWhenPropertyIsAnnotatedAndHasValue() { - assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotationAndTTLProperty(20L)), is(20L)); + assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotationAndTTLProperty(20L))).isEqualTo(20L); } @Test // DATAREDIS-425 public void getTimeToLiveShouldReturnValueFromTypeAnnotationWhenPropertyIsAnnotatedAndHasNullValue() { - assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotationAndTTLProperty()), is(10L)); + assertThat(accessor.getTimeToLive(new TypeWithRedisHashAnnotationAndTTLProperty())).isEqualTo(10L); } @Test // DATAREDIS-425 public void getTimeToLiveShouldReturnNullWhenPropertyIsAnnotatedAndHasNullValue() { - assertThat(accessor.getTimeToLive(new SimpleTypeWithTTLProperty()), nullValue()); + assertThat(accessor.getTimeToLive(new SimpleTypeWithTTLProperty())).isNull(); } @Test // DATAREDIS-425 @@ -99,7 +99,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { setting.setTimeToLive(10L); config.addKeyspaceSettings(setting); - assertThat(accessor.getTimeToLive(new SimpleTypeWithTTLProperty()), is(10L)); + assertThat(accessor.getTimeToLive(new SimpleTypeWithTTLProperty())).isEqualTo(10L); } @Test // DATAREDIS-425 @@ -109,12 +109,12 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { setting.setTimeToLive(10L); config.addKeyspaceSettings(setting); - assertThat(accessor.getTimeToLive(new SimpleTypeWithTTLProperty(25L)), is(25L)); + assertThat(accessor.getTimeToLive(new SimpleTypeWithTTLProperty(25L))).isEqualTo(25L); } @Test // DATAREDIS-425 public void getTimeToLiveShouldReturnMethodLevelTimeToLiveIfPresent() { - assertThat(accessor.getTimeToLive(new TypeWithTtlOnMethod(10L)), is(10L)); + assertThat(accessor.getTimeToLive(new TypeWithTtlOnMethod(10L))).isEqualTo(10L); } @Test // DATAREDIS-425 @@ -124,7 +124,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { setting.setTimeToLive(10L); config.addKeyspaceSettings(setting); - assertThat(accessor.getTimeToLive(new TypeWithTtlOnMethod(null)), is(10L)); + assertThat(accessor.getTimeToLive(new TypeWithTtlOnMethod(null))).isEqualTo(10L); } @Test // DATAREDIS-425 @@ -134,7 +134,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { setting.setTimeToLive(10L); config.addKeyspaceSettings(setting); - assertThat(accessor.getTimeToLive(new TypeWithTtlOnMethod(100L)), is(100L)); + assertThat(accessor.getTimeToLive(new TypeWithTtlOnMethod(100L))).isEqualTo(100L); } @Test // DATAREDIS-471 @@ -143,7 +143,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { Long ttl = accessor .getTimeToLive(new PartialUpdate<>("123", new TypeWithRedisHashAnnotation())); - assertThat(ttl, is(5L)); + assertThat(ttl).isEqualTo(5L); } @Test // DATAREDIS-471 @@ -153,7 +153,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { .getTimeToLive(new PartialUpdate<>("123", new SimpleTypeWithTTLProperty()) .set("ttl", 100).refreshTtl(true)); - assertThat(ttl, is(100L)); + assertThat(ttl).isEqualTo(100L); } @Test // DATAREDIS-471 @@ -163,7 +163,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { new PartialUpdate<>("123", new TypeWithRedisHashAnnotationAndTTLProperty()).set("ttl", 100).refreshTtl(true)); - assertThat(ttl, is(100L)); + assertThat(ttl).isEqualTo(100L); } @Test // DATAREDIS-471 @@ -173,7 +173,7 @@ public class ConfigAwareTimeToLiveAccessorUnitTests { .getTimeToLive(new PartialUpdate<>("123", new TypeWithRedisHashAnnotationAndTTLProperty()).refreshTtl(true)); - assertThat(ttl, is(10L)); + assertThat(ttl).isEqualTo(10L); } static class SimpleType {} diff --git a/src/test/java/org/springframework/data/redis/core/script/AbstractDefaultScriptExecutorTests.java b/src/test/java/org/springframework/data/redis/core/script/AbstractDefaultScriptExecutorTests.java index 9bb4eb1d7..58ca108c1 100644 --- a/src/test/java/org/springframework/data/redis/core/script/AbstractDefaultScriptExecutorTests.java +++ b/src/test/java/org/springframework/data/redis/core/script/AbstractDefaultScriptExecutorTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.core.script; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collections; @@ -23,6 +23,7 @@ import java.util.List; import org.junit.ClassRule; import org.junit.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.Person; @@ -52,7 +53,7 @@ public abstract class AbstractDefaultScriptExecutorTests { public static @ClassRule MinimumRedisVersionRule minRedisVersion = new MinimumRedisVersionRule(); - @SuppressWarnings("rawtypes")// + @SuppressWarnings("rawtypes") // private RedisTemplate template; protected abstract RedisConnectionFactory getConnectionFactory(); @@ -82,9 +83,9 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setResultType(Long.class); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); Long result = scriptExecutor.execute(script, Collections.singletonList("mykey")); - assertNull(result); + assertThat(result).isNull(); template.boundValueOps("mykey").set("2"); - assertEquals(Long.valueOf(3), scriptExecutor.execute(script, Collections.singletonList("mykey"))); + assertThat(scriptExecutor.execute(script, Collections.singletonList("mykey"))).isEqualTo(Long.valueOf(3)); } @SuppressWarnings("unchecked") @@ -99,10 +100,10 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setLocation(new ClassPathResource("org/springframework/data/redis/core/script/cas.lua")); script.setResultType(Boolean.class); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); - template.boundValueOps("counter").set(0l); + template.boundValueOps("counter").set(0L); Boolean valueSet = scriptExecutor.execute(script, Collections.singletonList("counter"), 0, 3); - assertTrue(valueSet); - assertFalse(scriptExecutor.execute(script, Collections.singletonList("counter"), 0, 3)); + assertThat(valueSet).isTrue(); + assertThat(scriptExecutor.execute(script, Collections.singletonList("counter"), 0, 3)).isFalse(); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -117,8 +118,8 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setResultType(List.class); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); List result = scriptExecutor.execute(script, new GenericToStringSerializer<>(Long.class), - template.getValueSerializer(), Collections.singletonList("mylist"), 1l); - assertEquals(Collections.singletonList("a"), result); + template.getValueSerializer(), Collections.singletonList("mylist"), 1L); + assertThat(result).isEqualTo(Collections.singletonList("a")); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -132,10 +133,9 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setResultType(List.class); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); List results = scriptExecutor.execute(script, Collections.singletonList("mylist")); - assertEquals(Arrays.asList(new Object[] { null, 0l }), results); + assertThat(results).isEqualTo(Arrays.asList(null, 0L)); template.boundListOps("mylist").leftPushAll("a", "b"); - assertEquals(Arrays.asList(new Object[] { "a", 1l }), - scriptExecutor.execute(script, Collections.singletonList("mylist"))); + assertThat(scriptExecutor.execute(script, Collections.singletonList("mylist"))).isEqualTo(Arrays.asList("a", 1L)); } @SuppressWarnings("unchecked") @@ -149,7 +149,7 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setResultType(String.class); template.opsForValue().set("foo", "bar"); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); - assertEquals("bar", scriptExecutor.execute(script, Collections.singletonList("foo"))); + assertThat(scriptExecutor.execute(script, Collections.singletonList("foo"))).isEqualTo("bar"); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -163,8 +163,9 @@ public abstract class AbstractDefaultScriptExecutorTests { DefaultRedisScript script = new DefaultRedisScript(); script.setScriptText("return redis.call('SET',KEYS[1], ARGV[1])"); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); - assertNull(scriptExecutor.execute(script, Collections.singletonList("foo"), 3l)); - assertEquals(Long.valueOf(3), template.opsForValue().get("foo")); + Object result = scriptExecutor.execute(script, Collections.singletonList("foo"), 3L); + assertThat(result).isNull(); + assertThat(template.opsForValue().get("foo")).isEqualTo(3L); } @SuppressWarnings("unchecked") @@ -183,8 +184,8 @@ public abstract class AbstractDefaultScriptExecutorTests { Person joe = new Person("Joe", "Schmoe", 23); String result = scriptExecutor.execute(script, personSerializer, StringRedisSerializer.UTF_8, Collections.singletonList("bar"), joe); - assertEquals("FOO", result); - assertEquals(joe, template.boundValueOps("bar").get()); + assertThat(result).isEqualTo("FOO"); + assertThat(template.boundValueOps("bar").get()).isEqualTo(joe); } @SuppressWarnings("unchecked") @@ -204,7 +205,7 @@ public abstract class AbstractDefaultScriptExecutorTests { }); // Result is deserialized by RedisTemplate as part of executePipelined - assertEquals(Collections.singletonList("foo"), results); + assertThat(results).isEqualTo(Collections.singletonList("foo")); } @SuppressWarnings("unchecked") @@ -226,7 +227,7 @@ public abstract class AbstractDefaultScriptExecutorTests { }); // Result is deserialized by RedisTemplate as part of exec - assertEquals(Collections.singletonList("barfoo"), results); + assertThat(results).isEqualTo(Collections.singletonList("barfoo")); } @SuppressWarnings("unchecked") @@ -240,8 +241,8 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setResultType(String.class); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); // Execute script twice, second time should be from cache - assertEquals("HELLO", scriptExecutor.execute(script, null)); - assertEquals("HELLO", scriptExecutor.execute(script, null)); + assertThat(scriptExecutor.execute(script, null)).isEqualTo("HELLO"); + assertThat(scriptExecutor.execute(script, null)).isEqualTo("HELLO"); } @Test // DATAREDIS-356 @@ -256,6 +257,6 @@ public abstract class AbstractDefaultScriptExecutorTests { script.setResultType(String.class); ScriptExecutor scriptExecutor = new DefaultScriptExecutor(template); - assertEquals("BUBU", scriptExecutor.execute(script, null).substring(0, 4)); + assertThat(scriptExecutor.execute(script, null).substring(0, 4)).isEqualTo("BUBU"); } } diff --git a/src/test/java/org/springframework/data/redis/core/script/DefaultRedisScriptTests.java b/src/test/java/org/springframework/data/redis/core/script/DefaultRedisScriptTests.java index b1bb47a68..6db812600 100644 --- a/src/test/java/org/springframework/data/redis/core/script/DefaultRedisScriptTests.java +++ b/src/test/java/org/springframework/data/redis/core/script/DefaultRedisScriptTests.java @@ -15,9 +15,10 @@ */ package org.springframework.data.redis.core.script; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.scripting.support.StaticScriptSource; @@ -39,10 +40,10 @@ public class DefaultRedisScriptTests { redisScript.setResultType(String.class); String sha1 = redisScript.getSha1(); // Ensure multiple calls return same sha - assertEquals(sha1, redisScript.getSha1()); + assertThat(redisScript.getSha1()).isEqualTo(sha1); script.setScript("return KEYS[2]"); // Sha should now be different as script text has changed - assertFalse(sha1.equals(redisScript.getSha1())); + assertThat(sha1.equals(redisScript.getSha1())).isFalse(); } @Test @@ -51,7 +52,7 @@ public class DefaultRedisScriptTests { DefaultRedisScript redisScript = new DefaultRedisScript<>(); redisScript.setScriptText("return ARGS[1]"); redisScript.setResultType(String.class); - assertEquals("return ARGS[1]", redisScript.getScriptAsString()); + assertThat(redisScript.getScriptAsString()).isEqualTo("return ARGS[1]"); } @Test(expected = ScriptingException.class) diff --git a/src/test/java/org/springframework/data/redis/core/script/lettuce/LettuceDefaultScriptExecutorTests.java b/src/test/java/org/springframework/data/redis/core/script/lettuce/LettuceDefaultScriptExecutorTests.java index c498ff285..f1351937e 100644 --- a/src/test/java/org/springframework/data/redis/core/script/lettuce/LettuceDefaultScriptExecutorTests.java +++ b/src/test/java/org/springframework/data/redis/core/script/lettuce/LettuceDefaultScriptExecutorTests.java @@ -17,6 +17,7 @@ package org.springframework.data.redis.core.script.lettuce; import org.junit.After; import org.junit.Before; + import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; diff --git a/src/test/java/org/springframework/data/redis/core/types/ExpirationUnitTests.java b/src/test/java/org/springframework/data/redis/core/types/ExpirationUnitTests.java index b639dee84..e49713a4f 100644 --- a/src/test/java/org/springframework/data/redis/core/types/ExpirationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/types/ExpirationUnitTests.java @@ -16,8 +16,7 @@ package org.springframework.data.redis.core.types; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.*; import java.util.concurrent.TimeUnit; @@ -33,8 +32,8 @@ public class ExpirationUnitTests { Expiration expiration = Expiration.from(5, null); - assertThat(expiration.getExpirationTime(), is(5L)); - assertThat(expiration.getTimeUnit(), is(TimeUnit.SECONDS)); + assertThat(expiration.getExpirationTime()).isEqualTo(5L); + assertThat(expiration.getTimeUnit()).isEqualTo(TimeUnit.SECONDS); } @Test // DATAREDIS-316 @@ -42,8 +41,8 @@ public class ExpirationUnitTests { Expiration expiration = Expiration.from(5L * 1000 * 1000, TimeUnit.NANOSECONDS); - assertThat(expiration.getExpirationTime(), is(5L)); - assertThat(expiration.getTimeUnit(), is(TimeUnit.MILLISECONDS)); + assertThat(expiration.getExpirationTime()).isEqualTo(5L); + assertThat(expiration.getTimeUnit()).isEqualTo(TimeUnit.MILLISECONDS); } @Test // DATAREDIS-316 @@ -51,7 +50,7 @@ public class ExpirationUnitTests { Expiration expiration = Expiration.from(5, TimeUnit.MINUTES); - assertThat(expiration.getExpirationTime(), is(5L * 60)); - assertThat(expiration.getTimeUnit(), is(TimeUnit.SECONDS)); + assertThat(expiration.getExpirationTime()).isEqualTo(5L * 60); + assertThat(expiration.getTimeUnit()).isEqualTo(TimeUnit.SECONDS); } } diff --git a/src/test/java/org/springframework/data/redis/core/types/RedisClientInfoUnitTests.java b/src/test/java/org/springframework/data/redis/core/types/RedisClientInfoUnitTests.java index fd17e0569..0122877f3 100644 --- a/src/test/java/org/springframework/data/redis/core/types/RedisClientInfoUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/types/RedisClientInfoUnitTests.java @@ -15,12 +15,11 @@ */ package org.springframework.data.redis.core.types; -import org.hamcrest.core.Is; -import org.hamcrest.core.IsEqual; -import org.hamcrest.core.IsNot; -import org.junit.Assert; +import static org.assertj.core.api.Assertions.*; + import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.core.types.RedisClientInfo.RedisClientInfoBuilder; /** @@ -56,16 +55,16 @@ public class RedisClientInfoUnitTests { @Test public void testGetReturnsNullForPropertiesNotAvailable() { - Assert.assertThat(info.get("foo-bar"), IsEqual.equalTo(null)); + assertThat(info.get("foo-bar")).isEqualTo(null); } private void assertValues(RedisClientInfo info, String[] values) { for (String potentialValue : values) { if (potentialValue.contains("=")) { String[] keyValuePair = potentialValue.split("="); - Assert.assertThat(info.get(keyValuePair[0]), Is.is(keyValuePair[1])); + assertThat(info.get(keyValuePair[0])).isEqualTo(keyValuePair[1]); } else { - Assert.assertThat(info.get(potentialValue), IsNot.not(null)); + assertThat(info.get(potentialValue)).isNotEqualTo(null); } } diff --git a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java index 2618f4b76..791c36276 100644 --- a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java +++ b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.listener; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.UUID; @@ -28,6 +27,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.DisposableBean; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; @@ -104,7 +104,7 @@ public class KeyExpirationEventMessageListenerTests { ArgumentCaptor captor = ArgumentCaptor.forClass(ApplicationEvent.class); verify(publisherMock, times(1)).publishEvent(captor.capture()); - assertThat((byte[]) captor.getValue().getSource(), is(key)); + assertThat((byte[]) captor.getValue().getSource()).isEqualTo(key); } @Test // DATAREDIS-425 diff --git a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java index 2466f4b08..831e79307 100644 --- a/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/listener/KeyExpirationEventMessageListenerUnitTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.listener; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsInstanceOf.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Before; @@ -26,6 +24,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.redis.connection.DefaultMessage; @@ -61,8 +60,8 @@ public class KeyExpirationEventMessageListenerUnitTests { ArgumentCaptor captor = ArgumentCaptor.forClass(ApplicationEvent.class); verify(publisherMock, times(1)).publishEvent(captor.capture()); - assertThat(captor.getValue(), instanceOf(RedisKeyExpiredEvent.class)); - assertThat((byte[]) captor.getValue().getSource(), is(MESSAGE_BODY.getBytes())); + assertThat(captor.getValue()).isInstanceOf(RedisKeyExpiredEvent.class); + assertThat((byte[]) captor.getValue().getSource()).isEqualTo(MESSAGE_BODY.getBytes()); } @Test // DATAREDIS-425 diff --git a/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java b/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java index 0ee56c831..a26fc1425 100644 --- a/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java +++ b/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.listener; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import static org.springframework.data.redis.SpinBarrier.*; @@ -40,6 +40,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.junit.runners.model.Statement; + import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.data.redis.ConnectionFactoryTracker; @@ -193,13 +194,13 @@ public class PubSubResubscribeTests { msgs.add(bag2.poll(500, TimeUnit.MILLISECONDS)); msgs.add(bag2.poll(500, TimeUnit.MILLISECONDS)); - assertEquals(2, msgs.size()); - assertTrue(msgs.contains(payload1)); - assertTrue(msgs.contains(payload2)); + assertThat(msgs.size()).isEqualTo(2); + assertThat(msgs.contains(payload1)).isTrue(); + assertThat(msgs.contains(payload2)).isTrue(); msgs.clear(); // unsubscribed adapter did not receive message - assertNull(bag.poll(500, TimeUnit.MILLISECONDS)); + assertThat(bag.poll(500, TimeUnit.MILLISECONDS)).isNull(); // bind original listener on another channel container.addMessageListener(adapter, new ChannelTopic(ANOTHER_CHANNEL)); @@ -215,16 +216,16 @@ public class PubSubResubscribeTests { msgs.add(bag.poll(500, TimeUnit.MILLISECONDS)); msgs.add(bag.poll(500, TimeUnit.MILLISECONDS)); - assertTrue(msgs.contains(payload2)); - assertTrue(msgs.contains(null)); + assertThat(msgs.contains(payload2)).isTrue(); + assertThat(msgs.contains(null)).isTrue(); // another listener receives messages on both channels msgs.clear(); msgs.add(bag2.poll(500, TimeUnit.MILLISECONDS)); msgs.add(bag2.poll(500, TimeUnit.MILLISECONDS)); - assertEquals(2, msgs.size()); - assertTrue(msgs.contains(payload1)); - assertTrue(msgs.contains(payload2)); + assertThat(msgs.size()).isEqualTo(2); + assertThat(msgs.contains(payload1)).isTrue(); + assertThat(msgs.contains(payload2)).isTrue(); } @Test @@ -258,11 +259,11 @@ public class PubSubResubscribeTests { set.add(bag.poll(500, TimeUnit.MILLISECONDS)); set.add(bag.poll(500, TimeUnit.MILLISECONDS)); - assertFalse(set.contains(payload1)); - assertFalse(set.contains(payload2)); + assertThat(set.contains(payload1)).isFalse(); + assertThat(set.contains(payload2)).isFalse(); - assertTrue(set.contains(anotherPayload1)); - assertTrue(set.contains(anotherPayload2)); + assertThat(set.contains(anotherPayload1)).isTrue(); + assertThat(set.contains(anotherPayload2)).isTrue(); } /** @@ -291,7 +292,7 @@ public class PubSubResubscribeTests { set.add(bag.poll(500, TimeUnit.MILLISECONDS)); set.add(bag.poll(500, TimeUnit.MILLISECONDS)); - assertEquals(new HashSet<>(Arrays.asList(new String[] { "HELLO", "WORLD" })), set); + assertThat(set).isEqualTo(new HashSet<>(Arrays.asList(new String[] { "HELLO", "WORLD" }))); } private class MessageHandler { diff --git a/src/test/java/org/springframework/data/redis/listener/PubSubTests.java b/src/test/java/org/springframework/data/redis/listener/PubSubTests.java index e0a3d5602..e8747824e 100644 --- a/src/test/java/org/springframework/data/redis/listener/PubSubTests.java +++ b/src/test/java/org/springframework/data/redis/listener/PubSubTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.listener; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; import java.util.Arrays; @@ -135,7 +134,7 @@ public class PubSubTests { set.add((T) bag.poll(1, TimeUnit.SECONDS)); set.add((T) bag.poll(1, TimeUnit.SECONDS)); - assertThat(set, hasItems(payload1, payload2)); + assertThat(set).contains(payload1, payload2); } @Test @@ -146,7 +145,7 @@ public class PubSubTests { } Thread.sleep(1000); - assertEquals(COUNT, bag.size()); + assertThat(bag.size()).isEqualTo(COUNT); } @Test @@ -158,7 +157,7 @@ public class PubSubTests { template.convertAndSend(CHANNEL, payload1); template.convertAndSend(CHANNEL, payload2); - assertNull(bag.poll(1, TimeUnit.SECONDS)); + assertThat(bag.poll(1, TimeUnit.SECONDS)).isNull(); } @Test @@ -188,7 +187,7 @@ public class PubSubTests { Set set = new LinkedHashSet<>(); set.add((T) bag.poll(3, TimeUnit.SECONDS)); - assertThat(set, hasItems(payload)); + assertThat(set).contains(payload); } private static boolean isClusterAware(RedisConnectionFactory connectionFactory) { diff --git a/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java b/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java index eb0fe3284..c41be4a4a 100644 --- a/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java +++ b/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.listener; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.concurrent.Executor; @@ -24,6 +23,7 @@ import java.util.concurrent.Executor; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.core.task.SyncTaskExecutor; import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.RedisStandaloneConfiguration; @@ -95,8 +95,8 @@ public class RedisMessageListenerContainerTests { container.start(); // reset the interrupted flag to not destroy the teardown - assertThat(Thread.interrupted(), is(true)); + assertThat(Thread.interrupted()).isTrue(); - assertThat(container.isRunning(), is(false)); + assertThat(container.isRunning()).isFalse(); } } diff --git a/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerUnitTests.java b/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerUnitTests.java index 03f591347..9cfebbf2f 100644 --- a/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/listener/RedisMessageListenerContainerUnitTests.java @@ -15,14 +15,14 @@ */ package org.springframework.data.redis.listener; -import static org.hamcrest.core.Is.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.concurrent.Executor; import org.junit.Before; import org.junit.Test; + import org.springframework.core.task.SyncTaskExecutor; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -96,7 +96,7 @@ public class RedisMessageListenerContainerUnitTests { container.stop(); - assertThat(container.isRunning(), is(false)); + assertThat(container.isRunning()).isFalse(); verify(subscriptionMock).close(); } } diff --git a/src/test/java/org/springframework/data/redis/listener/adapter/ContainerXmlSetupTest.java b/src/test/java/org/springframework/data/redis/listener/adapter/ContainerXmlSetupTest.java index ac991135a..d68c774b2 100644 --- a/src/test/java/org/springframework/data/redis/listener/adapter/ContainerXmlSetupTest.java +++ b/src/test/java/org/springframework/data/redis/listener/adapter/ContainerXmlSetupTest.java @@ -15,10 +15,11 @@ */ package org.springframework.data.redis.listener.adapter; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Test; + import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.data.redis.listener.RedisMessageListenerContainer; @@ -41,6 +42,6 @@ public class ContainerXmlSetupTest { public void testContainerSetup() throws Exception { ctx = new GenericXmlApplicationContext("/org/springframework/data/redis/listener/container.xml"); RedisMessageListenerContainer container = ctx.getBean("redisContainer", RedisMessageListenerContainer.class); - assertTrue(container.isRunning()); + assertThat(container.isRunning()).isTrue(); } } diff --git a/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java b/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java index 9a17f84b0..807bdab72 100644 --- a/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java +++ b/src/test/java/org/springframework/data/redis/listener/adapter/MessageListenerTest.java @@ -15,14 +15,14 @@ */ package org.springframework.data.redis.listener.adapter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; + import org.springframework.data.redis.connection.DefaultMessage; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; @@ -68,12 +68,12 @@ public class MessageListenerTest { @Test public void testThatWhenNoDelegateIsSuppliedTheDelegateIsAssumedToBeTheMessageListenerAdapterItself() throws Exception { - assertSame(adapter, adapter.getDelegate()); + assertThat(adapter.getDelegate()).isSameAs(adapter); } @Test public void testThatTheDefaultMessageHandlingMethodNameIsTheConstantDefault() throws Exception { - assertEquals(MessageListenerAdapter.ORIGINAL_DEFAULT_LISTENER_METHOD, adapter.getDefaultListenerMethod()); + assertThat(adapter.getDefaultListenerMethod()).isEqualTo(MessageListenerAdapter.ORIGINAL_DEFAULT_LISTENER_METHOD); } public void testAdapterWithListenerAndDefaultMessage() throws Exception { @@ -153,7 +153,7 @@ public class MessageListenerTest { }; listenerAdapter.onMessage(STRING_MSG, RAW_CHANNEL); - assertEquals(1, listener.count); + assertThat(listener.count).isEqualTo(1); } @Test // DATAREDIS-337 diff --git a/src/test/java/org/springframework/data/redis/listener/adapter/RedisMDP.java b/src/test/java/org/springframework/data/redis/listener/adapter/RedisMDP.java index e63f3df05..2b0d57e63 100644 --- a/src/test/java/org/springframework/data/redis/listener/adapter/RedisMDP.java +++ b/src/test/java/org/springframework/data/redis/listener/adapter/RedisMDP.java @@ -21,10 +21,8 @@ package org.springframework.data.redis.listener.adapter; public class RedisMDP { public void handleMessage(String message) { - System.out.println("Received message " + message); } public void anotherHandle(String message) { - System.out.println("[*] Received message " + message); } } diff --git a/src/test/java/org/springframework/data/redis/mapping/AbstractHashMapperTest.java b/src/test/java/org/springframework/data/redis/mapping/AbstractHashMapperTest.java index ce7f2cc9a..7340e50b4 100644 --- a/src/test/java/org/springframework/data/redis/mapping/AbstractHashMapperTest.java +++ b/src/test/java/org/springframework/data/redis/mapping/AbstractHashMapperTest.java @@ -15,16 +15,12 @@ */ package org.springframework.data.redis.mapping; -import static org.hamcrest.core.IsEqual.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Map; -import org.hamcrest.core.IsCollectionContaining; -import org.hamcrest.core.IsEqual; -import org.hamcrest.core.IsNot; -import org.hamcrest.core.IsNull; import org.junit.Test; + import org.springframework.data.redis.Address; import org.springframework.data.redis.Person; import org.springframework.data.redis.hash.HashMapper; @@ -43,16 +39,16 @@ public abstract class AbstractHashMapperTest { HashMapper mapper = mapperFor(o.getClass()); Map hash = mapper.toHash(o); - assertThat(mapper.fromHash(hash), equalTo(o)); + assertThat(mapper.fromHash(hash)).isEqualTo(o); } @Test - public void testSimpleBean() throws Exception { + public void testSimpleBean() { assertBackAndForwardMapping(new Address("Broadway", 1)); } @Test - public void testNestedBean() throws Exception { + public void testNestedBean() { assertBackAndForwardMapping(new Person("George", "Enescu", 74, new Address("liveni", 19))); } @@ -63,8 +59,6 @@ public abstract class AbstractHashMapperTest { assertBackAndForwardMapping(source); - assertThat((Iterable) mapperFor(Person.class).toHash(source).values(), - IsNot.not(IsCollectionContaining.hasItems(IsNull.nullValue()))); - + assertThat((Iterable) mapperFor(Person.class).toHash(source).values()).doesNotContainNull(); } } diff --git a/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java b/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java index 57f96e322..bc61b2536 100644 --- a/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java +++ b/src/test/java/org/springframework/data/redis/mapping/BeanUtilsHashMapperTest.java @@ -29,7 +29,7 @@ public class BeanUtilsHashMapperTest extends AbstractHashMapperTest { } @Test(expected = Exception.class) - public void testNestedBean() throws Exception { + public void testNestedBean() { super.testNestedBean(); } diff --git a/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperTests.java b/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperTests.java index 90885ae1f..f4bdba104 100644 --- a/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperTests.java +++ b/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperTests.java @@ -15,17 +15,18 @@ */ package org.springframework.data.redis.mapping; +import static org.assertj.core.api.Assertions.*; + import java.util.Arrays; import java.util.Collection; -import org.hamcrest.core.Is; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.beans.factory.InitializingBean; import org.springframework.data.redis.Address; import org.springframework.data.redis.ConnectionFactoryTracker; @@ -95,6 +96,6 @@ public class Jackson2HashMapperTests { template.opsForHash().putAll("JON-SNOW", mapper.toHash(jon)); Person result = (Person) mapper.fromHash(template. opsForHash().entries("JON-SNOW")); - Assert.assertThat(result, Is.is(jon)); + assertThat(result).isEqualTo(jon); } } diff --git a/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperUnitTests.java b/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperUnitTests.java index 48e65c698..735764b4c 100644 --- a/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperUnitTests.java +++ b/src/test/java/org/springframework/data/redis/mapping/Jackson2HashMapperUnitTests.java @@ -111,7 +111,7 @@ public class Jackson2HashMapperUnitTests extends AbstractHashMapperTest { public void shouldMapUntypedList() { WithList source = new WithList(); - source.objects = Arrays. asList(Integer.valueOf(100), "foo", new Person("jon", "snow", 19)); + source.objects = Arrays.asList(100, "foo", new Person("jon", "snow", 19)); assertBackAndForwardMapping(source); } @@ -142,7 +142,7 @@ public class Jackson2HashMapperUnitTests extends AbstractHashMapperTest { WithMap source = new WithMap(); source.objects = new LinkedHashMap<>(); source.objects.put("1", "spring"); - source.objects.put("2", Integer.valueOf(100)); + source.objects.put("2", 100); source.objects.put("3", "redis"); assertBackAndForwardMapping(source); } diff --git a/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java b/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java index 66e3f8380..ab25b4a99 100644 --- a/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java +++ b/src/test/java/org/springframework/data/redis/mapping/ObjectHashMapperTests.java @@ -15,12 +15,12 @@ */ package org.springframework.data.redis.mapping; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.*; import java.util.Map; import org.junit.Test; + import org.springframework.data.redis.hash.ObjectHashMapper; /** @@ -46,7 +46,7 @@ public class ObjectHashMapperTests extends AbstractHashMapperTest { Integer result = objectHashMapper.fromHash(hash, Integer.class); - assertThat(result, is(equalTo(new Integer(100)))); + assertThat(result).isEqualTo(new Integer(100)); } @Test(expected = ClassCastException.class) // DATAREDIS-503 diff --git a/src/test/java/org/springframework/data/redis/matcher/Equals.java b/src/test/java/org/springframework/data/redis/matcher/Equals.java deleted file mode 100644 index 2b0e28fb8..000000000 --- a/src/test/java/org/springframework/data/redis/matcher/Equals.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.matcher; - -import static org.hamcrest.CoreMatchers.hasItems; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; - -/** - * Custom JUnit {@link Matcher} that exists to properly compare byte arrays, either as individual results or members of - * a {@link Collection} or {@link LinkedHashMap}. Works the same as assertEquals for all other types of Objects. Make - * some assumptions about structure of data based on what we typically get back from Redis commands, i.e that Sets or - * Maps don't contain Collections, but a List might contain a bit of everything (when it comes back from exec() or - * closePipeline()) - * - * @author Jennifer Hickey - */ -public class Equals extends BaseMatcher { - - private Object expected; - - public Equals(Object expected) { - this.expected = expected; - } - - public void describeTo(Description description) { - description.appendValue(expected); - } - - @SuppressWarnings("rawtypes") - public boolean matches(Object actual) { - if (expected instanceof List || expected instanceof LinkedHashSet) { - return collectionEquals((Collection) expected, (Collection) actual); - } else if (expected instanceof Set) { - return setEquals((Set) expected, (Set) actual); - } else if (expected instanceof LinkedHashMap) { - return mapEquals((Map) expected, (Map) actual); - } else { - return equals(expected, actual); - } - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - private boolean collectionEquals(Collection expected, Collection actual) { - if (expected.size() != actual.size()) { - return false; - } - Iterator actualItr = actual.iterator(); - Iterator expectedItr = expected.iterator(); - while (expectedItr.hasNext()) { - Object expectedObj = expectedItr.next(); - if (expectedObj instanceof List || expectedObj instanceof LinkedHashSet) { - if (!(collectionEquals((Collection) expectedObj, (Collection) actualItr.next()))) { - return false; - } - } else if (expectedObj instanceof Set) { - if (!(setEquals((Set) expectedObj, (Set) actualItr.next()))) { - return false; - } - } else if (expectedObj instanceof Map) { - if (!(mapEquals((Map) expectedObj, (Map) actualItr.next()))) { - return false; - } - } else if (!equals(expectedObj, actualItr.next())) { - return false; - } - } - return true; - } - - @SuppressWarnings("rawtypes") - private boolean setEquals(Set expected, Set actual) { - if (expected.size() != actual.size()) { - return false; - } - return hasItems(actual.toArray()).matches(expected); - } - - @SuppressWarnings("rawtypes") - private boolean mapEquals(Map expected, Map actual) { - if (expected.size() != actual.size()) { - return false; - } - Iterator actualItr = actual.entrySet().iterator(); - Iterator expectedItr = expected.entrySet().iterator(); - while (expectedItr.hasNext()) { - Map.Entry expectedEntry = (Map.Entry) expectedItr.next(); - Map.Entry actualEntry = (Map.Entry) actualItr.next(); - if (!(equals(expectedEntry.getKey(), actualEntry.getKey())) - || !(equals(expectedEntry.getValue(), actualEntry.getValue()))) { - return false; - } - } - return true; - } - - private boolean equals(Object expected, Object actual) { - if (expected == null) { - return actual == null; - } - if (expected instanceof byte[]) { - return Arrays.equals((byte[]) expected, (byte[]) actual); - } - return expected.equals(actual); - } -} diff --git a/src/test/java/org/springframework/data/redis/matcher/RedisTestMatchers.java b/src/test/java/org/springframework/data/redis/matcher/RedisTestMatchers.java deleted file mode 100644 index aa48ab59f..000000000 --- a/src/test/java/org/springframework/data/redis/matcher/RedisTestMatchers.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.matcher; - -import org.hamcrest.Matcher; - -/** - * Customs {@link Matcher}s for Redis tests - * - * @author Jennifer Hickey - */ -abstract public class RedisTestMatchers { - - /** - * @param expected The expected results - * @return The {@link Equals} matcher - */ - public static Matcher isEqual(Object expected) { - return new Equals(expected); - } -} diff --git a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java index deb19b866..e60fc6812 100644 --- a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java +++ b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.repository; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import lombok.Data; import lombok.Value; @@ -27,9 +26,9 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import org.hamcrest.core.IsNull; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Reference; @@ -85,18 +84,18 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(rand, egwene)); - assertThat(repo.count(), is(2L)); + assertThat(repo.count()).isEqualTo(2L); - assertThat(repo.findById(rand.id), is(Optional.of(rand))); - assertThat(repo.findById(egwene.id), is(Optional.of(egwene))); + assertThat(repo.findById(rand.id)).isEqualTo(Optional.of(rand)); + assertThat(repo.findById(egwene.id)).isEqualTo(Optional.of(egwene)); - assertThat(repo.findByFirstname("rand").size(), is(1)); - assertThat(repo.findByFirstname("rand"), hasItem(rand)); + assertThat(repo.findByFirstname("rand").size()).isEqualTo(1); + assertThat(repo.findByFirstname("rand")).contains(rand); - assertThat(repo.findByFirstname("egwene").size(), is(1)); - assertThat(repo.findByFirstname("egwene"), hasItem(egwene)); + assertThat(repo.findByFirstname("egwene").size()).isEqualTo(1); + assertThat(repo.findByFirstname("egwene")).contains(egwene); - assertThat(repo.findByLastname("al'thor"), hasItem(rand)); + assertThat(repo.findByLastname("al'thor")).contains(rand); } @Test // DATAREDIS-425 @@ -112,10 +111,10 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(egwene, marin)); - assertThat(repo.findByLastname("al'vere").size(), is(2)); + assertThat(repo.findByLastname("al'vere").size()).isEqualTo(2); - assertThat(repo.findByFirstnameAndLastname("egwene", "al'vere").size(), is(1)); - assertThat(repo.findByFirstnameAndLastname("egwene", "al'vere").get(0), is(egwene)); + assertThat(repo.findByFirstnameAndLastname("egwene", "al'vere").size()).isEqualTo(1); + assertThat(repo.findByFirstnameAndLastname("egwene", "al'vere").get(0)).isEqualTo(egwene); } @Test // DATAREDIS-425 @@ -138,14 +137,14 @@ public abstract class RedisRepositoryIntegrationTestBase { // find and assert current location set correctly Optional loaded = repo.findById(moiraine.getId()); - assertThat(loaded.get().city, is(tarValon)); + assertThat(loaded.get().city).isEqualTo(tarValon); // remove reference location data kvTemplate.delete("1", City.class); // find and assert the location is gone Optional reLoaded = repo.findById(moiraine.getId()); - assertThat(reLoaded.get().city, IsNull.nullValue()); + assertThat(reLoaded.get().city).isNull(); } @Test // DATAREDIS-425 @@ -162,13 +161,13 @@ public abstract class RedisRepositoryIntegrationTestBase { Page page1 = repo.findPersonByLastname("stark", PageRequest.of(0, 5)); - assertThat(page1.getNumberOfElements(), is(5)); - assertThat(page1.getTotalElements(), is(6L)); + assertThat(page1.getNumberOfElements()).isEqualTo(5); + assertThat(page1.getTotalElements()).isEqualTo(6L); Page page2 = repo.findPersonByLastname("stark", page1.nextPageable()); - assertThat(page2.getNumberOfElements(), is(1)); - assertThat(page2.getTotalElements(), is(6L)); + assertThat(page2.getNumberOfElements()).isEqualTo(1); + assertThat(page2.getTotalElements()).isEqualTo(6L); } @Test // DATAREDIS-425 @@ -182,8 +181,8 @@ public abstract class RedisRepositoryIntegrationTestBase { List eddardAndJon = repo.findByFirstnameOrLastname("eddard", "snow"); - assertThat(eddardAndJon, hasSize(2)); - assertThat(eddardAndJon, containsInAnyOrder(eddard, jon)); + assertThat(eddardAndJon).hasSize(2); + assertThat(eddardAndJon).contains(eddard, jon); } @Test // DATAREDIS-547 @@ -195,7 +194,7 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(eddard, robb, jon)); - assertThat(repo.findFirstBy(), hasSize(1)); + assertThat(repo.findFirstBy()).hasSize(1); } @Test // DATAREDIS-547 @@ -208,8 +207,8 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(eddard, robb, jon)); Page firstPage = repo.findAll(PageRequest.of(0, 2)); - assertThat(firstPage.getContent(), hasSize(2)); - assertThat(repo.findAll(firstPage.nextPageable()).getContent(), hasSize(1)); + assertThat(firstPage.getContent()).hasSize(2); + assertThat(repo.findAll(firstPage.nextPageable()).getContent()).hasSize(1); } @Test // DATAREDIS-551 @@ -222,9 +221,9 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(eddard, robb, jon)); Page firstPage = repo.findBy(PageRequest.of(0, 2)); - assertThat(firstPage.getContent(), hasSize(2)); - assertThat(firstPage.getTotalElements(), is(equalTo(3L))); - assertThat(repo.findBy(firstPage.nextPageable()).getContent(), hasSize(1)); + assertThat(firstPage.getContent()).hasSize(2); + assertThat(firstPage.getTotalElements()).isEqualTo(3L); + assertThat(repo.findBy(firstPage.nextPageable()).getContent()).hasSize(1); } @Test // DATAREDIS-771 @@ -242,8 +241,8 @@ public abstract class RedisRepositoryIntegrationTestBase { List result = repo.findPersonByAliveIsTrue(); - assertThat(result, hasSize(1)); - assertThat(result, contains(eddard)); + assertThat(result).hasSize(1); + assertThat(result).containsExactly(eddard); } @Test // DATAREDIS-771 @@ -261,8 +260,8 @@ public abstract class RedisRepositoryIntegrationTestBase { List result = repo.findPersonByAliveIsFalse(); - assertThat(result, hasSize(1)); - assertThat(result, contains(robb)); + assertThat(result).hasSize(1); + assertThat(result).containsExactly(robb); } @Test // DATAREDIS-547 @@ -275,7 +274,7 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(eddard, robb, jon)); Page firstPage = repo.findAll(PageRequest.of(100, 2)); - assertThat(firstPage.getContent(), hasSize(0)); + assertThat(firstPage.getContent()).hasSize(0); } @Test // DATAREDIS-547 @@ -289,15 +288,15 @@ public abstract class RedisRepositoryIntegrationTestBase { Page page1 = repo.findPersonByLastname("stark", PageRequest.of(1, 3)); - assertThat(page1.getNumberOfElements(), is(0)); - assertThat(page1.getContent(), hasSize(0)); - assertThat(page1.getTotalElements(), is(3L)); + assertThat(page1.getNumberOfElements()).isEqualTo(0); + assertThat(page1.getContent()).hasSize(0); + assertThat(page1.getTotalElements()).isEqualTo(3L); Page page2 = repo.findPersonByLastname("stark", PageRequest.of(2, 3)); - assertThat(page2.getNumberOfElements(), is(0)); - assertThat(page2.getContent(), hasSize(0)); - assertThat(page2.getTotalElements(), is(3L)); + assertThat(page2.getNumberOfElements()).isEqualTo(0); + assertThat(page2.getContent()).hasSize(0); + assertThat(page2.getTotalElements()).isEqualTo(3L); } @Test // DATAREDIS-547 @@ -309,7 +308,7 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(eddard, robb, jon)); - assertThat(repo.findTop2By(), hasSize(2)); + assertThat(repo.findTop2By()).hasSize(2); } @Test // DATAREDIS-547 @@ -325,9 +324,9 @@ public abstract class RedisRepositoryIntegrationTestBase { List result = repo.findTop2ByLastname("stark"); - assertThat(result, hasSize(2)); + assertThat(result).hasSize(2); for (Person p : result) { - assertThat(p.getLastname(), is("stark")); + assertThat(p.getLastname()).isEqualTo("stark"); } } @@ -344,7 +343,7 @@ public abstract class RedisRepositoryIntegrationTestBase { List result = repo.findAll(Example.of(new Person(null, "stark"))); - assertThat(result, hasSize(3)); + assertThat(result).hasSize(3); } @Test // DATAREDIS-533 @@ -359,11 +358,10 @@ public abstract class RedisRepositoryIntegrationTestBase { cityRepo.saveAll(Arrays.asList(palermo, catania)); List result = cityRepo.findByLocationNear(new Point(15D, 37D), new Distance(200, Metrics.KILOMETERS)); - assertThat(result, hasItems(palermo, catania)); + assertThat(result).contains(palermo, catania); result = cityRepo.findByLocationNear(new Point(15D, 37D), new Distance(100, Metrics.KILOMETERS)); - assertThat(result, hasItems(catania)); - assertThat(result, not(hasItems(palermo))); + assertThat(result).contains(catania).doesNotContain(palermo); } @Test // DATAREDIS-533 @@ -378,7 +376,7 @@ public abstract class RedisRepositoryIntegrationTestBase { cityRepo.saveAll(Arrays.asList(palermo, catania)); List result = cityRepo.findByLocationNear(new Point(15D, 37D), new Distance(10, Metrics.KILOMETERS)); - assertThat(result, is(empty())); + assertThat(result).isEmpty(); } @Test // DATAREDIS-533 @@ -399,11 +397,10 @@ public abstract class RedisRepositoryIntegrationTestBase { repo.saveAll(Arrays.asList(p1, p2)); List result = repo.findByHometownLocationNear(new Point(15D, 37D), new Distance(200, Metrics.KILOMETERS)); - assertThat(result, hasItems(p1, p2)); + assertThat(result).contains(p1, p2); result = repo.findByHometownLocationNear(new Point(15D, 37D), new Distance(100, Metrics.KILOMETERS)); - assertThat(result, hasItems(p2)); - assertThat(result, not(hasItems(p1))); + assertThat(result).contains(p2).doesNotContain(p1); } @Test // DATAREDIS-849 @@ -412,8 +409,8 @@ public abstract class RedisRepositoryIntegrationTestBase { Immutable object = new Immutable(null, "Walter", new Immutable("heisenberg", "White", null)); Immutable saved = immutableObjectRepo.save(object); - assertThat(object.id, is(nullValue())); - assertThat(saved.id, is(notNullValue())); + assertThat(object.id).isNull(); + assertThat(saved.id).isNotNull(); } @Test // DATAREDIS-849 @@ -422,8 +419,8 @@ public abstract class RedisRepositoryIntegrationTestBase { Immutable object = new Immutable(null, "Walter", new Immutable("heisenberg", "White", null)); List saved = (List) immutableObjectRepo.saveAll(Collections.singleton(object)); - assertThat(object.id, is(nullValue())); - assertThat(saved.get(0).id, is(notNullValue())); + assertThat(object.id).isNull(); + assertThat(saved.get(0).id).isNotNull(); } @Test // DATAREDIS-849 @@ -434,7 +431,7 @@ public abstract class RedisRepositoryIntegrationTestBase { Immutable saved = immutableObjectRepo.save(object); Immutable loaded = immutableObjectRepo.findById(saved.id).get(); - assertThat(loaded.nested, is(nested)); + assertThat(loaded.nested).isEqualTo(nested); } public static interface PersonRepository diff --git a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java index 0cdd2e101..d134a1d6a 100644 --- a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.repository; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collections; import java.util.HashMap; @@ -24,6 +23,7 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -112,6 +112,6 @@ public class RedisRepositoryIntegrationTests extends RedisRepositoryIntegrationT Map entries = operations. opsForHash().entries("persons:rand"); - assertThat(entries.get("_class"), is(equalTo("person"))); + assertThat(entries.get("_class")).isEqualTo("person"); } } diff --git a/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java index bee6706ed..abcbf9a3e 100644 --- a/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.repository.cdi; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; import java.util.Set; @@ -59,8 +58,8 @@ public class CdiExtensionIntegrationTests { Set> beans = container.getBeanManager().getBeans(PersonRepository.class); - assertThat(beans, hasSize(1)); - assertThat(beans.iterator().next().getScope(), is(equalTo((Class) ApplicationScoped.class))); + assertThat(beans).hasSize(1); + assertThat(beans.iterator().next().getScope()).isEqualTo((Class) ApplicationScoped.class); } @Test // DATAREDIS-425, DATAREDIS-700 @@ -74,7 +73,7 @@ public class CdiExtensionIntegrationTests { repositoryConsumer.getUnqualifiedRepo().save(person); List result = repositoryConsumer.getUnqualifiedRepo().findByName("foo"); - assertThat(result, contains(person)); + assertThat(result).containsExactly(person); } @Test // DATAREDIS-425, DATAREDIS-700 @@ -88,7 +87,7 @@ public class CdiExtensionIntegrationTests { repositoryConsumer.getUnqualifiedRepo().save(person); List result = repositoryConsumer.getQualifiedRepo().findByName("foo"); - assertThat(result, contains(person)); + assertThat(result).containsExactly(person); } @Test // DATAREDIS-425, DATAREDIS-700 @@ -97,6 +96,6 @@ public class CdiExtensionIntegrationTests { RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get(); int result = repositoryConsumer.getUnqualifiedRepo().returnOne(); - assertThat(result, is(1)); + assertThat(result).isEqualTo(1); } } diff --git a/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtensionUnitTests.java b/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtensionUnitTests.java index a591b1f80..366b96df7 100644 --- a/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtensionUnitTests.java +++ b/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationExtensionUnitTests.java @@ -15,13 +15,13 @@ */ package org.springframework.data.redis.repository.configuration; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry; @@ -84,7 +84,7 @@ public class RedisRepositoryConfigurationExtensionUnitTests { metadata = new StandardAnnotationMetadata(Config.class, true); BeanDefinitionRegistry beanDefintionRegistry = getBeanDefinitionRegistry(); - assertThat(getEnableKeyspaceEvents(beanDefintionRegistry), equalTo((Object) EnableKeyspaceEvents.ON_STARTUP)); + assertThat(getEnableKeyspaceEvents(beanDefintionRegistry)).isEqualTo((Object) EnableKeyspaceEvents.ON_STARTUP); } @Test // DATAREDIS-491 @@ -93,7 +93,7 @@ public class RedisRepositoryConfigurationExtensionUnitTests { metadata = new StandardAnnotationMetadata(ConfigWithKeyspaceEventsDisabled.class, true); BeanDefinitionRegistry beanDefintionRegistry = getBeanDefinitionRegistry(); - assertThat(getEnableKeyspaceEvents(beanDefintionRegistry), equalTo((Object) EnableKeyspaceEvents.OFF)); + assertThat(getEnableKeyspaceEvents(beanDefintionRegistry)).isEqualTo((Object) EnableKeyspaceEvents.OFF); } @Test // DATAREDIS-505 @@ -102,7 +102,7 @@ public class RedisRepositoryConfigurationExtensionUnitTests { metadata = new StandardAnnotationMetadata(Config.class, true); BeanDefinitionRegistry beanDefintionRegistry = getBeanDefinitionRegistry(); - assertThat(getKeyspaceNotificationsConfigParameter(beanDefintionRegistry), equalTo((Object) "Ex")); + assertThat(getKeyspaceNotificationsConfigParameter(beanDefintionRegistry)).isEqualTo((Object) "Ex"); } @Test // DATAREDIS-505 @@ -111,7 +111,7 @@ public class RedisRepositoryConfigurationExtensionUnitTests { metadata = new StandardAnnotationMetadata(ConfigWithKeyspaceEventsEnabledAndCustomEventConfig.class, true); BeanDefinitionRegistry beanDefintionRegistry = getBeanDefinitionRegistry(); - assertThat(getKeyspaceNotificationsConfigParameter(beanDefintionRegistry), equalTo((Object) "KEA")); + assertThat(getKeyspaceNotificationsConfigParameter(beanDefintionRegistry)).isEqualTo((Object) "KEA"); } private static void assertDoesNotHaveRepo(Class repositoryInterface, diff --git a/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationUnitTests.java b/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationUnitTests.java index 7731f98b0..c92eee4fc 100644 --- a/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/redis/repository/configuration/RedisRepositoryConfigurationUnitTests.java @@ -15,10 +15,7 @@ */ package org.springframework.data.redis.repository.configuration; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsEqual.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; @@ -93,8 +90,8 @@ public class RedisRepositoryConfigurationUnitTests { Object referenceResolver = ReflectionTestUtils.getField(adapter.getConverter(), "referenceResolver"); - assertThat(referenceResolver, is(equalTo(ctx.getBean("redisReferenceResolver")))); - assertThat(mockingDetails(referenceResolver).isMock(), is(true)); + assertThat(referenceResolver).isEqualTo((ctx.getBean("redisReferenceResolver"))); + assertThat(mockingDetails(referenceResolver).isMock()).isTrue(); } } @@ -117,16 +114,17 @@ public class RedisRepositoryConfigurationUnitTests { @Test // DATAREDIS-425 public void shouldInitWithDefaults() { - assertThat(ctx.getBean(ContextSampleRepository.class), is(notNullValue())); + assertThat(ctx.getBean(ContextSampleRepository.class)).isNotNull(); + } @Test // DATAREDIS-425 public void shouldRegisterDefaultBeans() { - assertThat(ctx.getBean(ContextSampleRepository.class), is(notNullValue())); - assertThat(ctx.getBean("redisKeyValueAdapter"), is(notNullValue())); - assertThat(ctx.getBean("redisCustomConversions"), is(notNullValue())); - assertThat(ctx.getBean("redisReferenceResolver"), is(notNullValue())); + assertThat(ctx.getBean(ContextSampleRepository.class)).isNotNull(); + assertThat(ctx.getBean("redisKeyValueAdapter")).isNotNull(); + assertThat(ctx.getBean("redisCustomConversions")).isNotNull(); + assertThat(ctx.getBean("redisReferenceResolver")).isNotNull(); } } diff --git a/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java b/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java index ec1061d22..5a45b0c34 100644 --- a/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java @@ -15,11 +15,7 @@ */ package org.springframework.data.redis.repository.query; -import static org.hamcrest.collection.IsCollectionWithSize.*; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsCollectionContaining.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; @@ -27,6 +23,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.geo.Box; import org.springframework.data.geo.Circle; @@ -63,8 +60,8 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getSismember(), hasSize(1)); - assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("firstname", "eddard"))); + assertThat(query.getCriteria().getSismember()).hasSize(1); + assertThat(query.getCriteria().getSismember()).contains(new PathAndValue("firstname", "eddard")); } @Test // DATAREDIS-425 @@ -76,9 +73,9 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getSismember(), hasSize(2)); - assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("firstname", "eddard"))); - assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("age", 43))); + assertThat(query.getCriteria().getSismember()).hasSize(2); + assertThat(query.getCriteria().getSismember()).contains(new PathAndValue("firstname", "eddard")); + assertThat(query.getCriteria().getSismember()).contains(new PathAndValue("age", 43)); } @Test // DATAREDIS-425 @@ -90,9 +87,9 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getOrSismember(), hasSize(2)); - assertThat(query.getCriteria().getOrSismember(), hasItem(new PathAndValue("age", 43))); - assertThat(query.getCriteria().getOrSismember(), hasItem(new PathAndValue("firstname", "eddard"))); + assertThat(query.getCriteria().getOrSismember()).hasSize(2); + assertThat(query.getCriteria().getOrSismember()).contains(new PathAndValue("age", 43)); + assertThat(query.getCriteria().getOrSismember()).contains(new PathAndValue("firstname", "eddard")); } @Test // DATAREDIS-533 @@ -104,9 +101,9 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getNear(), is(notNullValue())); - assertThat(query.getCriteria().getNear().getPoint(), is(new Point(1, 2))); - assertThat(query.getCriteria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS))); + assertThat(query.getCriteria().getNear()).isNotNull(); + assertThat(query.getCriteria().getNear().getPoint()).isEqualTo(new Point(1, 2)); + assertThat(query.getCriteria().getNear().getDistance()).isEqualTo(new Distance(200, Metrics.KILOMETERS)); } @Test // DATAREDIS-533 @@ -118,9 +115,9 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getNear(), is(notNullValue())); - assertThat(query.getCriteria().getNear().getPoint(), is(new Point(1, 2))); - assertThat(query.getCriteria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS))); + assertThat(query.getCriteria().getNear()).isNotNull(); + assertThat(query.getCriteria().getNear().getPoint()).isEqualTo(new Point(1, 2)); + assertThat(query.getCriteria().getNear().getDistance()).isEqualTo(new Distance(200, Metrics.KILOMETERS)); } @Test // DATAREDIS-533 @@ -132,9 +129,9 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getNear(), is(notNullValue())); - assertThat(query.getCriteria().getNear().getPoint(), is(new Point(1, 2))); - assertThat(query.getCriteria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS))); + assertThat(query.getCriteria().getNear()).isNotNull(); + assertThat(query.getCriteria().getNear().getPoint()).isEqualTo(new Point(1, 2)); + assertThat(query.getCriteria().getNear().getDistance()).isEqualTo(new Distance(200, Metrics.KILOMETERS)); } @Test // DATAREDIS-533 @@ -183,8 +180,8 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getSismember(), hasSize(1)); - assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("alive", true))); + assertThat(query.getCriteria().getSismember()).hasSize(1); + assertThat(query.getCriteria().getSismember()).contains(new PathAndValue("alive", true)); } @Test // DATAREDIS-771 @@ -195,8 +192,8 @@ public class RedisQueryCreatorUnitTests { KeyValueQuery query = creator.createQuery(); - assertThat(query.getCriteria().getSismember(), hasSize(1)); - assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("alive", false))); + assertThat(query.getCriteria().getSismember()).hasSize(1); + assertThat(query.getCriteria().getSismember()).contains(new PathAndValue("alive", false)); } private RedisQueryCreator createQueryCreatorForMethodWithArgs(Method method, Object[] args) { diff --git a/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementReaderUnitTests.java b/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementReaderUnitTests.java index 4f67dd658..fa9b87f36 100644 --- a/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementReaderUnitTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementReaderUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.serializer; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -41,7 +40,7 @@ public class DefaultRedisElementReaderUnitTests { String result = reader.read(ByteBuffer.wrap(bytes)); - assertThat(result, is(equalTo(input))); + assertThat(result).isEqualTo(input); } @Test // DATAREDIS-602 @@ -53,6 +52,6 @@ public class DefaultRedisElementReaderUnitTests { Object result = reader.read(input); - assertThat(result, is(equalTo(input))); + assertThat(result).isEqualTo(input); } } diff --git a/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementWriterUnitTests.java b/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementWriterUnitTests.java index 45cddcde7..8eab0fa0b 100644 --- a/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementWriterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/DefaultRedisElementWriterUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.serializer; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -41,7 +40,7 @@ public class DefaultRedisElementWriterUnitTests { ByteBuffer result = writer.write(input); - assertThat(result.array(), is(equalTo(bytes))); + assertThat(result.array()).isEqualTo(bytes); } @Test // DATAREDIS-602 @@ -52,7 +51,7 @@ public class DefaultRedisElementWriterUnitTests { byte[] input = { 1, 2, 3 }; ByteBuffer result = writer.write(input); - assertThat(result.array(), is(equalTo(input))); + assertThat(result.array()).isEqualTo(input); } @Test // DATAREDIS-602 @@ -63,7 +62,7 @@ public class DefaultRedisElementWriterUnitTests { byte[] input = { 1, 2, 3 }; ByteBuffer result = writer.write(ByteBuffer.wrap(input)); - assertThat(result.array(), is(equalTo(input))); + assertThat(result.array()).isEqualTo(input); } @Test(expected = IllegalStateException.class) // DATAREDIS-602 diff --git a/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java b/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java index 65e79c918..06bf1d6fc 100644 --- a/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializerUnitTests.java @@ -15,12 +15,8 @@ */ package org.springframework.data.redis.serializer; -import static org.hamcrest.core.Is.*; -import static org.hamcrest.core.IsInstanceOf.*; -import static org.hamcrest.core.IsNull.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static org.mockito.Mockito.any; import static org.springframework.test.util.ReflectionTestUtils.*; import static org.springframework.util.ObjectUtils.*; @@ -28,6 +24,7 @@ import java.io.IOException; import org.junit.Test; import org.mockito.Mockito; + import org.springframework.beans.BeanUtils; import org.springframework.cache.support.NullValue; @@ -54,43 +51,45 @@ public class GenericJackson2JsonRedisSerializerUnitTests { @Test // DATAREDIS-392 public void shouldUseDefaultTyping() { - assertThat(extractTypeResolver(new GenericJackson2JsonRedisSerializer()), notNullValue()); + assertThat(extractTypeResolver(new GenericJackson2JsonRedisSerializer())).isNotNull(); } @Test // DATAREDIS-392 public void shouldUseDefaultTypingWhenClassPropertyNameIsEmpty() { TypeResolverBuilder typeResolver = extractTypeResolver(new GenericJackson2JsonRedisSerializer("")); - assertThat((String) getField(typeResolver, "_typeProperty"), is(JsonTypeInfo.Id.CLASS.getDefaultPropertyName())); + assertThat((String) getField(typeResolver, "_typeProperty")) + .isEqualTo(JsonTypeInfo.Id.CLASS.getDefaultPropertyName()); } @Test // DATAREDIS-392 public void shouldUseDefaultTypingWhenClassPropertyNameIsNull() { TypeResolverBuilder typeResolver = extractTypeResolver(new GenericJackson2JsonRedisSerializer((String) null)); - assertThat((String) getField(typeResolver, "_typeProperty"), is(JsonTypeInfo.Id.CLASS.getDefaultPropertyName())); + assertThat((String) getField(typeResolver, "_typeProperty")) + .isEqualTo(JsonTypeInfo.Id.CLASS.getDefaultPropertyName()); } @Test // DATAREDIS-392 public void shouldUseDefaultTypingWhenClassPropertyNameIsProvided() { TypeResolverBuilder typeResolver = extractTypeResolver(new GenericJackson2JsonRedisSerializer("firefight")); - assertThat((String) getField(typeResolver, "_typeProperty"), is("firefight")); + assertThat((String) getField(typeResolver, "_typeProperty")).isEqualTo("firefight"); } @Test // DATAREDIS-392 public void serializeShouldReturnEmptyByteArrayWhenSouceIsNull() { - assertThat(new GenericJackson2JsonRedisSerializer().serialize(null), is(SerializationUtils.EMPTY_ARRAY)); + assertThat(new GenericJackson2JsonRedisSerializer().serialize(null)).isEqualTo(SerializationUtils.EMPTY_ARRAY); } @Test // DATAREDIS-392 public void deserializeShouldReturnNullWhenSouceIsNull() { - assertThat(new GenericJackson2JsonRedisSerializer().deserialize(null), nullValue()); + assertThat(new GenericJackson2JsonRedisSerializer().deserialize(null)).isNull(); } @Test // DATAREDIS-392 public void deserializeShouldReturnNullWhenSouceIsEmptyArray() { - assertThat(new GenericJackson2JsonRedisSerializer().deserialize(SerializationUtils.EMPTY_ARRAY), nullValue()); + assertThat(new GenericJackson2JsonRedisSerializer().deserialize(SerializationUtils.EMPTY_ARRAY)).isNull(); } @Test // DATAREDIS-392 @@ -98,7 +97,7 @@ public class GenericJackson2JsonRedisSerializerUnitTests { GenericJackson2JsonRedisSerializer serializer = new GenericJackson2JsonRedisSerializer(); - assertThat((SimpleObject) serializer.deserialize(serializer.serialize(SIMPLE_OBJECT)), is(SIMPLE_OBJECT)); + assertThat((SimpleObject) serializer.deserialize(serializer.serialize(SIMPLE_OBJECT))).isEqualTo(SIMPLE_OBJECT); } @Test // DATAREDIS-392 @@ -106,7 +105,7 @@ public class GenericJackson2JsonRedisSerializerUnitTests { GenericJackson2JsonRedisSerializer serializer = new GenericJackson2JsonRedisSerializer(); - assertThat((ComplexObject) serializer.deserialize(serializer.serialize(COMPLEX_OBJECT)), is(COMPLEX_OBJECT)); + assertThat((ComplexObject) serializer.deserialize(serializer.serialize(COMPLEX_OBJECT))).isEqualTo(COMPLEX_OBJECT); } @Test(expected = SerializationException.class) // DATAREDIS-392 @@ -153,10 +152,10 @@ public class GenericJackson2JsonRedisSerializerUnitTests { NullValue nv = BeanUtils.instantiateClass(NullValue.class); byte[] serializedValue = serializer.serialize(nv); - assertThat(serializedValue, is(notNullValue())); + assertThat(serializedValue).isNotNull(); Object deserializedValue = serializer.deserialize(serializedValue); - assertThat(deserializedValue, is(instanceOf(NullValue.class))); + assertThat(deserializedValue).isInstanceOf(NullValue.class); } private TypeResolverBuilder extractTypeResolver(GenericJackson2JsonRedisSerializer serializer) { diff --git a/src/test/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializerTests.java b/src/test/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializerTests.java index 1ca9f6927..0e4ef01ea 100644 --- a/src/test/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializerTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializerTests.java @@ -15,14 +15,13 @@ */ package org.springframework.data.redis.serializer; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; -import org.hamcrest.core.Is; -import org.hamcrest.core.IsNull; import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.Person; import org.springframework.data.redis.PersonObjectFactory; @@ -43,17 +42,17 @@ public class Jackson2JsonRedisSerializerTests { public void testJackson2JsonSerializer() throws Exception { Person person = new PersonObjectFactory().instance(); - assertEquals(person, serializer.deserialize(serializer.serialize(person))); + assertThat(serializer.deserialize(serializer.serialize(person))).isEqualTo(person); } @Test // DATAREDIS-241 public void testJackson2JsonSerializerShouldReturnEmptyByteArrayWhenSerializingNull() { - assertThat(serializer.serialize(null), Is.is(new byte[0])); + assertThat(serializer.serialize(null)).isEqualTo(new byte[0]); } @Test // DTATREDIS-241 public void testJackson2JsonSerializerShouldReturnNullWhenDerserializingEmtyByteArray() { - assertThat(serializer.deserialize(new byte[0]), IsNull.nullValue()); + assertThat(serializer.deserialize(new byte[0])).isNull(); } @Test(expected = SerializationException.class) // DTATREDIS-241 diff --git a/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java b/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java index 1f0d63900..e9dd9746c 100644 --- a/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.serializer; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.Serializable; import java.util.UUID; @@ -24,6 +23,7 @@ import java.util.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.Address; import org.springframework.data.redis.Person; import org.springframework.instrument.classloading.ShadowingClassLoader; @@ -118,8 +118,8 @@ public class SimpleRedisSerializerTests { private void verifySerializedObjects(Object... objects) { for (Object object : objects) { - assertEquals("Incorrectly (de)serialized object " + object, object, - serializer.deserialize(serializer.serialize(object))); + assertThat(serializer.deserialize(serializer.serialize(object))).as("Incorrectly (de)serialized object " + object) + .isEqualTo(object); } } @@ -134,25 +134,25 @@ public class SimpleRedisSerializerTests { byte[] serialized = serializer.serialize(domainClass); Object deserialized = serializer.deserialize(serialized); - assertThat(deserialized.getClass().getName(), is(equalTo(SerializableDomainClass.class.getName()))); - assertThat(deserialized, is(not(instanceOf(SerializableDomainClass.class)))); - assertThat(deserialized.getClass().getClassLoader(), is(equalTo(customClassLoader))); + assertThat(deserialized.getClass().getName()).isEqualTo(SerializableDomainClass.class.getName()); + assertThat(deserialized).isNotInstanceOf(SerializableDomainClass.class); + assertThat(deserialized.getClass().getClassLoader()).isEqualTo(customClassLoader); } @Test public void testStringEncodedSerialization() { String value = UUID.randomUUID().toString(); - assertEquals(value, serializer.deserialize(serializer.serialize(value))); - assertEquals(value, serializer.deserialize(serializer.serialize(value))); - assertEquals(value, serializer.deserialize(serializer.serialize(value))); + assertThat(serializer.deserialize(serializer.serialize(value))).isEqualTo(value); + assertThat(serializer.deserialize(serializer.serialize(value))).isEqualTo(value); + assertThat(serializer.deserialize(serializer.serialize(value))).isEqualTo(value); } @Test public void testPersonSerialization() throws Exception { String value = UUID.randomUUID().toString(); Person p1 = new Person(value, value, 1, new Address(value, 2)); - assertEquals(p1, serializer.deserialize(serializer.serialize(p1))); - assertEquals(p1, serializer.deserialize(serializer.serialize(p1))); + assertThat(serializer.deserialize(serializer.serialize(p1))).isEqualTo(p1); + assertThat(serializer.deserialize(serializer.serialize(p1))).isEqualTo(p1); } @Test @@ -164,8 +164,8 @@ public class SimpleRedisSerializerTests { String value = UUID.randomUUID().toString(); Person p1 = new Person(value, value, 1, new Address(value, 2)); - assertEquals(p1, serializer.deserialize(serializer.serialize(p1))); - assertEquals(p1, serializer.deserialize(serializer.serialize(p1))); + assertThat(serializer.deserialize(serializer.serialize(p1))).isEqualTo(p1); + assertThat(serializer.deserialize(serializer.serialize(p1))).isEqualTo(p1); } @Test @@ -173,7 +173,7 @@ public class SimpleRedisSerializerTests { Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(Person.class); String value = UUID.randomUUID().toString(); Person p1 = new Person(value, value, 1, new Address(value, 2)); - assertEquals(p1, serializer.deserialize(serializer.serialize(p1))); - assertEquals(p1, serializer.deserialize(serializer.serialize(p1))); + assertThat(serializer.deserialize(serializer.serialize(p1))).isEqualTo(p1); + assertThat(serializer.deserialize(serializer.serialize(p1))).isEqualTo(p1); } } diff --git a/src/test/java/org/springframework/data/redis/serializer/StringRedisSerializerUnitTests.java b/src/test/java/org/springframework/data/redis/serializer/StringRedisSerializerUnitTests.java index efacd55c3..3812d8e66 100644 --- a/src/test/java/org/springframework/data/redis/serializer/StringRedisSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/redis/serializer/StringRedisSerializerUnitTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.redis.serializer; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.nio.charset.StandardCharsets; @@ -32,39 +31,39 @@ public class StringRedisSerializerUnitTests { @Test public void shouldSerializeToAscii() { - assertThat(StringRedisSerializer.US_ASCII.serialize("foo-bar"), is(equalTo("foo-bar".getBytes()))); - assertThat(StringRedisSerializer.US_ASCII.serialize("üßØ"), is(equalTo("???".getBytes()))); + assertThat(StringRedisSerializer.US_ASCII.serialize("foo-bar")).isEqualTo("foo-bar".getBytes()); + assertThat(StringRedisSerializer.US_ASCII.serialize("üßØ")).isEqualTo("???".getBytes()); } @Test public void shouldDeserializeFromAscii() { - assertThat(StringRedisSerializer.US_ASCII.deserialize("foo-bar".getBytes()), is(equalTo("foo-bar"))); + assertThat(StringRedisSerializer.US_ASCII.deserialize("foo-bar".getBytes())).isEqualTo("foo-bar"); } @Test public void shouldSerializeToIso88591() { - assertThat(StringRedisSerializer.ISO_8859_1.serialize("üßØ"), - is(equalTo("üßØ".getBytes(StandardCharsets.ISO_8859_1)))); + assertThat(StringRedisSerializer.ISO_8859_1.serialize("üßØ")) + .isEqualTo("üßØ".getBytes(StandardCharsets.ISO_8859_1)); } @Test public void shouldDeserializeFromIso88591() { - assertThat(StringRedisSerializer.ISO_8859_1.deserialize("üßØ".getBytes(StandardCharsets.ISO_8859_1)), - is(equalTo("üßØ"))); + assertThat(StringRedisSerializer.ISO_8859_1.deserialize("üßØ".getBytes(StandardCharsets.ISO_8859_1))) + .isEqualTo("üßØ"); } @Test public void shouldSerializeToUtf8() { - assertThat(StringRedisSerializer.UTF_8.serialize("foo-bar"), is(equalTo("foo-bar".getBytes()))); - assertThat(StringRedisSerializer.UTF_8.serialize("üßØ"), is(equalTo("üßØ".getBytes(StandardCharsets.UTF_8)))); + assertThat(StringRedisSerializer.UTF_8.serialize("foo-bar")).isEqualTo("foo-bar".getBytes()); + assertThat(StringRedisSerializer.UTF_8.serialize("üßØ")).isEqualTo("üßØ".getBytes(StandardCharsets.UTF_8)); } @Test public void shouldDeserializeFromUtf8() { - assertThat(StringRedisSerializer.UTF_8.deserialize("üßØ".getBytes(StandardCharsets.UTF_8)), is(equalTo("üßØ"))); + assertThat(StringRedisSerializer.UTF_8.deserialize("üßØ".getBytes(StandardCharsets.UTF_8))).isEqualTo("üßØ"); } } diff --git a/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsTest.java b/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsTest.java index 143091e46..c5fa654a0 100644 --- a/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsTest.java +++ b/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsTest.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.support; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; import java.util.Map; @@ -28,6 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.core.BoundKeyOperations; @@ -94,20 +95,21 @@ public class BoundKeyOperationsTest { Object newName = objFactory.instance(); keyOps.rename(newName); - assertEquals(newName, keyOps.getKey()); + assertThat(keyOps.getKey()).isEqualTo(newName); keyOps.rename(key); - assertEquals(key, keyOps.getKey()); + assertThat(keyOps.getKey()).isEqualTo(key); } @Test // DATAREDIS-251 public void testExpire() throws Exception { - assertEquals(keyOps.getClass().getName() + " -> " + keyOps.getKey(), Long.valueOf(-1), keyOps.getExpire()); + assertThat(keyOps.getExpire()).as(keyOps.getClass().getName() + " -> " + keyOps.getKey()) + .isEqualTo(Long.valueOf(-1)); if (keyOps.expire(10, TimeUnit.SECONDS)) { long expire = keyOps.getExpire().longValue(); - assertTrue(expire <= 10 && expire > 5); + assertThat(expire <= 10 && expire > 5).isTrue(); } } @@ -116,13 +118,14 @@ public class BoundKeyOperationsTest { keyOps.persist(); - assertEquals(keyOps.getClass().getName() + " -> " + keyOps.getKey(), Long.valueOf(-1), keyOps.getExpire()); + assertThat(keyOps.getExpire()).as(keyOps.getClass().getName() + " -> " + keyOps.getKey()) + .isEqualTo(Long.valueOf(-1)); if (keyOps.expire(10, TimeUnit.SECONDS)) { - assertTrue(keyOps.getExpire().longValue() > 0); + assertThat(keyOps.getExpire().longValue() > 0).isTrue(); } keyOps.persist(); - assertEquals(keyOps.getClass().getName() + " -> " + keyOps.getKey(), -1, keyOps.getExpire().longValue()); + assertThat(keyOps.getExpire().longValue()).as(keyOps.getClass().getName() + " -> " + keyOps.getKey()).isEqualTo(-1); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java index c621d21e2..14bd32d48 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisCollectionTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.support.collections; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Collection; @@ -32,6 +30,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.core.RedisCallback; @@ -99,9 +98,9 @@ public abstract class AbstractRedisCollectionTests { @Test public void testAdd() { T t1 = getT(); - assertThat(collection.add(t1), is(true)); - assertThat(collection, hasItem(t1)); - assertEquals(1, collection.size()); + assertThat(collection.add(t1)).isTrue(); + assertThat(collection).contains(t1); + assertThat(collection.size()).isEqualTo(1); } @SuppressWarnings("unchecked") @@ -113,29 +112,29 @@ public abstract class AbstractRedisCollectionTests { List list = Arrays.asList(t1, t2, t3); - assertThat(collection.addAll(list), is(true)); - assertThat(collection, hasItem(t1)); - assertThat(collection, hasItem(t2)); - assertThat(collection, hasItem(t3)); - assertEquals(collection.size(), 3); + assertThat(collection.addAll(list)).isTrue(); + assertThat(collection).contains(t1); + assertThat(collection).contains(t2); + assertThat(collection).contains(t3); + assertThat(3).isEqualTo(collection.size()); } @Test public void testClear() { T t1 = getT(); - assertEquals(0, collection.size()); + assertThat(collection.size()).isEqualTo(0); collection.add(t1); - assertEquals(1, collection.size()); + assertThat(collection.size()).isEqualTo(1); collection.clear(); - assertEquals(0, collection.size()); + assertThat(collection.size()).isEqualTo(0); } @Test public void testContainsObject() { T t1 = getT(); - assertThat(collection, not(hasItem(t1))); - assertThat(collection.add(t1), is(true)); - assertThat(collection, hasItem(t1)); + assertThat(collection).doesNotContain(t1); + assertThat(collection.add(t1)).isTrue(); + assertThat(collection).contains(t1); } @SuppressWarnings("unchecked") @@ -147,9 +146,9 @@ public abstract class AbstractRedisCollectionTests { List list = Arrays.asList(t1, t2, t3); - assertThat(collection.addAll(list), is(true)); - assertThat(collection, hasItems((T[]) list.toArray())); - assertThat(collection, hasItems(t1, t2, t3)); + assertThat(collection.addAll(list)).isTrue(); + assertThat(collection).contains((T[]) list.toArray()); + assertThat(collection).contains(t1, t2, t3); } @Test @@ -159,18 +158,18 @@ public abstract class AbstractRedisCollectionTests { @Test public void testHashCode() { - assertThat(collection.hashCode(), not(equalTo(collection.getKey().hashCode()))); + assertThat(collection.hashCode()).isNotEqualTo(collection.getKey().hashCode()); } @Test public void testIsEmpty() { - assertEquals(0, collection.size()); - assertTrue(collection.isEmpty()); + assertThat(collection.size()).isEqualTo(0); + assertThat(collection.isEmpty()).isTrue(); collection.add(getT()); - assertEquals(1, collection.size()); - assertFalse(collection.isEmpty()); + assertThat(collection.size()).isEqualTo(1); + assertThat(collection.isEmpty()).isFalse(); collection.clear(); - assertTrue(collection.isEmpty()); + assertThat(collection.isEmpty()).isTrue(); } @SuppressWarnings("unchecked") @@ -183,14 +182,14 @@ public abstract class AbstractRedisCollectionTests { List list = Arrays.asList(t1, t2, t3, t4); - assertThat(collection.addAll(list), is(true)); + assertThat(collection.addAll(list)).isTrue(); Iterator iterator = collection.iterator(); - assertThat(iterator.next(), isEqual(t1)); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t3)); - assertThat(iterator.next(), isEqual(t4)); - assertFalse(iterator.hasNext()); + assertThat(iterator.next()).isEqualTo(t1); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.next()).isEqualTo(t4); + assertThat(iterator.hasNext()).isFalse(); } @Test @@ -199,16 +198,16 @@ public abstract class AbstractRedisCollectionTests { T t2 = getT(); T t3 = getT(); - assertEquals(0, collection.size()); - assertThat(collection.add(t1), is(true)); - assertThat(collection.add(t2), is(true)); - assertEquals(2, collection.size()); - assertThat(collection.remove(t3), is(false)); - assertThat(collection.remove(t2), is(true)); - assertThat(collection.remove(t2), is(false)); - assertEquals(1, collection.size()); - assertThat(collection.remove(t1), is(true)); - assertEquals(0, collection.size()); + assertThat(collection.size()).isEqualTo(0); + assertThat(collection.add(t1)).isTrue(); + assertThat(collection.add(t2)).isTrue(); + assertThat(collection.size()).isEqualTo(2); + assertThat(collection.remove(t3)).isFalse(); + assertThat(collection.remove(t2)).isTrue(); + assertThat(collection.remove(t2)).isFalse(); + assertThat(collection.size()).isEqualTo(1); + assertThat(collection.remove(t1)).isTrue(); + assertThat(collection.size()).isEqualTo(0); } @SuppressWarnings("unchecked") @@ -220,19 +219,19 @@ public abstract class AbstractRedisCollectionTests { List list = Arrays.asList(t1, t2, t3); - assertThat(collection.addAll(list), is(true)); - assertThat(collection, hasItems((T[]) list.toArray())); - assertThat(collection, hasItems(t1, t2, t3)); + assertThat(collection.addAll(list)).isTrue(); + assertThat(collection).contains((T[]) list.toArray()); + assertThat(collection).contains(t1, t2, t3); List newList = Arrays.asList(getT(), getT()); List partialList = Arrays.asList(getT(), t1, getT()); - assertThat(collection.removeAll(newList), is(false)); - assertThat(collection.removeAll(partialList), is(true)); - assertThat(collection, not(hasItem(t1))); - assertThat(collection, hasItems(t2, t3)); - assertThat(collection.removeAll(list), is(true)); - assertThat(collection, not(hasItems(t2, t3))); + assertThat(collection.removeAll(newList)).isFalse(); + assertThat(collection.removeAll(partialList)).isTrue(); + assertThat(collection).doesNotContain(t1); + assertThat(collection).contains(t2, t3); + assertThat(collection.removeAll(list)).isTrue(); + assertThat(collection).doesNotContain(t2, t3); } // @Test(expected = UnsupportedOperationException.class) @@ -245,22 +244,22 @@ public abstract class AbstractRedisCollectionTests { List list = Arrays.asList(t1, t2); List newList = Arrays.asList(t2, t3); - assertThat(collection.addAll(list), is(true)); - assertThat(collection, hasItems(t1, t2)); - assertThat(collection.retainAll(newList), is(true)); - assertThat(collection, not(hasItem(t1))); - assertThat(collection, hasItem(t2)); + assertThat(collection.addAll(list)).isTrue(); + assertThat(collection).contains(t1, t2); + assertThat(collection.retainAll(newList)).isTrue(); + assertThat(collection).doesNotContain(t1); + assertThat(collection).contains(t2); } @Test public void testSize() { - assertEquals(0, collection.size()); - assertTrue(collection.isEmpty()); + assertThat(collection.size()).isEqualTo(0); + assertThat(collection.isEmpty()).isTrue(); collection.add(getT()); - assertEquals(1, collection.size()); + assertThat(collection.size()).isEqualTo(1); collection.add(getT()); collection.add(getT()); - assertEquals(3, collection.size()); + assertThat(collection.size()).isEqualTo(3); } @SuppressWarnings("unchecked") @@ -269,10 +268,10 @@ public abstract class AbstractRedisCollectionTests { Object[] expectedArray = new Object[] { getT(), getT(), getT() }; List list = (List) Arrays.asList(expectedArray); - assertThat(collection.addAll(list), is(true)); + assertThat(collection.addAll(list)).isTrue(); Object[] array = collection.toArray(); - assertArrayEquals(expectedArray, array); + assertThat(array).isEqualTo(expectedArray); } @SuppressWarnings("unchecked") @@ -281,21 +280,21 @@ public abstract class AbstractRedisCollectionTests { Object[] expectedArray = new Object[] { getT(), getT(), getT() }; List list = (List) Arrays.asList(expectedArray); - assertThat(collection.addAll(list), is(true)); + assertThat(collection.addAll(list)).isTrue(); Object[] array = collection.toArray(new Object[expectedArray.length]); - assertArrayEquals(expectedArray, array); + assertThat(array).isEqualTo(expectedArray); } @Test public void testToString() { String name = collection.toString(); collection.add(getT()); - assertEquals(name, collection.toString()); + assertThat(collection.toString()).isEqualTo(name); } @Test public void testGetKey() throws Exception { - assertNotNull(collection.getKey()); + assertThat(collection.getKey()).isNotNull(); } } diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java index 1ca72fef3..a8b6ac615 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisListTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.support.collections; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.Arrays; @@ -28,6 +26,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; + import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.core.RedisTemplate; @@ -68,9 +67,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t1); list.add(t2); - assertThat(list.get(0), isEqual(t1)); + assertThat(list.get(0)).isEqualTo(t1); list.add(0, t3); - assertThat(list.get(0), isEqual(t3)); + assertThat(list.get(0)).isEqualTo(t3); } @Test @@ -82,9 +81,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t1); list.add(t2); - assertThat(list.get(1), isEqual(t2)); + assertThat(list.get(1)).isEqualTo(t2); list.add(2, t3); - assertThat(list.get(2), isEqual(t3)); + assertThat(list.get(2)).isEqualTo(t3); } @Test(expected = IllegalArgumentException.class) @@ -96,7 +95,7 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t1); list.add(t2); - assertThat(list.get(0), isEqual(t1)); + assertThat(list.get(0)).isEqualTo(t1); list.add(1, t3); } @@ -113,11 +112,11 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT List asList = Arrays.asList(t3, t4); - assertThat(list.get(0), isEqual(t1)); + assertThat(list.get(0)).isEqualTo(t1); list.addAll(0, asList); // verify insertion order - assertThat(list.get(0), isEqual(t3)); - assertThat(list.get(1), isEqual(t4)); + assertThat(list.get(0)).isEqualTo(t3); + assertThat(list.get(1)).isEqualTo(t4); } @SuppressWarnings("unchecked") @@ -133,12 +132,12 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT List asList = Arrays.asList(t3, t4); - assertThat(list.get(0), isEqual(t1)); - assertTrue(list.addAll(2, asList)); + assertThat(list.get(0)).isEqualTo(t1); + assertThat(list.addAll(2, asList)).isTrue(); // verify insertion order - assertThat(list.get(2), isEqual(t3)); - assertThat(list.get(3), isEqual(t4)); + assertThat(list.get(2)).isEqualTo(t3); + assertThat(list.get(3)).isEqualTo(t4); } @SuppressWarnings("unchecked") @@ -154,8 +153,8 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT List asList = Arrays.asList(t3, t4); - assertThat(list.get(0), isEqual(t1)); - assertTrue(list.addAll(1, asList)); + assertThat(list.get(0)).isEqualTo(t1); + assertThat(list.addAll(1, asList)).isTrue(); } @Test(expected = UnsupportedOperationException.class) @@ -163,52 +162,43 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT T t1 = getT(); T t2 = getT(); - assertEquals(-1, list.indexOf(t1)); + assertThat(list.indexOf(t1)).isEqualTo(-1); list.add(t1); - assertEquals(0, list.indexOf(t1)); + assertThat(list.indexOf(t1)).isEqualTo(0); - assertEquals(-1, list.indexOf(t2)); + assertThat(list.indexOf(t2)).isEqualTo(-1); list.add(t2); - assertEquals(1, list.indexOf(t1)); + assertThat(list.indexOf(t1)).isEqualTo(1); } @Test public void testOffer() { T t1 = getT(); - assertTrue(list.offer(t1)); - assertThat(list.get(0), isEqual(t1)); + assertThat(list.offer(t1)).isTrue(); + assertThat(list.get(0)).isEqualTo(t1); } @Test public void testPeek() { - assertNull(list.peek()); + assertThat(list.peek()).isNull(); T t1 = getT(); list.add(t1); - assertThat(list.peek(), isEqual(t1)); + assertThat(list.peek()).isEqualTo(t1); list.clear(); - assertNull(list.peek()); + assertThat(list.peek()).isNull(); } @Test public void testElement() { - try { - list.element(); - fail(); - } catch (NoSuchElementException nse) { - // expected - } + + assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(list::element); T t1 = getT(); list.add(t1); - assertThat(list.element(), isEqual(t1)); + assertThat(list.element()).isEqualTo(t1); list.clear(); - try { - list.element(); - fail(); - } catch (NoSuchElementException nse) { - // expected - } + assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(list::element); } @Test @@ -218,11 +208,11 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT @Test public void testPoll() { - assertNull(list.poll()); + assertThat(list.poll()).isNull(); T t1 = getT(); list.add(t1); - assertThat(list.poll(), isEqual(t1)); - assertNull(list.poll()); + assertThat(list.poll()).isEqualTo(t1); + assertThat(list.poll()).isNull(); } @Test @@ -230,27 +220,17 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT T t1 = getT(); list.add(t1); - assertThat(list.poll(1, TimeUnit.MILLISECONDS), isEqual(t1)); + assertThat(list.poll(1, TimeUnit.MILLISECONDS)).isEqualTo(t1); } @Test public void testRemove() { - try { - list.remove(); - fail(); - } catch (NoSuchElementException nse) { - // expected - } + assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(list::remove); T t1 = getT(); list.add(t1); - assertThat(list.remove(), isEqual(t1)); - try { - list.remove(); - fail(); - } catch (NoSuchElementException nse) { - // expected - } + assertThat(list.remove()).isEqualTo(t1); + assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(list::remove); } @Test @@ -258,12 +238,12 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT T t1 = getT(); T t2 = getT(); - assertTrue(list.range(0, -1).isEmpty()); + assertThat(list.range(0, -1).isEmpty()).isTrue(); list.add(t1); list.add(t2); - assertEquals(2, list.range(0, -1).size()); - assertThat(list.range(0, 0).get(0), isEqual(t1)); - assertThat(list.range(1, 1).get(0), isEqual(t2)); + assertThat(list.range(0, -1).size()).isEqualTo(2); + assertThat(list.range(0, 0).get(0)).isEqualTo(t1); + assertThat(list.range(1, 1).get(0)).isEqualTo(t2); } @Test(expected = UnsupportedOperationException.class) @@ -271,12 +251,12 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT T t1 = getT(); T t2 = getT(); - assertNull(list.remove(0)); + assertThat(list.remove(0)).isNull(); list.add(t1); list.add(t2); - assertNull(list.remove(2)); - assertEquals(t2, list.remove(1)); - assertEquals(t1, list.remove(0)); + assertThat(list.remove(2)).isNull(); + assertThat(list.remove(1)).isEqualTo(t2); + assertThat(list.remove(0)).isEqualTo(t1); } @Test @@ -285,8 +265,8 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT T t2 = getT(); list.add(t1); list.set(0, t1); - assertThat(list.set(0, t2), isEqual(t1)); - assertThat(list.get(0), isEqual(t2)); + assertThat(list.set(0, t2)).isEqualTo(t1); + assertThat(list.get(0)).isEqualTo(t2); } @Test @@ -294,13 +274,13 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT T t1 = getT(); T t2 = getT(); - assertTrue(list.trim(0, 0).isEmpty()); + assertThat(list.trim(0, 0).isEmpty()).isTrue(); list.add(t1); list.add(t2); - assertEquals(2, list.size()); - assertEquals(1, list.trim(0, 0).size()); - assertEquals(1, list.size()); - assertThat(list.get(0), isEqual(t1)); + assertThat(list.size()).isEqualTo(2); + assertThat(list.trim(0, 0).size()).isEqualTo(1); + assertThat(list.size()).isEqualTo(1); + assertThat(list.get(0)).isEqualTo(t1); } @SuppressWarnings("unchecked") @@ -309,13 +289,13 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT RedisList cappedList = new DefaultRedisList(template.boundListOps(collection.getKey() + ":capped"), 1); T first = getT(); cappedList.offer(first); - assertEquals(1, cappedList.size()); + assertThat(cappedList.size()).isEqualTo(1); cappedList.add(getT()); - assertEquals(1, cappedList.size()); + assertThat(cappedList.size()).isEqualTo(1); T last = getT(); cappedList.add(last); - assertEquals(1, cappedList.size()); - assertThat(cappedList.get(0), isEqual(first)); + assertThat(cappedList.size()).isEqualTo(1); + assertThat(cappedList.get(0)).isEqualTo(first); } @Test @@ -329,9 +309,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.addFirst(t3); Iterator iterator = list.iterator(); - assertThat(iterator.next(), isEqual(t3)); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t1)); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t1); } @Test @@ -350,9 +330,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t3); Iterator iterator = list.descendingIterator(); - assertThat(iterator.next(), isEqual(t3)); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t1)); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t1); } @@ -370,10 +350,10 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT List c = new ArrayList<>(); list.drainTo(c, 2); - assertEquals(1, list.size()); - assertThat(list, hasItem(t3)); - assertEquals(2, c.size()); - assertThat(c, hasItems(t1, t2)); + assertThat(list.size()).isEqualTo(1); + assertThat(list).contains(t3); + assertThat(c.size()).isEqualTo(2); + assertThat(c).contains(t1, t2); } @SuppressWarnings("unchecked") @@ -390,9 +370,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT List c = new ArrayList<>(); list.drainTo(c); - assertTrue(list.isEmpty()); - assertEquals(3, c.size()); - assertThat(c, hasItems(t1, t2, t3)); + assertThat(list.isEmpty()).isTrue(); + assertThat(c.size()).isEqualTo(3); + assertThat(c).contains(t1, t2, t3); } @Test @@ -403,7 +383,7 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t1); list.add(t2); - assertThat(list.getFirst(), isEqual(t1)); + assertThat(list.getFirst()).isEqualTo(t1); } @Test @@ -434,8 +414,8 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t1); list.add(t2); - assertThat(list.peekLast(), isEqual(t2)); - assertEquals(2, list.size()); + assertThat(list.peekLast()).isEqualTo(t2); + assertThat(list.size()).isEqualTo(2); } @Test @@ -452,9 +432,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t2); T last = list.pollLast(); - assertThat(last, isEqual(t2)); - assertEquals(1, list.size()); - assertThat(list, hasItem(t1)); + assertThat(last).isEqualTo(t2); + assertThat(list.size()).isEqualTo(1); + assertThat(list).contains(t1); } @Test @@ -467,9 +447,9 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t2); T last = list.pollLast(1, TimeUnit.MILLISECONDS); - assertThat(last, isEqual(t2)); - assertEquals(1, list.size()); - assertThat(list, hasItem(t1)); + assertThat(last).isEqualTo(t2); + assertThat(list.size()).isEqualTo(1); + assertThat(list).contains(t1); } @Test @@ -489,7 +469,7 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT @Test public void testRemainingCapacity() { - assertEquals(Integer.MAX_VALUE, list.remainingCapacity()); + assertThat(list.remainingCapacity()).isEqualTo(Integer.MAX_VALUE); } @Test @@ -518,11 +498,11 @@ public abstract class AbstractRedisListTests extends AbstractRedisCollectionT list.add(t2); list.removeLastOccurrence(t2); - assertEquals(3, list.size()); + assertThat(list.size()).isEqualTo(3); Iterator iterator = list.iterator(); - assertThat(iterator.next(), isEqual(t1)); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t1)); + assertThat(iterator.next()).isEqualTo(t1); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t1); } @Test diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java index 8e1db7024..625951882 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java @@ -15,10 +15,8 @@ */ package org.springframework.data.redis.support.collections; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assume.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; import java.io.IOException; import java.text.DecimalFormat; @@ -38,6 +36,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.DoubleAsStringObjectFactory; @@ -127,11 +126,11 @@ public abstract class AbstractRedisMapTests { @Test public void testClear() { map.clear(); - assertEquals(0, map.size()); + assertThat(map.size()).isEqualTo(0); map.put(getKey(), getValue()); - assertEquals(1, map.size()); + assertThat(map.size()).isEqualTo(1); map.clear(); - assertEquals(0, map.size()); + assertThat(map.size()).isEqualTo(0); } @Test @@ -139,12 +138,12 @@ public abstract class AbstractRedisMapTests { K k1 = getKey(); K k2 = getKey(); - assertFalse(map.containsKey(k1)); - assertFalse(map.containsKey(k2)); + assertThat(map.containsKey(k1)).isFalse(); + assertThat(map.containsKey(k2)).isFalse(); map.put(k1, getValue()); - assertTrue(map.containsKey(k1)); + assertThat(map.containsKey(k1)).isTrue(); map.put(k2, getValue()); - assertTrue(map.containsKey(k2)); + assertThat(map.containsKey(k2)).isTrue(); } @Test(expected = UnsupportedOperationException.class) @@ -152,12 +151,12 @@ public abstract class AbstractRedisMapTests { V v1 = getValue(); V v2 = getValue(); - assertFalse(map.containsValue(v1)); - assertFalse(map.containsValue(v2)); + assertThat(map.containsValue(v1)).isFalse(); + assertThat(map.containsValue(v2)).isFalse(); map.put(getKey(), v1); - assertTrue(map.containsValue(v1)); + assertThat(map.containsValue(v1)).isTrue(); map.put(getKey(), v2); - assertTrue(map.containsValue(v2)); + assertThat(map.containsValue(v2)).isTrue(); } public Set> entrySet() { @@ -167,17 +166,17 @@ public abstract class AbstractRedisMapTests { @Test public void testEquals() { RedisStore clone = copyStore(map); - assertEquals(clone, map); - assertEquals(clone, clone); - assertEquals(map, map); + assertThat(map).isEqualTo(clone); + assertThat(clone).isEqualTo(clone); + assertThat(map).isEqualTo(map); } @Test public void testNotEquals() { RedisOperations ops = map.getOperations(); RedisStore newInstance = new DefaultRedisMap<>(ops. boundHashOps(map.getKey() + ":new")); - assertFalse(map.equals(newInstance)); - assertFalse(newInstance.equals(map)); + assertThat(map.equals(newInstance)).isFalse(); + assertThat(newInstance.equals(map)).isFalse(); } @Test @@ -185,25 +184,25 @@ public abstract class AbstractRedisMapTests { K k1 = getKey(); V v1 = getValue(); - assertNull(map.get(k1)); + assertThat(map.get(k1)).isNull(); map.put(k1, v1); - assertThat(map.get(k1), isEqual(v1)); + assertThat(map.get(k1)).isEqualTo(v1); } @Test public void testGetKey() { - assertNotNull(map.getKey()); + assertThat(map.getKey()).isNotNull(); } @Test public void testGetOperations() { - assertEquals(template, map.getOperations()); + assertThat(map.getOperations()).isEqualTo(template); } @Test public void testHashCode() { - assertThat(map.hashCode(), not(equalTo(map.getKey().hashCode()))); - assertEquals(map.hashCode(), copyStore(map).hashCode()); + assertThat(map.hashCode()).isNotEqualTo(map.getKey().hashCode()); + assertThat(copyStore(map).hashCode()).isEqualTo(map.hashCode()); } @Test @@ -228,7 +227,7 @@ public abstract class AbstractRedisMapTests { K k1 = getKey(); V v1 = getValue(); map.put(k1, v1); - assertEquals(Long.valueOf(Long.valueOf((String) v1) + 10), map.increment(k1, 10)); + assertThat(map.increment(k1, 10)).isEqualTo(Long.valueOf(Long.valueOf((String) v1) + 10)); } @Test @@ -239,24 +238,24 @@ public abstract class AbstractRedisMapTests { V v1 = getValue(); map.put(k1, v1); DecimalFormat twoDForm = new DecimalFormat("#.##"); - assertEquals(twoDForm.format(Double.valueOf((String) v1) + 3.4), twoDForm.format(map.increment(k1, 3.4))); + assertThat(twoDForm.format(map.increment(k1, 3.4))).isEqualTo(twoDForm.format(Double.valueOf((String) v1) + 3.4)); } @Test public void testIsEmpty() { map.clear(); - assertTrue(map.isEmpty()); + assertThat(map.isEmpty()).isTrue(); map.put(getKey(), getValue()); - assertFalse(map.isEmpty()); + assertThat(map.isEmpty()).isFalse(); map.clear(); - assertTrue(map.isEmpty()); + assertThat(map.isEmpty()).isTrue(); } @SuppressWarnings("unchecked") @Test public void testKeySet() { map.clear(); - assertTrue(map.keySet().isEmpty()); + assertThat(map.keySet().isEmpty()).isTrue(); K k1 = getKey(); K k2 = getKey(); K k3 = getKey(); @@ -266,8 +265,8 @@ public abstract class AbstractRedisMapTests { map.put(k3, getValue()); Set keySet = map.keySet(); - assertThat(keySet, hasItems(k1, k2, k3)); - assertEquals(3, keySet.size()); + assertThat(keySet).contains(k1, k2, k3); + assertThat(keySet.size()).isEqualTo(3); } @Test @@ -280,8 +279,8 @@ public abstract class AbstractRedisMapTests { map.put(k1, v1); map.put(k2, v2); - assertThat(map.get(k1), isEqual(v1)); - assertThat(map.get(k2), isEqual(v2)); + assertThat(map.get(k1)).isEqualTo(v1); + assertThat(map.get(k2)).isEqualTo(v2); } @Test @@ -297,13 +296,13 @@ public abstract class AbstractRedisMapTests { m.put(k1, v1); m.put(k2, v2); - assertNull(map.get(k1)); - assertNull(map.get(k2)); + assertThat(map.get(k1)).isNull(); + assertThat(map.get(k2)).isNull(); map.putAll(m); - assertThat(map.get(k1), isEqual(v1)); - assertThat(map.get(k2), isEqual(v2)); + assertThat(map.get(k1)).isEqualTo(v1); + assertThat(map.get(k2)).isEqualTo(v2); } @Test @@ -314,34 +313,34 @@ public abstract class AbstractRedisMapTests { V v1 = getValue(); V v2 = getValue(); - assertNull(map.remove(k1)); - assertNull(map.remove(k2)); + assertThat(map.remove(k1)).isNull(); + assertThat(map.remove(k2)).isNull(); map.put(k1, v1); map.put(k2, v2); - assertThat(map.remove(k1), isEqual(v1)); - assertNull(map.remove(k1)); - assertNull(map.get(k1)); + assertThat(map.remove(k1)).isEqualTo(v1); + assertThat(map.remove(k1)).isNull(); + assertThat(map.get(k1)).isNull(); - assertThat(map.remove(k2), isEqual(v2)); - assertNull(map.remove(k2)); - assertNull(map.get(k2)); + assertThat(map.remove(k2)).isEqualTo(v2); + assertThat(map.remove(k2)).isNull(); + assertThat(map.get(k2)).isNull(); } @Test public void testSize() { - assertEquals(0, map.size()); + assertThat(map.size()).isEqualTo(0); map.put(getKey(), getValue()); - assertEquals(1, map.size()); + assertThat(map.size()).isEqualTo(1); K k = getKey(); map.put(k, getValue()); - assertEquals(2, map.size()); + assertThat(map.size()).isEqualTo(2); map.remove(k); - assertEquals(1, map.size()); + assertThat(map.size()).isEqualTo(1); map.clear(); - assertEquals(0, map.size()); + assertThat(map.size()).isEqualTo(0); } @SuppressWarnings("unchecked") @@ -355,13 +354,13 @@ public abstract class AbstractRedisMapTests { map.put(getKey(), v2); Collection values = map.values(); - assertEquals(2, values.size()); - assertThat(values, hasItems(v1, v2)); + assertThat(values.size()).isEqualTo(2); + assertThat(values).contains(v1, v2); map.put(getKey(), v3); values = map.values(); - assertEquals(3, values.size()); - assertThat(values, hasItems(v1, v2, v3)); + assertThat(values.size()).isEqualTo(3); + assertThat(values).contains(v1, v2, v3); } @SuppressWarnings("unchecked") @@ -369,7 +368,7 @@ public abstract class AbstractRedisMapTests { public void testEntrySet() { Set> entries = map.entrySet(); - assertTrue(entries.isEmpty()); + assertThat(entries.isEmpty()).isTrue(); K k1 = getKey(); K k2 = getKey(); @@ -390,11 +389,11 @@ public abstract class AbstractRedisMapTests { values.add(entry.getValue()); } - assertEquals(2, keys.size()); + assertThat(keys.size()).isEqualTo(2); - assertThat(keys, hasItems(k1, k2)); - assertThat(values, hasItem(v1)); - assertThat(values, not(hasItem(v2))); + assertThat(keys).contains(k1, k2); + assertThat(values).contains(v1); + assertThat(values).doesNotContain(v2); } @Test @@ -406,15 +405,15 @@ public abstract class AbstractRedisMapTests { V v1 = getValue(); V v2 = getValue(); - assertNull(map.get(k1)); - assertNull(map.putIfAbsent(k1, v1)); - assertThat(map.putIfAbsent(k1, v2), isEqual(v1)); - assertThat(map.get(k1), isEqual(v1)); + assertThat(map.get(k1)).isNull(); + assertThat(map.putIfAbsent(k1, v1)).isNull(); + assertThat(map.putIfAbsent(k1, v2)).isEqualTo(v1); + assertThat(map.get(k1)).isEqualTo(v1); - assertNull(map.putIfAbsent(k2, v2)); - assertThat(map.putIfAbsent(k2, v1), isEqual(v2)); + assertThat(map.putIfAbsent(k2, v2)).isNull(); + assertThat(map.putIfAbsent(k2, v1)).isEqualTo(v2); - assertThat(map.get(k2), isEqual(v2)); + assertThat(map.get(k2)).isEqualTo(v2); } @Test @@ -426,10 +425,10 @@ public abstract class AbstractRedisMapTests { // No point testing this with byte[], they will never be equal assumeTrue(!(v1 instanceof byte[])); map.put(k1, v2); - assertFalse(map.remove(k1, v1)); - assertThat(map.get(k1), isEqual(v2)); - assertTrue(map.remove(k1, v2)); - assertNull(map.get(k1)); + assertThat(map.remove(k1, v1)).isFalse(); + assertThat(map.get(k1)).isEqualTo(v2); + assertThat(map.remove(k1, v2)).isTrue(); + assertThat(map.get(k1)).isNull(); } @Test(expected = NullPointerException.class) @@ -448,10 +447,10 @@ public abstract class AbstractRedisMapTests { map.put(k1, v1); - assertFalse(map.replace(k1, v2, v1)); - assertThat(map.get(k1), isEqual(v1)); - assertTrue(map.replace(k1, v1, v2)); - assertThat(map.get(k1), isEqual(v2)); + assertThat(map.replace(k1, v2, v1)).isFalse(); + assertThat(map.get(k1)).isEqualTo(v1); + assertThat(map.replace(k1, v1, v2)).isTrue(); + assertThat(map.get(k1)).isEqualTo(v2); } @Test(expected = NullPointerException.class) @@ -471,11 +470,11 @@ public abstract class AbstractRedisMapTests { V v1 = getValue(); V v2 = getValue(); - assertNull(map.replace(k1, v1)); + assertThat(map.replace(k1, v1)).isNull(); map.put(k1, v1); - assertNull(map.replace(getKey(), v1)); - assertThat(map.replace(k1, v2), isEqual(v1)); - assertThat(map.get(k1), isEqual(v2)); + assertThat(map.replace(getKey(), v1)).isNull(); + assertThat(map.replace(k1, v2)).isEqualTo(v1); + assertThat(map.get(k1)).isEqualTo(v2); } @Test(expected = NullPointerException.class) @@ -500,8 +499,8 @@ public abstract class AbstractRedisMapTests { Cursor> cursor = (Cursor>) map.scan(); while (cursor.hasNext()) { Entry entry = cursor.next(); - assertThat(entry.getKey(), anyOf(equalTo(k1), equalTo(k2))); - assertThat(entry.getValue(), anyOf(equalTo(v1), equalTo(v2))); + assertThat(entry.getKey()).isIn(k1, k2); + assertThat(entry.getValue()).isIn(v1, v2); } cursor.close(); } diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisSetTests.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisSetTests.java index 72fad2369..7a43446e7 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisSetTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisSetTests.java @@ -15,9 +15,7 @@ */ package org.springframework.data.redis.support.collections; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; +import static org.assertj.core.api.Assertions.*; import java.io.IOException; import java.util.ArrayList; @@ -29,6 +27,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; + import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.BoundSetOperations; @@ -39,6 +38,7 @@ import org.springframework.data.redis.test.util.RedisClientRule; import org.springframework.data.redis.test.util.RedisDriver; import org.springframework.data.redis.test.util.WithRedisDriver; import org.springframework.test.annotation.IfProfileValue; +import org.springframework.util.ObjectUtils; /** * Integration test for Redis set. @@ -99,8 +99,8 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe diffSet2.add(t3); Set diff = set.diff(Arrays.asList(diffSet1, diffSet2)); - assertEquals(1, diff.size()); - assertThat(diff, hasItem(t1)); + assertThat(diff.size()).isEqualTo(1); + assertThat(diff).contains(t1); } @Test @@ -124,9 +124,9 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe String resultName = "test:set:diff:result:1"; RedisSet diff = set.diffAndStore(Arrays.asList(diffSet1, diffSet2), resultName); - assertEquals(1, diff.size()); - assertThat(diff, hasItem(t1)); - assertEquals(resultName, diff.getKey()); + assertThat(diff.size()).isEqualTo(1); + assertThat(diff).contains(t1); + assertThat(diff.getKey()).isEqualTo(resultName); } @Test @@ -149,8 +149,8 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe intSet2.add(t3); Set inter = set.intersect(Arrays.asList(intSet1, intSet2)); - assertEquals(1, inter.size()); - assertThat(inter, hasItem(t2)); + assertThat(inter.size()).isEqualTo(1); + assertThat(inter).contains(t2); } public void testIntersectAndStore() { @@ -173,9 +173,9 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe String resultName = "test:set:intersect:result:1"; RedisSet inter = set.intersectAndStore(Arrays.asList(intSet1, intSet2), resultName); - assertEquals(1, inter.size()); - assertThat(inter, hasItem(t2)); - assertEquals(resultName, inter.getKey()); + assertThat(inter.size()).isEqualTo(1); + assertThat(inter).contains(t2); + assertThat(inter.getKey()).isEqualTo(resultName); } @SuppressWarnings("unchecked") @@ -197,8 +197,8 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe unionSet2.add(t3); Set union = set.union(Arrays.asList(unionSet1, unionSet2)); - assertEquals(4, union.size()); - assertThat(union, hasItems(t1, t2, t3, t4)); + assertThat(union.size()).isEqualTo(4); + assertThat(union).contains(t1, t2, t3, t4); } @SuppressWarnings("unchecked") @@ -221,9 +221,9 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe String resultName = "test:set:union:result:1"; RedisSet union = set.unionAndStore(Arrays.asList(unionSet1, unionSet2), resultName); - assertEquals(4, union.size()); - assertThat(union, hasItems(t1, t2, t3, t4)); - assertEquals(resultName, union.getKey()); + assertThat(union.size()).isEqualTo(4); + assertThat(union).contains(t1, t2, t3, t4); + assertThat(union.getKey()).isEqualTo(resultName); } @Test @@ -235,7 +235,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe List list = Arrays.asList(t1, t2, t3, t4); - assertThat(collection.addAll(list), is(true)); + assertThat(collection.addAll(list)).isTrue(); Iterator iterator = collection.iterator(); List result = new ArrayList<>(list); @@ -245,13 +245,13 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe Iterator resultItr = result.iterator(); while (resultItr.hasNext()) { T obj = resultItr.next(); - if (isEqual(expected).matches(obj)) { + if (ObjectUtils.nullSafeEquals(expected, obj)) { resultItr.remove(); } } } - assertEquals(0, result.size()); + assertThat(result.size()).isEqualTo(0); } @SuppressWarnings("unchecked") @@ -260,7 +260,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe Object[] expectedArray = new Object[] { getT(), getT(), getT() }; List list = (List) Arrays.asList(expectedArray); - assertThat(collection.addAll(list), is(true)); + assertThat(collection.addAll(list)).isTrue(); Object[] array = collection.toArray(); @@ -270,13 +270,13 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe Iterator resultItr = result.iterator(); while (resultItr.hasNext()) { T obj = resultItr.next(); - if (isEqual(array[i]).matches(obj)) { + if (ObjectUtils.nullSafeEquals(array[i], obj)) { resultItr.remove(); } } } - assertEquals(0, result.size()); + assertThat(result).isEmpty(); } @SuppressWarnings("unchecked") @@ -285,7 +285,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe Object[] expectedArray = new Object[] { getT(), getT(), getT() }; List list = (List) Arrays.asList(expectedArray); - assertThat(collection.addAll(list), is(true)); + assertThat(collection.addAll(list)).isTrue(); Object[] array = collection.toArray(new Object[expectedArray.length]); List result = new ArrayList<>(list); @@ -294,13 +294,13 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe Iterator resultItr = result.iterator(); while (resultItr.hasNext()) { T obj = resultItr.next(); - if (isEqual(array[i]).matches(obj)) { + if (ObjectUtils.nullSafeEquals(array[i], obj)) { resultItr.remove(); } } } - assertEquals(0, result.size()); + assertThat(result.size()).isEqualTo(0); } // DATAREDIS-314 @@ -315,7 +315,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe Cursor cursor = (Cursor) set.scan(); while (cursor.hasNext()) { - assertThat(cursor.next(), anyOf(equalTo(expectedArray[0]), equalTo(expectedArray[1]), equalTo(expectedArray[2]))); + assertThat(cursor.next()).isIn(expectedArray[0], expectedArray[1], expectedArray[2]); } cursor.close(); } diff --git a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTest.java b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTest.java index 41ba4ed74..d002db9bd 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTest.java +++ b/src/test/java/org/springframework/data/redis/support/collections/AbstractRedisZSetTest.java @@ -15,10 +15,8 @@ */ package org.springframework.data.redis.support.collections; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.junit.Assume.*; -import static org.springframework.data.redis.matcher.RedisTestMatchers.*; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assumptions.*; import java.io.IOException; import java.util.Arrays; @@ -26,9 +24,11 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Set; +import org.assertj.core.data.Offset; import org.junit.Before; import org.junit.Rule; import org.junit.Test; + import org.springframework.data.redis.DoubleAsStringObjectFactory; import org.springframework.data.redis.DoubleObjectFactory; import org.springframework.data.redis.LongAsStringObjectFactory; @@ -95,10 +95,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 5); Iterator iterator = zSet.iterator(); - assertThat(iterator.next(), isEqual(t1)); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t3)); - assertFalse(iterator.hasNext()); + assertThat(iterator.next()).isEqualTo(t1); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.hasNext()).isFalse(); } @Test @@ -113,9 +113,9 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe Double d = new Double("1"); - assertEquals(d, zSet.score(t1)); - assertEquals(d, zSet.score(t2)); - assertEquals(d, zSet.score(t3)); + assertThat(zSet.score(t1)).isEqualTo(d); + assertThat(zSet.score(t2)).isEqualTo(d); + assertThat(zSet.score(t3)).isEqualTo(d); } @Test @@ -128,8 +128,8 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t2, 4); zSet.add(t3, 5); - assertEquals(3, zSet.size()); - assertThat(zSet.first(), isEqual(t1)); + assertThat(zSet.size()).isEqualTo(3); + assertThat(zSet.first()).isEqualTo(t1); } @Test(expected = NoSuchElementException.class) @@ -147,8 +147,8 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t2, 4); zSet.add(t3, 5); - assertEquals(3, zSet.size()); - assertThat(zSet.last(), isEqual(t3)); + assertThat(zSet.size()).isEqualTo(3); + assertThat(zSet.last()).isEqualTo(t3); } @Test(expected = NoSuchElementException.class) @@ -166,10 +166,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t2, 4); zSet.add(t3, 5); - assertEquals(Long.valueOf(0), zSet.rank(t1)); - assertEquals(Long.valueOf(1), zSet.rank(t2)); - assertEquals(Long.valueOf(2), zSet.rank(t3)); - assertNull(zSet.rank(getT())); + assertThat(zSet.rank(t1)).isEqualTo(Long.valueOf(0)); + assertThat(zSet.rank(t2)).isEqualTo(Long.valueOf(1)); + assertThat(zSet.rank(t3)).isEqualTo(Long.valueOf(2)); + assertThat(zSet.rank(getT())).isNull(); // assertNull(); } @@ -183,10 +183,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t2, 4); zSet.add(t3, 5); - assertEquals(Long.valueOf(0), zSet.reverseRank(t3)); - assertEquals(Long.valueOf(1), zSet.reverseRank(t2)); - assertEquals(Long.valueOf(2), zSet.reverseRank(t1)); - assertNull(zSet.rank(getT())); + assertThat(zSet.reverseRank(t3)).isEqualTo(Long.valueOf(0)); + assertThat(zSet.reverseRank(t2)).isEqualTo(Long.valueOf(1)); + assertThat(zSet.reverseRank(t1)).isEqualTo(Long.valueOf(2)); + assertThat(zSet.rank(getT())).isNull(); } @Test @@ -199,15 +199,15 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t2, 4); zSet.add(t3, 5); - assertNull(zSet.score(getT())); - assertEquals(Double.valueOf(3), zSet.score(t1)); - assertEquals(Double.valueOf(4), zSet.score(t2)); - assertEquals(Double.valueOf(5), zSet.score(t3)); + assertThat(zSet.score(getT())).isNull(); + assertThat(zSet.score(t1)).isEqualTo(Double.valueOf(3)); + assertThat(zSet.score(t2)).isEqualTo(Double.valueOf(4)); + assertThat(zSet.score(t3)).isEqualTo(Double.valueOf(5)); } @Test public void testDefaultScore() { - assertEquals(1, zSet.getDefaultScore(), 0); + assertThat(zSet.getDefaultScore()).isCloseTo(1, Offset.offset(0d)); } @SuppressWarnings("unchecked") @@ -239,10 +239,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe String resultName = "test:zset:inter:result:1"; RedisZSet inter = zSet.intersectAndStore(Arrays.asList(interSet1, interSet2), resultName); - assertEquals(1, inter.size()); - assertThat(inter, hasItem(t2)); - assertEquals(Double.valueOf(6), inter.score(t2)); - assertEquals(resultName, inter.getKey()); + assertThat(inter.size()).isEqualTo(1); + assertThat(inter).contains(t2); + assertThat(inter.score(t2)).isEqualTo(Double.valueOf(6)); + assertThat(inter.getKey()).isEqualTo(resultName); } @Test @@ -256,10 +256,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set range = zSet.range(1, 2); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator iterator = range.iterator(); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t3)); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t3); } @Test @@ -274,16 +274,16 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set> range = zSet.rangeWithScores(1, 2); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator> iterator = range.iterator(); TypedTuple tuple1 = iterator.next(); - assertThat(tuple1.getValue(), isEqual(t2)); - assertThat(tuple1.getScore(), isEqual(Double.valueOf(2))); + assertThat(tuple1.getValue()).isEqualTo(t2); + assertThat(tuple1.getScore()).isEqualTo(Double.valueOf(2)); TypedTuple tuple2 = iterator.next(); - assertThat(tuple2.getValue(), isEqual(t3)); - assertThat(tuple2.getScore(), isEqual(Double.valueOf(3))); + assertThat(tuple2.getValue()).isEqualTo(t3); + assertThat(tuple2.getScore()).isEqualTo(Double.valueOf(3)); } @Test @@ -297,10 +297,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set range = zSet.reverseRange(1, 2); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator iterator = range.iterator(); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t1)); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t1); } @Test @@ -315,23 +315,23 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set> range = zSet.reverseRangeWithScores(1, 2); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator> iterator = range.iterator(); TypedTuple tuple1 = iterator.next(); - assertThat(tuple1.getValue(), isEqual(t2)); - assertThat(tuple1.getScore(), isEqual(Double.valueOf(2))); + assertThat(tuple1.getValue()).isEqualTo(t2); + assertThat(tuple1.getScore()).isEqualTo(Double.valueOf(2)); TypedTuple tuple2 = iterator.next(); - assertThat(tuple2.getValue(), isEqual(t1)); - assertThat(tuple2.getScore(), isEqual(Double.valueOf(1))); + assertThat(tuple2.getValue()).isEqualTo(t1); + assertThat(tuple2.getScore()).isEqualTo(Double.valueOf(1)); } @Test // DATAREDIS-407 public void testRangeByLexUnbounded() { - assumeThat(factory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(factory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); T t1 = getT(); T t2 = getT(); @@ -342,16 +342,16 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set tuples = zSet.rangeByLex(RedisZSetCommands.Range.unbounded()); - assertEquals(3, tuples.size()); + assertThat(tuples.size()).isEqualTo(3); T tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(t1)); + assertThat(tuple).isEqualTo(t1); } @Test // DATAREDIS-407 public void testRangeByLexBounded() { - assumeThat(factory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(factory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); T t1 = getT(); T t2 = getT(); @@ -362,16 +362,16 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set tuples = zSet.rangeByLex(RedisZSetCommands.Range.range().gt(t1).lt(t3)); - assertEquals(1, tuples.size()); + assertThat(tuples.size()).isEqualTo(1); T tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(t2)); + assertThat(tuple).isEqualTo(t2); } @Test // DATAREDIS-407 public void testRangeByLexUnboundedWithLimit() { - assumeThat(factory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(factory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); T t1 = getT(); T t2 = getT(); @@ -383,16 +383,16 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe Set tuples = zSet.rangeByLex(RedisZSetCommands.Range.unbounded(), RedisZSetCommands.Limit.limit().count(1).offset(1)); - assertEquals(1, tuples.size()); + assertThat(tuples.size()).isEqualTo(1); T tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(t2)); + assertThat(tuple).isEqualTo(t2); } @Test // DATAREDIS-407 public void testRangeByLexBoundedWithLimit() { - assumeThat(factory, anyOf(instanceOf(DoubleObjectFactory.class), instanceOf(DoubleAsStringObjectFactory.class), - instanceOf(LongAsStringObjectFactory.class), instanceOf(LongObjectFactory.class))); + assumeThat(factory).isOfAnyClassIn(DoubleObjectFactory.class, DoubleAsStringObjectFactory.class, + LongAsStringObjectFactory.class, LongObjectFactory.class); T t1 = getT(); T t2 = getT(); @@ -404,9 +404,9 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe Set tuples = zSet.rangeByLex(RedisZSetCommands.Range.range().gte(t1), RedisZSetCommands.Limit.limit().count(1).offset(1)); - assertEquals(1, tuples.size()); + assertThat(tuples.size()).isEqualTo(1); T tuple = tuples.iterator().next(); - assertThat(tuple, isEqual(t2)); + assertThat(tuple).isEqualTo(t2); } @Test @@ -421,10 +421,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set range = zSet.reverseRangeByScore(1.5, 3.5); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator iterator = range.iterator(); - assertThat(iterator.next(), isEqual(t3)); - assertThat(iterator.next(), isEqual(t2)); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.next()).isEqualTo(t2); } @Test @@ -439,16 +439,16 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set> range = zSet.reverseRangeByScoreWithScores(1.5, 3.5); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator> iterator = range.iterator(); TypedTuple tuple1 = iterator.next(); - assertThat(tuple1.getValue(), isEqual(t3)); - assertThat(tuple1.getScore(), isEqual(Double.valueOf(3))); + assertThat(tuple1.getValue()).isEqualTo(t3); + assertThat(tuple1.getScore()).isEqualTo(Double.valueOf(3)); TypedTuple tuple2 = iterator.next(); - assertThat(tuple2.getValue(), isEqual(t2)); - assertThat(tuple2.getScore(), isEqual(Double.valueOf(2))); + assertThat(tuple2.getValue()).isEqualTo(t2); + assertThat(tuple2.getScore()).isEqualTo(Double.valueOf(2)); } @SuppressWarnings("unchecked") @@ -463,12 +463,12 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set range = zSet.rangeByScore(1.5, 3.5); - assertEquals(2, range.size()); - assertThat(range, hasItems(t2, t3)); + assertThat(range.size()).isEqualTo(2); + assertThat(range).contains(t2, t3); Iterator iterator = range.iterator(); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t3)); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t3); } @Test @@ -483,16 +483,16 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t3, 3); Set> range = zSet.rangeByScoreWithScores(1.5, 3.5); - assertEquals(2, range.size()); + assertThat(range.size()).isEqualTo(2); Iterator> iterator = range.iterator(); TypedTuple tuple1 = iterator.next(); - assertThat(tuple1.getValue(), isEqual(t2)); - assertThat(tuple1.getScore(), isEqual(Double.valueOf(2))); + assertThat(tuple1.getValue()).isEqualTo(t2); + assertThat(tuple1.getScore()).isEqualTo(Double.valueOf(2)); TypedTuple tuple2 = iterator.next(); - assertThat(tuple2.getValue(), isEqual(t3)); - assertThat(tuple2.getScore(), isEqual(Double.valueOf(3))); + assertThat(tuple2.getValue()).isEqualTo(t3); + assertThat(tuple2.getScore()).isEqualTo(Double.valueOf(3)); } @Test @@ -509,10 +509,10 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.remove(1, 2); - assertEquals(2, zSet.size()); + assertThat(zSet.size()).isEqualTo(2); Iterator iterator = zSet.iterator(); - assertThat(iterator.next(), isEqual(t1)); - assertThat(iterator.next(), isEqual(t4)); + assertThat(iterator.next()).isEqualTo(t1); + assertThat(iterator.next()).isEqualTo(t4); } @Test @@ -529,11 +529,11 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.removeByScore(1.5, 2.5); - assertEquals(3, zSet.size()); + assertThat(zSet.size()).isEqualTo(3); Iterator iterator = zSet.iterator(); - assertThat(iterator.next(), isEqual(t1)); - assertThat(iterator.next(), isEqual(t3)); - assertThat(iterator.next(), isEqual(t4)); + assertThat(iterator.next()).isEqualTo(t1); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.next()).isEqualTo(t4); } @SuppressWarnings("unchecked") @@ -557,14 +557,14 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe String resultName = "test:zset:union:result:1"; RedisZSet union = zSet.unionAndStore(Arrays.asList(unionSet1, unionSet2), resultName); - assertEquals(4, union.size()); - assertThat(union, hasItems(t1, t2, t3, t4)); - assertEquals(resultName, union.getKey()); + assertThat(union.size()).isEqualTo(4); + assertThat(union).contains(t1, t2, t3, t4); + assertThat(union.getKey()).isEqualTo(resultName); - assertEquals(Double.valueOf(1), union.score(t1)); - assertEquals(Double.valueOf(4), union.score(t2)); - assertEquals(Double.valueOf(6), union.score(t3)); - assertEquals(Double.valueOf(5), union.score(t4)); + assertThat(union.score(t1)).isEqualTo(Double.valueOf(1)); + assertThat(union.score(t2)).isEqualTo(Double.valueOf(4)); + assertThat(union.score(t3)).isEqualTo(Double.valueOf(6)); + assertThat(union.score(t4)).isEqualTo(Double.valueOf(5)); } @Test @@ -581,11 +581,11 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe Iterator iterator = collection.iterator(); - assertThat(iterator.next(), isEqual(t1)); - assertThat(iterator.next(), isEqual(t2)); - assertThat(iterator.next(), isEqual(t3)); - assertThat(iterator.next(), isEqual(t4)); - assertFalse(iterator.hasNext()); + assertThat(iterator.next()).isEqualTo(t1); + assertThat(iterator.next()).isEqualTo(t2); + assertThat(iterator.next()).isEqualTo(t3); + assertThat(iterator.next()).isEqualTo(t4); + assertThat(iterator.hasNext()).isFalse(); } @Test @@ -601,7 +601,7 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t4, 4); Object[] array = collection.toArray(); - assertArrayEquals(new Object[] { t1, t2, t3, t4 }, array); + assertThat(array).isEqualTo(new Object[] { t1, t2, t3, t4 }); } @Test @@ -617,7 +617,7 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe zSet.add(t4, 4); Object[] array = collection.toArray(new Object[zSet.size()]); - assertArrayEquals(new Object[] { t1, t2, t3, t4 }, array); + assertThat(array).isEqualTo(new Object[] { t1, t2, t3, t4 }); } @IfProfileValue(name = "redisVersion", value = "2.8+") @@ -637,7 +637,7 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe Cursor cursor = (Cursor) zSet.scan(); while (cursor.hasNext()) { - assertThat(cursor.next(), anyOf(equalTo(t1), equalTo(t2), equalTo(t3), equalTo(t4))); + assertThat(cursor.next()).isIn(t1, t2, t3, t4); } cursor.close(); diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java index 4332dbb92..08e59b246 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisCollectionFactoryBeanTests.java @@ -15,12 +15,12 @@ */ package org.springframework.data.redis.support.collections; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.AfterClass; import org.junit.Test; + import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.SettingsUtils; @@ -83,19 +83,19 @@ public class RedisCollectionFactoryBeanTests { @Test public void testNone() throws Exception { RedisStore store = createCollection("nosrt", CollectionType.PROPERTIES); - assertThat(store, instanceOf(RedisProperties.class)); + assertThat(store).isInstanceOf(RedisProperties.class); store = createCollection("nosrt", CollectionType.MAP); - assertThat(store, instanceOf(DefaultRedisMap.class)); + assertThat(store).isInstanceOf(DefaultRedisMap.class); store = createCollection("nosrt", CollectionType.SET); - assertThat(store, instanceOf(DefaultRedisSet.class)); + assertThat(store).isInstanceOf(DefaultRedisSet.class); store = createCollection("nosrt", CollectionType.LIST); - assertThat(store, instanceOf(DefaultRedisList.class)); + assertThat(store).isInstanceOf(DefaultRedisList.class); store = createCollection("nosrt"); - assertThat(store, instanceOf(DefaultRedisList.class)); + assertThat(store).isInstanceOf(DefaultRedisList.class); } @Test @@ -105,15 +105,15 @@ public class RedisCollectionFactoryBeanTests { template.boundSetOps(key).add(val); RedisStore col = createCollection(key); - assertThat(col, instanceOf(DefaultRedisSet.class)); + assertThat(col).isInstanceOf(DefaultRedisSet.class); key = "map"; template.boundHashOps(key).put(val, val); col = createCollection(key); - assertThat(col, instanceOf(DefaultRedisMap.class)); + assertThat(col).isInstanceOf(DefaultRedisMap.class); col = createCollection(key, CollectionType.PROPERTIES); - assertThat(col, instanceOf(RedisProperties.class)); + assertThat(col).isInstanceOf(RedisProperties.class); } } diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java index ce1777c57..eed13bcc6 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisListTests.java @@ -17,9 +17,6 @@ package org.springframework.data.redis.support.collections; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.support.collections.AbstractRedisCollection; -import org.springframework.data.redis.support.collections.DefaultRedisList; -import org.springframework.data.redis.support.collections.RedisStore; /** * Parameterized instance of Redis tests. diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java index 263fb1071..faaad21e5 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.redis.support.collections; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,6 +32,7 @@ import java.util.Set; import org.junit.Ignore; import org.junit.Test; import org.junit.runners.Parameterized.Parameters; + import org.springframework.data.redis.DoubleAsStringObjectFactory; import org.springframework.data.redis.LongAsStringObjectFactory; import org.springframework.data.redis.ObjectFactory; @@ -82,7 +83,7 @@ public class RedisPropertiesTests extends RedisMapTests { @Test public void testGetOperations() { - assertTrue(map.getOperations() instanceof StringRedisTemplate); + assertThat(map.getOperations() instanceof StringRedisTemplate).isTrue(); } @Test @@ -90,7 +91,7 @@ public class RedisPropertiesTests extends RedisMapTests { InputStream stream = getClass() .getResourceAsStream("/org/springframework/data/redis/support/collections/props.properties"); - assertNotNull(stream); + assertThat(stream).isNotNull(); int size = props.size(); @@ -100,10 +101,10 @@ public class RedisPropertiesTests extends RedisMapTests { stream.close(); } - assertEquals("bar", props.get("foo")); - assertEquals("head", props.get("bucket")); - assertEquals("island", props.get("lotus")); - assertEquals(size + 3, props.size()); + assertThat(props.get("foo")).isEqualTo("bar"); + assertThat(props.get("bucket")).isEqualTo("head"); + assertThat(props.get("lotus")).isEqualTo("island"); + assertThat(props.size()).isEqualTo(size + 3); } @Test @@ -112,7 +113,7 @@ public class RedisPropertiesTests extends RedisMapTests { InputStream stream = getClass() .getResourceAsStream("/org/springframework/data/keyvalue/redis/support/collections/props.properties"); - assertNotNull(stream); + assertThat(stream).isNotNull(); int size = props.size(); @@ -122,10 +123,10 @@ public class RedisPropertiesTests extends RedisMapTests { stream.close(); } - assertEquals("bar", props.get("foo")); - assertEquals("head", props.get("bucket")); - assertEquals("island", props.get("lotus")); - assertEquals(size + 3, props.size()); + assertThat(props.get("foo")).isEqualTo("bar"); + assertThat(props.get("bucket")).isEqualTo("head"); + assertThat(props.get("lotus")).isEqualTo("island"); + assertThat(props.size()).isEqualTo(size + 3); } @Test @@ -144,27 +145,26 @@ public class RedisPropertiesTests extends RedisMapTests { props.setProperty("a", "b"); ByteArrayOutputStream bos = new ByteArrayOutputStream(); props.storeToXML(bos, "comment"); - System.out.println(bos.toString()); } @Test public void testGetProperty() throws Exception { String property = props.getProperty("a"); - assertNull(property); + assertThat(property).isNull(); defaults.put("a", "x"); - assertEquals("x", props.getProperty("a")); + assertThat(props.getProperty("a")).isEqualTo("x"); } @Test public void testGetPropertyDefault() throws Exception { - assertEquals("x", props.getProperty("a", "x")); + assertThat(props.getProperty("a", "x")).isEqualTo("x"); } @Test public void testSetProperty() throws Exception { - assertNull(props.getProperty("a")); + assertThat(props.getProperty("a")).isNull(); defaults.setProperty("a", "x"); - assertEquals("x", props.getProperty("a")); + assertThat(props.getProperty("a")).isEqualTo("x"); } @Test @@ -193,7 +193,7 @@ public class RedisPropertiesTests extends RedisMapTests { keys.add(names.nextElement()); keys.add(names.nextElement()); - assertFalse(names.hasMoreElements()); + assertThat(names.hasMoreElements()).isFalse(); } @Test @@ -215,9 +215,9 @@ public class RedisPropertiesTests extends RedisMapTests { props.setProperty(key2, val); Set keys = props.stringPropertyNames(); - assertTrue(keys.contains(key1)); - assertTrue(keys.contains(key2)); - assertTrue(keys.contains(key3)); + assertThat(keys.contains(key1)).isTrue(); + assertThat(keys.contains(key2)).isTrue(); + assertThat(keys.contains(key3)).isTrue(); } @Override diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java index 1baa85222..b16b334ee 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java +++ b/src/test/java/org/springframework/data/redis/support/collections/RedisSetTests.java @@ -17,9 +17,6 @@ package org.springframework.data.redis.support.collections; import org.springframework.data.redis.ObjectFactory; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.support.collections.AbstractRedisCollection; -import org.springframework.data.redis.support.collections.DefaultRedisSet; -import org.springframework.data.redis.support.collections.RedisStore; /** * Parameterized instance of Redis tests. diff --git a/src/test/java/org/springframework/data/redis/test/util/CollectionAwareComparator.java b/src/test/java/org/springframework/data/redis/test/util/CollectionAwareComparator.java new file mode 100644 index 000000000..5b643f2ba --- /dev/null +++ b/src/test/java/org/springframework/data/redis/test/util/CollectionAwareComparator.java @@ -0,0 +1,65 @@ +/* + * Copyright 2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.redis.test.util; + +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; + +import org.springframework.util.ObjectUtils; + +/** + * Generic comparator that dives into {@link java.util.Collections} and uses + * {@link ObjectUtils#nullSafeEquals(Object, Object)}. + * + * @author Mark Paluch + */ +public enum CollectionAwareComparator implements Comparator { + + INSTANCE; + + @Override + public int compare(Object o1, Object o2) { + + if (o1 instanceof Collection && o2 instanceof Collection) { + + Collection c1 = (Collection) o1; + Collection c2 = (Collection) o2; + + if (c1.size() != c2.size()) { + return 1; + } + + Iterator i1 = c1.iterator(); + Iterator i2 = c2.iterator(); + + while (i1.hasNext()) { + int result = compare(i1.next(), i2.next()); + if (result != 0) { + return result; + } + } + + return 0; + } + + if (!ObjectUtils.nullSafeEquals(o1, o2)) { + return 1; + } + + return 0; + } +} diff --git a/src/test/java/org/springframework/data/redis/test/util/IsBucketMatcher.java b/src/test/java/org/springframework/data/redis/test/util/IsBucketMatcher.java deleted file mode 100644 index 0c345beec..000000000 --- a/src/test/java/org/springframework/data/redis/test/util/IsBucketMatcher.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright 2015-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.redis.test.util; - -import java.util.Arrays; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; - -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.TypeSafeMatcher; -import org.springframework.data.redis.core.convert.Bucket; - -/** - * {@link TypeSafeMatcher} implementation for checking contents of {@link Bucket}. - * - * @author Christoph Strobl - * @since 1.7 - */ -public class IsBucketMatcher extends TypeSafeMatcher { - - Map expected = new LinkedHashMap<>(); - Set without = new LinkedHashSet<>(); - - /* - * (non-Javadoc) - * @see org.hamcrest.SelfDescribing#describeTo(org.hamcrest.Description) - */ - @Override - public void describeTo(Description description) { - - if (!expected.isEmpty()) { - description.appendValueList("Expected Bucket content [{", "},{", "}].", expected.entrySet()); - } - if (!without.isEmpty()) { - description.appendValueList("Expected Bucket to not include [", ",", "].", without); - } - - } - - /* - * (non-Javadoc) - * @see org.hamcrest.TypeSafeMatcher#matchesSafely(java.lang.Object) - */ - @Override - protected boolean matchesSafely(Bucket bucket) { - - if (bucket == null) { - return false; - } - - if (bucket.isEmpty() && expected.isEmpty()) { - return true; - } - - for (String notContained : without) { - byte[] value = bucket.get(notContained); - if (value != null || (value != null && value.length > 0)) { - return false; - } - } - - for (Map.Entry entry : expected.entrySet()) { - - byte[] actualValue = bucket.get(entry.getKey()); - Object expectedValue = entry.getValue(); - if (expectedValue == null && actualValue != null) { - return false; - } - - if (expectedValue != null && actualValue == null) { - return false; - } - - if (expectedValue instanceof byte[]) { - if (!Arrays.equals((byte[]) expectedValue, actualValue)) { - return false; - } - } else if (expectedValue instanceof String) { - if (!((String) expectedValue).equals(new String(actualValue, Bucket.CHARSET))) { - return false; - } - } else if (expectedValue instanceof Class) { - if (!((Class) expectedValue).getName().equals(new String(actualValue, Bucket.CHARSET))) { - return false; - } - } else if (expectedValue instanceof Date) { - if (((Date) expectedValue).getTime() != Long.valueOf(new String(actualValue, Bucket.CHARSET)).longValue()) { - return false; - } - } - - else if (expectedValue instanceof Matcher) { - if (!((Matcher) expectedValue).matches(actualValue)) { - return false; - } - } else { - if (!(expectedValue.toString()).equals(new String(actualValue, Bucket.CHARSET))) { - return false; - } - } - } - - return true; - } - - /** - * Creates new {@link IsBucketMatcher}. - * - * @return - */ - public static IsBucketMatcher isBucket() { - return new IsBucketMatcher(); - } - - /** - * Checks for presence of type hint at given path. - * - * @param path - * @param type - * @return - */ - public IsBucketMatcher containingTypeHint(String path, Class type) { - - this.expected.put(path, type); - return this; - } - - /** - * Checks for presence of equivalent String value at path. - * - * @param path - * @param value - * @return - */ - public IsBucketMatcher containingUtf8String(String path, String value) { - - this.expected.put(path, value); - return this; - } - - /** - * Checks for presence of given value at path. - * - * @param path - * @param value - * @return - */ - public IsBucketMatcher containing(String path, byte[] value) { - - this.expected.put(path, value); - return this; - } - - public IsBucketMatcher matchingPath(String path, Matcher matcher) { - - this.expected.put(path, matcher); - return this; - } - - /** - * Checks for presence of equivalent time in msec value at path. - * - * @param path - * @param date - * @return - */ - public IsBucketMatcher containingDateAsMsec(String path, Date date) { - - this.expected.put(path, date); - return this; - } - - /** - * Checks given path is not present. - * - * @param path - * @return - */ - public IsBucketMatcher without(String path) { - this.without.add(path); - return this; - } - -} diff --git a/src/test/java/org/springframework/data/redis/test/util/RedisClusterRule.java b/src/test/java/org/springframework/data/redis/test/util/RedisClusterRule.java index b9fc2e3c2..fb717cc0b 100644 --- a/src/test/java/org/springframework/data/redis/test/util/RedisClusterRule.java +++ b/src/test/java/org/springframework/data/redis/test/util/RedisClusterRule.java @@ -15,13 +15,13 @@ */ package org.springframework.data.redis.test.util; -import static org.hamcrest.CoreMatchers.*; +import static org.assertj.core.api.Assumptions.*; import redis.clients.jedis.Jedis; -import org.junit.Assume; import org.junit.rules.ExternalResource; import org.junit.rules.TestRule; + import org.springframework.data.redis.connection.RedisClusterConfiguration; import org.springframework.data.redis.connection.RedisNode; import org.springframework.data.redis.connection.jedis.JedisConverters; @@ -60,7 +60,7 @@ public class RedisClusterRule extends ExternalResource { */ @Override public void before() { - Assume.assumeThat(mode, is("cluster")); + assumeThat(mode).isEqualTo("cluster"); } public RedisClusterConfiguration getConfiguration() { diff --git a/src/test/java/org/springframework/data/redis/test/util/RedisTestData.java b/src/test/java/org/springframework/data/redis/test/util/RedisTestData.java new file mode 100644 index 000000000..212c76432 --- /dev/null +++ b/src/test/java/org/springframework/data/redis/test/util/RedisTestData.java @@ -0,0 +1,152 @@ +/* + * Copyright 2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.redis.test.util; + +import static org.assertj.core.error.ShouldContain.*; + +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.assertj.core.api.AssertProvider; +import org.assertj.core.api.MapAssert; +import org.assertj.core.internal.Failures; + +import org.springframework.data.redis.core.convert.Bucket; +import org.springframework.data.redis.core.convert.RedisData; + +/** + * {@link AssertProvider} for {@link RedisTestData}. + * + * @author Mark Paluch + */ +public class RedisTestData implements AssertProvider { + + private final RedisData redisData; + + RedisTestData(RedisData redisData) { + this.redisData = redisData; + } + + public static RedisTestData from(RedisData data) { + return new RedisTestData(data); + } + + @Override + public RedisBucketAssert assertThat() { + return new RedisBucketAssert(redisData); + } + + public Bucket getBucket() { + return redisData.getBucket(); + } + + public String getId() { + return redisData.getId(); + } + + public RedisData getRedisData() { + return redisData; + } + + public static class RedisBucketAssert extends MapAssert { + + private final Failures failures = Failures.instance(); + + private final RedisData redisData; + + RedisBucketAssert(RedisData redisData) { + + super(toStringMap(redisData.getBucket().asMap())); + this.redisData = redisData; + } + + /** + * Checks for presence of type hint at given path. + * + * @param path + * @param type + * @return + */ + public RedisBucketAssert containingTypeHint(String path, Class type) { + + isNotNull(); + + String hint = String.format("Type hint for <%s> at <%s>", type.getName(), path); + + if (!actual.containsKey(path)) { + + throw failures.failure(info, shouldContain(actual, hint, hint)); + } + + String string = getString(path); + + if (!string.equals(type.getName())) { + throw failures.failure(info, shouldContain(actual, hint, hint)); + } + + return this; + } + + /** + * Checks for presence of equivalent String value at path. + * + * @param path + * @param value + * @return + */ + public RedisBucketAssert containsEntry(String path, String value) { + super.containsEntry(path, value); + return this; + } + + /** + * Checks for presence of equivalent time in msec value at path. + * + * @param path + * @param date + * @return + */ + public RedisBucketAssert containsEntry(String path, Date date) { + return containsEntry(path, "" + date.getTime()); + } + + /** + * Checks given path is not present. + * + * @param path + * @return + */ + public RedisBucketAssert without(String path) { + + return this; + } + + private String getString(String path) { + return actual.get(path); + } + + private static Map toStringMap(Map source) { + + Map converted = new LinkedHashMap<>(); + + source.forEach((k, v) -> converted.put(k, new String(v, StandardCharsets.UTF_8))); + + return converted; + } + } +}