Merge branch '1.3.x'

pull/5615/merge
Andy Wilkinson 9 years ago
commit 571973a51a

@ -67,19 +67,6 @@ public class DevToolsDataSourceAutoConfigurationTests {
verify(dataSource, times(0)).getConnection();
}
@Test
public void nonEmbeddedInMemoryDatabaseIsShutDown() throws SQLException {
ConfigurableApplicationContext context = createContextWithDriver("org.h2.Driver",
DataSourceConfiguration.class);
DataSource dataSource = context.getBean(DataSource.class);
Connection connection = mock(Connection.class);
given(dataSource.getConnection()).willReturn(connection);
Statement statement = mock(Statement.class);
given(connection.createStatement()).willReturn(statement);
context.close();
verify(statement).execute("SHUTDOWN");
}
@Test
public void nonEmbeddedInMemoryDatabaseConfiguredWithDriverIsShutDown()
throws SQLException {

Loading…
Cancel
Save