Browse Source

Polish

pull/1331/merge
Stephane Nicoll 9 years ago
parent
commit
73909f41cb
  1. 2
      spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
  2. 1
      spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
  3. 4
      spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
  4. 2
      spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java
  5. 1
      spring-context/src/test/java/org/springframework/cache/AbstractValueAdaptingCacheTests.java
  6. 2
      spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
  7. 3
      spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java

2
spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java vendored

@ -102,7 +102,7 @@ public class CaffeineCacheManagerTests { @@ -102,7 +102,7 @@ public class CaffeineCacheManagerTests {
assertEquals("value1", cache1x.get("key1").get());
cache1x.put("key2", 2);
assertEquals(2, cache1x.get("key2").get());
cm.setAllowNullValues(true);
Cache cache1y = cm.getCache("c1");

1
spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java vendored

@ -20,7 +20,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; @@ -20,7 +20,6 @@ import com.github.benmanes.caffeine.cache.Caffeine;
import org.junit.Before;
import org.junit.Test;
import org.springframework.cache.AbstractCacheTests;
import org.springframework.cache.AbstractValueAdaptingCacheTests;
import org.springframework.cache.Cache;

4
spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java vendored

@ -25,7 +25,6 @@ import javax.cache.spi.CachingProvider; @@ -25,7 +25,6 @@ import javax.cache.spi.CachingProvider;
import org.junit.After;
import org.junit.Before;
import org.springframework.cache.AbstractCacheTests;
import org.springframework.cache.AbstractValueAdaptingCacheTests;
/**
@ -70,7 +69,8 @@ public class JCacheEhCacheApiTests extends AbstractValueAdaptingCacheTests<JCach @@ -70,7 +69,8 @@ public class JCacheEhCacheApiTests extends AbstractValueAdaptingCacheTests<JCach
return getCache(true);
}
@Override protected JCacheCache getCache(boolean allowNull) {
@Override
protected JCacheCache getCache(boolean allowNull) {
return allowNull ? this.cache : this.cacheNoNull;
}

2
spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java vendored

@ -26,8 +26,6 @@ import org.junit.Rule; @@ -26,8 +26,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.cache.support.AbstractValueAdaptingCache;
import static org.hamcrest.core.Is.*;
import static org.junit.Assert.*;

1
spring-context/src/test/java/org/springframework/cache/AbstractValueAdaptingCacheTests.java vendored

@ -23,7 +23,6 @@ import org.junit.rules.ExpectedException; @@ -23,7 +23,6 @@ import org.junit.rules.ExpectedException;
import org.springframework.cache.support.AbstractValueAdaptingCache;
/**
*
* @author Stephane Nicoll
*/
public abstract class AbstractValueAdaptingCacheTests<T extends AbstractValueAdaptingCache>

2
spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java vendored

@ -104,7 +104,7 @@ public class ConcurrentMapCacheManagerTests { @@ -104,7 +104,7 @@ public class ConcurrentMapCacheManagerTests {
assertEquals("value1", cache1x.get("key1").get());
cache1x.put("key2", 2);
assertEquals(2, cache1x.get("key2").get());
cm.setAllowNullValues(true);
Cache cache1y = cm.getCache("c1");

3
spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java vendored

@ -62,7 +62,8 @@ public class ConcurrentMapCacheTests @@ -62,7 +62,8 @@ public class ConcurrentMapCacheTests
return getCache(true);
}
@Override protected ConcurrentMapCache getCache(boolean allowNull) {
@Override
protected ConcurrentMapCache getCache(boolean allowNull) {
return allowNull ? this.cache : this.cacheNoNull;
}

Loading…
Cancel
Save