Commit 023bc13f authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 1e648801 6c191e14
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -31,8 +31,10 @@ import org.junit.Test; ...@@ -31,8 +31,10 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.boot.liquibase.CommonsLoggingLiquibaseLogger; import org.springframework.boot.liquibase.CommonsLoggingLiquibaseLogger;
import org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener; import org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener;
...@@ -67,7 +69,9 @@ public class LiquibaseAutoConfigurationTests { ...@@ -67,7 +69,9 @@ public class LiquibaseAutoConfigurationTests {
@Before @Before
public void init() { public void init() {
new LiquibaseServiceLocatorApplicationListener().onApplicationEvent(null); new LiquibaseServiceLocatorApplicationListener().onApplicationEvent(
new ApplicationStartingEvent(new SpringApplication(Object.class),
new String[0]));
} }
private ApplicationContextRunner contextRunner = new ApplicationContextRunner() private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment