Skip to content

Commit a53987a

Browse files
committed
Renamed JCacheEhCacheTest to JCacheEhCacheTests
1 parent da5b0b9 commit a53987a

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheTest.java renamed to spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheTests.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
import org.springframework.context.annotation.Configuration;
4141

4242
/**
43-
*
4443
* @author Stephane Nicoll
4544
*/
46-
public class JCacheEhCacheTest extends AbstractAnnotationTests {
45+
public class JCacheEhCacheTests extends AbstractAnnotationTests {
4746

4847
private CacheManager jCacheManager;
4948

49+
5050
@Override
5151
protected ConfigurableApplicationContext getApplicationContext() {
5252
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(EnableCachingConfig.class);
@@ -59,12 +59,14 @@ public void shutdown() {
5959
jCacheManager.close();
6060
}
6161

62+
6263
@Override
6364
@Test
6465
@Ignore("Multi cache manager support to be added")
6566
public void testCustomCacheManager() {
6667
}
6768

69+
6870
@Configuration
6971
@EnableCaching
7072
static class EnableCachingConfig extends CachingConfigurerSupport {
@@ -78,16 +80,11 @@ public org.springframework.cache.CacheManager cacheManager() {
7880
@Bean
7981
public CacheManager jCacheManager() {
8082
CacheManager cacheManager = Caching.getCachingProvider().getCacheManager();
81-
final MutableConfiguration<Object, Object> mutableConfiguration
82-
= new MutableConfiguration<Object, Object>();
83-
mutableConfiguration.setStoreByValue(false); // Otherwise value has to be Serializable
84-
cacheManager.createCache("testCache",
85-
new JCacheConfiguration<Object, Object>(mutableConfiguration));
86-
cacheManager.createCache("primary",
87-
new JCacheConfiguration<Object, Object>(mutableConfiguration));
88-
cacheManager.createCache("secondary",
89-
new JCacheConfiguration<Object, Object>(mutableConfiguration));
90-
83+
MutableConfiguration<Object, Object> mutableConfiguration = new MutableConfiguration<Object, Object>();
84+
mutableConfiguration.setStoreByValue(false); // otherwise value has to be Serializable
85+
cacheManager.createCache("testCache", new JCacheConfiguration<Object, Object>(mutableConfiguration));
86+
cacheManager.createCache("primary", new JCacheConfiguration<Object, Object>(mutableConfiguration));
87+
cacheManager.createCache("secondary", new JCacheConfiguration<Object, Object>(mutableConfiguration));
9188
return cacheManager;
9289
}
9390

@@ -111,6 +108,6 @@ public KeyGenerator keyGenerator() {
111108
public KeyGenerator customKeyGenerator() {
112109
return new SomeCustomKeyGenerator();
113110
}
114-
115111
}
116-
}
112+
113+
}

0 commit comments

Comments
 (0)