mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Polish
This commit is contained in:
parent
5cc569fc91
commit
3e0e4e81b9
@ -441,7 +441,7 @@ public class CacheAutoConfigurationTests {
|
||||
cacheManager.getCache("defaultCache");
|
||||
assertThat(cacheManager.getCacheNames()).containsOnly("defaultCache");
|
||||
assertThat(this.context.getBean(HazelcastInstance.class))
|
||||
.isEqualTo(getHazelcastInstance(cacheManager));
|
||||
.isEqualTo(cacheManager.getHazelcastInstance());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -458,7 +458,7 @@ public class CacheAutoConfigurationTests {
|
||||
.getBean(HazelcastInstance.class);
|
||||
HazelcastCacheManager cacheManager = validateCacheManager(
|
||||
HazelcastCacheManager.class);
|
||||
HazelcastInstance actual = getHazelcastInstance(cacheManager);
|
||||
HazelcastInstance actual = cacheManager.getHazelcastInstance();
|
||||
assertThat(actual).isSameAs(hazelcastInstance);
|
||||
assertThat(actual.getConfig().getConfigurationUrl())
|
||||
.isEqualTo(new ClassPathResource(
|
||||
@ -481,7 +481,7 @@ public class CacheAutoConfigurationTests {
|
||||
load(HazelcastCustomHazelcastInstance.class, "spring.cache.type=hazelcast");
|
||||
HazelcastCacheManager cacheManager = validateCacheManager(
|
||||
HazelcastCacheManager.class);
|
||||
assertThat(getHazelcastInstance(cacheManager))
|
||||
assertThat(cacheManager.getHazelcastInstance())
|
||||
.isEqualTo(this.context.getBean("customHazelcastInstance"));
|
||||
}
|
||||
|
||||
@ -499,7 +499,7 @@ public class CacheAutoConfigurationTests {
|
||||
HazelcastCacheManager.class);
|
||||
HazelcastInstance hazelcastInstance = this.context
|
||||
.getBean(HazelcastInstance.class);
|
||||
assertThat(getHazelcastInstance(cacheManager)).isEqualTo(hazelcastInstance);
|
||||
assertThat(cacheManager.getHazelcastInstance()).isEqualTo(hazelcastInstance);
|
||||
assertThat(hazelcastInstance.getConfig().getConfigurationFile())
|
||||
.isEqualTo(new ClassPathResource(mainConfig).getFile());
|
||||
}
|
||||
@ -522,8 +522,7 @@ public class CacheAutoConfigurationTests {
|
||||
.getBean(HazelcastInstance.class);
|
||||
HazelcastCacheManager cacheManager = validateCacheManager(
|
||||
HazelcastCacheManager.class);
|
||||
HazelcastInstance cacheHazelcastInstance = (HazelcastInstance) new DirectFieldAccessor(
|
||||
cacheManager).getPropertyValue("hazelcastInstance");
|
||||
HazelcastInstance cacheHazelcastInstance = cacheManager.getHazelcastInstance();
|
||||
assertThat(cacheHazelcastInstance).isNotEqualTo(hazelcastInstance); // Our custom
|
||||
assertThat(hazelcastInstance.getConfig().getConfigurationFile())
|
||||
.isEqualTo(new ClassPathResource(mainConfig).getFile());
|
||||
@ -760,12 +759,6 @@ public class CacheAutoConfigurationTests {
|
||||
this.context = applicationContext;
|
||||
}
|
||||
|
||||
private static HazelcastInstance getHazelcastInstance(
|
||||
HazelcastCacheManager cacheManager) {
|
||||
return (HazelcastInstance) new DirectFieldAccessor(cacheManager)
|
||||
.getPropertyValue("hazelcastInstance");
|
||||
}
|
||||
|
||||
@Configuration
|
||||
static class EmptyConfiguration {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user