Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-531 - Polishing.

Browse Source 
Use quit method for close verification in tests. Refine static imports. Fix spelling.

Original pull request: #218.
This commit is contained in:
Mark Paluch
2016-09-05 08:52:17 +02:00
parent 58d23dea37
commit d4af51e77d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionUnitTestSuite.java
View File

@@ -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;
}
}
}

10
src/test/java/org/springframework/data/redis/core/RedisTemplateUnitTests.java
View File

@@ -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;
}
}
}