From aa3c883f87dff264556e9ae5bfaa8ffd4dba0091 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Thu, 2 Dec 2021 17:40:25 -0600 Subject: [PATCH] Use BDD in tests --- .../SecurityContextHolderAwareRequestFilterTests.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java index b705886faf..f1ea9c4182 100644 --- a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java @@ -62,7 +62,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; /** * Tests {@link SecurityContextHolderAwareRequestFilter}. @@ -226,8 +225,8 @@ public class SecurityContextHolderAwareRequestFilterTests { throws Exception { String ipAddress = "10.0.0.100"; String sessionId = "session-id"; - when(this.request.getRemoteAddr()).thenReturn(ipAddress); - when(this.request.getSession(anyBoolean())).thenReturn(new MockHttpSession(null, sessionId)); + given(this.request.getRemoteAddr()).willReturn(ipAddress); + given(this.request.getSession(anyBoolean())).willReturn(new MockHttpSession(null, sessionId)); wrappedRequest().login("username", "password"); ArgumentCaptor authenticationCaptor = ArgumentCaptor