Update unit tests

Author: courtneyeh

validator/api/src/test/java/tech/pegasys/teku/validator/api/GraffitiManagerTest.java

@@ -60,7 +60,7 @@ void setGraffiti_shouldSetGraffitiWhenFileNotExist(@TempDir final Path tempDir)
     assertThat(getGraffitiManagementDir().toFile().exists()).isTrue();
 
     assertThat(manager.setGraffiti(publicKey, graffiti)).isEmpty();
-    checkStoredGraffitiFile(publicKey, graffiti);
+    checkStoredGraffitiFile(publicKey);
   }
 
   @Test
@@ -71,7 +71,7 @@ void setGraffiti_shouldSetGraffitiWhenFileExist(@TempDir final Path tempDir) thr
         .isTrue();
 
     assertThat(manager.setGraffiti(publicKey, graffiti)).isEmpty();
-    checkStoredGraffitiFile(publicKey, graffiti);
+    checkStoredGraffitiFile(publicKey);
   }
 
   @Test
@@ -129,7 +129,7 @@ void deleteGraffiti_shouldDeleteGraffitiWhenFileExist(@TempDir final Path tempDi
 
   @Test
   @DisabledOnOs(OS.WINDOWS) // Can't set permissions on Windows
-  void deleteGraffiti_shouldReturnErrorMessageWhenUnableToWriteFile(@TempDir final Path tempDir)
+  void deleteGraffiti_shouldReturnErrorMessageWhenUnableToDeleteFile(@TempDir final Path tempDir)
       throws IOException {
     dataDirLayout = new SimpleDataDirLayout(tempDir);
     manager = new GraffitiManager(dataDirLayout);
@@ -151,13 +151,13 @@ void shouldSetAndDeleteGraffitiWhenManagementPreexisting(@TempDir final Path tem
     manager = new GraffitiManager(dataDirLayout);
 
     assertThat(manager.setGraffiti(publicKey, graffiti)).isEmpty();
-    checkStoredGraffitiFile(publicKey, graffiti);
+    checkStoredGraffitiFile(publicKey);
 
     assertThat(manager.deleteGraffiti(publicKey)).isEmpty();
     checkNoGraffitiFile(publicKey);
   }
 
-  private void checkStoredGraffitiFile(final BLSPublicKey publicKey, final String graffiti) {
+  private void checkStoredGraffitiFile(final BLSPublicKey publicKey) {
     final Path filePath = getGraffitiManagementDir().resolve(getFileName(publicKey));
     try {
       final byte[] readBytes = Files.readAllBytes(filePath);

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

@@ -43,13 +43,11 @@
 class DeleteGraffitiTest {
   private final DataStructureUtil dataStructureUtil =
       new DataStructureUtil(TestSpecFactory.createDefault());
+  private final BLSPublicKey publicKey = dataStructureUtil.randomPublicKey();
 
   private final OwnedKeyManager keyManager = mock(OwnedKeyManager.class);
   private final GraffitiManager graffitiManager = mock(GraffitiManager.class);
   private final DeleteGraffiti handler = new DeleteGraffiti(keyManager, graffitiManager);
-
-  private final BLSPublicKey publicKey = dataStructureUtil.randomPublicKey();
-
   private final StubRestApiRequest request =
       StubRestApiRequest.builder()
           .metadata(handler.getMetadata())

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

@@ -44,15 +44,19 @@
 import tech.pegasys.teku.validator.client.Validator;
 
 class GetGraffitiTest {
-  private final OwnedKeyManager keyManager = mock(OwnedKeyManager.class);
-  private final GetGraffiti handler = new GetGraffiti(keyManager);
-  private StubRestApiRequest request;
-
-  final String stringGraffiti = "Test graffiti";
-  final Bytes32 bytesGraffiti = Bytes32Parser.toBytes32(stringGraffiti);
-
   private final DataStructureUtil dataStructureUtil =
       new DataStructureUtil(TestSpecFactory.createDefault());
+  private final String stringGraffiti = "Test graffiti";
+  private final Bytes32 bytesGraffiti = Bytes32Parser.toBytes32(stringGraffiti);
+  private final BLSPublicKey publicKey = dataStructureUtil.randomPublicKey();
+
+  private final OwnedKeyManager keyManager = mock(OwnedKeyManager.class);
+  private final GetGraffiti handler = new GetGraffiti(keyManager);
+  private final StubRestApiRequest request =
+      StubRestApiRequest.builder()
+          .metadata(handler.getMetadata())
+          .pathParameter("pubkey", publicKey.toHexString())
+          .build();
 
   @Test
   void shouldGetGraffiti() throws JsonProcessingException {
@@ -66,15 +70,10 @@ void shouldGetEmptyGraffiti() throws JsonProcessingException {
 
   @Test
   void shouldHandleValidatorNotFound() throws IOException {
-    request =
-        StubRestApiRequest.builder()
-            .metadata(handler.getMetadata())
-            .pathParameter("pubkey", dataStructureUtil.randomPublicKey().toHexString())
-            .build();
-
     when(keyManager.getValidatorByPublicKey(any())).thenReturn(Optional.empty());
 
     handler.handleRequest(request);
+
     assertThat(request.getResponseCode()).isEqualTo(SC_NOT_FOUND);
     assertThat(request.getResponseBody())
         .isEqualTo(new HttpErrorResponse(SC_NOT_FOUND, "Validator not found"));
@@ -83,13 +82,13 @@ void shouldHandleValidatorNotFound() throws IOException {
   @Test
   void metadata_shouldHandle200() throws JsonProcessingException {
     final GetGraffiti.GraffitiResponse response =
-        new GetGraffiti.GraffitiResponse(dataStructureUtil.randomPublicKey(), bytesGraffiti);
+        new GetGraffiti.GraffitiResponse(publicKey, bytesGraffiti);
     final String responseData = getResponseStringFromMetadata(handler, SC_OK, response);
-    assertThat(responseData)
-        .isEqualTo(
-            "{\"data\":{\"pubkey\":"
-                + "\"0xa4654ac3105a58c7634031b5718c4880c87300f72091cfbc69fe490b71d93a671e00e80a388e1ceb8ea1de112003e976\","
-                + "\"graffiti\":\"Test graffiti\"}}");
+    final String expectedResponse =
+        String.format(
+            "{\"data\":{\"pubkey\":\"%s\",\"graffiti\":\"%s\"}}",
+            publicKey.toHexString(), stringGraffiti);
+    assertThat(responseData).isEqualTo(expectedResponse);
   }
 
   @Test
@@ -114,13 +113,6 @@ void metadata_shouldHandle500() throws JsonProcessingException {
 
   private void checkGraffiti(final Optional<Bytes32> graffiti) throws JsonProcessingException {
     final GraffitiProvider provider = () -> graffiti;
-    final BLSPublicKey publicKey = dataStructureUtil.randomPublicKey();
-    request =
-        StubRestApiRequest.builder()
-            .metadata(handler.getMetadata())
-            .pathParameter("pubkey", publicKey.toHexString())
-            .build();
-
     final Validator validator = new Validator(publicKey, NO_OP_SIGNER, provider);
     when(keyManager.getValidatorByPublicKey(eq(publicKey))).thenReturn(Optional.of(validator));
 

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

@@ -44,13 +44,12 @@
 class SetGraffitiTest {
   private final DataStructureUtil dataStructureUtil =
       new DataStructureUtil(TestSpecFactory.createDefault());
+  private final BLSPublicKey publicKey = dataStructureUtil.randomPublicKey();
+  private final String graffiti = "Test graffiti";
 
   private final OwnedKeyManager keyManager = mock(OwnedKeyManager.class);
   private final GraffitiManager graffitiManager = mock(GraffitiManager.class);
   private final SetGraffiti handler = new SetGraffiti(keyManager, graffitiManager);
-
-  private final BLSPublicKey publicKey = dataStructureUtil.randomPublicKey();
-
   private final StubRestApiRequest request =
       StubRestApiRequest.builder()
           .metadata(handler.getMetadata())
@@ -59,7 +58,7 @@ class SetGraffitiTest {
 
   @Test
   void shouldSuccessfullySetGraffiti() throws JsonProcessingException {
-    request.setRequestBody("Test graffiti");
+    request.setRequestBody(graffiti);
 
     final Validator validator = new Validator(publicKey, NO_OP_SIGNER, Optional::empty);
     when(keyManager.getValidatorByPublicKey(any())).thenReturn(Optional.of(validator));
@@ -73,11 +72,11 @@ void shouldSuccessfullySetGraffiti() throws JsonProcessingException {
 
   @Test
   void shouldReturnErrorWhenIssueSetting() throws JsonProcessingException {
-    request.setRequestBody("Test graffiti");
+    request.setRequestBody(graffiti);
 
     final Validator validator = new Validator(publicKey, NO_OP_SIGNER, Optional::empty);
     when(keyManager.getValidatorByPublicKey(any())).thenReturn(Optional.of(validator));
-    when(graffitiManager.setGraffiti(any(), eq("Test graffiti")))
+    when(graffitiManager.setGraffiti(any(), eq(graffiti)))
         .thenReturn(Optional.of("Error deleting graffiti"));
 
     handler.handleRequest(request);