From d4af51e77d7bd7f67c1091b0623dae66a57b99d8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 5 Sep 2016 08:52:17 +0200 Subject: [PATCH] DATAREDIS-531 - Polishing. Use quit method for close verification in tests. Refine static imports. Fix spelling. Original pull request: #218. --- .../connection/jedis/JedisConnectionUnitTestSuite.java | 9 ++++----- .../data/redis/core/RedisTemplateUnitTests.java | 10 ++++------ 2 files changed, 8 insertions(+), 11 deletions(-) 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 2ea442890..150954be7 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 @@ -225,7 +225,7 @@ public class JedisConnectionUnitTestSuite { connection.scan(); - verify(jedisSpy, never()).close(); + verify(jedisSpy, never()).quit(); } /** @@ -254,7 +254,7 @@ public class JedisConnectionUnitTestSuite { connection.sScan("foo".getBytes(), ScanOptions.NONE); - verify(jedisSpy, never()).close(); + verify(jedisSpy, never()).quit(); } /** @@ -283,7 +283,7 @@ public class JedisConnectionUnitTestSuite { connection.zScan("foo".getBytes(), ScanOptions.NONE); - verify(jedisSpy, never()).close(); + verify(jedisSpy, never()).quit(); } /** @@ -312,7 +312,7 @@ public class JedisConnectionUnitTestSuite { connection.hScan("foo".getBytes(), ScanOptions.NONE); - verify(jedisSpy, never()).close(); + verify(jedisSpy, never()).quit(); } /** @@ -467,6 +467,5 @@ public class JedisConnectionUnitTestSuite { super(host); this.client = client; } - } } 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 0a8a9a1df..f28035676 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java @@ -17,13 +17,13 @@ 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.mockito.Matchers.*; import static org.mockito.Mockito.*; import java.io.Serializable; -import org.hamcrest.core.IsSame; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -89,7 +89,7 @@ public class RedisTemplateUnitTests { template.afterPropertiesSet(); when(redisConnectionMock.get(any(byte[].class))) - .thenReturn(new JdkSerializationRedisSerializer().serialize(new SomeArbitrarySeriaizableObject())); + .thenReturn(new JdkSerializationRedisSerializer().serialize(new SomeArbitrarySerializableObject())); Object deserialized = template.opsForValue().get("spring"); assertThat(deserialized, notNullValue()); @@ -105,11 +105,11 @@ public class RedisTemplateUnitTests { CapturingCallback callback = new CapturingCallback(); template.executeWithStickyConnection(callback); - assertThat(callback.getConnection(), IsSame.sameInstance(redisConnectionMock)); + assertThat(callback.getConnection(), sameInstance(redisConnectionMock)); verify(redisConnectionMock, never()).close(); } - static class SomeArbitrarySeriaizableObject implements Serializable { + static class SomeArbitrarySerializableObject implements Serializable { private static final long serialVersionUID = -5973659324040506423L; } @@ -126,7 +126,5 @@ public class RedisTemplateUnitTests { public RedisConnection getConnection() { return connection; } - } - }