From 3115dd41fa1633a5c8dda860f2909fc48efbcafa Mon Sep 17 00:00:00 2001
From: Filipe Oliveira <filipe.oliveira@r3.com>
Date: Tue, 18 Jun 2024 11:59:08 +0100
Subject: [PATCH] Fixed unit tests.

---
 .../kotlin/net/corda/rest/server/impl/RestServerTest.kt  | 2 +-
 .../credentials/DefaultCredentialResolverTest.kt         | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/RestServerTest.kt b/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/RestServerTest.kt
index 4fa33f2a3b7..d3d92eef5c4 100644
--- a/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/RestServerTest.kt
+++ b/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/RestServerTest.kt
@@ -42,7 +42,7 @@ class RestServerTest {
         doReturn(null).whenever(configProvider).getSSLKeyStorePassword()
         doReturn(false).whenever(configProvider).isDevModeEnabled()
         Assertions.assertThrows(
-            IllegalArgumentException::class.java,
+            Exception::class.java,
             {
                 RestServerInternal(
                     JavalinRouteProviderImpl(
diff --git a/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/security/provider/credentials/DefaultCredentialResolverTest.kt b/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/security/provider/credentials/DefaultCredentialResolverTest.kt
index f5cc6922c11..a555bc5f55e 100644
--- a/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/security/provider/credentials/DefaultCredentialResolverTest.kt
+++ b/libs/rest/rest-server-impl/src/test/kotlin/net/corda/rest/server/impl/security/provider/credentials/DefaultCredentialResolverTest.kt
@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
-import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
 import java.util.Base64
@@ -22,9 +22,10 @@ class DefaultCredentialResolverTest {
     // https://github.com/mockito/mockito/issues/1943
     private val req: HttpServletRequest = mock()
     private val res: HttpServletResponse = mock()
-    private val ctx: Context = mock {
-        on { req() } doAnswer { req }
-        on { res() } doAnswer { res }
+    private val ctx = mock<Context>().apply {
+        whenever(req()).thenReturn(req)
+        whenever(res()).thenReturn(res)
+        whenever(header(any())).thenCallRealMethod()
     }
     private val context = ClientHttpRequestContext(ctx)
     private val resolver = DefaultCredentialResolver()