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

Polish

This commit is contained in:
Phillip Webb 2017-07-28 10:11:49 -07:00
parent 71ade559d5
commit 30ff329e3d
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
View File

@ -51,9 +51,10 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
public void invokeWithCustomSchema() throws Exception {
this.context.close();
this.context = new AnnotationConfigApplicationContext();
TestPropertyValues.of("liquibase.default-schema=CUSTOMSCHEMA",
"spring.datasource.generate-unique-name=true",
"spring.datasource.schema=classpath:/db/create-custom-schema.sql")
TestPropertyValues
.of("liquibase.default-schema=CUSTOMSCHEMA",
"spring.datasource.generate-unique-name=true",
"spring.datasource.schema=classpath:/db/create-custom-schema.sql")
.applyTo(this.context);
this.context.register(CustomSchemaConfig.class);
this.context.refresh();

38
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java
View File

@ -53,24 +53,24 @@ public class HazelcastJpaDependencyAutoConfigurationTests {
@Test
public void registrationIfHazelcastInstanceHasRegularBeanName() {
this.contextRunner.withUserConfiguration(
HazelcastConfiguration.class).run((context) -> {
assertThat(postProcessors(context))
.containsKey("hazelcastInstanceJpaDependencyPostProcessor");
assertThat(entityManagerFactoryDependencies(context)).contains(
"hazelcastInstance");
});
this.contextRunner.withUserConfiguration(HazelcastConfiguration.class)
.run((context) -> {
assertThat(postProcessors(context))
.containsKey("hazelcastInstanceJpaDependencyPostProcessor");
assertThat(entityManagerFactoryDependencies(context))
.contains("hazelcastInstance");
});
}
@Test
public void noRegistrationIfHazelcastInstanceHasCustomBeanName() {
this.contextRunner.withUserConfiguration(
HazelcastCustomNameConfiguration.class).run((context) -> {
assertThat(entityManagerFactoryDependencies(context))
.doesNotContain("hazelcastInstance");
assertThat(postProcessors(context))
.doesNotContainKey("hazelcastInstanceJpaDependencyPostProcessor");
});
this.contextRunner.withUserConfiguration(HazelcastCustomNameConfiguration.class)
.run((context) -> {
assertThat(entityManagerFactoryDependencies(context))
.doesNotContain("hazelcastInstance");
assertThat(postProcessors(context)).doesNotContainKey(
"hazelcastInstanceJpaDependencyPostProcessor");
});
}
@Test
@ -86,8 +86,8 @@ public class HazelcastJpaDependencyAutoConfigurationTests {
@Test
public void noRegistrationWithNoEntityManagerFactory() {
new ApplicationContextRunner().withUserConfiguration(HazelcastConfiguration.class)
.withConfiguration(AutoConfigurations.of(
HazelcastJpaDependencyAutoConfiguration.class))
.withConfiguration(AutoConfigurations
.of(HazelcastJpaDependencyAutoConfiguration.class))
.run((context) -> assertThat(postProcessors(context)).doesNotContainKey(
"hazelcastInstanceJpaDependencyPostProcessor"));
}
@ -99,13 +99,13 @@ public class HazelcastJpaDependencyAutoConfigurationTests {
private List<String> entityManagerFactoryDependencies(
AssertableApplicationContext context) {
String[] dependsOn = ((BeanDefinitionRegistry) context.getSourceApplicationContext())
.getBeanDefinition("entityManagerFactory").getDependsOn();
String[] dependsOn = ((BeanDefinitionRegistry) context
.getSourceApplicationContext()).getBeanDefinition("entityManagerFactory")
.getDependsOn();
return dependsOn != null ? Arrays.asList(dependsOn)
: Collections.<String>emptyList();
}
@Configuration
static class HazelcastConfiguration {