From c04d940a8037c10f07b66cf894c0d105aa37f23a Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 28 Feb 2021 13:03:25 +0100 Subject: [PATCH] test: close static mocks --- .../connector/HTTPVaultConnectorOfflineTest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java index d3f6d0f..f599f72 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorOfflineTest.java @@ -27,9 +27,7 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicStatusLine; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.function.Executable; import org.mockito.MockedStatic; @@ -60,16 +58,22 @@ import static org.mockito.Mockito.*; class HTTPVaultConnectorOfflineTest { private static final String INVALID_URL = "foo:/\\1nv4l1d_UrL"; + private static MockedStatic hcbMock; private static CloseableHttpClient httpMock; private final CloseableHttpResponse responseMock = mock(CloseableHttpResponse.class); @BeforeAll static void prepare() { // Mock the static HTTPClient creation. - MockedStatic hcbMock = mockStatic(HttpClientBuilder.class); + hcbMock = mockStatic(HttpClientBuilder.class); hcbMock.when(HttpClientBuilder::create).thenReturn(new MockedHttpClientBuilder()); } + @AfterAll + static void tearDown() { + hcbMock.close(); + } + @BeforeEach void init() { // Re-initialize HTTP mock to ensure fresh (empty) results.