Test for VerificationServiceHealthIndicator, remove null check (#619)

corona-warn-app · Jun 24, 2020 · 61dbbda · 61dbbda
1 parent 0c1794e
commit 61dbbda
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...ain/java/app/coronawarn/server/services/submission/validation/ValidSubmissionPayload.java b/...ain/java/app/coronawarn/server/services/submission/validation/ValidSubmissionPayload.java
@@ -88,11 +88,6 @@ public boolean isValid(SubmissionPayload submissionPayload, ConstraintValidatorC
       List<TemporaryExposureKey> exposureKeys = submissionPayload.getKeysList();
       validatorContext.disableDefaultConstraintViolation();
 
-      if (Objects.isNull(exposureKeys)) {
-        addViolation(validatorContext, "Field 'keys' points to Null.");
-        return false;
-      }
-
       boolean isValid = checkKeyCollectionSize(exposureKeys, validatorContext);
       isValid &= checkUniqueStartIntervalNumbers(exposureKeys, validatorContext);
       isValid &= checkNoOverlapsInTimeWindow(exposureKeys, validatorContext);

diff --git a/...onawarn/server/services/submission/monitoring/VerificationServiceHealthIndicatorTest.java b/...onawarn/server/services/submission/monitoring/VerificationServiceHealthIndicatorTest.java
@@ -57,12 +57,19 @@ public void setup() {
   }
 
   @Test
-  void checkIsHealthyIfVerificationServerIsRunning() throws Exception {
+  void checkIsHealthyIfVerificationServerIsRunningAndExceptionIsThrown() throws Exception {
     when(verificationServerClient.verifyTan(any())).thenThrow(FeignException.NotFound.class);
     mvc.perform(get("/actuator/health"))
         .andExpect(status().is2xxSuccessful()).andReturn();
   }
 
+  @Test
+  void checkIsHealthyIfVerificationServerIsRunning() throws Exception {
+    when(verificationServerClient.verifyTan(any())).thenReturn("ok");
+    mvc.perform(get("/actuator/health"))
+        .andExpect(status().is2xxSuccessful()).andReturn();
+  }
+
   @Test
   void checkIsUnhealthyIfVerificationServerIsDown() throws Exception {
     when(verificationServerClient.verifyTan(any())).thenThrow(FeignException.InternalServerError.class);