healthIndicatorService.calculate doesn't work the way I thought

Author: prdoyle

server/src/test/java/org/elasticsearch/reservedstate/service/FileSettingsServiceTests.java

@@ -233,7 +233,6 @@ public void testInitialFileError() throws Exception {
         verify(fileSettingsService, times(1)).processFile(eq(watchedFile), eq(true));
         verify(controller, times(1)).process(any(), any(XContentParser.class), eq(ReservedStateVersionCheck.HIGHER_OR_SAME_VERSION), any());
 
-        assertEquals(YELLOW, healthIndicatorService.calculate(false, null).status());
         verify(healthIndicatorService, times(1)).changeOccurred();
         verify(healthIndicatorService, times(1)).failureOccurred(argThat(s -> s.startsWith(IllegalStateException.class.getName())));
     }
@@ -268,7 +267,6 @@ public void testInitialFileWorks() throws Exception {
         verify(fileSettingsService, times(1)).processFile(eq(watchedFile), eq(true));
         verify(controller, times(1)).process(any(), any(XContentParser.class), eq(ReservedStateVersionCheck.HIGHER_OR_SAME_VERSION), any());
 
-        assertEquals(GREEN, healthIndicatorService.calculate(false, null).status());
         verify(healthIndicatorService, times(1)).changeOccurred();
         verify(healthIndicatorService, times(1)).successOccurred();
     }
@@ -323,7 +321,6 @@ public void testProcessFileChanges() throws Exception {
         verify(fileSettingsService, times(1)).processFile(eq(watchedFile), eq(false));
         verify(controller, times(1)).process(any(), any(XContentParser.class), eq(ReservedStateVersionCheck.HIGHER_VERSION_ONLY), any());
 
-        assertEquals(GREEN, healthIndicatorService.calculate(false, null).status());
         verify(healthIndicatorService, times(2)).changeOccurred();
         verify(healthIndicatorService, times(2)).successOccurred();
     }
@@ -367,7 +364,6 @@ public void testInvalidJSON() throws Exception {
             argThat(e -> unwrapException(e) instanceof XContentParseException)
         );
 
-        assertEquals(YELLOW, healthIndicatorService.calculate(false, null).status());
         verify(healthIndicatorService, Mockito.atLeast(1)).failureOccurred(contains(XContentParseException.class.getName()));
     }
 
@@ -433,8 +429,6 @@ public void testStopWorksInMiddleOfProcessing() throws Exception {
         assertFalse(fileSettingsService.watching());
         fileSettingsService.close();
 
-        // When the service is stopped, the health indicator should be green
-        assertEquals(GREEN, healthIndicatorService.calculate(false, null).status());
         verify(healthIndicatorService).stopOccurred();
 
         // let the deadlocked thread end, so we can cleanly exit the test