From c94f0822e57cce48691e7873c38272353099b2c6 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 14 Dec 2017 12:30:13 -0800 Subject: [PATCH] Fix bean names in tests See gh-11224 --- .../jdbc/CompleteTwoDataSourcesExampleTests.java | 6 +++--- .../boot/jdbc/SimpleTwoDataSourcesExampleTests.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/CompleteTwoDataSourcesExampleTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/CompleteTwoDataSourcesExampleTests.java index 920a224bab..b5dcfb0731 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/CompleteTwoDataSourcesExampleTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/CompleteTwoDataSourcesExampleTests.java @@ -48,12 +48,12 @@ public class CompleteTwoDataSourcesExampleTests { public void validateConfiguration() throws SQLException { assertThat(this.context.getBeansOfType(DataSource.class)).hasSize(2); DataSource dataSource = this.context.getBean(DataSource.class); - assertThat(this.context.getBean("fooDataSource")).isSameAs(dataSource); + assertThat(this.context.getBean("firstDataSource")).isSameAs(dataSource); assertThat(dataSource.getConnection().getMetaData().getURL()) .startsWith("jdbc:h2:mem:"); - DataSource barDataSource = this.context.getBean("barDataSource", + DataSource secondDataSource = this.context.getBean("secondDataSource", DataSource.class); - assertThat(barDataSource.getConnection().getMetaData().getURL()) + assertThat(secondDataSource.getConnection().getMetaData().getURL()) .startsWith("jdbc:h2:mem:"); } diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/SimpleTwoDataSourcesExampleTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/SimpleTwoDataSourcesExampleTests.java index 01ad89b423..bfacf9dfdf 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/SimpleTwoDataSourcesExampleTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/jdbc/SimpleTwoDataSourcesExampleTests.java @@ -38,8 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Stephane Nicoll */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { "app.datasource.bar.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1", - "app.datasource.bar.max-total=42" }) +@SpringBootTest(properties = { "app.datasource.second.url=jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1", + "app.datasource.second.max-total=42" }) @Import(SimpleTwoDataSourcesExample.SimpleDataSourcesConfiguration.class) public class SimpleTwoDataSourcesExampleTests { @@ -50,13 +50,13 @@ public class SimpleTwoDataSourcesExampleTests { public void validateConfiguration() throws SQLException { assertThat(this.context.getBeansOfType(DataSource.class)).hasSize(2); DataSource dataSource = this.context.getBean(DataSource.class); - assertThat(this.context.getBean("fooDataSource")).isSameAs(dataSource); + assertThat(this.context.getBean("firstDataSource")).isSameAs(dataSource); assertThat(dataSource.getConnection().getMetaData().getURL()) .startsWith("jdbc:h2:mem:"); - BasicDataSource barDataSource = this.context.getBean("barDataSource", + BasicDataSource secondDataSource = this.context.getBean("secondDataSource", BasicDataSource.class); - assertThat(barDataSource.getUrl()).isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1"); - assertThat(barDataSource.getMaxTotal()).isEqualTo(42); + assertThat(secondDataSource.getUrl()).isEqualTo("jdbc:h2:mem:bar;DB_CLOSE_DELAY=-1"); + assertThat(secondDataSource.getMaxTotal()).isEqualTo(42); } }