Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2018-01-16 11:46:42 +01:00

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,8 +31,10 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.boot.liquibase.CommonsLoggingLiquibaseLogger;
import org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener;
@@ -67,7 +69,9 @@ public class LiquibaseAutoConfigurationTests {
@Before
public void init() {
new LiquibaseServiceLocatorApplicationListener().onApplicationEvent(null);
new LiquibaseServiceLocatorApplicationListener().onApplicationEvent(
new ApplicationStartingEvent(new SpringApplication(Object.class),
new String[0]));
}
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()