You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/03/30 12:08:40 UTC
[camel-quarkus] branch main updated: Fix potential Azure Blob test failures when testing against the real service
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 152f917 Fix potential Azure Blob test failures when testing against the real service
152f917 is described below
commit 152f91743b6c5a9e50bb2181885915ffb598b79d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 30 09:34:52 2022 +0100
Fix potential Azure Blob test failures when testing against the real service
Fixes #3655
---
.../storage/blob/it/AzureStorageBlobResource.java | 6 ++++--
.../azure/storage/blob/it/AzureStorageBlobTest.java | 21 +++++++++++----------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
index 790cbb1..5bd0f54 100644
--- a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
+++ b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
@@ -348,8 +348,10 @@ public class AzureStorageBlobResource {
List<BlobContainerItem> containers = producerTemplate.requestBody("direct:listBlobContainers", null, List.class);
containers.stream()
- .map(container -> Json.createObjectBuilder()
- .add("name", container.getName())
+ .map(BlobContainerItem::getName)
+ .filter(containerName -> containerName.startsWith("camel-quarkus"))
+ .map(containerName -> Json.createObjectBuilder()
+ .add("name", containerName)
.build())
.forEach(arrayBuilder::add);
diff --git a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
index 7a3e8c1..1eb12e8 100644
--- a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
+++ b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
@@ -43,6 +43,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;
+import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.StringEndsWith.endsWith;
@@ -121,7 +122,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@@ -166,7 +167,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@@ -224,7 +225,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@@ -258,7 +259,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@@ -352,13 +353,13 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@Test
public void blobContainer() {
- String alternativeContainerName = "cq-test-" + UUID.randomUUID();
+ String alternativeContainerName = "camel-quarkus-" + UUID.randomUUID();
try {
// Create
@@ -381,13 +382,13 @@ class AzureStorageBlobTest {
.queryParam("containerName", alternativeContainerName)
.delete("/azure-storage-blob/blob/container")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@Test
public void copyBlob() {
- String alternativeContainerName = "cq-test-" + UUID.randomUUID();
+ String alternativeContainerName = "camel-quarkus-" + UUID.randomUUID();
try {
// Create container to copy to
@@ -443,7 +444,7 @@ class AzureStorageBlobTest {
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
@@ -512,7 +513,7 @@ class AzureStorageBlobTest {
} finally {
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
- .statusCode(204);
+ .statusCode(anyOf(is(204), is(404)));
}
}
}