This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 353542dc7fa Regen 353542dc7fa is described below commit 353542dc7fa55251bb1e4b91b4993a9c73eaebea Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Jan 13 13:26:37 2023 +0100 Regen --- .../camel/component/as2/AS2ServerManagerIT.java | 40 +++++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java index 7449fe0a66f..82bb9d53679 100644 --- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java +++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java @@ -207,7 +207,7 @@ public class AS2ServerManagerIT extends AbstractAS2ITSupport { assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessageFromBody.replaceAll("[\n\r]", ""), "EDI message does not match"); } - + @Test public void receiveMultipartSignedMessageTest() throws Exception { @@ -378,30 +378,35 @@ public class AS2ServerManagerIT extends AbstractAS2ITSupport { String errorMessage = new String(Streams.readAll(responseEntity.getContent())); assertEquals(EXPECTED_EXCEPTION_MSG, errorMessage, ""); } - + @Test public void checkMDNTest() throws Exception { AS2ClientConnection clientConnection = new AS2ClientConnection(AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, TARGET_PORT); AS2ClientManager clientManager = new AS2ClientManager(clientConnection); - + //Testing MDN parameter defaults - HttpCoreContext response=clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME, AS2MessageStructure.PLAIN, - ContentType.create(AS2MediaType.APPLICATION_EDIFACT, StandardCharsets.US_ASCII), null, null, null, null, - null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null); - - assertEquals(new AS2Configuration().getServer(), response.getResponse().getFirstHeader(AS2Header.FROM).getValue(), "Default value for From header not set"); - assertEquals("MDN Response To:" + SUBJECT, response.getResponse().getFirstHeader(AS2Header.SUBJECT).getValue(), "Default value for Subject header not set"); - + HttpCoreContext response + = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME, AS2MessageStructure.PLAIN, + ContentType.create(AS2MediaType.APPLICATION_EDIFACT, StandardCharsets.US_ASCII), null, null, null, null, + null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null); + + assertEquals(new AS2Configuration().getServer(), response.getResponse().getFirstHeader(AS2Header.FROM).getValue(), + "Default value for From header not set"); + assertEquals("MDN Response To:" + SUBJECT, response.getResponse().getFirstHeader(AS2Header.SUBJECT).getValue(), + "Default value for Subject header not set"); + //Testing MDN parameter overwrites - response=clientManager.send(EDI_MESSAGE, REQUEST_URI+"mdnTest", SUBJECT, FROM, AS2_NAME, AS2_NAME, AS2MessageStructure.PLAIN, + response = clientManager.send(EDI_MESSAGE, REQUEST_URI + "mdnTest", SUBJECT, FROM, AS2_NAME, AS2_NAME, + AS2MessageStructure.PLAIN, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, StandardCharsets.US_ASCII), null, null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null); - - assertEquals("MdnTestFrom", response.getResponse().getFirstHeader(AS2Header.FROM).getValue(), "Configured value for From header not set"); - assertEquals("MdnTestSubjectPrefix" + SUBJECT, response.getResponse().getFirstHeader(AS2Header.SUBJECT).getValue(), "Configured value for Subject header not set"); - } + assertEquals("MdnTestFrom", response.getResponse().getFirstHeader(AS2Header.FROM).getValue(), + "Configured value for From header not set"); + assertEquals("MdnTestSubjectPrefix" + SUBJECT, response.getResponse().getFirstHeader(AS2Header.SUBJECT).getValue(), + "Configured value for Subject header not set"); + } private static void setupSigningGenerator() throws Exception { Security.addProvider(new BouncyCastleProvider()); @@ -487,8 +492,9 @@ public class AS2ServerManagerIT extends AbstractAS2ITSupport { .to("mock:as2RcvMsgs"); // test route for listen with custom MDN parameters - from("as2://" + PATH_PREFIX + "/listen?requestUriPattern=/mdnTest&from=MdnTestFrom&subject=MdnTestSubjectPrefix") - .to("mock:as2RcvMsgs"); + from("as2://" + PATH_PREFIX + + "/listen?requestUriPattern=/mdnTest&from=MdnTestFrom&subject=MdnTestSubjectPrefix") + .to("mock:as2RcvMsgs"); } }; }