From b8eb13d827cbd91546140b5f581acd3922766473 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 8 Oct 2014 18:00:56 +0100 Subject: [PATCH] Fix tests after addition of disk space health indicator --- ...HealthIndicatorAutoConfigurationTests.java | 45 ++++++++++++++++--- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java index e307b8a2e4..35b5deb1ee 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java @@ -25,6 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.actuate.health.ApplicationHealthIndicator; import org.springframework.boot.actuate.health.DataSourceHealthIndicator; +import org.springframework.boot.actuate.health.DiskSpaceHealthIndicator; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.actuate.health.MongoHealthIndicator; import org.springframework.boot.actuate.health.RabbitHealthIndicator; @@ -76,6 +77,8 @@ public class HealthIndicatorAutoConfigurationTests { public void defaultHealthIndicator() { this.context = new AnnotationConfigApplicationContext(); this.context.register(HealthIndicatorAutoConfiguration.class); + EnvironmentTestUtils.addEnvironment(this.context, + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -89,6 +92,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(RedisAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); + EnvironmentTestUtils.addEnvironment(this.context, + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -102,7 +107,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(RedisAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "health.redis.enabled:false"); + EnvironmentTestUtils.addEnvironment(this.context, "health.redis.enabled:false", + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -116,6 +122,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); + EnvironmentTestUtils.addEnvironment(this.context, + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -129,7 +137,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "health.mongo.enabled:false"); + EnvironmentTestUtils.addEnvironment(this.context, "health.mongo.enabled:false", + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -147,7 +156,7 @@ public class HealthIndicatorAutoConfigurationTests { this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); - assertEquals(3, beans.size()); + assertEquals(4, beans.size()); } @Test @@ -155,6 +164,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(EmbeddedDataSourceConfiguration.class, HealthIndicatorAutoConfiguration.class); + EnvironmentTestUtils.addEnvironment(this.context, + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -171,7 +182,8 @@ public class HealthIndicatorAutoConfigurationTests { DataSourcePoolMetadataProvidersConfiguration.class, HealthIndicatorAutoConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.validation-query:SELECT from FOOBAR"); + "spring.datasource.validation-query:SELECT from FOOBAR", + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -187,7 +199,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(EmbeddedDataSourceConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "health.db.enabled:false"); + EnvironmentTestUtils.addEnvironment(this.context, "health.db.enabled:false", + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -201,6 +214,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(RabbitAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); + EnvironmentTestUtils.addEnvironment(this.context, + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -214,7 +229,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(RabbitAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "health.rabbit.enabled:false"); + EnvironmentTestUtils.addEnvironment(this.context, "health.rabbit.enabled:false", + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -228,6 +244,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(SolrAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); + EnvironmentTestUtils.addEnvironment(this.context, + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -241,7 +259,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(SolrAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "health.solr.enabled:false"); + EnvironmentTestUtils.addEnvironment(this.context, "health.solr.enabled:false", + "health.diskspace.enabled:false"); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -250,6 +269,18 @@ public class HealthIndicatorAutoConfigurationTests { .getClass()); } + @Test + public void diskSpaceHealthIndicator() { + this.context = new AnnotationConfigApplicationContext(); + this.context.register(HealthIndicatorAutoConfiguration.class); + this.context.refresh(); + Map beans = this.context + .getBeansOfType(HealthIndicator.class); + assertEquals(1, beans.size()); + assertEquals(DiskSpaceHealthIndicator.class, beans.values().iterator().next() + .getClass()); + } + @Configuration @EnableConfigurationProperties protected static class DataSourceConfig {