Skip to content

Commit 3574873

Browse files
change assertion to show that they are bind
1 parent f6af322 commit 3574873

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteDataSourcesConfigurationTests.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434
* Tests for {@link MyCompleteAdditionalDataSourceConfiguration}.
3535
*
3636
* @author Stephane Nicoll
37+
* @author Raja Kolli
3738
*/
38-
@SpringBootTest
39+
@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1",
40+
"app.datasource.hikari.maximum-pool-size=42" })
3941
@Import(MyCompleteAdditionalDataSourceConfiguration.class)
4042
class MyCompleteDataSourcesConfigurationTests {
4143

@@ -55,7 +57,11 @@ void validateConfiguration() throws SQLException {
5557
assertThat(this.context.getBean("dataSource")).isSameAs(this.dataSource);
5658
assertThat(this.dataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:");
5759
assertThat(this.context.getBean("secondDataSource")).isSameAs(this.secondDataSource);
58-
assertThat(this.secondDataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:");
60+
assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getJdbcUrl())
61+
.isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1");
62+
assertThat(this.secondDataSource)
63+
.extracting((dataSource) -> ((HikariDataSource) dataSource).getMaximumPoolSize())
64+
.isEqualTo(42);
5965
}
6066

6167
}

spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyDataSourcesConfigurationTests.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@
3232
import static org.assertj.core.api.Assertions.assertThat;
3333

3434
/**
35-
* Tests for {@link MyCompleteAdditionalDataSourceConfiguration}.
35+
* Tests for {@link MyAdditionalDataSourceConfiguration}.
3636
*
3737
* @author Stephane Nicoll
3838
*/
39-
@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1",
40-
"app.datasource.hikari.maximum-pool-size=42" })
41-
@Import(MyCompleteAdditionalDataSourceConfiguration.class)
39+
@SpringBootTest(properties = { "app.datasource.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1" })
40+
@Import(MyAdditionalDataSourceConfiguration.class)
4241
class MyDataSourcesConfigurationTests {
4342

4443
@Autowired
@@ -57,11 +56,7 @@ void validateConfiguration() throws SQLException {
5756
assertThat(this.context.getBean("dataSource")).isSameAs(this.dataSource);
5857
assertThat(this.dataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:");
5958
assertThat(this.context.getBean("secondDataSource")).isSameAs(this.secondDataSource);
60-
assertThat(this.secondDataSource).extracting((dataSource) -> ((HikariDataSource) dataSource).getJdbcUrl())
61-
.isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1");
62-
assertThat(this.secondDataSource)
63-
.extracting((dataSource) -> ((HikariDataSource) dataSource).getMaximumPoolSize())
64-
.isEqualTo(42);
59+
assertThat(this.secondDataSource.getConnection().getMetaData().getURL()).startsWith("jdbc:h2:mem:");
6560
}
6661

6762
}

0 commit comments

Comments
 (0)