From eb6da139ae8703b30fb3472c988fc6cf48941002 Mon Sep 17 00:00:00 2001 From: Jialin Shao Date: Tue, 1 Dec 2020 13:19:36 -0800 Subject: [PATCH] Fix flaky test in SpringSecurityPasswordValidationCallbackHandlerTest and SpringDigestPasswordValidationCallbackHandlerTest --- .../SpringSecurityPasswordValidationCallbackHandlerTest.java | 4 +++- .../SpringDigestPasswordValidationCallbackHandlerTest.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java index 1ae83093..1035c70d 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java @@ -51,7 +51,9 @@ public class SpringSecurityPasswordValidationCallbackHandlerTest { @BeforeEach public void setUp() { - + // add clearContext() at the beginning of each method in case {@code SecurityContextHolder} isn't clean + SecurityContextHolder.clearContext(); + callbackHandler = new SpringSecurityPasswordValidationCallbackHandler(); grantedAuthority = new SimpleGrantedAuthority("ROLE_1"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java index 150075e2..58158384 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java @@ -46,9 +46,11 @@ public class SpringDigestPasswordValidationCallbackHandlerTest { private String password; private PasswordValidationCallback callback; - + @BeforeEach public void setUp() { + // add clearContext() at the beginning of each method in case {@code SecurityContextHolder} isn't clean + SecurityContextHolder.clearContext(); callbackHandler = new SpringDigestPasswordValidationCallbackHandler(); userDetailsService = createMock(UserDetailsService.class);