You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2020/03/06 17:44:18 UTC
[camel] branch master updated: CAMEL-11807: Migrated camel-as2
tests to JUnit 5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a4ff497 CAMEL-11807: Migrated camel-as2 tests to JUnit 5
a4ff497 is described below
commit a4ff4971a1f25d6e0b6a10be4c352f4cec035e3b
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Mar 6 17:23:59 2020 +0100
CAMEL-11807: Migrated camel-as2 tests to JUnit 5
---
components/camel-as2/camel-as2-api/pom.xml | 2 +-
.../camel/component/as2/api/AS2MessageTest.java | 673 +++++++++------------
.../as2/api/entity/CompressedEntityTest.java | 20 +-
.../DispositionNotificationOptionsParserTest.java | 24 +-
.../component/as2/api/entity/EntityParserTest.java | 66 +-
.../component/as2/api/util/AS2HeaderUtilsTest.java | 18 +-
.../DispositionNotificationContentUtilsTest.java | 46 +-
.../camel/component/as2/api/util/MicUtilsTest.java | 21 +-
components/camel-as2/camel-as2-component/pom.xml | 2 +-
.../as2/AS2ClientManagerIntegrationTest.java | 284 +++++----
.../as2/AS2ServerManagerIntegrationTest.java | 206 +++----
.../component/as2/AbstractAS2TestSupport.java | 11 +-
12 files changed, 641 insertions(+), 732 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index cf98b44b..8dc5d3f 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -84,7 +84,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
index 84ebd96..0480858 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
@@ -74,18 +74,18 @@ import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AS2MessageTest {
@@ -147,7 +147,7 @@ public class AS2MessageTest {
private AS2SignedDataGenerator gen;
- @BeforeClass
+ @BeforeAll
public static void setUpOnce() throws Exception {
Security.addProvider(new BouncyCastleProvider());
@@ -194,12 +194,12 @@ public class AS2MessageTest {
});
}
- @AfterClass
+ @AfterAll
public static void tearDownOnce() throws Exception {
testServer.close();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Security.addProvider(new BouncyCastleProvider());
@@ -249,36 +249,29 @@ public class AS2MessageTest {
null, null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationEDIFACTEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationEDIFACTEntity, "Unexpected request entity type");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) entity;
- assertTrue("Unexpected content type for entity",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertTrue("Entity not set as main body of request", ediEntity.isMainBody());
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for entity");
+ assertTrue(ediEntity.isMainBody(), "Entity not set as main body of request");
}
@Test
@@ -293,51 +286,41 @@ public class AS2MessageTest {
null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.MULTIPART_SIGNED));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.MULTIPART_SIGNED), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof MultipartSignedEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof MultipartSignedEntity, "Unexpected request entity type");
MultipartSignedEntity signedEntity = (MultipartSignedEntity) entity;
- assertTrue("Entity not set as main body of request", signedEntity.isMainBody());
- assertTrue("Request contains invalid number of mime parts", signedEntity.getPartCount() == 2);
+ assertTrue(signedEntity.isMainBody(), "Entity not set as main body of request");
+ assertTrue(signedEntity.getPartCount() == 2, "Request contains invalid number of mime parts");
// Validated first mime part.
- assertTrue("First mime part incorrect type ", signedEntity.getPart(0) instanceof ApplicationEDIFACTEntity);
+ assertTrue(signedEntity.getPart(0) instanceof ApplicationEDIFACTEntity, "First mime part incorrect type ");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) signedEntity.getPart(0);
- assertTrue("Unexpected content type for first mime part",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("First mime type set as main body of request", ediEntity.isMainBody());
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for first mime part");
+ assertFalse(ediEntity.isMainBody(), "First mime type set as main body of request");
// Validate second mime part.
- assertTrue("Second mime part incorrect type ",
- signedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity);
+ assertTrue(signedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity, "Second mime part incorrect type ");
ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity) signedEntity.getPart(1);
- assertTrue("Unexpected content type for second mime part",
- signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE));
- assertFalse("First mime type set as main body of request", signatureEntity.isMainBody());
-
+ assertTrue(signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE), "Unexpected content type for second mime part");
+ assertFalse(signatureEntity.isMainBody(), "First mime type set as main body of request");
}
@Test
@@ -455,52 +438,43 @@ public class AS2MessageTest {
certList.toArray(new Certificate[0]));
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity, "Unexpected request entity type");
ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
- assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
+ assertTrue(envelopedEntity.isMainBody(), "Entity not set as main body of request");
// Validated enveloped part.
MimeEntity encryptedEntity = envelopedEntity.getEncryptedEntity(signingKP.getPrivate());
- assertTrue("Enveloped mime part incorrect type ", encryptedEntity instanceof ApplicationEDIFACTEntity);
+ assertTrue(encryptedEntity instanceof ApplicationEDIFACTEntity, "Enveloped mime part incorrect type ");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) encryptedEntity;
- assertTrue("Unexpected content type for enveloped mime part",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("Enveloped mime type set as main body of request", ediEntity.isMainBody());
- assertEquals("Unexpected content for enveloped mime part", EDI_MESSAGE.replaceAll("[\n\r]", ""),
- ediEntity.getEdiMessage().replaceAll("[\n\r]", ""));
-
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for enveloped mime part");
+ assertFalse(ediEntity.isMainBody(), "Enveloped mime type set as main body of request");
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediEntity.getEdiMessage().replaceAll("[\n\r]", ""), "Unexpected content for enveloped mime part");
}
@Test
public void aes128CbcEnvelopedAndSignedMessageTest() throws Exception {
envelopedAndSignedMessageTest(AS2EncryptionAlgorithm.AES128_CBC);
}
-
+
public void envelopedAndSignedMessageTest(AS2EncryptionAlgorithm encryptionAlgorithm) throws Exception {
AS2ClientConnection clientConnection = new AS2ClientConnection(AS2_VERSION, USER_AGENT, CLIENT_FQDN,
TARGET_HOST, TARGET_PORT);
@@ -516,58 +490,50 @@ public class AS2MessageTest {
certList.toArray(new Certificate[0]));
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT,
+ request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT,
+ request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity, "Unexpected request entity type");
ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
- assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
+ assertTrue(envelopedEntity.isMainBody(), "Entity not set as main body of request");
// Validated enveloped part.
MimeEntity encryptedEntity = envelopedEntity.getEncryptedEntity(signingKP.getPrivate());
- assertTrue("Enveloped mime part incorrect type ", encryptedEntity instanceof MultipartSignedEntity);
+ assertTrue(encryptedEntity instanceof MultipartSignedEntity, "Enveloped mime part incorrect type ");
MultipartSignedEntity multipartSignedEntity = (MultipartSignedEntity) encryptedEntity;
- assertTrue("Unexpected content type for enveloped mime part",
- multipartSignedEntity.getContentType().getValue().startsWith(AS2MediaType.MULTIPART_SIGNED));
- assertFalse("Enveloped mime type set as main body of request", multipartSignedEntity.isMainBody());
- assertTrue("Request contains invalid number of mime parts", multipartSignedEntity.getPartCount() == 2);
+ assertTrue(multipartSignedEntity.getContentType().getValue().startsWith(AS2MediaType.MULTIPART_SIGNED), "Unexpected content type for enveloped mime part");
+ assertFalse(multipartSignedEntity.isMainBody(), "Enveloped mime type set as main body of request");
+ assertTrue(multipartSignedEntity.getPartCount() == 2, "Request contains invalid number of mime parts");
// Validated first mime part.
- assertTrue("First mime part incorrect type ", multipartSignedEntity.getPart(0) instanceof ApplicationEDIFACTEntity);
+ assertTrue(multipartSignedEntity.getPart(0) instanceof ApplicationEDIFACTEntity, "First mime part incorrect type ");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) multipartSignedEntity.getPart(0);
- assertTrue("Unexpected content type for first mime part",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("First mime type set as main body of request", ediEntity.isMainBody());
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for first mime part");
+ assertFalse(ediEntity.isMainBody(), "First mime type set as main body of request");
// Validate second mime part.
- assertTrue("Second mime part incorrect type ",
- multipartSignedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity);
+ assertTrue(multipartSignedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity, "Second mime part incorrect type ");
ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity) multipartSignedEntity.getPart(1);
- assertTrue("Unexpected content type for second mime part",
- signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE));
- assertFalse("First mime type set as main body of request", signatureEntity.isMainBody());
+ assertTrue(signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE), "Unexpected content type for second mime part");
+ assertFalse(signatureEntity.isMainBody(), "First mime type set as main body of request");
}
@@ -583,20 +549,20 @@ public class AS2MessageTest {
null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
HttpRequest request = httpContext.getRequest();
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof MultipartSignedEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof MultipartSignedEntity, "Unexpected request entity type");
MultipartSignedEntity multipartSignedEntity = (MultipartSignedEntity) entity;
MimeEntity signedEntity = multipartSignedEntity.getSignedDataEntity();
- assertTrue("Signed entity wrong type", signedEntity instanceof ApplicationEDIEntity);
+ assertTrue(signedEntity instanceof ApplicationEDIEntity, "Signed entity wrong type");
ApplicationEDIEntity ediMessageEntity = (ApplicationEDIEntity) signedEntity;
- assertNotNull("Multipart signed entity does not contain EDI message entity", ediMessageEntity);
+ assertNotNull(ediMessageEntity, "Multipart signed entity does not contain EDI message entity");
ApplicationPkcs7SignatureEntity signatureEntity = multipartSignedEntity.getSignatureEntity();
- assertNotNull("Multipart signed entity does not contain signature entity", signatureEntity);
+ assertNotNull(signatureEntity, "Multipart signed entity does not contain signature entity");
// Validate Signature
- assertTrue("Signature is invalid", multipartSignedEntity.isValid());
+ assertTrue(multipartSignedEntity.isValid(), "Signature is invalid");
}
@@ -611,33 +577,29 @@ public class AS2MessageTest {
null, null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
HttpResponse response = httpContext.getResponse();
- assertEquals("Unexpected method value", HttpVersion.HTTP_1_1, response.getStatusLine().getProtocolVersion());
- assertEquals("Unexpected method value", HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
- assertEquals("Unexpected method value", EnglishReasonPhraseCatalog.INSTANCE.getReason(200, null),
- response.getStatusLine().getReasonPhrase());
+ assertEquals(HttpVersion.HTTP_1_1, response.getStatusLine().getProtocolVersion(), "Unexpected method value");
+ assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode(), "Unexpected method value");
+ assertEquals(EnglishReasonPhraseCatalog.INSTANCE.getReason(200, null), response.getStatusLine().getReasonPhrase(), "Unexpected method value");
HttpEntity responseEntity = response.getEntity();
- assertNotNull("Response entity", responseEntity);
- assertTrue("Unexpected response entity type", responseEntity instanceof MultipartSignedEntity);
- MultipartSignedEntity responseSignedEntity = (MultipartSignedEntity) responseEntity;
+ assertNotNull(responseEntity, "Response entity");
+ assertTrue(responseEntity instanceof MultipartSignedEntity, "Unexpected response entity type");
+ MultipartSignedEntity responseSignedEntity = (MultipartSignedEntity)responseEntity;
MimeEntity responseSignedDataEntity = responseSignedEntity.getSignedDataEntity();
- assertTrue("Signed entity wrong type",
- responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity);
- DispositionNotificationMultipartReportEntity reportEntity = (DispositionNotificationMultipartReportEntity) responseSignedDataEntity;
- assertEquals("Unexpected number of body parts in report", 2, reportEntity.getPartCount());
+ assertTrue(responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity, "Signed entity wrong type");
+ DispositionNotificationMultipartReportEntity reportEntity = (DispositionNotificationMultipartReportEntity)responseSignedDataEntity;
+ assertEquals(2, reportEntity.getPartCount(), "Unexpected number of body parts in report");
MimeEntity firstPart = reportEntity.getPart(0);
- assertEquals("Unexpected content type in first body part of report",
- ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(),
- firstPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue(),
+ "Unexpected content type in first body part of report");
MimeEntity secondPart = reportEntity.getPart(1);
- assertEquals("Unexpected content type in second body part of report",
- ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(),
- secondPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(), secondPart.getContentTypeValue(),
+ "Unexpected content type in second body part of report");
ApplicationPkcs7SignatureEntity signatureEntity = responseSignedEntity.getSignatureEntity();
- assertNotNull("Signature Entity", signatureEntity);
+ assertNotNull(signatureEntity, "Signature Entity");
// Validate Signature
- assertTrue("Signature is invalid", responseSignedEntity.isValid());
+ assertTrue(responseSignedEntity.isValid(), "Signature is invalid");
}
@Test
@@ -682,32 +644,25 @@ public class AS2MessageTest {
// Send MDN
HttpCoreContext httpContext = mdnManager.send(mdn, RECIPIENT_DELIVERY_ADDRESS);
HttpRequest mndRequest = httpContext.getRequest();
- DispositionNotificationMultipartReportEntity reportEntity = HttpMessageUtils.getEntity(mndRequest,
- DispositionNotificationMultipartReportEntity.class);
- assertNotNull("Request does not contain resport", reportEntity);
- assertEquals("Report entity contains invalid number of parts", 2, reportEntity.getPartCount());
- assertTrue("Report first part is not text entity", reportEntity.getPart(0) instanceof TextPlainEntity);
- assertTrue("Report second part is not MDN entity",
- reportEntity.getPart(1) instanceof AS2MessageDispositionNotificationEntity);
- AS2MessageDispositionNotificationEntity mdnEntity = (AS2MessageDispositionNotificationEntity) reportEntity
- .getPart(1);
- assertEquals("Unexpected value for Reporting UA", REPORTING_UA, mdnEntity.getReportingUA());
- assertEquals("Unexpected value for Final Recipient", AS2_NAME, mdnEntity.getFinalRecipient());
- assertEquals("Unexpected value for Original Message ID", originalMessageId, mdnEntity.getOriginalMessageId());
- assertEquals("Unexpected value for Disposition Mode", DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY,
- mdnEntity.getDispositionMode());
- assertEquals("Unexpected value for Disposition Type", AS2DispositionType.PROCESSED,
- mdnEntity.getDispositionType());
- assertEquals("Unexpected value for Disposition Modifier", dispositionModifier,
- mdnEntity.getDispositionModifier());
- assertArrayEquals("Unexpected value for Failure Fields", failureFields, mdnEntity.getFailureFields());
- assertArrayEquals("Unexpected value for Error Fields", errorFields, mdnEntity.getErrorFields());
- assertArrayEquals("Unexpected value for Warning Fields", warningFields, mdnEntity.getWarningFields());
- assertEquals("Unexpected value for Extension Fields", extensionFields, mdnEntity.getExtensionFields());
+ DispositionNotificationMultipartReportEntity reportEntity = HttpMessageUtils.getEntity(mndRequest, DispositionNotificationMultipartReportEntity.class);
+ assertNotNull(reportEntity, "Request does not contain resport");
+ assertEquals(2, reportEntity.getPartCount(), "Report entity contains invalid number of parts");
+ assertTrue(reportEntity.getPart(0) instanceof TextPlainEntity, "Report first part is not text entity");
+ assertTrue(reportEntity.getPart(1) instanceof AS2MessageDispositionNotificationEntity, "Report second part is not MDN entity");
+ AS2MessageDispositionNotificationEntity mdnEntity = (AS2MessageDispositionNotificationEntity)reportEntity.getPart(1);
+ assertEquals(REPORTING_UA, mdnEntity.getReportingUA(), "Unexpected value for Reporting UA");
+ assertEquals(AS2_NAME, mdnEntity.getFinalRecipient(), "Unexpected value for Final Recipient");
+ assertEquals(originalMessageId, mdnEntity.getOriginalMessageId(), "Unexpected value for Original Message ID");
+ assertEquals(DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, mdnEntity.getDispositionMode(), "Unexpected value for Disposition Mode");
+ assertEquals(AS2DispositionType.PROCESSED, mdnEntity.getDispositionType(), "Unexpected value for Disposition Type");
+ assertEquals(dispositionModifier, mdnEntity.getDispositionModifier(), "Unexpected value for Disposition Modifier");
+ assertArrayEquals(failureFields, mdnEntity.getFailureFields(), "Unexpected value for Failure Fields");
+ assertArrayEquals(errorFields, mdnEntity.getErrorFields(), "Unexpected value for Error Fields");
+ assertArrayEquals(warningFields, mdnEntity.getWarningFields(), "Unexpected value for Warning Fields");
+ assertEquals(extensionFields, mdnEntity.getExtensionFields(), "Unexpected value for Extension Fields");
ReceivedContentMic expectedMic = MicUtils.createReceivedContentMic(request, null);
ReceivedContentMic mdnMic = mdnEntity.getReceivedContentMic();
- assertEquals("Unexpected value for Recieved Content Mic", expectedMic.getEncodedMessageDigest(),
- mdnMic.getEncodedMessageDigest());
+ assertEquals(expectedMic.getEncodedMessageDigest(), mdnMic.getEncodedMessageDigest(), "Unexpected value for Recieved Content Mic");
LOG.debug("\r\n" + AS2Utils.printMessage(mndRequest));
}
@@ -727,42 +682,35 @@ public class AS2MessageTest {
null);
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
- HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeCompressedDataEntity);
- ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity) entity;
- assertTrue("Entity not set as main body of request", compressedDataEntity.isMainBody());
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
+ HttpEntity entity = ((BasicHttpEntityEnclosingRequest)request).getEntity();
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeCompressedDataEntity, "Unexpected request entity type");
+ ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity)entity;
+ assertTrue(compressedDataEntity.isMainBody(), "Entity not set as main body of request");
// Validated compessed part.
MimeEntity compressedEntity = compressedDataEntity.getCompressedEntity(new ZlibExpanderProvider());
- assertTrue("Enveloped mime part incorrect type ", compressedEntity instanceof ApplicationEDIFACTEntity);
- ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) compressedEntity;
- assertTrue("Unexpected content type for compressed entity",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("Compressed entity set as main body of request", ediEntity.isMainBody());
+ assertTrue(compressedEntity instanceof ApplicationEDIFACTEntity, "Enveloped mime part incorrect type ");
+ ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity)compressedEntity;
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for compressed entity");
+ assertFalse(ediEntity.isMainBody(), "Compressed entity set as main body of request");
}
@@ -783,59 +731,48 @@ public class AS2MessageTest {
null);
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
- HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeCompressedDataEntity);
- ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity) entity;
- assertTrue("Entity not set as main body of request", compressedDataEntity.isMainBody());
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
+ HttpEntity entity = ((BasicHttpEntityEnclosingRequest)request).getEntity();
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeCompressedDataEntity, "Unexpected request entity type");
+ ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity)entity;
+ assertTrue(compressedDataEntity.isMainBody(), "Entity not set as main body of request");
// Validated compressed part.
MimeEntity compressedEntity = compressedDataEntity.getCompressedEntity(new ZlibExpanderProvider());
- assertTrue("Enveloped mime part incorrect type ", compressedEntity instanceof MultipartSignedEntity);
- MultipartSignedEntity multipartSignedEntity = (MultipartSignedEntity) compressedEntity;
- assertTrue("Unexpected content type for compressed entity",
- multipartSignedEntity.getContentType().getValue().startsWith(AS2MediaType.MULTIPART_SIGNED));
- assertFalse("Multipart signed entity set as main body of request", multipartSignedEntity.isMainBody());
- assertTrue("Multipart signed entity contains invalid number of mime parts",
- multipartSignedEntity.getPartCount() == 2);
+ assertTrue(compressedEntity instanceof MultipartSignedEntity, "Enveloped mime part incorrect type ");
+ MultipartSignedEntity multipartSignedEntity = (MultipartSignedEntity)compressedEntity;
+ assertTrue(multipartSignedEntity.getContentType().getValue().startsWith(AS2MediaType.MULTIPART_SIGNED), "Unexpected content type for compressed entity");
+ assertFalse(multipartSignedEntity.isMainBody(), "Multipart signed entity set as main body of request");
+ assertTrue(multipartSignedEntity.getPartCount() == 2, "Multipart signed entity contains invalid number of mime parts");
// Validated first mime part.
- assertTrue("First mime part incorrect type ", multipartSignedEntity.getPart(0) instanceof ApplicationEDIFACTEntity);
- ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) multipartSignedEntity.getPart(0);
- assertTrue("Unexpected content type for first mime part",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("First mime type set as main body of request", ediEntity.isMainBody());
-
+ assertTrue(multipartSignedEntity.getPart(0) instanceof ApplicationEDIFACTEntity, "First mime part incorrect type ");
+ ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity)multipartSignedEntity.getPart(0);
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for first mime part");
+ assertFalse(ediEntity.isMainBody(), "First mime type set as main body of request");
+
// Validate second mime part.
- assertTrue("Second mime part incorrect type ",
- multipartSignedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity);
- ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity) multipartSignedEntity.getPart(1);
- assertTrue("Unexpected content type for second mime part",
- signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE));
- assertFalse("First mime type set as main body of request", signatureEntity.isMainBody());
+ assertTrue(multipartSignedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity, "Second mime part incorrect type ");
+ ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity)multipartSignedEntity.getPart(1);
+ assertTrue(signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE), "Unexpected content type for second mime part");
+ assertFalse(signatureEntity.isMainBody(), "First mime type set as main body of request");
}
@Test
@@ -846,60 +783,49 @@ public class AS2MessageTest {
LOG.info("Key Algoritm: " + signingKP.getPrivate().getAlgorithm());
- HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
- AS2MessageStructure.ENCRYPTED_COMPRESSED,
- ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), "base64",
- null, null, null, AS2CompressionAlgorithm.ZLIB,
- DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, AS2EncryptionAlgorithm.AES128_CBC,
- certList.toArray(new Certificate[0]));
+ HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME, AS2MessageStructure.ENCRYPTED_COMPRESSED,
+ ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), "base64", null, null, null,
+ AS2CompressionAlgorithm.ZLIB, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS,
+ AS2EncryptionAlgorithm.AES128_CBC, certList.toArray(new Certificate[0]));
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
- HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
- ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
- assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
+ HttpEntity entity = ((BasicHttpEntityEnclosingRequest)request).getEntity();
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity, "Unexpected request entity type");
+ ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity)entity;
+ assertTrue(envelopedEntity.isMainBody(), "Entity not set as main body of request");
// Validated enveloped part.
MimeEntity encryptedEntity = envelopedEntity.getEncryptedEntity(signingKP.getPrivate());
- assertTrue("Enveloped mime part incorrect type ", encryptedEntity instanceof ApplicationPkcs7MimeCompressedDataEntity);
- ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity) encryptedEntity;
- assertTrue("Unexpected content type for compressed mime part",
- compressedDataEntity.getContentType().getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
- assertFalse("Enveloped mime type set as main body of request", compressedDataEntity.isMainBody());
+ assertTrue(encryptedEntity instanceof ApplicationPkcs7MimeCompressedDataEntity, "Enveloped mime part incorrect type ");
+ ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity)encryptedEntity;
+ assertTrue(compressedDataEntity.getContentType().getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for compressed mime part");
+ assertFalse(compressedDataEntity.isMainBody(), "Enveloped mime type set as main body of request");
// Validated compressed part.
MimeEntity compressedEntity = compressedDataEntity.getCompressedEntity(new ZlibExpanderProvider());
- assertTrue("Enveloped mime part incorrect type ", compressedEntity instanceof ApplicationEDIFACTEntity);
- ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) compressedEntity;
- assertTrue("Unexpected content type for compressed entity",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("Compressed entity set as main body of request", ediEntity.isMainBody());
- assertEquals("Unexpected content for enveloped mime part", EDI_MESSAGE.replaceAll("[\n\r]", ""),
- ediEntity.getEdiMessage().replaceAll("[\n\r]", ""));
+ assertTrue(compressedEntity instanceof ApplicationEDIFACTEntity, "Enveloped mime part incorrect type ");
+ ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity)compressedEntity;
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for compressed entity");
+ assertFalse(ediEntity.isMainBody(), "Compressed entity set as main body of request");
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediEntity.getEdiMessage().replaceAll("[\n\r]", ""), "Unexpected content for enveloped mime part");
}
@Test
@@ -918,68 +844,55 @@ public class AS2MessageTest {
AS2EncryptionAlgorithm.AES128_CBC, certList.toArray(new Certificate[0]));
HttpRequest request = httpContext.getRequest();
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1,
- request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION,
- request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value",
- request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT,
- request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT,
- request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message",
- request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
- HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
- ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
- assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
+ HttpEntity entity = ((BasicHttpEntityEnclosingRequest)request).getEntity();
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity, "Unexpected request entity type");
+ ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity)entity;
+ assertTrue(envelopedEntity.isMainBody(), "Entity not set as main body of request");
// Validated enveloped part.
MimeEntity encryptedEntity = envelopedEntity.getEncryptedEntity(signingKP.getPrivate());
- assertTrue("Enveloped mime part incorrect type ", encryptedEntity instanceof ApplicationPkcs7MimeCompressedDataEntity);
- ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity) encryptedEntity;
- assertTrue("Unexpected content type for compressed mime part",
- compressedDataEntity.getContentType().getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
- assertFalse("Enveloped mime type set as main body of request", compressedDataEntity.isMainBody());
+ assertTrue(encryptedEntity instanceof ApplicationPkcs7MimeCompressedDataEntity, "Enveloped mime part incorrect type ");
+ ApplicationPkcs7MimeCompressedDataEntity compressedDataEntity = (ApplicationPkcs7MimeCompressedDataEntity)encryptedEntity;
+ assertTrue(compressedDataEntity.getContentType().getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for compressed mime part");
+ assertFalse(compressedDataEntity.isMainBody(), "Enveloped mime type set as main body of request");
// Validated compressed part.
MimeEntity compressedEntity = compressedDataEntity.getCompressedEntity(new ZlibExpanderProvider());
- assertTrue("Enveloped mime part incorrect type ", compressedEntity instanceof MultipartSignedEntity);
- MultipartSignedEntity multipartSignedEntity = (MultipartSignedEntity) compressedEntity;
- assertTrue("Unexpected content type for compressed entity",
- multipartSignedEntity.getContentType().getValue().startsWith(AS2MediaType.MULTIPART_SIGNED));
- assertFalse("Multipart signed entity set as main body of request", multipartSignedEntity.isMainBody());
- assertTrue("Multipart signed entity contains invalid number of mime parts",
- multipartSignedEntity.getPartCount() == 2);
+ assertTrue(compressedEntity instanceof MultipartSignedEntity, "Enveloped mime part incorrect type ");
+ MultipartSignedEntity multipartSignedEntity = (MultipartSignedEntity)compressedEntity;
+ assertTrue(multipartSignedEntity.getContentType().getValue().startsWith(AS2MediaType.MULTIPART_SIGNED), "Unexpected content type for compressed entity");
+ assertFalse(multipartSignedEntity.isMainBody(), "Multipart signed entity set as main body of request");
+ assertTrue(multipartSignedEntity.getPartCount() == 2, "Multipart signed entity contains invalid number of mime parts");
// Validated first mime part.
- assertTrue("First mime part incorrect type ", multipartSignedEntity.getPart(0) instanceof ApplicationEDIFACTEntity);
- ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) multipartSignedEntity.getPart(0);
- assertTrue("Unexpected content type for first mime part",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("First mime type set as main body of request", ediEntity.isMainBody());
-
- // Validate second mime part.
- assertTrue("Second mime part incorrect type ",
- multipartSignedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity);
- ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity) multipartSignedEntity.getPart(1);
- assertTrue("Unexpected content type for second mime part",
- signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE));
- assertFalse("First mime type set as main body of request", signatureEntity.isMainBody());
+ assertTrue(multipartSignedEntity.getPart(0) instanceof ApplicationEDIFACTEntity, "First mime part incorrect type ");
+ ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity)multipartSignedEntity.getPart(0);
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for first mime part");
+ assertFalse(ediEntity.isMainBody(), "First mime type set as main body of request");
+ // Validate second mime part.
+ assertTrue(multipartSignedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity, "Second mime part incorrect type ");
+ ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity)multipartSignedEntity.getPart(1);
+ assertTrue(signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE), "Unexpected content type for second mime part");
+ assertFalse(signatureEntity.isMainBody(), "First mime type set as main body of request");
}
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java
index 27f849e..34fb709 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java
@@ -20,12 +20,12 @@ import org.bouncycastle.cms.CMSCompressedDataGenerator;
import org.bouncycastle.cms.jcajce.ZlibCompressor;
import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
import org.bouncycastle.operator.OutputCompressor;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CompressedEntityTest {
@@ -60,14 +60,14 @@ public class CompressedEntityTest {
public static final String APPLICATION_PKCS7_MIME_COMPRESSED_TRANSFER_ENCODING = "base64";
- @Before
+ @BeforeEach
public void setUp() throws Exception {
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
}
-
+
@Test
public void createCompressedEntityTest() throws Exception {
TextPlainEntity textPlainEntity = new TextPlainEntity(TEXT_PLAIN_CONTENT, TEXT_PLAIN_CONTENT_CHARSET_NAME,
@@ -81,9 +81,9 @@ public class CompressedEntityTest {
textPlainEntity, cGen, compressor, APPLICATION_PKCS7_MIME_COMPRESSED_TRANSFER_ENCODING, false);
MimeEntity decompressedEntity = compressedEntity.getCompressedEntity(new ZlibExpanderProvider());
- assertTrue("", decompressedEntity instanceof TextPlainEntity);
+ assertTrue(decompressedEntity instanceof TextPlainEntity, "");
TextPlainEntity decompressedTextPlainEntity = (TextPlainEntity) decompressedEntity;
- assertEquals("", EXPECTED_TEXT_PLAIN_CONTENT, decompressedTextPlainEntity.getText());
+ assertEquals(EXPECTED_TEXT_PLAIN_CONTENT, decompressedTextPlainEntity.getText(), "");
}
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParserTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParserTest.java
index e71d8d1..8dbef27 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParserTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParserTest.java
@@ -17,11 +17,11 @@
package org.apache.camel.component.as2.api.entity;
import org.apache.camel.component.as2.api.util.AS2HeaderUtils.Parameter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DispositionNotificationOptionsParserTest {
@@ -38,16 +38,16 @@ public class DispositionNotificationOptionsParserTest {
DispositionNotificationOptions dispositionNotificationOptions = DispositionNotificationOptionsParser.parseDispositionNotificationOptions(TEST_NAME_VALUES, null);
Parameter signedReceiptProtocol = dispositionNotificationOptions.getSignedReceiptProtocol();
- assertNotNull("signed receipt protocol not parsed", signedReceiptProtocol);
- assertEquals("Unexpected value for signed receipt protocol attribute", SIGNED_RECEIPT_PROTOCOL_ATTRIBUTE, signedReceiptProtocol.getAttribute());
- assertEquals("Unexpected value for signed receipt protocol importance", SIGNED_RECEIPT_PROTOCOL_IMPORTANCE, signedReceiptProtocol.getImportance().getImportance());
- assertArrayEquals("Unexpected value for parameter importance", SIGNED_RECEIPT_PROTOCOL_VALUES, signedReceiptProtocol.getValues());
+ assertNotNull(signedReceiptProtocol, "signed receipt protocol not parsed");
+ assertEquals(SIGNED_RECEIPT_PROTOCOL_ATTRIBUTE, signedReceiptProtocol.getAttribute(), "Unexpected value for signed receipt protocol attribute");
+ assertEquals(SIGNED_RECEIPT_PROTOCOL_IMPORTANCE, signedReceiptProtocol.getImportance().getImportance(), "Unexpected value for signed receipt protocol importance");
+ assertArrayEquals(SIGNED_RECEIPT_PROTOCOL_VALUES, signedReceiptProtocol.getValues(), "Unexpected value for parameter importance");
Parameter signedReceiptMicalg = dispositionNotificationOptions.getSignedReceiptMicalg();
- assertNotNull("signed receipt micalg not parsed", signedReceiptProtocol);
- assertEquals("Unexpected value for signed receipt micalg attribute", SIGNED_RECEIPT_MICALG_ATTRIBUTE, signedReceiptMicalg.getAttribute());
- assertEquals("Unexpected value for signed receipt micalg importance", SIGNED_RECEIPT_MICALG_IMPORTANCE, signedReceiptMicalg.getImportance().getImportance());
- assertArrayEquals("Unexpected value for micalg importance", SIGNED_RECEIPT_MICALG_VALUES, signedReceiptMicalg.getValues());
+ assertNotNull(signedReceiptProtocol, "signed receipt micalg not parsed");
+ assertEquals(SIGNED_RECEIPT_MICALG_ATTRIBUTE, signedReceiptMicalg.getAttribute(), "Unexpected value for signed receipt micalg attribute");
+ assertEquals(SIGNED_RECEIPT_MICALG_IMPORTANCE, signedReceiptMicalg.getImportance().getImportance(), "Unexpected value for signed receipt micalg importance");
+ assertArrayEquals(SIGNED_RECEIPT_MICALG_VALUES, signedReceiptMicalg.getValues(), "Unexpected value for micalg importance");
}
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java
index 8aa954b..cad0c7b 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java
@@ -61,14 +61,14 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.OutputEncryptor;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class EntityParserTest {
@@ -185,11 +185,11 @@ public class EntityParserTest {
//
int serialNo = 1;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
}
@@ -206,8 +206,8 @@ public class EntityParserTest {
EntityParser.parseAS2MessageEntity(response);
HttpEntity parsedEntity = EntityUtils.getMessageEntity(response);
- assertNotNull("Unexpected Null message disposition notification report entity", parsedEntity);
- assertTrue("Unexpected type for message disposition notification report entity", parsedEntity instanceof DispositionNotificationMultipartReportEntity);
+ assertNotNull(parsedEntity, "Unexpected Null message disposition notification report entity");
+ assertTrue(parsedEntity instanceof DispositionNotificationMultipartReportEntity, "Unexpected type for message disposition notification report entity");
}
@Test
@@ -222,11 +222,11 @@ public class EntityParserTest {
DISPOSITION_NOTIFICATION_REPORT_CONTENT_CHARSET_NAME,
DISPOSITION_NOTIFICATION_REPORT_CONTENT_TRANSFER_ENCODING);
- assertNotNull("Unexpected Null disposition notification multipart entity", dispositionNotificationMultipartReportEntity);
- assertEquals("Unexpected number of body parts", 2, dispositionNotificationMultipartReportEntity.getPartCount());
+ assertNotNull(dispositionNotificationMultipartReportEntity, "Unexpected Null disposition notification multipart entity");
+ assertEquals(2, dispositionNotificationMultipartReportEntity.getPartCount(), "Unexpected number of body parts");
- assertTrue("Unexpected type for first body part", dispositionNotificationMultipartReportEntity.getPart(0) instanceof TextPlainEntity);
- assertTrue("Unexpected type for second body part", dispositionNotificationMultipartReportEntity.getPart(1) instanceof AS2MessageDispositionNotificationEntity);
+ assertTrue(dispositionNotificationMultipartReportEntity.getPart(0) instanceof TextPlainEntity, "Unexpected type for first body part");
+ assertTrue(dispositionNotificationMultipartReportEntity.getPart(1) instanceof AS2MessageDispositionNotificationEntity, "Unexpected type for second body part");
}
@Test
@@ -240,7 +240,7 @@ public class EntityParserTest {
String text = textPlainEntity.getText();
- assertEquals("Unexpected text", EXPECTED_TEXT_PLAIN_CONTENT, text);
+ assertEquals(EXPECTED_TEXT_PLAIN_CONTENT, text, "Unexpected text");
}
@Test
@@ -255,21 +255,21 @@ public class EntityParserTest {
DISPOSITION_NOTIFICATION_CONTENT_CHARSET_NAME,
DISPOSITION_NOTIFICATION_CONTENT_TRANSFER_ENCODING);
- assertEquals("Unexpected Reporting UA value", EXPECTED_REPORTING_UA, messageDispositionNotificationEntity.getReportingUA());
- assertEquals("Unexpected MTN Name", EXPECTED_MTN_NAME, messageDispositionNotificationEntity.getMtnName());
- assertEquals("Unexpected Original Recipient", EXPECTED_ORIGINAL_RECIPIENT, messageDispositionNotificationEntity.getExtensionFields().get("Original-Recipient"));
- assertEquals("Unexpected Final Reciptient", EXPECTED_FINAL_RECIPIENT, messageDispositionNotificationEntity.getFinalRecipient());
- assertEquals("Unexpected Original Message ID", EXPECTED_ORIGINAL_MESSAGE_ID, messageDispositionNotificationEntity.getOriginalMessageId());
- assertEquals("Unexpected Disposition Mode", EXPECTED_DISPOSITION_MODE, messageDispositionNotificationEntity.getDispositionMode());
- assertNotNull("Unexpected Null Disposition Modifier", messageDispositionNotificationEntity.getDispositionModifier());
- assertEquals("Unexpected Disposition Modifier", EXPECTED_DISPOSITION_MODIFIER, messageDispositionNotificationEntity.getDispositionModifier().getModifier());
- assertEquals("Unexpected Disposition Type", EXPECTED_DISPOSITION_TYPE, messageDispositionNotificationEntity.getDispositionType());
- assertArrayEquals("Unexpected Failure Array value", EXPECTED_FAILURE, messageDispositionNotificationEntity.getFailureFields());
- assertArrayEquals("Unexpected Error Array value", EXPECTED_ERROR, messageDispositionNotificationEntity.getErrorFields());
- assertArrayEquals("Unexpected Warning Array value", EXPECTED_WARNING, messageDispositionNotificationEntity.getWarningFields());
- assertNotNull("Unexpected Null Received Content MIC", messageDispositionNotificationEntity.getReceivedContentMic());
- assertEquals("Unexpected Encoded Message Digest", EXPECTED_ENCODED_MESSAGE_DIGEST, messageDispositionNotificationEntity.getReceivedContentMic().getEncodedMessageDigest());
- assertEquals("Unexpected Digest Algorithm ID", EXPECTED_DIGEST_ALGORITHM_ID, messageDispositionNotificationEntity.getReceivedContentMic().getDigestAlgorithmId());
+ assertEquals(EXPECTED_REPORTING_UA, messageDispositionNotificationEntity.getReportingUA(), "Unexpected Reporting UA value");
+ assertEquals(EXPECTED_MTN_NAME, messageDispositionNotificationEntity.getMtnName(), "Unexpected MTN Name");
+ assertEquals(EXPECTED_ORIGINAL_RECIPIENT, messageDispositionNotificationEntity.getExtensionFields().get("Original-Recipient"), "Unexpected Original Recipient");
+ assertEquals(EXPECTED_FINAL_RECIPIENT, messageDispositionNotificationEntity.getFinalRecipient(), "Unexpected Final Reciptient");
+ assertEquals(EXPECTED_ORIGINAL_MESSAGE_ID, messageDispositionNotificationEntity.getOriginalMessageId(), "Unexpected Original Message ID");
+ assertEquals(EXPECTED_DISPOSITION_MODE, messageDispositionNotificationEntity.getDispositionMode(), "Unexpected Disposition Mode");
+ assertNotNull(messageDispositionNotificationEntity.getDispositionModifier(), "Unexpected Null Disposition Modifier");
+ assertEquals(EXPECTED_DISPOSITION_MODIFIER, messageDispositionNotificationEntity.getDispositionModifier().getModifier(), "Unexpected Disposition Modifier");
+ assertEquals(EXPECTED_DISPOSITION_TYPE, messageDispositionNotificationEntity.getDispositionType(), "Unexpected Disposition Type");
+ assertArrayEquals(EXPECTED_FAILURE, messageDispositionNotificationEntity.getFailureFields(), "Unexpected Failure Array value");
+ assertArrayEquals(EXPECTED_ERROR, messageDispositionNotificationEntity.getErrorFields(), "Unexpected Error Array value");
+ assertArrayEquals(EXPECTED_WARNING, messageDispositionNotificationEntity.getWarningFields(), "Unexpected Warning Array value");
+ assertNotNull(messageDispositionNotificationEntity.getReceivedContentMic(), "Unexpected Null Received Content MIC");
+ assertEquals(EXPECTED_ENCODED_MESSAGE_DIGEST, messageDispositionNotificationEntity.getReceivedContentMic().getEncodedMessageDigest(), "Unexpected Encoded Message Digest");
+ assertEquals(EXPECTED_DIGEST_ALGORITHM_ID, messageDispositionNotificationEntity.getReceivedContentMic().getDigestAlgorithmId(), "Unexpected Digest Algorithm ID");
}
@Test
@@ -320,8 +320,8 @@ public class EntityParserTest {
ApplicationPkcs7MimeEnvelopedDataEntity applicationPkcs7MimeEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(textEntity, cmsEnvelopeDataGenerator, contentEncryptor, "binary", true);
MimeEntity decryptedMimeEntity = applicationPkcs7MimeEntity.getEncryptedEntity(encryptKP.getPrivate());
- assertEquals("Decrypted entity has unexpected content type", "text/plain; charset=US-ASCII", decryptedMimeEntity.getContentTypeValue());
- assertEquals("Decrypted entity has unexpected content", "This is a super secret messatge!", ((TextPlainEntity)decryptedMimeEntity).getText());
+ assertEquals("text/plain; charset=US-ASCII", decryptedMimeEntity.getContentTypeValue(), "Decrypted entity has unexpected content type");
+ assertEquals("This is a super secret messatge!", ((TextPlainEntity)decryptedMimeEntity).getText(), "Decrypted entity has unexpected content");
}
/**
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/AS2HeaderUtilsTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/AS2HeaderUtilsTest.java
index 1d09efe..892f5c6 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/AS2HeaderUtilsTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/AS2HeaderUtilsTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.as2.api.util;
import org.apache.camel.component.as2.api.util.AS2HeaderUtils.Parameter;
import org.apache.http.message.ParserCursor;
import org.apache.http.util.CharArrayBuffer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AS2HeaderUtilsTest {
@@ -42,14 +42,14 @@ public class AS2HeaderUtilsTest {
final ParserCursor cursor = new ParserCursor(0, TEST_NAME_VALUES.length());
Parameter parameter = AS2HeaderUtils.parseParameter(buffer, cursor);
- assertEquals("Unexpected value for parameter attribute", SIGNED_RECEIPT_PROTOCOL_ATTRIBUTE, parameter.getAttribute());
- assertEquals("Unexpected value for parameter importance", SIGNED_RECEIPT_PROTOCOL_IMPORTANCE, parameter.getImportance().getImportance());
- assertArrayEquals("Unexpected value for parameter values", SIGNED_RECEIPT_PROTOCOL_VALUES, parameter.getValues());
+ assertEquals(SIGNED_RECEIPT_PROTOCOL_ATTRIBUTE, parameter.getAttribute(), "Unexpected value for parameter attribute");
+ assertEquals(SIGNED_RECEIPT_PROTOCOL_IMPORTANCE, parameter.getImportance().getImportance(), "Unexpected value for parameter importance");
+ assertArrayEquals(SIGNED_RECEIPT_PROTOCOL_VALUES, parameter.getValues(), "Unexpected value for parameter values");
parameter = AS2HeaderUtils.parseParameter(buffer, cursor);
- assertEquals("Unexpected value for parameter attribute", SIGNED_RECEIPT_MICALG_ATTRIBUTE, parameter.getAttribute());
- assertEquals("Unexpected value for parameter importance", SIGNED_RECEIPT_MICALG_IMPORTANCE, parameter.getImportance().getImportance());
- assertArrayEquals("Unexpected value for parameter values", SIGNED_RECEIPT_MICALG_VALUES, parameter.getValues());
+ assertEquals(SIGNED_RECEIPT_MICALG_ATTRIBUTE, parameter.getAttribute(), "Unexpected value for parameter attribute");
+ assertEquals(SIGNED_RECEIPT_MICALG_IMPORTANCE, parameter.getImportance().getImportance(), "Unexpected value for parameter importance");
+ assertArrayEquals(SIGNED_RECEIPT_MICALG_VALUES, parameter.getValues(), "Unexpected value for parameter values");
}
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtilsTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtilsTest.java
index d7a536b..bd0a696 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtilsTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtilsTest.java
@@ -29,13 +29,13 @@ import org.apache.camel.component.as2.api.io.AS2SessionInputBuffer;
import org.apache.http.impl.io.HttpTransportMetricsImpl;
import org.apache.http.message.BasicLineParser;
import org.apache.http.util.CharArrayBuffer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DispositionNotificationContentUtilsTest {
@@ -67,11 +67,11 @@ public class DispositionNotificationContentUtilsTest {
public static final String EXPECTED_DIGEST_ALGORITHM_ID = "sha1";
- @Before
+ @BeforeEach
public void setUp() throws Exception {
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
}
@@ -86,21 +86,21 @@ public class DispositionNotificationContentUtilsTest {
List<CharArrayBuffer> dispositionNotificationFields = EntityParser.parseBodyPartFields(inbuffer, null, BasicLineParser.INSTANCE, new ArrayList<CharArrayBuffer>());
AS2MessageDispositionNotificationEntity messageDispositionNotificationEntity = DispositionNotificationContentUtils.parseDispositionNotification(dispositionNotificationFields);
- assertEquals("Unexpected Reporting UA value", EXPECTED_REPORTING_UA, messageDispositionNotificationEntity.getReportingUA());
- assertEquals("Unexpected MTN Name", EXPECTED_MTN_NAME, messageDispositionNotificationEntity.getMtnName());
- assertEquals("Unexpected Original Recipient", EXPECTED_ORIGINAL_RECIPIENT, messageDispositionNotificationEntity.getExtensionFields().get("Original-Recipient"));
- assertEquals("Unexpected Final Reciptient", EXPECTED_FINAL_RECIPIENT, messageDispositionNotificationEntity.getFinalRecipient());
- assertEquals("Unexpected Original Message ID", EXPECTED_ORIGINAL_MESSAGE_ID, messageDispositionNotificationEntity.getOriginalMessageId());
- assertEquals("Unexpected Disposition Mode", EXPECTED_DISPOSITION_MODE, messageDispositionNotificationEntity.getDispositionMode());
- assertNotNull("Unexpected Null Disposition Modifier", messageDispositionNotificationEntity.getDispositionModifier());
- assertEquals("Unexpected Disposition Modifier", EXPECTED_DISPOSITION_MODIFIER, messageDispositionNotificationEntity.getDispositionModifier().getModifier());
- assertEquals("Unexpected Disposition Type", EXPECTED_DISPOSITION_TYPE, messageDispositionNotificationEntity.getDispositionType());
- assertArrayEquals("Unexpected Failure Array value", EXPECTED_FAILURE, messageDispositionNotificationEntity.getFailureFields());
- assertArrayEquals("Unexpected Error Array value", EXPECTED_ERROR, messageDispositionNotificationEntity.getErrorFields());
- assertArrayEquals("Unexpected Warning Array value", EXPECTED_WARNING, messageDispositionNotificationEntity.getWarningFields());
- assertNotNull("Unexpected Null Received Content MIC", messageDispositionNotificationEntity.getReceivedContentMic());
- assertEquals("Unexpected Encoded Message Digest", EXPECTED_ENCODED_MESSAGE_DIGEST, messageDispositionNotificationEntity.getReceivedContentMic().getEncodedMessageDigest());
- assertEquals("Unexpected Digest Algorithm ID", EXPECTED_DIGEST_ALGORITHM_ID, messageDispositionNotificationEntity.getReceivedContentMic().getDigestAlgorithmId());
+ assertEquals(EXPECTED_REPORTING_UA, messageDispositionNotificationEntity.getReportingUA(), "Unexpected Reporting UA value");
+ assertEquals(EXPECTED_MTN_NAME, messageDispositionNotificationEntity.getMtnName(), "Unexpected MTN Name");
+ assertEquals(EXPECTED_ORIGINAL_RECIPIENT, messageDispositionNotificationEntity.getExtensionFields().get("Original-Recipient"), "Unexpected Original Recipient");
+ assertEquals(EXPECTED_FINAL_RECIPIENT, messageDispositionNotificationEntity.getFinalRecipient(), "Unexpected Final Reciptient");
+ assertEquals(EXPECTED_ORIGINAL_MESSAGE_ID, messageDispositionNotificationEntity.getOriginalMessageId(), "Unexpected Original Message ID");
+ assertEquals(EXPECTED_DISPOSITION_MODE, messageDispositionNotificationEntity.getDispositionMode(), "Unexpected Disposition Mode");
+ assertNotNull(messageDispositionNotificationEntity.getDispositionModifier(), "Unexpected Null Disposition Modifier");
+ assertEquals(EXPECTED_DISPOSITION_MODIFIER, messageDispositionNotificationEntity.getDispositionModifier().getModifier(), "Unexpected Disposition Modifier");
+ assertEquals(EXPECTED_DISPOSITION_TYPE, messageDispositionNotificationEntity.getDispositionType(), "Unexpected Disposition Type");
+ assertArrayEquals(EXPECTED_FAILURE, messageDispositionNotificationEntity.getFailureFields(), "Unexpected Failure Array value");
+ assertArrayEquals(EXPECTED_ERROR, messageDispositionNotificationEntity.getErrorFields(), "Unexpected Error Array value");
+ assertArrayEquals(EXPECTED_WARNING, messageDispositionNotificationEntity.getWarningFields(), "Unexpected Warning Array value");
+ assertNotNull(messageDispositionNotificationEntity.getReceivedContentMic(), "Unexpected Null Received Content MIC");
+ assertEquals(EXPECTED_ENCODED_MESSAGE_DIGEST, messageDispositionNotificationEntity.getReceivedContentMic().getEncodedMessageDigest(), "Unexpected Encoded Message Digest");
+ assertEquals(EXPECTED_DIGEST_ALGORITHM_ID, messageDispositionNotificationEntity.getReceivedContentMic().getDigestAlgorithmId(), "Unexpected Digest Algorithm ID");
}
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/MicUtilsTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/MicUtilsTest.java
index 27675d8..8333d5c 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/MicUtilsTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/util/MicUtilsTest.java
@@ -30,14 +30,14 @@ import org.apache.http.HttpVersion;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MicUtilsTest {
@@ -76,12 +76,12 @@ public class MicUtilsTest {
private static final String EXPECTED_MESSAGE_DIGEST_ALGORITHM = "sha1";
private static final String EXPECTED_ENCODED_MESSAGE_DIGEST = "XUt+ug5GEDD0X9+Nv8DGYZZThOQ=";
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Security.addProvider(new BouncyCastleProvider());
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
}
@@ -100,12 +100,11 @@ public class MicUtilsTest {
request.setEntity(basicEntity);
ReceivedContentMic receivedContentMic = MicUtils.createReceivedContentMic(request, null);
- assertNotNull("Failed to create Received Content MIC");
+ assertNotNull(receivedContentMic, "Failed to create Received Content MIC");
LOG.debug("Digest Algorithm: " + receivedContentMic.getDigestAlgorithmId());
- assertEquals("Unexpected digest algorithm value", EXPECTED_MESSAGE_DIGEST_ALGORITHM, receivedContentMic.getDigestAlgorithmId());
+ assertEquals(EXPECTED_MESSAGE_DIGEST_ALGORITHM, receivedContentMic.getDigestAlgorithmId(), "Unexpected digest algorithm value");
LOG.debug("Encoded Message Digest: " + receivedContentMic.getEncodedMessageDigest());
- assertEquals("Unexpected encoded message digest value", EXPECTED_ENCODED_MESSAGE_DIGEST, receivedContentMic.getEncodedMessageDigest());
-
+ assertEquals(EXPECTED_ENCODED_MESSAGE_DIGEST, receivedContentMic.getEncodedMessageDigest(), "Unexpected encoded message digest value");
}
}
diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml
index 8f8d342..8cc7f12 100644
--- a/components/camel-as2/camel-as2-component/pom.xml
+++ b/components/camel-as2/camel-as2-component/pom.xml
@@ -65,7 +65,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
index 4830406..c1d2786 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
@@ -90,13 +90,17 @@ import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test class for {@link org.apache.camel.component.as2.api.AS2ClientManager} APIs.
*/
@@ -171,7 +175,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
private AS2SignedDataGenerator gen;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
Security.addProvider(new BouncyCastleProvider());
@@ -239,44 +243,43 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
HttpRequest request = result.getMiddle();
HttpResponse response = result.getRight();
- assertNotNull("send result", result);
+ assertNotNull(result, "send result");
LOG.debug("send: " + result);
- assertNotNull("Request", request);
- assertTrue("Request does not contain body", request instanceof HttpEntityEnclosingRequest);
+ assertNotNull(request, "Request");
+ assertTrue(request instanceof HttpEntityEnclosingRequest, "Request does not contain body");
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
- assertNotNull("Request body", entity);
- assertTrue("Request body does not contain EDI entity", entity instanceof ApplicationEDIEntity);
+ assertNotNull(entity, "Request body");
+ assertTrue(entity instanceof ApplicationEDIEntity, "Request body does not contain EDI entity");
String ediMessage = ((ApplicationEDIEntity)entity).getEdiMessage();
- assertEquals("EDI message is different", EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""));
-
- assertNotNull("Response", response);
- assertTrue("Unexpected response type", HttpMessageUtils.getHeaderValue(response, AS2Header.CONTENT_TYPE).startsWith(AS2MimeType.MULTIPART_REPORT));
- assertEquals("Unexpected mime version", AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION));
- assertEquals("Unexpected AS2 version", EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION));
- assertEquals("Unexpected MDN subject", EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT));
- assertEquals("Unexpected MDN from", MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM));
- assertEquals("Unexpected AS2 from", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM));
- assertEquals("Unexpected AS2 to", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO));
- assertNotNull("Missing message id", HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID));
-
- assertNotNull("Response entity", responseEntity);
- assertTrue("Unexpected response entity type", responseEntity instanceof DispositionNotificationMultipartReportEntity);
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""), "EDI message is different");
+
+ assertNotNull(response, "Response");
+ assertTrue(HttpMessageUtils.getHeaderValue(response, AS2Header.CONTENT_TYPE).startsWith(AS2MimeType.MULTIPART_REPORT), "Unexpected response type");
+ assertEquals(AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION), "Unexpected mime version");
+ assertEquals(EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION), "Unexpected AS2 version");
+ assertEquals(EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT), "Unexpected MDN subject");
+ assertEquals(MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM), "Unexpected MDN from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM), "Unexpected AS2 from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO), "Unexpected AS2 to");
+ assertNotNull(HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID), "Missing message id");
+
+ assertNotNull(responseEntity, "Response entity");
+ assertTrue(responseEntity instanceof DispositionNotificationMultipartReportEntity, "Unexpected response entity type");
DispositionNotificationMultipartReportEntity reportEntity = (DispositionNotificationMultipartReportEntity)responseEntity;
- assertEquals("Unexpected number of body parts in report", 2, reportEntity.getPartCount());
+ assertEquals(2, reportEntity.getPartCount(), "Unexpected number of body parts in report");
MimeEntity firstPart = reportEntity.getPart(0);
- assertEquals("Unexpected content type in first body part of report", ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue(), "Unexpected content type in first body part of report");
MimeEntity secondPart = reportEntity.getPart(1);
- assertEquals("Unexpected content type in second body part of report",
- ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(),
- secondPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(), secondPart.getContentTypeValue(),
+ "Unexpected content type in second body part of report");
- assertTrue("", secondPart instanceof AS2MessageDispositionNotificationEntity);
+ assertTrue(secondPart instanceof AS2MessageDispositionNotificationEntity, "");
AS2MessageDispositionNotificationEntity messageDispositionNotificationEntity = (AS2MessageDispositionNotificationEntity) secondPart;
- assertEquals("Unexpected value for reporting UA", ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA());
- assertEquals("Unexpected value for final recipient", AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient());
- assertEquals("Unexpected value for original message ID", HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId());
- assertEquals("Unexpected value for disposition mode", DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode());
- assertEquals("Unexpected value for disposition type", AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType());
+ assertEquals(ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA(), "Unexpected value for reporting UA");
+ assertEquals(AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient(), "Unexpected value for final recipient");
+ assertEquals(HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId(), "Unexpected value for original message ID");
+ assertEquals(DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode(), "Unexpected value for disposition mode");
+ assertEquals(AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType(), "Unexpected value for disposition type");
}
@@ -311,48 +314,46 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
HttpRequest request = result.getMiddle();
HttpResponse response = result.getRight();
- assertNotNull("send result", result);
+ assertNotNull(result, "send result");
LOG.debug("send: " + result);
- assertNotNull("Request", request);
- assertTrue("Request does not contain body", request instanceof HttpEntityEnclosingRequest);
+ assertNotNull(request, "Request");
+ assertTrue(request instanceof HttpEntityEnclosingRequest, "Request does not contain body");
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
- assertNotNull("Request body", entity);
- assertTrue("Request body does not contain ApplicationPkcs7Mime entity", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+ assertNotNull(entity, "Request body");
+ assertTrue(entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity, "Request body does not contain ApplicationPkcs7Mime entity");
MimeEntity envelopeEntity = ((ApplicationPkcs7MimeEnvelopedDataEntity)entity).getEncryptedEntity(decryptingKP.getPrivate());
- assertTrue("Enveloped entity is not an EDI entity", envelopeEntity instanceof ApplicationEDIEntity);
+ assertTrue(envelopeEntity instanceof ApplicationEDIEntity, "Enveloped entity is not an EDI entity");
String ediMessage = ((ApplicationEDIEntity)envelopeEntity).getEdiMessage();
- assertEquals("EDI message is different", EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""));
-
- assertNotNull("Response", response);
- assertTrue("Unexpected response type", HttpMessageUtils.getHeaderValue(response, AS2Header.CONTENT_TYPE).startsWith(AS2MimeType.MULTIPART_REPORT));
- assertEquals("Unexpected mime version", AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION));
- assertEquals("Unexpected AS2 version", EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION));
- assertEquals("Unexpected MDN subject", EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT));
- assertEquals("Unexpected MDN from", MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM));
- assertEquals("Unexpected AS2 from", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM));
- assertEquals("Unexpected AS2 to", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO));
- assertNotNull("Missing message id", HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID));
-
-
- assertNotNull("Response entity", responseEntity);
- assertTrue("Unexpected response entity type", responseEntity instanceof DispositionNotificationMultipartReportEntity);
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""), "EDI message is different");
+
+ assertNotNull(response, "Response");
+ assertTrue(HttpMessageUtils.getHeaderValue(response, AS2Header.CONTENT_TYPE).startsWith(AS2MimeType.MULTIPART_REPORT), "Unexpected response type");
+ assertEquals(AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION), "Unexpected mime version");
+ assertEquals(EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION), "Unexpected AS2 version");
+ assertEquals(EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT), "Unexpected MDN subject");
+ assertEquals(MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM), "Unexpected MDN from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM), "Unexpected AS2 from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO), "Unexpected AS2 to");
+ assertNotNull(HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID), "Missing message id");
+
+ assertNotNull(responseEntity, "Response entity");
+ assertTrue(responseEntity instanceof DispositionNotificationMultipartReportEntity, "Unexpected response entity type");
DispositionNotificationMultipartReportEntity reportEntity = (DispositionNotificationMultipartReportEntity)responseEntity;
- assertEquals("Unexpected number of body parts in report", 2, reportEntity.getPartCount());
+ assertEquals(2, reportEntity.getPartCount(), "Unexpected number of body parts in report");
MimeEntity firstPart = reportEntity.getPart(0);
- assertEquals("Unexpected content type in first body part of report", ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue(), "Unexpected content type in first body part of report");
MimeEntity secondPart = reportEntity.getPart(1);
- assertEquals("Unexpected content type in second body part of report",
- ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(),
- secondPart.getContentTypeValue());
-
- assertTrue("", secondPart instanceof AS2MessageDispositionNotificationEntity);
+ assertEquals(ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(), secondPart.getContentTypeValue(),
+ "Unexpected content type in second body part of report");
+
+ assertTrue(secondPart instanceof AS2MessageDispositionNotificationEntity, "");
AS2MessageDispositionNotificationEntity messageDispositionNotificationEntity = (AS2MessageDispositionNotificationEntity) secondPart;
- assertEquals("Unexpected value for reporting UA", ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA());
- assertEquals("Unexpected value for final recipient", AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient());
- assertEquals("Unexpected value for original message ID", HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId());
- assertEquals("Unexpected value for disposition mode", DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode());
- assertEquals("Unexpected value for disposition type", AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType());
+ assertEquals(ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA(), "Unexpected value for reporting UA");
+ assertEquals(AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient(), "Unexpected value for final recipient");
+ assertEquals(HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId(), "Unexpected value for original message ID");
+ assertEquals(DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode(), "Unexpected value for disposition mode");
+ assertEquals(AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType(), "Unexpected value for disposition type");
}
@@ -391,60 +392,59 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
HttpRequest request = result.getMiddle();
HttpResponse response = result.getRight();
- assertNotNull("send result", result);
+ assertNotNull(result, "send result");
LOG.debug("send: " + result);
- assertNotNull("Request", request);
- assertTrue("Request does not contain body", request instanceof HttpEntityEnclosingRequest);
+ assertNotNull(request, "Request");
+ assertTrue(request instanceof HttpEntityEnclosingRequest, "Request does not contain body");
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
- assertNotNull("Request body", entity);
- assertTrue("Request body does not contain EDI entity", entity instanceof MultipartSignedEntity);
+ assertNotNull(entity, "Request body");
+ assertTrue(entity instanceof MultipartSignedEntity, "Request body does not contain EDI entity");
MimeEntity signedEntity = ((MultipartSignedEntity)entity).getSignedDataEntity();
- assertTrue("Signed entity wrong type", signedEntity instanceof ApplicationEDIEntity);
+ assertTrue(signedEntity instanceof ApplicationEDIEntity, "Signed entity wrong type");
ApplicationEDIEntity ediMessageEntity = (ApplicationEDIEntity) signedEntity;
String ediMessage = ediMessageEntity.getEdiMessage();
- assertEquals("EDI message is different", EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""));
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""), "EDI message is different");
- assertNotNull("Response", response);
+ assertNotNull(response, "Response");
String contentTypeHeaderValue = HttpMessageUtils.getHeaderValue(response, AS2Header.CONTENT_TYPE);
ContentType responseContentType = ContentType.parse(contentTypeHeaderValue);
- assertEquals("Unexpected response type", AS2MimeType.MULTIPART_SIGNED, responseContentType.getMimeType());
- assertEquals("Unexpected mime version", AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION));
- assertEquals("Unexpected AS2 version", EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION));
- assertEquals("Unexpected MDN subject", EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT));
- assertEquals("Unexpected MDN from", MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM));
- assertEquals("Unexpected AS2 from", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM));
- assertEquals("Unexpected AS2 to", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO));
- assertNotNull("Missing message id", HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID));
-
- assertNotNull("Response entity", responseEntity);
- assertTrue("Unexpected response entity type", responseEntity instanceof MultipartSignedEntity);
+ assertEquals(AS2MimeType.MULTIPART_SIGNED, responseContentType.getMimeType(), "Unexpected response type");
+ assertEquals(AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION), "Unexpected mime version");
+ assertEquals(EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION), "Unexpected AS2 version");
+ assertEquals(EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT), "Unexpected MDN subject");
+ assertEquals(MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM), "Unexpected MDN from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM), "Unexpected AS2 from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO), "Unexpected AS2 to");
+ assertNotNull(HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID), "Missing message id");
+
+ assertNotNull(responseEntity, "Response entity");
+ assertTrue(responseEntity instanceof MultipartSignedEntity, "Unexpected response entity type");
MultipartSignedEntity responseSignedEntity = (MultipartSignedEntity) responseEntity;
- assertTrue("Signature for response entity is invalid", responseSignedEntity.isValid());
+ assertTrue(responseSignedEntity.isValid(), "Signature for response entity is invalid");
MimeEntity responseSignedDataEntity = responseSignedEntity.getSignedDataEntity();
- assertTrue("Signed entity wrong type", responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity);
+ assertTrue(responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity, "Signed entity wrong type");
DispositionNotificationMultipartReportEntity reportEntity = (DispositionNotificationMultipartReportEntity)responseSignedDataEntity;
- assertEquals("Unexpected number of body parts in report", 2, reportEntity.getPartCount());
+ assertEquals(2, reportEntity.getPartCount(), "Unexpected number of body parts in report");
MimeEntity firstPart = reportEntity.getPart(0);
- assertEquals("Unexpected content type in first body part of report", ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue(), "Unexpected content type in first body part of report");
MimeEntity secondPart = reportEntity.getPart(1);
- assertEquals("Unexpected content type in second body part of report",
- ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(),
- secondPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(), secondPart.getContentTypeValue(),
+ "Unexpected content type in second body part of report");
ApplicationPkcs7SignatureEntity signatureEntity = responseSignedEntity.getSignatureEntity();
- assertNotNull("Signature Entity", signatureEntity);
+ assertNotNull(signatureEntity, "Signature Entity");
- assertTrue("", secondPart instanceof AS2MessageDispositionNotificationEntity);
+ assertTrue(secondPart instanceof AS2MessageDispositionNotificationEntity, "");
AS2MessageDispositionNotificationEntity messageDispositionNotificationEntity = (AS2MessageDispositionNotificationEntity) secondPart;
- assertEquals("Unexpected value for reporting UA", ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA());
- assertEquals("Unexpected value for final recipient", AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient());
- assertEquals("Unexpected value for original message ID", HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId());
- assertEquals("Unexpected value for disposition mode", DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode());
- assertEquals("Unexpected value for disposition type", AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType());
+ assertEquals(ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA(), "Unexpected value for reporting UA");
+ assertEquals(AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient(), "Unexpected value for final recipient");
+ assertEquals(HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId(), "Unexpected value for original message ID");
+ assertEquals(DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode(), "Unexpected value for disposition mode");
+ assertEquals(AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType(), "Unexpected value for disposition type");
ReceivedContentMic receivedContentMic = messageDispositionNotificationEntity.getReceivedContentMic();
ReceivedContentMic computedContentMic = MicUtils.createReceivedContentMic((HttpEntityEnclosingRequest)request, decryptingKP.getPrivate());
- assertEquals("Received content MIC does not match computed", computedContentMic.getEncodedMessageDigest(), receivedContentMic.getEncodedMessageDigest());
+ assertEquals(computedContentMic.getEncodedMessageDigest(), receivedContentMic.getEncodedMessageDigest(), "Received content MIC does not match computed");
}
@Test
@@ -478,60 +478,59 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
HttpRequest request = result.getMiddle();
HttpResponse response = result.getRight();
- assertNotNull("send result", result);
+ assertNotNull(result, "send result");
LOG.debug("send: " + result);
- assertNotNull("Request", request);
- assertTrue("Request does not contain body", request instanceof HttpEntityEnclosingRequest);
+ assertNotNull(request, "Request");
+ assertTrue(request instanceof HttpEntityEnclosingRequest, "Request does not contain body");
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
- assertNotNull("Request body", entity);
- assertTrue("Request body does not contain EDI entity", entity instanceof ApplicationPkcs7MimeCompressedDataEntity);
+ assertNotNull(entity, "Request body");
+ assertTrue(entity instanceof ApplicationPkcs7MimeCompressedDataEntity, "Request body does not contain EDI entity");
MimeEntity compressedEntity = ((ApplicationPkcs7MimeCompressedDataEntity)entity).getCompressedEntity(new ZlibExpanderProvider());
- assertTrue("Signed entity wrong type", compressedEntity instanceof ApplicationEDIEntity);
+ assertTrue(compressedEntity instanceof ApplicationEDIEntity, "Signed entity wrong type");
ApplicationEDIEntity ediMessageEntity = (ApplicationEDIEntity) compressedEntity;
String ediMessage = ediMessageEntity.getEdiMessage();
- assertEquals("EDI message is different", EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""));
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""), "EDI message is different");
- assertNotNull("Response", response);
+ assertNotNull(response, "Response");
String contentTypeHeaderValue = HttpMessageUtils.getHeaderValue(response, AS2Header.CONTENT_TYPE);
ContentType responseContentType = ContentType.parse(contentTypeHeaderValue);
- assertEquals("Unexpected response type", AS2MimeType.MULTIPART_SIGNED, responseContentType.getMimeType());
- assertEquals("Unexpected mime version", AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION));
- assertEquals("Unexpected AS2 version", EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION));
- assertEquals("Unexpected MDN subject", EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT));
- assertEquals("Unexpected MDN from", MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM));
- assertEquals("Unexpected AS2 from", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM));
- assertEquals("Unexpected AS2 to", AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO));
- assertNotNull("Missing message id", HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID));
-
- assertNotNull("Response entity", responseEntity);
- assertTrue("Unexpected response entity type", responseEntity instanceof MultipartSignedEntity);
+ assertEquals(AS2MimeType.MULTIPART_SIGNED, responseContentType.getMimeType(), "Unexpected response type");
+ assertEquals(AS2Constants.MIME_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.MIME_VERSION), "Unexpected mime version");
+ assertEquals(EXPECTED_AS2_VERSION, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_VERSION), "Unexpected AS2 version");
+ assertEquals(EXPECTED_MDN_SUBJECT, HttpMessageUtils.getHeaderValue(response, AS2Header.SUBJECT), "Unexpected MDN subject");
+ assertEquals(MDN_FROM, HttpMessageUtils.getHeaderValue(response, AS2Header.FROM), "Unexpected MDN from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_FROM), "Unexpected AS2 from");
+ assertEquals(AS2_NAME, HttpMessageUtils.getHeaderValue(response, AS2Header.AS2_TO), "Unexpected AS2 to");
+ assertNotNull(HttpMessageUtils.getHeaderValue(response, AS2Header.MESSAGE_ID), "Missing message id");
+
+ assertNotNull(responseEntity, "Response entity");
+ assertTrue(responseEntity instanceof MultipartSignedEntity, "Unexpected response entity type");
MultipartSignedEntity responseSignedEntity = (MultipartSignedEntity) responseEntity;
- assertTrue("Signature for response entity is invalid", responseSignedEntity.isValid());
+ assertTrue(responseSignedEntity.isValid(), "Signature for response entity is invalid");
MimeEntity responseSignedDataEntity = responseSignedEntity.getSignedDataEntity();
- assertTrue("Signed entity wrong type", responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity);
+ assertTrue(responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity, "Signed entity wrong type");
DispositionNotificationMultipartReportEntity reportEntity = (DispositionNotificationMultipartReportEntity)responseSignedDataEntity;
- assertEquals("Unexpected number of body parts in report", 2, reportEntity.getPartCount());
+ assertEquals(2, reportEntity.getPartCount(), "Unexpected number of body parts in report");
MimeEntity firstPart = reportEntity.getPart(0);
- assertEquals("Unexpected content type in first body part of report", ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.TEXT_PLAIN, AS2Charset.US_ASCII).toString(), firstPart.getContentTypeValue(), "Unexpected content type in first body part of report");
MimeEntity secondPart = reportEntity.getPart(1);
- assertEquals("Unexpected content type in second body part of report",
- ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(),
- secondPart.getContentTypeValue());
+ assertEquals(ContentType.create(AS2MimeType.MESSAGE_DISPOSITION_NOTIFICATION, AS2Charset.US_ASCII).toString(), secondPart.getContentTypeValue(),
+ "Unexpected content type in second body part of report");
ApplicationPkcs7SignatureEntity signatureEntity = responseSignedEntity.getSignatureEntity();
- assertNotNull("Signature Entity", signatureEntity);
-
- assertTrue("", secondPart instanceof AS2MessageDispositionNotificationEntity);
+ assertNotNull(signatureEntity, "Signature Entity");
+
+ assertTrue(secondPart instanceof AS2MessageDispositionNotificationEntity, "");
AS2MessageDispositionNotificationEntity messageDispositionNotificationEntity = (AS2MessageDispositionNotificationEntity) secondPart;
- assertEquals("Unexpected value for reporting UA", ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA());
- assertEquals("Unexpected value for final recipient", AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient());
- assertEquals("Unexpected value for original message ID", HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId());
- assertEquals("Unexpected value for disposition mode", DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode());
- assertEquals("Unexpected value for disposition type", AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType());
-
+ assertEquals(ORIGIN_SERVER_NAME, messageDispositionNotificationEntity.getReportingUA(), "Unexpected value for reporting UA");
+ assertEquals(AS2_NAME, messageDispositionNotificationEntity.getFinalRecipient(), "Unexpected value for final recipient");
+ assertEquals(HttpMessageUtils.getHeaderValue(request, AS2Header.MESSAGE_ID), messageDispositionNotificationEntity.getOriginalMessageId(), "Unexpected value for original message ID");
+ assertEquals(DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY, messageDispositionNotificationEntity.getDispositionMode(), "Unexpected value for disposition mode");
+ assertEquals(AS2DispositionType.PROCESSED, messageDispositionNotificationEntity.getDispositionType(), "Unexpected value for disposition type");
+
ReceivedContentMic receivedContentMic = messageDispositionNotificationEntity.getReceivedContentMic();
ReceivedContentMic computedContentMic = MicUtils.createReceivedContentMic((HttpEntityEnclosingRequest)request, decryptingKP.getPrivate());
- assertEquals("Received content MIC does not match computed", computedContentMic.getEncodedMessageDigest(), receivedContentMic.getEncodedMessageDigest());
+ assertEquals(computedContentMic.getEncodedMessageDigest(), receivedContentMic.getEncodedMessageDigest(), "Received content MIC does not match computed");
}
@Test
@@ -578,13 +577,13 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
}
- @BeforeClass
+ @BeforeAll
public static void setupTest() throws Exception {
setupServerKeysAndCertificates();
receiveTestMessages();
}
- @AfterClass
+ @AfterAll
public static void teardownTest() throws Exception {
if (serverConnection != null) {
serverConnection.stopListening("/");
@@ -623,13 +622,12 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
return new ImmutableTriple(responseEntity, requestHandler.getRequest(), requestHandler.getResponse());
}
-
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
Processor proc = new Processor() {
- public void process(org.apache.camel.Exchange exchange) throws Exception {
+ public void process(org.apache.camel.Exchange exchange) {
HttpMessage message = exchange.getIn(HttpMessage.class);
@SuppressWarnings("unused")
String body = message.getBody(String.class);
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
index dd224b1..2952519 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
@@ -69,11 +69,16 @@ import org.bouncycastle.asn1.x500.X500Name;
import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.util.io.Streams;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test class for {@link org.apache.camel.component.as2.api.AS2ServerManager} APIs.
*/
@@ -132,10 +137,10 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
private static KeyPair signingKP;
private static X509Certificate signingCert;
private static List<X509Certificate> certList;
-
+
private static KeyPair decryptingKP;
-
- @BeforeClass
+
+ @BeforeAll
public static void setup() throws Exception {
setupSigningGenerator();
}
@@ -155,45 +160,45 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
mockEndpoint.assertIsSatisfied();
final List<Exchange> exchanges = mockEndpoint.getExchanges();
- assertNotNull("listen result", exchanges);
- assertFalse("listen result", exchanges.isEmpty());
+ assertNotNull(exchanges, "listen result");
+ assertFalse(exchanges.isEmpty(), "listen result");
LOG.debug("poll result: " + exchanges);
Exchange exchange = exchanges.get(0);
Message message = exchange.getIn();
- assertNotNull("exchange message", message);
+ assertNotNull(message, "exchange message");
HttpCoreContext coreContext = exchange.getProperty(AS2Constants.AS2_INTERCHANGE, HttpCoreContext.class);
- assertNotNull("context", coreContext);
+ assertNotNull(coreContext, "context");
HttpRequest request = coreContext.getRequest();
- assertNotNull("request", request);
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion());
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value", request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message", request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertNotNull(request, "request");
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest)request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationEDIFACTEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationEDIFACTEntity, "Unexpected request entity type");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) entity;
- assertTrue("Unexpected content type for entity", ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertTrue("Entity not set as main body of request", ediEntity.isMainBody());
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for entity");
+ assertTrue(ediEntity.isMainBody(), "Entity not set as main body of request");
String rcvdMessage = ediEntity.getEdiMessage().replaceAll("\r", "");
- assertEquals("EDI message does not match", EDI_MESSAGE, rcvdMessage);
+ assertEquals(EDI_MESSAGE, rcvdMessage, "EDI message does not match");
String rcvdMessageFromBody = message.getBody(String.class);
- assertEquals("EDI message does not match", EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessageFromBody.replaceAll("[\n\r]", ""));
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessageFromBody.replaceAll("[\n\r]", ""), "EDI message does not match");
}
@Test
@@ -213,60 +218,60 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
mockEndpoint.assertIsSatisfied();
final List<Exchange> exchanges = mockEndpoint.getExchanges();
- assertNotNull("listen result", exchanges);
- assertFalse("listen result", exchanges.isEmpty());
+ assertNotNull(exchanges, "listen result");
+ assertFalse(exchanges.isEmpty(), "listen result");
LOG.debug("poll result: " + exchanges);
Exchange exchange = exchanges.get(0);
Message message = exchange.getIn();
- assertNotNull("exchange message", message);
+ assertNotNull(message, "exchange message");
HttpCoreContext coreContext = exchange.getProperty(AS2Constants.AS2_INTERCHANGE, HttpCoreContext.class);
- assertNotNull("context", coreContext);
+ assertNotNull(coreContext, "context");
HttpRequest request = coreContext.getRequest();
- assertNotNull("request", request);
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion());
-
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value", request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message", request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.MULTIPART_SIGNED));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertNotNull(request, "request");
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MediaType.MULTIPART_SIGNED), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest)request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof MultipartSignedEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof MultipartSignedEntity, "Unexpected request entity type");
MultipartSignedEntity signedEntity = (MultipartSignedEntity)entity;
- assertTrue("Entity not set as main body of request", signedEntity.isMainBody());
- assertTrue("Request contains invalid number of mime parts", signedEntity.getPartCount() == 2);
+ assertTrue(signedEntity.isMainBody(), "Entity not set as main body of request");
+ assertTrue(signedEntity.getPartCount() == 2, "Request contains invalid number of mime parts");
// Validated first mime part.
- assertTrue("First mime part incorrect type ", signedEntity.getPart(0) instanceof ApplicationEDIFACTEntity);
+ assertTrue(signedEntity.getPart(0) instanceof ApplicationEDIFACTEntity, "First mime part incorrect type ");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) signedEntity.getPart(0);
- assertTrue("Unexpected content type for first mime part", ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("First mime type set as main body of request", ediEntity.isMainBody());
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for first mime part");
+ assertFalse(ediEntity.isMainBody(), "First mime type set as main body of request");
// Validate second mime part.
- assertTrue("Second mime part incorrect type ", signedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity);
+ assertTrue(signedEntity.getPart(1) instanceof ApplicationPkcs7SignatureEntity, "Second mime part incorrect type ");
ApplicationPkcs7SignatureEntity signatureEntity = (ApplicationPkcs7SignatureEntity) signedEntity.getPart(1);
- assertTrue("Unexpected content type for second mime part", signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE));
- assertFalse("First mime type set as main body of request", signatureEntity.isMainBody());
+ assertTrue(signatureEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_PKCS7_SIGNATURE), "Unexpected content type for second mime part");
+ assertFalse(signatureEntity.isMainBody(), "First mime type set as main body of request");
// Validate Signature
- assertTrue("Signature is invalid", signedEntity.isValid());
+ assertTrue(signedEntity.isValid(), "Signature is invalid");
String rcvdMessage = message.getBody(String.class);
- assertEquals("Unexpected content for enveloped mime part", EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessage.replaceAll("[\n\r]", ""));
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessage.replaceAll("[\n\r]", ""), "Unexpected content for enveloped mime part");
}
-
+
@Test
public void receiveEnvelopedMessageTest() throws Exception {
AS2ClientConnection clientConnection = new AS2ClientConnection(AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, TARGET_PORT);
@@ -282,52 +287,49 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
mockEndpoint.assertIsSatisfied();
final List<Exchange> exchanges = mockEndpoint.getExchanges();
- assertNotNull("listen result", exchanges);
- assertFalse("listen result", exchanges.isEmpty());
+ assertNotNull(exchanges, "listen result");
+ assertFalse(exchanges.isEmpty(), "listen result");
LOG.debug("poll result: " + exchanges);
Exchange exchange = exchanges.get(0);
Message message = exchange.getIn();
- assertNotNull("exchange message", message);
+ assertNotNull(message, "exchange message");
HttpCoreContext coreContext = exchange.getProperty(AS2Constants.AS2_INTERCHANGE, HttpCoreContext.class);
- assertNotNull("context", coreContext);
+ assertNotNull(coreContext, "context");
HttpRequest request = coreContext.getRequest();
- assertNotNull("request", request);
- assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
- assertEquals("Unexpected request URI value", REQUEST_URI, request.getRequestLine().getUri());
- assertEquals("Unexpected HTTP version value", HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion());
- assertEquals("Unexpected subject value", SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue());
- assertEquals("Unexpected from value", FROM, request.getFirstHeader(AS2Header.FROM).getValue());
- assertEquals("Unexpected AS2 version value", AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue());
- assertEquals("Unexpected AS2 from value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue());
- assertEquals("Unexpected AS2 to value", AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue());
- assertTrue("Unexpected message id value", request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"));
- assertEquals("Unexpected target host value", TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue());
- assertEquals("Unexpected user agent value", USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue());
- assertNotNull("Date value missing", request.getFirstHeader(AS2Header.DATE));
- assertNotNull("Content length value missing", request.getFirstHeader(AS2Header.CONTENT_LENGTH));
- assertTrue("Unexpected content type for message", request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME));
-
- assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
+ assertNotNull(request, "request");
+ assertEquals(METHOD, request.getRequestLine().getMethod(), "Unexpected method value");
+ assertEquals(REQUEST_URI, request.getRequestLine().getUri(), "Unexpected request URI value");
+ assertEquals(HttpVersion.HTTP_1_1, request.getRequestLine().getProtocolVersion(), "Unexpected HTTP version value");
+ assertEquals(SUBJECT, request.getFirstHeader(AS2Header.SUBJECT).getValue(), "Unexpected subject value");
+ assertEquals(FROM, request.getFirstHeader(AS2Header.FROM).getValue(), "Unexpected from value");
+ assertEquals(AS2_VERSION, request.getFirstHeader(AS2Header.AS2_VERSION).getValue(), "Unexpected AS2 version value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_FROM).getValue(), "Unexpected AS2 from value");
+ assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
+ assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"), "Unexpected message id value");
+ assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(), "Unexpected target host value");
+ assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
+ assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
+ assertNotNull(request.getFirstHeader(AS2Header.CONTENT_LENGTH), "Content length value missing");
+ assertTrue(request.getFirstHeader(AS2Header.CONTENT_TYPE).getValue().startsWith(AS2MimeType.APPLICATION_PKCS7_MIME), "Unexpected content type for message");
+
+ assertTrue(request instanceof BasicHttpEntityEnclosingRequest, "Request does not contain entity");
HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
- assertNotNull("Request does not contain entity", entity);
- assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+ assertNotNull(entity, "Request does not contain entity");
+ assertTrue(entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity, "Unexpected request entity type");
ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
- assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
+ assertTrue(envelopedEntity.isMainBody(), "Entity not set as main body of request");
// Validated enveloped part.
MimeEntity encryptedEntity = envelopedEntity.getEncryptedEntity(signingKP.getPrivate());
- assertTrue("Enveloped mime part incorrect type ", encryptedEntity instanceof ApplicationEDIFACTEntity);
+ assertTrue(encryptedEntity instanceof ApplicationEDIFACTEntity, "Enveloped mime part incorrect type ");
ApplicationEDIFACTEntity ediEntity = (ApplicationEDIFACTEntity) encryptedEntity;
- assertTrue("Unexpected content type for enveloped mime part",
- ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT));
- assertFalse("Enveloped mime type set as main body of request", ediEntity.isMainBody());
- assertEquals("Unexpected content for enveloped mime part", EDI_MESSAGE.replaceAll("[\n\r]", ""),
- ediEntity.getEdiMessage().replaceAll("[\n\r]", ""));
+ assertTrue(ediEntity.getContentType().getValue().startsWith(AS2MediaType.APPLICATION_EDIFACT), "Unexpected content type for enveloped mime part");
+ assertFalse(ediEntity.isMainBody(), "Enveloped mime type set as main body of request");
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), ediEntity.getEdiMessage().replaceAll("[\n\r]", ""), "Unexpected content for enveloped mime part");
String rcvdMessage = message.getBody(String.class);
- assertEquals("Unexpected content for enveloped mime part", EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessage.replaceAll("[\n\r]", ""));
-
+ assertEquals(EDI_MESSAGE.replaceAll("[\n\r]", ""), rcvdMessage.replaceAll("[\n\r]", ""), "Unexpected content for enveloped mime part");
}
@Test
@@ -345,10 +347,10 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
mockEndpoint.assertIsSatisfied();
HttpResponse response = context.getResponse();
- assertEquals("Unexpected status code for response", HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatusLine().getStatusCode());
+ assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getStatusLine().getStatusCode(), "Unexpected status code for response");
HttpEntity responseEntity = response.getEntity();
String errorMessage = new String(Streams.readAll(responseEntity.getContent()));
- assertEquals("", EXPECTED_EXCEPTION_MSG, errorMessage);
+ assertEquals(EXPECTED_EXCEPTION_MSG, errorMessage, "");
}
private static void setupSigningGenerator() throws Exception {
@@ -415,7 +417,7 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
// test route for listen
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
index 939b7bb..e9038e2 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
@@ -24,11 +24,14 @@ import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.support.PropertyBindingSupport;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
/**
* Abstract base class for AS2 Integration tests generated by Camel API component maven plugin.
*/
+@TestInstance(Lifecycle.PER_CLASS)
public class AbstractAS2TestSupport extends CamelTestSupport {
private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
@@ -63,12 +66,6 @@ public class AbstractAS2TestSupport extends CamelTestSupport {
return context;
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- // only create the context once for this class
- return true;
- }
-
@SuppressWarnings("unchecked")
protected <T> T requestBodyAndHeaders(String endpointUri, Object body, Map<String, Object> headers)
throws CamelExecutionException {