test(apiv1): correct tests

cryostatio · Jul 20, 2021 · c788d16 · c788d16
1 parent 5523e54
commit c788d16
Show file tree

Hide file tree

Showing 10 changed files with 169 additions and 1 deletion.
diff --git a/src/test/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandlerTest.java b/src/test/java/io/cryostat/net/web/http/AbstractAuthenticatedRequestHandlerTest.java
@@ -79,6 +79,15 @@ class AbstractAuthenticatedRequestHandlerTest {
     @BeforeEach
     void setup() {
         this.handler = new AuthenticatedHandler(auth);
+        Mockito.lenient().when(ctx.response()).thenReturn(resp);
+        Mockito.lenient()
+                .when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
+        Mockito.lenient()
+                .when(resp.putHeader(Mockito.anyString(), Mockito.anyString()))
+                .thenReturn(resp);
     }
 
     @Test

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingDeleteHandlerTest.java
@@ -118,6 +118,12 @@ void shouldThrow404IfNoMatchingRecordingFound() throws Exception {
 
         Mockito.when(fs.listDirectoryChildren(Mockito.any())).thenReturn(List.of());
 
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
+
         HttpStatusException ex =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
         MatcherAssert.assertThat(ex.getStatusCode(), Matchers.equalTo(404));
@@ -168,6 +174,12 @@ void shouldThrowExceptionIfDeletionFails() throws Exception {
 
         Mockito.when(ctx.pathParam("recordingName")).thenReturn(recordingName);
 
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
+
         HttpStatusException ex =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
         MatcherAssert.assertThat(ex.getStatusCode(), Matchers.equalTo(500));

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/RecordingUploadPostHandlerTest.java
@@ -115,6 +115,12 @@ void shouldHandleCorrectPath() {
             })
     @NullAndEmptySource
     void shouldThrow501IfDatasourceUrlMalformed(String rawUrl) {
+        HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         Mockito.when(auth.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
         Mockito.when(env.getEnv("GRAFANA_DATASOURCE_URL")).thenReturn(rawUrl);
@@ -126,6 +132,12 @@ void shouldThrow501IfDatasourceUrlMalformed(String rawUrl) {
 
     @Test
     void shouldThrowExceptionIfRecordingNotFound() throws Exception {
+        HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         Mockito.when(auth.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
         Mockito.when(env.getEnv("GRAFANA_DATASOURCE_URL")).thenReturn(DATASOURCE_URL);
@@ -173,6 +185,10 @@ public Void answer(InvocationOnMock args) throws Throwable {
 
         HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
         Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         handler.handle(ctx);
 
@@ -221,6 +237,13 @@ public Void answer(InvocationOnMock args) throws Throwable {
                 .when(httpReq)
                 .sendMultipartForm(Mockito.any(), Mockito.any());
 
+        HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
+
         HttpStatusException e =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
 
@@ -238,6 +261,12 @@ public Void answer(InvocationOnMock args) throws Throwable {
 
     @Test
     void shouldHandleNullStatusMessage() throws Exception {
+        HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         Mockito.when(auth.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
         Mockito.when(env.getEnv("GRAFANA_DATASOURCE_URL")).thenReturn(DATASOURCE_URL);
@@ -288,6 +317,12 @@ public Void answer(InvocationOnMock args) throws Throwable {
 
     @Test
     void shouldHandleNullResponseBody() throws Exception {
+        HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         Mockito.when(auth.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
         Mockito.when(env.getEnv("GRAFANA_DATASOURCE_URL")).thenReturn(DATASOURCE_URL);

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/ReportGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/ReportGetHandlerTest.java
@@ -40,14 +40,18 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 
 import io.cryostat.core.log.Logger;
 import io.cryostat.net.AuthManager;
 import io.cryostat.net.reports.ReportService;
 
+import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.impl.HttpStatusException;
 import org.hamcrest.MatcherAssert;
@@ -94,14 +98,44 @@ void shouldBeOrdered() {
         Assertions.assertTrue(handler.isOrdered());
     }
 
+    @Test
+    void shouldRespondBySendingFile() throws Exception {
+        when(authManager.validateHttpHeader(Mockito.any()))
+                .thenReturn(CompletableFuture.completedFuture(true));
+
+        RoutingContext ctx = mock(RoutingContext.class);
+        HttpServerRequest req = mock(HttpServerRequest.class);
+        HttpServerResponse resp = mock(HttpServerResponse.class);
+        when(ctx.request()).thenReturn(req);
+        when(ctx.response()).thenReturn(resp);
+        when(resp.putHeader(Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
+
+        Path fakePath = Paths.get("/some/fake/path.html");
+
+        when(ctx.pathParam("recordingName")).thenReturn("someRecording");
+        when(reportService.get(Mockito.anyString()))
+                .thenReturn(CompletableFuture.completedFuture(fakePath));
+
+        handler.handle(ctx);
+
+        Mockito.verify(reportService).get("someRecording");
+        Mockito.verify(resp).sendFile(fakePath.toString());
+        Mockito.verify(resp).putHeader(HttpHeaders.CONTENT_TYPE, "text/html");
+    }
+
     @Test
     void shouldRespond404IfRecordingNameNotFound() throws Exception {
         when(authManager.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
 
         RoutingContext ctx = mock(RoutingContext.class);
         HttpServerRequest req = mock(HttpServerRequest.class);
+        HttpServerResponse resp = mock(HttpServerResponse.class);
         when(ctx.request()).thenReturn(req);
+        when(ctx.response()).thenReturn(resp);
+        when(resp.putHeader(Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         when(ctx.pathParam("recordingName")).thenReturn("someRecording");
         when(reportService.get(Mockito.anyString()))

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingGetHandlerTest.java
@@ -116,6 +116,8 @@ void shouldHandleRecordingDownloadRequest() throws Exception {
         RoutingContext ctx = mock(RoutingContext.class);
         HttpServerResponse resp = mock(HttpServerResponse.class);
         when(ctx.response()).thenReturn(resp);
+        when(resp.putHeader(Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         HttpServerRequest req = mock(HttpServerRequest.class);
         when(ctx.request()).thenReturn(req);
         when(ctx.request().headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
@@ -166,6 +168,8 @@ void shouldHandleRecordingDownloadRequestWithJfrSuffix() throws Exception {
         RoutingContext ctx = mock(RoutingContext.class);
         HttpServerResponse resp = mock(HttpServerResponse.class);
         when(ctx.response()).thenReturn(resp);
+        when(resp.putHeader(Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         HttpServerRequest req = mock(HttpServerRequest.class);
         when(ctx.request()).thenReturn(req);
         when(ctx.request().headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
@@ -216,6 +220,10 @@ void shouldRespond404IfRecordingNameNotFound() throws Exception {
         HttpServerRequest req = mock(HttpServerRequest.class);
         when(ctx.request()).thenReturn(req);
         when(ctx.request().headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
+        HttpServerResponse resp = mock(HttpServerResponse.class);
+        when(ctx.response()).thenReturn(resp);
+        when(resp.putHeader(Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         when(targetConnectionManager.executeConnectedTask(Mockito.any(), Mockito.any()))
                 .thenAnswer(
@@ -247,6 +255,10 @@ void shouldRespond500IfUnexpectedExceptionThrown() throws Exception {
         HttpServerRequest req = mock(HttpServerRequest.class);
         when(ctx.request()).thenReturn(req);
         when(ctx.request().headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
+        HttpServerResponse resp = mock(HttpServerResponse.class);
+        when(ctx.response()).thenReturn(resp);
+        when(resp.putHeader(Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         when(targetConnectionManager.executeConnectedTask(Mockito.any(), Mockito.any()))
                 .thenAnswer(

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingOptionsGetHandlerTest.java
@@ -53,6 +53,7 @@
 
 import com.google.gson.Gson;
 import io.vertx.core.MultiMap;
+import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.HttpServerResponse;
@@ -153,6 +154,10 @@ public Map answer(InvocationOnMock args) throws Throwable {
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
         HttpServerResponse resp = Mockito.mock(HttpServerResponse.class);
         Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         IFlightRecorderService service = Mockito.mock(IFlightRecorderService.class);
         Mockito.when(jfrConnection.getService()).thenReturn(service);
 
@@ -164,5 +169,6 @@ public Map answer(InvocationOnMock args) throws Throwable {
         MatcherAssert.assertThat(
                 responseCaptor.getValue(),
                 Matchers.equalTo("{\"maxAge\":50,\"toDisk\":true,\"maxSize\":32}"));
+        Mockito.verify(resp).putHeader(HttpHeaders.CONTENT_TYPE, "application/json");
     }
 }
diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingPatchHandlerTest.java
@@ -45,6 +45,7 @@
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.impl.HttpStatusException;
 import org.hamcrest.MatcherAssert;
@@ -69,6 +70,7 @@ class TargetRecordingPatchHandlerTest {
     @Mock TargetRecordingPatchStop patchStop;
     @Mock RoutingContext ctx;
     @Mock HttpServerRequest req;
+    @Mock HttpServerResponse resp;
     @Mock ConnectionDescriptor connectionDescriptor;
 
     @BeforeEach
@@ -111,6 +113,11 @@ void shouldThrow400InvalidOperations(String mtd) {
         Mockito.when(authManager.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
         Mockito.when(ctx.getBodyAsString()).thenReturn(mtd);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         HttpStatusException ex =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
@@ -126,6 +133,11 @@ void shouldDelegateSupportedOperations(String mtd) throws Exception {
         Mockito.when(ctx.request()).thenReturn(req);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
         Mockito.when(ctx.getBodyAsString()).thenReturn(mtd);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         handler.handle(ctx);
 

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingUploadPostHandlerTest.java
@@ -134,6 +134,11 @@ void shouldThrow501IfDatasourceUrlMalformed(String rawUrl) {
         Mockito.when(auth.validateHttpHeader(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(true));
         Mockito.when(env.getEnv("GRAFANA_DATASOURCE_URL")).thenReturn(rawUrl);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         HttpStatusException ex =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
@@ -143,6 +148,11 @@ void shouldThrow501IfDatasourceUrlMalformed(String rawUrl) {
     @Test
     void shouldThrowExceptionIfRecordingNotFound() throws Exception {
         Mockito.when(ctx.request()).thenReturn(req);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         Mockito.when(ctx.pathParam("targetId")).thenReturn("fooHost:1234");
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
         Mockito.when(auth.validateHttpHeader(Mockito.any()))
@@ -220,6 +230,10 @@ public Void answer(InvocationOnMock args) throws Throwable {
         Mockito.when(ctx.request()).thenReturn(req);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
         Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         handler.handle(ctx);
 
@@ -281,6 +295,11 @@ public Void answer(InvocationOnMock args) throws Throwable {
 
         Mockito.when(ctx.request()).thenReturn(req);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         HttpStatusException e =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
@@ -345,6 +364,11 @@ public Void answer(InvocationOnMock args) throws Throwable {
 
         Mockito.when(ctx.request()).thenReturn(req);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         HttpStatusException e =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));
@@ -409,6 +433,11 @@ public Void answer(InvocationOnMock args) throws Throwable {
 
         Mockito.when(ctx.request()).thenReturn(req);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         HttpStatusException e =
                 Assertions.assertThrows(HttpStatusException.class, () -> handler.handle(ctx));

diff --git a/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandlerTest.java b/src/test/java/io/cryostat/net/web/http/api/v1/TargetRecordingsPostHandlerTest.java
@@ -171,6 +171,10 @@ void shouldStartRecording() throws Exception {
         attrs.add("maxAge", "50");
         attrs.add("maxSize", "64");
         Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
 
         IRecordingDescriptor descriptor = createDescriptor("someRecording");
         Mockito.when(
@@ -256,6 +260,11 @@ void shouldHandleNameCollision() throws Exception {
         Mockito.when(ctx.request()).thenReturn(req);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
         Mockito.when(req.formAttributes()).thenReturn(attrs);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         attrs.add("recordingName", "someRecording");
         attrs.add("events", "template=Foo");
 
@@ -313,6 +322,11 @@ void shouldThrowInvalidOptionException(Map<String, String> requestValues) throws
         Mockito.when(ctx.pathParam("targetId")).thenReturn("fooHost:9091");
         MultiMap attrs = MultiMap.caseInsensitiveMultiMap();
         Mockito.when(ctx.request()).thenReturn(req);
+        Mockito.when(ctx.response()).thenReturn(resp);
+        Mockito.when(
+                        resp.putHeader(
+                                Mockito.any(CharSequence.class), Mockito.any(CharSequence.class)))
+                .thenReturn(resp);
         Mockito.when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
         attrs.addAll(requestValues);
         attrs.add("recordingName", "someRecording");