From e5b41f30ea534a61acef682ca962490802497deb Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 27 Nov 2017 12:01:31 -0600 Subject: [PATCH] Fix DelegatingPasswordEncoderTests Issue: gh-4872 --- .../crypto/password/DelegatingPasswordEncoderTests.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java index 9b44c02c73..d03120b4b4 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java @@ -25,7 +25,8 @@ import org.mockito.junit.MockitoJUnitRunner; import java.util.HashMap; import java.util.Map; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @@ -178,8 +179,8 @@ public class DelegatingPasswordEncoderTests { verifyZeroInteractions(this.bcrypt, this.noop); } - @Test(expected = IllegalStateException.class) - public void matchesWhenRawPasswordNotNullAndEncodedPasswordNullThenThrowsIllegalStateException() { + @Test(expected = IllegalArgumentException.class) + public void matchesWhenRawPasswordNotNullAndEncodedPasswordNullThenThrowsIllegalArgumentException() { this.passwordEncoder.matches(this.rawPassword, null); } }