From 6ff81b013ee7a35644962ec21a54981f668111ad Mon Sep 17 00:00:00 2001
From: Edvard Fonsell <edvard.fonsell@nitorcreations.com>
Date: Sun, 19 Apr 2020 01:59:10 +0300
Subject: [PATCH] fix test

---
 .../rest/v1/jaxrs/WorkflowInstanceResourceTest.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowInstanceResourceTest.java b/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowInstanceResourceTest.java
index 9329858fa..89d3ab2d2 100644
--- a/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowInstanceResourceTest.java
+++ b/nflow-rest-api-jax-rs/src/test/java/io/nflow/rest/v1/jaxrs/WorkflowInstanceResourceTest.java
@@ -5,13 +5,13 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptySet;
 import static javax.ws.rs.core.Response.Status.CREATED;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.lenient;
@@ -25,7 +25,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.ws.rs.NotFoundException;
 import javax.ws.rs.core.Response;
 
 import org.joda.time.DateTime;
@@ -222,10 +221,12 @@ public void listWorkflowInstancesWorksWithAllIncludes() {
   }
 
   @Test
-  public void fetchingNonExistingWorkflowThrowsNotFoundException() {
-    when(workflowInstances.getWorkflowInstance(42, emptySet(), null))
-    .thenThrow(EmptyResultDataAccessException.class);
-    assertThrows(NotFoundException.class, () -> resource.fetchWorkflowInstance(42, null, null));
+  public void fetchingNonExistingWorkflowReturnsNotFound() {
+    when(workflowInstances.getWorkflowInstance(42, emptySet(), null)).thenThrow(EmptyResultDataAccessException.class);
+    try (Response response = resource.fetchWorkflowInstance(42, null, null)) {
+      assertThat(response.getStatus(), is(equalTo(NOT_FOUND.getStatusCode())));
+      assertThat(response.readEntity(String.class), is(equalTo("Workflow instance 42 not found")));
+    }
   }
 
   @SuppressWarnings("unchecked")