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

DATAREDIS-344 - Assert RedisCache works with Spring 4.1.

Browse Source 
Added `putIfAbsent` to `RedisCache` to satisfy compatibility with newly introduced method.

Original pull request: #102.
This commit is contained in:
Christoph Strobl
2014-09-04 10:18:06 +02:00
committed by Thomas Darimont
parent f94df9f535
commit 4c7e405f7b
2 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/test/java/org/springframework/data/redis/cache/RedisCacheTest.java vendored
View File

@@ -16,14 +16,17 @@
package org.springframework.data.redis.cache;
import static org.hamcrest.core.IsInstanceOf.*;
import static org.hamcrest.core.IsNull.*;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.IsNot.not;
import static org.hamcrest.core.IsNull.nullValue;
import static org.hamcrest.core.IsSame.sameInstance;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.*;
import static org.junit.Assume.assumeThat;
import static org.springframework.data.redis.matcher.RedisTestMatchers.isEqual;
import java.util.Collection;
@@ -71,7 +74,7 @@ public class RedisCacheTest extends AbstractNativeCacheTest<RedisTemplate> {
}
@SuppressWarnings("unchecked")
protected Cache createCache(RedisTemplate nativeCache) {
protected RedisCache createCache(RedisTemplate nativeCache) {
return new RedisCache(CACHE_NAME, CACHE_NAME.concat(":").getBytes(), nativeCache, TimeUnit.MINUTES.toSeconds(10));
}
@@ -246,4 +249,31 @@ public class RedisCacheTest extends AbstractNativeCacheTest<RedisTemplate> {
Object invalidKey = template.getKeySerializer() == null ? "spring-data-redis".getBytes() : "spring-data-redis";
assertThat(redisCache.get(invalidKey, value.getClass()), nullValue());
}
/**
* @see DATAREDIS-344
*/
@Test
public void putIfAbsentShouldSetValueOnlyIfNotPresent() {
assumeThat(cache, instanceOf(RedisCache.class));
RedisCache redisCache = (RedisCache)cache;
Object key = getKey();
template.delete(key);
Object value = getValue();
ValueWrapper wrapper = redisCache.putIfAbsent(key, value);
assertThat(wrapper.get(), sameInstance(value));
ValueWrapper wrapper2 = redisCache.putIfAbsent(key, value);
if (!(value instanceof Number)) {
assertThat(wrapper2.get(), not(sameInstance(value)));
}
assertThat(wrapper2.get(), equalTo(value));
}
}