Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish disk space health indicator

Browse Source 
- Supply auto-configuration for the new indicator
 - As suggested in the pull request, include the free disk space and
   configured threshold in the health details
 - Update the documentation to describe the indicator and its
   two configuration settings
 - Use @ConfigurationProperties to bind the indicator's configuration.
   This should make the changes sympathetic to the work being done
   to automate the configuration properties documentation

Closes gh-1297
This commit is contained in:
Andy Wilkinson
2014-10-08 17:02:07 +01:00
parent 78d7fe9cb5
commit 97178915a4
6 changed files with 120 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.health;
import java.io.File;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -24,7 +25,6 @@ import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
@@ -49,10 +49,10 @@ public class DiskSpaceHealthIndicatorTests {
@Before
public void setUp() throws Exception {
this.healthIndicator =
new DiskSpaceHealthIndicator(DiskSpaceHealthIndicatorTests.class.getResource("").getPath(),
THRESHOLD_BYTES);
ReflectionTestUtils.setField(this.healthIndicator, "path", this.fileMock);
when(this.fileMock.exists()).thenReturn(true);
when(this.fileMock.canRead()).thenReturn(true);
this.healthIndicator = new DiskSpaceHealthIndicator(createProperties(
this.fileMock, THRESHOLD_BYTES));
}
@Test
@@ -61,6 +61,8 @@ public class DiskSpaceHealthIndicatorTests {
Health health = this.healthIndicator.health();
assertEquals(Status.UP, health.getStatus());
assertEquals(THRESHOLD_BYTES, health.getDetails().get("threshold"));
assertEquals(THRESHOLD_BYTES + 10, health.getDetails().get("free"));
}
@Test
@@ -69,21 +71,14 @@ public class DiskSpaceHealthIndicatorTests {
Health health = this.healthIndicator.health();
assertEquals(Status.DOWN, health.getStatus());
assertEquals(THRESHOLD_BYTES, health.getDetails().get("threshold"));
assertEquals(THRESHOLD_BYTES - 10, health.getDetails().get("free"));
}
@Test
public void throwsExceptionForUnknownPath() {
exception.expect(IllegalArgumentException.class);
exception.expectMessage("Path does not exist: an_path_that_does_not_exist");
new DiskSpaceHealthIndicator("an_path_that_does_not_exist", THRESHOLD_BYTES);
}
@Test
public void throwsExceptionForNegativeThreshold() {
exception.expect(IllegalArgumentException.class);
exception.expectMessage("thresholdBytes must be greater than 0");
new DiskSpaceHealthIndicator(DiskSpaceHealthIndicatorTests.class.getResource("").getPath(), -1);
private DiskSpaceHealthIndicatorProperties createProperties(File path, long threshold) {
DiskSpaceHealthIndicatorProperties properties = new DiskSpaceHealthIndicatorProperties();
properties.setPath(path);
properties.setThreshold(threshold);
return properties;
}
}