root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Stephane Nicoll 2017-03-02 14:31:31 +01:00
parent 5cc569fc91
commit 3e0e4e81b9
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java vendored
View File

@ -441,7 +441,7 @@ public class CacheAutoConfigurationTests {
cacheManager.getCache("defaultCache"); cacheManager.getCache("defaultCache");
assertThat(cacheManager.getCacheNames()).containsOnly("defaultCache"); assertThat(cacheManager.getCacheNames()).containsOnly("defaultCache");
assertThat(this.context.getBean(HazelcastInstance.class)) assertThat(this.context.getBean(HazelcastInstance.class))
.isEqualTo(getHazelcastInstance(cacheManager)); .isEqualTo(cacheManager.getHazelcastInstance());
} }
@Test @Test
@ -458,7 +458,7 @@ public class CacheAutoConfigurationTests {
.getBean(HazelcastInstance.class); .getBean(HazelcastInstance.class);
HazelcastCacheManager cacheManager = validateCacheManager( HazelcastCacheManager cacheManager = validateCacheManager(
HazelcastCacheManager.class); HazelcastCacheManager.class);
HazelcastInstance actual = getHazelcastInstance(cacheManager); HazelcastInstance actual = cacheManager.getHazelcastInstance();
assertThat(actual).isSameAs(hazelcastInstance); assertThat(actual).isSameAs(hazelcastInstance);
assertThat(actual.getConfig().getConfigurationUrl()) assertThat(actual.getConfig().getConfigurationUrl())
.isEqualTo(new ClassPathResource( .isEqualTo(new ClassPathResource(
@ -481,7 +481,7 @@ public class CacheAutoConfigurationTests {
load(HazelcastCustomHazelcastInstance.class, "spring.cache.type=hazelcast"); load(HazelcastCustomHazelcastInstance.class, "spring.cache.type=hazelcast");
HazelcastCacheManager cacheManager = validateCacheManager( HazelcastCacheManager cacheManager = validateCacheManager(
HazelcastCacheManager.class); HazelcastCacheManager.class);
assertThat(getHazelcastInstance(cacheManager)) assertThat(cacheManager.getHazelcastInstance())
.isEqualTo(this.context.getBean("customHazelcastInstance")); .isEqualTo(this.context.getBean("customHazelcastInstance"));
} }
@ -499,7 +499,7 @@ public class CacheAutoConfigurationTests {
HazelcastCacheManager.class); HazelcastCacheManager.class);
HazelcastInstance hazelcastInstance = this.context HazelcastInstance hazelcastInstance = this.context
.getBean(HazelcastInstance.class); .getBean(HazelcastInstance.class);
assertThat(getHazelcastInstance(cacheManager)).isEqualTo(hazelcastInstance); assertThat(cacheManager.getHazelcastInstance()).isEqualTo(hazelcastInstance);
assertThat(hazelcastInstance.getConfig().getConfigurationFile()) assertThat(hazelcastInstance.getConfig().getConfigurationFile())
.isEqualTo(new ClassPathResource(mainConfig).getFile()); .isEqualTo(new ClassPathResource(mainConfig).getFile());
} }
@ -522,8 +522,7 @@ public class CacheAutoConfigurationTests {
.getBean(HazelcastInstance.class); .getBean(HazelcastInstance.class);
HazelcastCacheManager cacheManager = validateCacheManager( HazelcastCacheManager cacheManager = validateCacheManager(
HazelcastCacheManager.class); HazelcastCacheManager.class);
HazelcastInstance cacheHazelcastInstance = (HazelcastInstance) new DirectFieldAccessor( HazelcastInstance cacheHazelcastInstance = cacheManager.getHazelcastInstance();
cacheManager).getPropertyValue("hazelcastInstance");
assertThat(cacheHazelcastInstance).isNotEqualTo(hazelcastInstance); // Our custom assertThat(cacheHazelcastInstance).isNotEqualTo(hazelcastInstance); // Our custom
assertThat(hazelcastInstance.getConfig().getConfigurationFile()) assertThat(hazelcastInstance.getConfig().getConfigurationFile())
.isEqualTo(new ClassPathResource(mainConfig).getFile()); .isEqualTo(new ClassPathResource(mainConfig).getFile());
@ -760,12 +759,6 @@ public class CacheAutoConfigurationTests {
this.context = applicationContext; this.context = applicationContext;
} }
private static HazelcastInstance getHazelcastInstance(
HazelcastCacheManager cacheManager) {
return (HazelcastInstance) new DirectFieldAccessor(cacheManager)
.getPropertyValue("hazelcastInstance");
}
@Configuration @Configuration
static class EmptyConfiguration { static class EmptyConfiguration {