From 5b5213f42fc6a96cb8c179de0bb294cc2e018a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Willi=20Sch=C3=B6nborn?= <w.schoenborn@gmail.com>
Date: Sun, 2 Aug 2020 21:38:29 +0200
Subject: [PATCH] Refactored ExcludeTest to correctly use new setup

Fixes #754
---
 .../logbook/autoconfigure/ExcludeTest.java      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/ExcludeTest.java b/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/ExcludeTest.java
index afce426e2..5bcfd644f 100644
--- a/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/ExcludeTest.java
+++ b/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/ExcludeTest.java
@@ -2,14 +2,15 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
+import org.zalando.logbook.HttpLogWriter;
 import org.zalando.logbook.HttpRequest;
 import org.zalando.logbook.Logbook;
 import org.zalando.logbook.MockHttpRequest;
+import org.zalando.logbook.Precorrelation;
 
 import java.io.IOException;
 import java.util.function.Predicate;
@@ -35,33 +36,33 @@ public Predicate<HttpRequest> requestCondition() {
     @Autowired
     private Logbook logbook;
 
-    @MockBean(name = "httpLogger")
-    private Logger logger;
+    @MockBean
+    private HttpLogWriter writer;
 
     @BeforeEach
     void setUp() {
-        doReturn(true).when(logger).isTraceEnabled();
+        doReturn(true).when(writer).isActive();
     }
 
     @Test
     void shouldExcludeHealth() throws IOException {
         logbook.process(request("/health")).write();
 
-        verify(logger, never()).trace(any());
+        verify(writer, never()).write(any(Precorrelation.class), any());
     }
 
     @Test
     void shouldExcludeAdmin() throws IOException {
         logbook.process(request("/admin")).write();
 
-        verify(logger, never()).trace(any());
+        verify(writer, never()).write(any(Precorrelation.class), any());
     }
 
     @Test
     void shouldExcludeAdminWithPath() throws IOException {
         logbook.process(request("/admin/users")).write();
 
-        verify(logger, never()).trace(any());
+        verify(writer, never()).write(any(Precorrelation.class), any());
     }
 
     @Test
@@ -70,7 +71,7 @@ void shouldExcludeAdminWithQueryParameters() throws IOException {
                 .withPath("/admin")
                 .withQuery("debug=true")).write();
 
-        verify(logger, never()).trace(any());
+        verify(writer, never()).write(any(Precorrelation.class), any());
     }
 
     private MockHttpRequest request(final String path) {