From 7848d3df4d6802a17dc589e3e13d6c9bbc70cd68 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 4 Apr 2022 14:51:18 +1000 Subject: [PATCH] Revert "removed todos and created issue see #1424" This reverts commit a5b39f0fff100ad11e6691a6d5fe50ed370cebd6. --- .../tessera/q2t/TransactionResourceTest.java | 26 ++++++++++++++++++ .../tessera/test/rest/ReceiveRawIT.java | 27 ------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/TransactionResourceTest.java b/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/TransactionResourceTest.java index ed728e3fc9..4ea63e4299 100644 --- a/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/TransactionResourceTest.java +++ b/tessera-jaxrs/transaction-jaxrs/src/test/java/com/quorum/tessera/q2t/TransactionResourceTest.java @@ -593,4 +593,30 @@ 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 index 0c5e41a2b8..72b0a6576e 100644 --- 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,8 +13,6 @@ import org.junit.Test; import suite.NodeAlias; -import java.util.Base64; - public class ReceiveRawIT { private static final String RECEIVE_PATH = "/receiveraw"; @@ -191,29 +189,4 @@ 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); - } }