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

Polish mock verification and formatting 

See gh-10773
This commit is contained in:
Andy Wilkinson 2017-10-27 09:42:48 +01:00
parent 37392c0ec8
commit 194e03c913
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java
View File

@ -45,8 +45,8 @@ public class DataSourceInitializerTests {
@Test @Test
public void initializeEmbeddedByDefault() { public void initializeEmbeddedByDefault() {
try (HikariDataSource dataSource = createDataSource()) { try (HikariDataSource dataSource = createDataSource()) {
DataSourceInitializer initializer = new DataSourceInitializer( DataSourceInitializer initializer = new DataSourceInitializer(dataSource,
dataSource, new DataSourceProperties()); new DataSourceProperties());
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
assertThat(initializer.createSchema()).isTrue(); assertThat(initializer.createSchema()).isTrue();
assertNumberOfRows(jdbcTemplate, 0); assertNumberOfRows(jdbcTemplate, 0);
@ -60,8 +60,8 @@ public class DataSourceInitializerTests {
try (HikariDataSource dataSource = createDataSource()) { try (HikariDataSource dataSource = createDataSource()) {
DataSourceProperties properties = new DataSourceProperties(); DataSourceProperties properties = new DataSourceProperties();
properties.setInitializationMode(DataSourceInitializationMode.ALWAYS); properties.setInitializationMode(DataSourceInitializationMode.ALWAYS);
DataSourceInitializer initializer = new DataSourceInitializer( DataSourceInitializer initializer = new DataSourceInitializer(dataSource,
dataSource, properties); properties);
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
assertThat(initializer.createSchema()).isTrue(); assertThat(initializer.createSchema()).isTrue();
assertNumberOfRows(jdbcTemplate, 0); assertNumberOfRows(jdbcTemplate, 0);
@ -80,8 +80,8 @@ public class DataSourceInitializerTests {
try (HikariDataSource dataSource = createDataSource()) { try (HikariDataSource dataSource = createDataSource()) {
DataSourceProperties properties = new DataSourceProperties(); DataSourceProperties properties = new DataSourceProperties();
properties.setInitializationMode(DataSourceInitializationMode.NEVER); properties.setInitializationMode(DataSourceInitializationMode.NEVER);
DataSourceInitializer initializer = new DataSourceInitializer( DataSourceInitializer initializer = new DataSourceInitializer(dataSource,
dataSource, properties); properties);
assertThat(initializer.createSchema()).isFalse(); assertThat(initializer.createSchema()).isFalse();
} }
} }
@ -95,15 +95,14 @@ public class DataSourceInitializerTests {
DataSource dataSource = mock(DataSource.class); DataSource dataSource = mock(DataSource.class);
given(dataSource.getConnection()).willReturn(connection); given(dataSource.getConnection()).willReturn(connection);
DataSourceInitializer initializer = new DataSourceInitializer( DataSourceInitializer initializer = new DataSourceInitializer(dataSource,
dataSource, new DataSourceProperties()); new DataSourceProperties());
assertThat(initializer.createSchema()).isFalse(); assertThat(initializer.createSchema()).isFalse();
verify(dataSource.getConnection()); verify(dataSource).getConnection();
} }
private HikariDataSource createDataSource() { private HikariDataSource createDataSource() {
return DataSourceBuilder.create() return DataSourceBuilder.create().type(HikariDataSource.class)
.type(HikariDataSource.class)
.url("jdbc:h2:mem:" + UUID.randomUUID().toString()).build(); .url("jdbc:h2:mem:" + UUID.randomUUID().toString()).build();
} }