Refactored the test to stablize the test

stellar · Sep 6, 2023 · 6deb82b · 6deb82b
1 parent 4aa31af
commit 6deb82b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/platform/src/main/java/org/stellar/anchor/platform/utils/RequestLoggerFilter.java b/platform/src/main/java/org/stellar/anchor/platform/utils/RequestLoggerFilter.java
@@ -26,16 +26,9 @@ public RequestLoggerFilter(AppLoggingConfig appLoggingConfig) {
     this.appLoggingConfig = appLoggingConfig;
   }
 
-  @Override
-  protected void doFilterInternal(
+  protected void doFilterWithLogging(
       HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
       throws ServletException, IOException {
-
-    if (!appLoggingConfig.isRequestLoggerEnabled()) {
-      filterChain.doFilter(request, response);
-      return;
-    }
-
     long startTime = System.currentTimeMillis();
 
     // ========= Log request and response payload ("body") ========
@@ -77,6 +70,19 @@ protected void doFilterInternal(
     wrappedResponse.copyBodyToResponse();
   }
 
+  @Override
+  protected void doFilterInternal(
+      HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+      throws ServletException, IOException {
+
+    if (!appLoggingConfig.isRequestLoggerEnabled()) {
+      filterChain.doFilter(request, response);
+      return;
+    }
+
+    doFilterWithLogging(request, response, filterChain);
+  }
+
   /**
    * getBody will get the response body (if it's an error) or omit it if it's not an error.
    *

diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/utils/RequestLoggerFilterTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/utils/RequestLoggerFilterTest.kt
@@ -19,11 +19,11 @@ class RequestLoggerFilterTest {
 
   @BeforeEach
   fun setUp() {
-    appLoggingConfig = AppLoggingConfig()
+    appLoggingConfig = mockk<AppLoggingConfig>(relaxed = true)
+    filterChain = mockk<FilterChain>(relaxed = true)
     requestLoggerFilter = RequestLoggerFilter(appLoggingConfig)
     request = MockHttpServletRequest()
     response = MockHttpServletResponse()
-    filterChain = mockk<FilterChain>(relaxed = true)
     mockkStatic(Log::class)
   }
 
@@ -36,28 +36,26 @@ class RequestLoggerFilterTest {
   @Test
   fun `doFilterInternal when RequestLogger disabled should not send debug and trace logs`() {
     // Arrange
-    appLoggingConfig.isRequestLoggerEnabled = false
+    every { appLoggingConfig.isRequestLoggerEnabled } returns false
 
     // Act
     requestLoggerFilter.doFilterInternal(request, response, filterChain)
 
     // Assert
     verify(exactly = 1) { filterChain.doFilter(any(), any()) }
-    verify(exactly = 0) { Log.debugF(any(), *varargAny { true }) }
-    verify(exactly = 0) { Log.trace(any()) }
+    verify(exactly = 0) { requestLoggerFilter.doFilterWithLogging(any(), any(), any()) }
   }
 
   @Test
   fun `doFilterInternal when RequestLogger enabled should send debug and trace logs`() {
     // Arrange
-    appLoggingConfig.isRequestLoggerEnabled = true
+    every { appLoggingConfig.isRequestLoggerEnabled } returns false
 
     // Act
     requestLoggerFilter.doFilterInternal(request, response, filterChain)
 
     // Assert
     verify(exactly = 1) { filterChain.doFilter(any(), any()) }
-    verify(exactly = 1) { Log.debugF(any(), *varargAny { true }) }
-    verify(exactly = 1) { Log.trace(any()) }
+    verify(exactly = 1) { requestLoggerFilter.doFilterWithLogging(any(), any(), any()) }
   }
 }