This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 3bc69c499ca CAMEL-21314: Make test throw exception to see the failure
3bc69c499ca is described below
commit 3bc69c499ca740e3607768116952288e52dab553
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Oct 15 07:59:31 2024 +0200
CAMEL-21314: Make test throw exception to see the failure
---
.../s3/integration/S3CopyObjectCustomerKeyIT.java | 20 +++++++------
.../aws2/s3/integration/S3HeadBucketIT.java | 33 ++++++++++++++++------
2 files changed, 36 insertions(+), 17 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
index b5d76850466..49f140244d3 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectCustomerKeyIT.java
@@ -20,7 +20,6 @@ import java.io.InputStream;
import java.security.SecureRandom;
import java.util.Base64;
import java.util.List;
-import java.util.UUID;
import javax.crypto.KeyGenerator;
@@ -43,7 +42,6 @@ import static
software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES2
public class S3CopyObjectCustomerKeyIT extends Aws2S3Base {
- String key = UUID.randomUUID().toString();
byte[] secretKey = generateSecretKey();
String b64Key = Base64.getEncoder().encodeToString(secretKey);
String b64KeyMd5 = Md5Utils.md5AsBase64(secretKey);
@@ -58,17 +56,18 @@ public class S3CopyObjectCustomerKeyIT extends Aws2S3Base {
public void sendIn() throws Exception {
result.expectedMessageCount(1);
- template.send("direct:putObject", new Processor() {
-
+ Exchange res = template.send("direct:putObject", new Processor() {
@Override
public void process(Exchange exchange) {
exchange.getIn().setHeader(AWS2S3Constants.KEY, "test.txt");
exchange.getIn().setBody("Test");
}
});
+ if (res.getException() != null) {
+ throw res.getException();
+ }
- template.send("direct:copyObject", new Processor() {
-
+ res = template.send("direct:copyObject", new Processor() {
@Override
public void process(Exchange exchange) {
exchange.getIn().setHeader(AWS2S3Constants.KEY, "test.txt");
@@ -77,9 +76,11 @@ public class S3CopyObjectCustomerKeyIT extends Aws2S3Base {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION,
AWS2S3Operations.copyObject);
}
});
+ if (res.getException() != null) {
+ throw res.getException();
+ }
- Exchange res = template.request("direct:getObject", new Processor() {
-
+ res = template.request("direct:getObject", new Processor() {
@Override
public void process(Exchange exchange) {
GetObjectRequest getObjectRequest = GetObjectRequest.builder()
@@ -93,6 +94,9 @@ public class S3CopyObjectCustomerKeyIT extends Aws2S3Base {
exchange.getIn().setBody(getObjectRequest);
}
});
+ if (res.getException() != null) {
+ throw res.getException();
+ }
InputStream is = res.getIn().getBody(InputStream.class);
Assertions.assertNotNull(is);
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
index 4bc0b7427c9..61b469296df 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3HeadBucketIT.java
@@ -16,32 +16,43 @@
*/
package org.apache.camel.component.aws2.s3.integration;
+import java.util.UUID;
+
import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.component.aws2.s3.AWS2S3Operations;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
public class S3HeadBucketIT extends Aws2S3Base {
@EndpointInject
private ProducerTemplate template;
- @EndpointInject("mock:result")
- private MockEndpoint result;
+ @EndpointInject("mock:bucket")
+ private MockEndpoint bucket;
+
+ @EndpointInject("mock:noBucket")
+ private MockEndpoint noBucket;
@Test
- public void sendInHeadBucket() throws InterruptedException {
- result.expectedMessageCount(1);
+ public void sendInHeadBucket() throws Exception {
+ bucket.expectedMessageCount(0);
+ noBucket.expectedMessageCount(1);
- template.send("direct:headBucket", exchange -> {
+ Exchange res = template.send("direct:headBucket", exchange -> {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION,
AWS2S3Operations.headBucket);
- exchange.getIn().setHeader(AWS2S3Constants.BUCKET_NAME, "mycamel");
+ exchange.getIn().setHeader(AWS2S3Constants.BUCKET_NAME,
"doesnotexist" + UUID.randomUUID().toString());
});
+ if (res.getException() != null) {
+ throw res.getException();
+ }
- result.assertIsSatisfied();
+ MockEndpoint.assertIsSatisfied(context);
}
@Override
@@ -51,8 +62,12 @@ public class S3HeadBucketIT extends Aws2S3Base {
public void configure() {
String awsEndpoint = "aws2-s3://test-ss3-s3";
-
from("direct:headBucket").to(awsEndpoint).log("${body}").to("mock:result");
-
+ from("direct:headBucket")
+ .doTry()
+ .to(awsEndpoint).log("${body}").to("mock:bucket")
+ .doCatch(NoSuchBucketException.class)
+ .to("mock:noBucket")
+ .end();
}
};
}
