removed todos and created issue see Consensys#1424

Signed-off-by: Sally MacFarlane <[email protected]>
macfarla · Apr 4, 2022 · a5b39f0 · a5b39f0
1 parent df920f3
commit a5b39f0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/...jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/TransactionResourceTest.java b/...jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/TransactionResourceTest.java
@@ -593,30 +593,4 @@ public void validationReceiveIsRawMustBeBoolean() {
   }
   */
 
-  /*
-  @Test
-  public void receiveRawValidations() {
-      assertThat(jersey.target("receiveraw").request().header("c11n-key", null).get().getStatus())
-              .describedAs("key header cannot be null")
-              .isEqualTo(400);
-
-      assertThat(jersey.target("receiveraw").request().get().getStatus()).isEqualTo(400);
-
-      assertThat(jersey.target("receiveraw").request().header("c11n-key", "notbase64").get().getStatus())
-              .describedAs("key header must be valid base64")
-              .isEqualTo(400);
-
-      String validBase64Encoded = Base64.getEncoder().encodeToString("VALIDKEY".getBytes());
-      assertThat(
-                      jersey.target("receiveraw")
-                              .request()
-                              .header("c11n-key", validBase64Encoded)
-                              .header("c11n-to", "notbase64")
-                              .get()
-                              .getStatus())
-              .describedAs("to header must be valid base64")
-              .isEqualTo(400);
-  }
-  */
-
 }
diff --git a/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/ReceiveRawIT.java b/tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/ReceiveRawIT.java
@@ -13,6 +13,8 @@
 import org.junit.Test;
 import suite.NodeAlias;
 
+import java.util.Base64;
+
 public class ReceiveRawIT {
 
   private static final String RECEIVE_PATH = "/receiveraw";
@@ -189,4 +191,29 @@ public void fetchNonexistentTransactionFails() {
     final String result = response.readEntity(String.class);
     assertThat(result).isEqualTo("Message with hash invalidhashvalue was not found");
   }
+
+  @Test
+  public void testValidations () {
+
+    assertThat(partyOne.getRestClient().target("receiveraw").request().header("c11n-key", null).get().getStatus())
+      .describedAs("key header cannot be null")
+      .isEqualTo(400);
+
+    assertThat(partyOne.getRestClient().target("receiveraw").request().get().getStatus()).isEqualTo(400);
+
+    assertThat(partyOne.getRestClient().target("receiveraw").request().header("c11n-key", "notbase64").get().getStatus())
+      .describedAs("key header must be valid base64")
+      .isEqualTo(400);
+
+    String validBase64Encoded = Base64.getEncoder().encodeToString("VALIDKEY".getBytes());
+    assertThat(
+      partyOne.getRestClient().target("receiveraw")
+        .request()
+        .header("c11n-key", validBase64Encoded)
+        .header("c11n-to", "notbase64")
+        .get()
+        .getStatus())
+      .describedAs("to header must be valid base64")
+      .isEqualTo(400);
+  }
 }