Make tests more comprehensive

Author: courtneyeh

validator/client/src/test/java/tech/pegasys/teku/validator/client/restapi/apis/DeleteGraffitiTest.java

@@ -15,8 +15,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static tech.pegasys.teku.infrastructure.http.HttpStatusCodes.SC_BAD_REQUEST;
 import static tech.pegasys.teku.infrastructure.http.HttpStatusCodes.SC_FORBIDDEN;
@@ -59,10 +62,10 @@ class DeleteGraffitiTest {
   void shouldSuccessfullyDeleteGraffiti() throws IOException {
     final Validator validator = new Validator(publicKey, NO_OP_SIGNER, Optional::empty);
     when(keyManager.getValidatorByPublicKey(any())).thenReturn(Optional.of(validator));
-    graffitiManager.deleteGraffiti(any());
 
     handler.handleRequest(request);
 
+    verify(graffitiManager).deleteGraffiti(eq(publicKey));
     assertThat(request.getResponseCode()).isEqualTo(SC_NO_CONTENT);
     assertThat(request.getResponseBody()).isNull();
   }
@@ -75,6 +78,7 @@ void shouldReturnErrorWhenIssueDeleting() throws IOException {
 
     handler.handleRequest(request);
 
+    verify(graffitiManager).deleteGraffiti(eq(publicKey));
     assertThat(request.getResponseCode()).isEqualTo(SC_INTERNAL_SERVER_ERROR);
     assertThat(request.getResponseBody())
         .isEqualTo(
@@ -88,6 +92,7 @@ void shouldRespondNotFoundWhenNoValidator() throws IOException {
 
     handler.handleRequest(request);
 
+    verifyNoInteractions(graffitiManager);
     assertThat(request.getResponseCode()).isEqualTo(SC_NOT_FOUND);
   }
 

validator/client/src/test/java/tech/pegasys/teku/validator/client/restapi/apis/SetGraffitiTest.java

@@ -19,6 +19,8 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static tech.pegasys.teku.infrastructure.http.HttpStatusCodes.SC_BAD_REQUEST;
 import static tech.pegasys.teku.infrastructure.http.HttpStatusCodes.SC_FORBIDDEN;
@@ -67,6 +69,7 @@ void shouldSuccessfullySetGraffiti() throws IOException {
 
     handler.handleRequest(request);
 
+    verify(graffitiManager).setGraffiti(eq(publicKey), eq(graffiti));
     assertThat(request.getResponseCode()).isEqualTo(SC_NO_CONTENT);
     assertThat(request.getResponseBody()).isNull();
   }
@@ -81,6 +84,7 @@ void shouldReturnErrorWhenIssueSetting() throws IOException {
 
     handler.handleRequest(request);
 
+    verify(graffitiManager).setGraffiti(eq(publicKey), eq(graffiti));
     assertThat(request.getResponseCode()).isEqualTo(SC_INTERNAL_SERVER_ERROR);
     assertThat(request.getResponseBody())
         .isEqualTo(
@@ -105,14 +109,16 @@ void shouldThrowExceptionWhenInvalidGraffitiInput() throws IOException {
     assertThatThrownBy(() -> handler.handleRequest(request))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage(errorMessage);
+    verify(graffitiManager).setGraffiti(eq(publicKey), eq(invalidGraffiti));
   }
 
   @Test
-  void shouldRespondNotFoundWhenNoValidator() throws JsonProcessingException {
+  void shouldRespondNotFoundWhenNoValidator() throws IOException {
     when(keyManager.getValidatorByPublicKey(any())).thenReturn(Optional.empty());
 
     handler.handleRequest(request);
 
+    verifyNoInteractions(graffitiManager);
     assertThat(request.getResponseCode()).isEqualTo(SC_NOT_FOUND);
   }