From 81efa1caa659d9c781985cf2d0225b88b4f867dc Mon Sep 17 00:00:00 2001 From: trang Date: Fri, 21 Jul 2017 15:56:56 +0800 Subject: [PATCH] add properties test --- .../trang/druid/config/SpringDataSourceConfig.java | 6 +++--- .../src/main/resources/application.yml | 10 +++++----- .../com/github/trang/druid/test/DevProfilesTests.java | 3 ++- .../trang/druid/test/DynamicDevProfilesTests.java | 9 +++++---- .../resources/application-dev-props.properties} | 0 .../application-dynamic-dev-props.properties} | 6 +++--- 6 files changed, 18 insertions(+), 16 deletions(-) rename druid-spring-boot-samples/src/{main/resources/application-dev.properties => test/resources/application-dev-props.properties} (100%) rename druid-spring-boot-samples/src/{main/resources/application-dynamic-dev.properties => test/resources/application-dynamic-dev-props.properties} (98%) diff --git a/druid-spring-boot-samples/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java b/druid-spring-boot-samples/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java index 6f1485c..4a85903 100644 --- a/druid-spring-boot-samples/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java +++ b/druid-spring-boot-samples/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java @@ -20,7 +20,7 @@ import java.util.Map; * @author trang */ @Configuration -@Profile({"dynamic", "dynamic-dev"}) +@Profile({"dynamic", "dynamic-dev-yaml", "dynamic-dev-props"}) public class SpringDataSourceConfig { private static final Logger log = LoggerFactory.getLogger(SpringDataSourceConfig.class); @@ -31,7 +31,7 @@ public class SpringDataSourceConfig { * `spring.datasource.druid.one` 前缀的配置会注入到该 Bean，同时会继承 `spring.datasource.druid` * 前缀的配置，若名称相同则会被 `spring.datasource.druid.one` 覆盖 */ - @Bean + @Bean(initMethod = "init", destroyMethod = "close") @ConfigurationProperties("spring.datasource.druid.one") public DruidDataSource firstDataSource() { log.debug("druid first-data-source init..."); @@ -41,7 +41,7 @@ public class SpringDataSourceConfig { /** * 第二个数据源，若还有其它数据源可以继续增加 */ - @Bean + @Bean(initMethod = "init", destroyMethod = "close") @ConfigurationProperties("spring.datasource.druid.two") public DruidDataSource secondDataSource() { log.debug("druid second-data-source init..."); diff --git a/druid-spring-boot-samples/src/main/resources/application.yml b/druid-spring-boot-samples/src/main/resources/application.yml index 6102f65..fa711a3 100644 --- a/druid-spring-boot-samples/src/main/resources/application.yml +++ b/druid-spring-boot-samples/src/main/resources/application.yml @@ -113,7 +113,7 @@ spring: --- spring: - profiles: dev + profiles: dev-yaml datasource: druid: min-evictable-idle-time-millis: 100000 @@ -122,7 +122,7 @@ spring: --- spring: - profiles: dynamic-dev + profiles: dynamic-dev-yaml autoconfigure: exclude: - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration @@ -130,9 +130,9 @@ spring: druid: one: name: one - min-evictable-idle-time-millis: 100000 - max-evictable-idle-time-millis: 200000 + min-evictable-idle-time-millis: 100001 + max-evictable-idle-time-millis: 200001 two: name: two - min-evictable-idle-time-millis: 100001 + min-evictable-idle-time-millis: 100002 max-evictable-idle-time-millis: 200002 \ No newline at end of file diff --git a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DevProfilesTests.java b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DevProfilesTests.java index 41e766f..2ba95dd 100644 --- a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DevProfilesTests.java +++ b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DevProfilesTests.java @@ -12,7 +12,8 @@ import static org.junit.Assert.assertEquals; * * @author trang */ -@ActiveProfiles("dev") +@ActiveProfiles("dev-yaml") +//@ActiveProfiles("dev-props") public class DevProfilesTests extends BaseTest { @Autowired diff --git a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java index 028e9f8..cb93687 100644 --- a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java +++ b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java @@ -13,7 +13,8 @@ import static org.junit.Assert.assertEquals; * * @author trang */ -@ActiveProfiles("dynamic-dev") +@ActiveProfiles("dynamic-dev-yaml") +//@ActiveProfiles("dynamic-dev-props") public class DynamicDevProfilesTests extends BaseTest { @Autowired @@ -25,13 +26,13 @@ public class DynamicDevProfilesTests extends BaseTest { @Test public void testFirstDataSource() { - assertEquals(100000, firstDataSource.getMinEvictableIdleTimeMillis()); - assertEquals(200000, firstDataSource.getMaxEvictableIdleTimeMillis()); + assertEquals(100001, firstDataSource.getMinEvictableIdleTimeMillis()); + assertEquals(200001, firstDataSource.getMaxEvictableIdleTimeMillis()); } @Test public void testSecondDataSource() { - assertEquals(100001, secondDataSource.getMinEvictableIdleTimeMillis()); + assertEquals(100002, secondDataSource.getMinEvictableIdleTimeMillis()); assertEquals(200002, secondDataSource.getMaxEvictableIdleTimeMillis()); } diff --git a/druid-spring-boot-samples/src/main/resources/application-dev.properties b/druid-spring-boot-samples/src/test/resources/application-dev-props.properties similarity index 100% rename from druid-spring-boot-samples/src/main/resources/application-dev.properties rename to druid-spring-boot-samples/src/test/resources/application-dev-props.properties diff --git a/druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties b/druid-spring-boot-samples/src/test/resources/application-dynamic-dev-props.properties similarity index 98% rename from druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties rename to druid-spring-boot-samples/src/test/resources/application-dynamic-dev-props.properties index f978bd4..616dffd 100644 --- a/druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties +++ b/druid-spring-boot-samples/src/test/resources/application-dynamic-dev-props.properties @@ -1,5 +1,5 @@ spring.autoconfigure.exclude=- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration -spring.datasource.druid.one.min-evictable-idle-time-millis=100000 -spring.datasource.druid.one.max-evictable-idle-time-millis=200000 -spring.datasource.druid.two.min-evictable-idle-time-millis=100001 +spring.datasource.druid.one.min-evictable-idle-time-millis=100001 +spring.datasource.druid.one.max-evictable-idle-time-millis=200001 +spring.datasource.druid.two.min-evictable-idle-time-millis=100002 spring.datasource.druid.two.max-evictable-idle-time-millis=200002 \ No newline at end of file