From a5516b9b1668298a1a323444898db5a991d4d5ee Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Wed, 22 Nov 2023 15:20:26 -0500
Subject: [PATCH] handle deletion redirect

---
 .../java/itest/TargetRecordingPatchTest.java  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/test/java/itest/TargetRecordingPatchTest.java b/src/test/java/itest/TargetRecordingPatchTest.java
index dcae96c2f..130e43657 100644
--- a/src/test/java/itest/TargetRecordingPatchTest.java
+++ b/src/test/java/itest/TargetRecordingPatchTest.java
@@ -18,13 +18,15 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import io.cryostat.util.HttpStatusCodeIdentifier;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.HttpResponse;
 import itest.bases.StandardSelfTest;
+import itest.util.ITestCleanupFailedException;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
@@ -96,26 +98,24 @@ void testSaveEmptyRecordingDoesNotArchiveRecordingFile() throws Exception {
             Assertions.assertTrue(listResp.isEmpty());
 
         } finally {
-
             // Clean up recording
-            CompletableFuture<JsonObject> deleteActiveRecResponse = new CompletableFuture<>();
-            webClient
-                    .delete(String.format("%s/%s", recordingRequestUrl(), TEST_RECORDING_NAME))
-                    .basicAuthentication("user", "pass")
-                    .send(ar -> deleteActiveRecResponse.complete(null));
-            deleteActiveRecResponse.get();
+            HttpResponse<Buffer> deleteResponse =
+                    webClient
+                            .extensions()
+                            .delete(
+                                    String.format(
+                                            "%s/%s", recordingRequestUrl(), TEST_RECORDING_NAME),
+                                    true,
+                                    5);
+            if (!HttpStatusCodeIdentifier.isSuccessCode(deleteResponse.statusCode())) {
+                throw new ITestCleanupFailedException();
+            }
 
             // Reset default target recording options
-            CompletableFuture<JsonObject> optionsResponse = new CompletableFuture<>();
             MultiMap optionsForm = MultiMap.caseInsensitiveMultiMap();
             optionsForm.add("toDisk", "unset");
             optionsForm.add("maxSize", "unset");
-
-            webClient
-                    .patch(optionsRequestUrl())
-                    .basicAuthentication("user", "pass")
-                    .sendForm(optionsForm, ar -> optionsResponse.complete(null));
-            optionsResponse.get();
+            webClient.extensions().patch(optionsRequestUrl(), true, null, optionsForm, 5);
         }
     }
 }