commit 476f7be6a4b4a49e84a63d9a4eeb930eb0033897
author James Netherton <jamesnetherton@gmail.com> Wed Mar 30 09:34:52 2022 +0100
committer Peter Palaga <ppalaga@redhat.com> Thu Mar 31 11:47:15 2022 +0200
tree 6573f038630bd76e269005343aea840cde88743c
parent 1d3928ccec604e49fed09c0c4f4a6ee4409565e0

Fix potential Azure Blob test failures when testing against the real service

Fixes #3655

integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java

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 @@
 
         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);
 

integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java

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 6594824..d0f4700 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
@@ -49,6 +49,7 @@
 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;
@@ -132,7 +133,7 @@
             // Delete
             RestAssured.delete("/azure-storage-blob/blob/delete")
                     .then()
-                    .statusCode(204);
+                    .statusCode(anyOf(is(204), is(404)));
         }
     }
 
@@ -177,7 +178,7 @@
             // Delete
             RestAssured.delete("/azure-storage-blob/blob/delete")
                     .then()
-                    .statusCode(204);
+                    .statusCode(anyOf(is(204), is(404)));
         }
     }
 
@@ -235,7 +236,7 @@
             // Delete
             RestAssured.delete("/azure-storage-blob/blob/delete")
                     .then()
-                    .statusCode(204);
+                    .statusCode(anyOf(is(204), is(404)));
         }
     }
 
@@ -269,7 +270,7 @@
             // Delete
             RestAssured.delete("/azure-storage-blob/blob/delete")
                     .then()
-                    .statusCode(204);
+                    .statusCode(anyOf(is(204), is(404)));
         }
     }
 
@@ -363,13 +364,13 @@
             // 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
@@ -392,13 +393,13 @@
                     .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
@@ -454,7 +455,7 @@
 
             RestAssured.delete("/azure-storage-blob/blob/delete")
                     .then()
-                    .statusCode(204);
+                    .statusCode(anyOf(is(204), is(404)));
         }
     }
 
@@ -523,7 +524,7 @@
         } finally {
             RestAssured.delete("/azure-storage-blob/blob/delete")
                     .then()
-                    .statusCode(204);
+                    .statusCode(anyOf(is(204), is(404)));
         }
     }
 }