From bb600a473e29ea6be70e65ccfcc93f306224453e Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 16 Dec 2015 10:38:31 -0600 Subject: [PATCH] Start AssertJ Migration Issue gh-3175 --- .../acls/AclFormattingUtilsTests.java | 73 +++--- .../acls/AclPermissionEvaluatorTests.java | 7 +- ...ationCollectionFilteringProviderTests.java | 23 +- .../AclEntryAfterInvocationProviderTests.java | 24 +- .../domain/AccessControlImplEntryTests.java | 50 ++-- .../security/acls/domain/AclImplTests.java | 189 +++++++------- .../AclImplementationSecurityCheckTests.java | 14 +- .../acls/domain/AuditLoggerTests.java | 12 +- .../acls/domain/ObjectIdentityImplTests.java | 35 ++- ...ectIdentityRetrievalStrategyImplTests.java | 7 +- .../security/acls/domain/PermissionTests.java | 82 +++--- .../acls/jdbc/BasicLookupStrategyTests.java | 244 ++++++++---------- .../acls/jdbc/EhCacheBasedAclCacheTests.java | 14 +- .../acls/jdbc/JdbcMutableAclServiceTests.java | 126 +++++---- .../jdbc/SpringCacheBasedAclCacheTests.java | 44 ++-- .../acls/sid/SidRetrievalStrategyTests.java | 28 +- .../security/acls/sid/SidTests.java | 118 ++++----- .../aspect/AnnotationSecurityAspectTests.java | 8 +- .../CasAuthenticationProviderTests.java | 52 ++-- .../CasAuthenticationTokenTests.java | 40 +-- .../EhCacheBasedTicketCacheTests.java | 14 +- .../NullStatelessTicketCacheTests.java | 8 +- .../SpringCacheBasedTicketCacheTests.java | 10 +- ...tionAttributesUserDetailsServiceTests.java | 13 +- .../web/CasAuthenticationEntryPointTests.java | 10 +- .../cas/web/CasAuthenticationFilterTests.java | 36 +-- .../cas/web/ServicePropertiesTests.java | 12 +- ...aultServiceAuthenticationDetailsTests.java | 16 +- .../LdapServerBeanDefinitionParserTests.java | 5 +- ...pUserServiceBeanDefinitionParserTests.java | 38 ++- .../annotation/ObjectPostProcessorTests.java | 2 +- ...balMethodSecurityConfigurationTests.groovy | 2 +- ...ethodSecurityExpressionHandlerTests.groovy | 2 +- .../NamespaceGlobalMethodSecurityTests.groovy | 2 +- .../config/FilterChainProxyConfigTests.java | 34 +-- .../config/InvalidConfigurationTests.java | 8 +- .../config/SecurityNamespaceHandlerTests.java | 4 +- .../configurers/AuthorizeRequestsTests.java | 2 +- .../CsrfConfigurerNoWebMvcTests.java | 2 +- .../HttpSecurityAntMatchersTests.java | 2 +- .../configurers/HttpSecurityLogoutTests.java | 2 +- ...geSecurityMetadataSourceRegistryTests.java | 2 +- ...SocketMessageBrokerConfigurerDocTests.java | 6 +- ...WebSocketMessageBrokerConfigurerTests.java | 6 +- ...ationManagerBeanDefinitionParserTests.java | 14 +- ...tionProviderBeanDefinitionParserTests.java | 4 +- ...cUserServiceBeanDefinitionParserTests.java | 34 ++- .../UserServiceBeanDefinitionParserTests.java | 23 +- ...tadataSourceBeanDefinitionParserTests.java | 16 +- .../CustomHttpSecurityConfigurerTests.java | 2 +- ...thodSecurityBeanDefinitionParserTests.java | 22 +- ...ptMethodsBeanDefinitionDecoratorTests.java | 8 +- ...SecurityInterceptorWithAopConfigTests.java | 2 +- .../AuthorizationFailureEventTests.java | 8 +- .../security/access/SecurityConfigTests.java | 21 +- ...r250MethodSecurityMetadataSourceTests.java | 52 ++-- .../access/annotation/Jsr250VoterTests.java | 22 +- ...AnnotationSecurityMetadataSourceTests.java | 50 ++-- ...bstractSecurityExpressionHandlerTests.java | 9 +- .../SecurityExpressionRootTests.java | 30 +-- .../method/MethodExpressionVoterTests.java | 36 +-- .../MethodSecurityExpressionRootTests.java | 24 +- ...AnnotationSecurityMetadataSourceTests.java | 85 +++--- .../RoleHierarchyAuthoritiesMapperTests.java | 6 +- .../RoleHierarchyImplTests.java | 13 +- .../hierarchicalroles/TestHelperTests.java | 124 ++++----- .../AfterInvocationProviderManagerTests.java | 24 +- .../InterceptorStatusTokenTests.java | 10 +- .../intercept/NullRunAsManagerTests.java | 8 +- .../RunAsImplAuthenticationProviderTests.java | 10 +- .../intercept/RunAsManagerImplTests.java | 40 +-- .../MethodSecurityInterceptorTests.java | 38 ++- ...hodSecurityMetadataSourceAdvisorTests.java | 7 +- ...AspectJMethodSecurityInterceptorTests.java | 18 +- ...asedMethodSecurityMetadataSourceTests.java | 8 +- ...thodInvocationPrivilegeEvaluatorTests.java | 10 +- ...tingMethodSecurityMetadataSourceTests.java | 23 +- ...vocationAuthorizationAdviceVoterTests.java | 8 +- .../AbstractAccessDecisionManagerTests.java | 24 +- .../access/vote/AbstractAclVoterTests.java | 10 +- .../access/vote/AffirmativeBasedTests.java | 7 +- .../access/vote/AuthenticatedVoterTests.java | 8 +- .../access/vote/ConsensusBasedTests.java | 14 +- .../access/vote/RoleHierarchyVoterTests.java | 5 +- .../security/access/vote/RoleVoterTests.java | 6 +- .../access/vote/UnanimousBasedTests.java | 13 +- .../AbstractAuthenticationTokenTests.java | 40 +-- .../AuthenticationTrustResolverImplTests.java | 6 +- .../authentication/ProviderManagerTests.java | 24 +- .../TestingAuthenticationProviderTests.java | 17 +- ...rnamePasswordAuthenticationTokenTests.java | 20 +- .../AnonymousAuthenticationProviderTests.java | 16 +- .../AnonymousAuthenticationTokenTests.java | 28 +- .../dao/DaoAuthenticationProviderTests.java | 84 +++--- .../dao/salt/ReflectionSaltSourceTests.java | 4 +- .../dao/salt/SystemWideSaltSourceTests.java | 8 +- .../encoding/BasePasswordEncoderTests.java | 34 +-- .../encoding/Md4PasswordEncoderTests.java | 14 +- .../encoding/Md5PasswordEncoderTests.java | 18 +- .../encoding/PasswordEncoderUtilsTests.java | 16 +- .../PlaintextPasswordEncoderTests.java | 18 +- .../encoding/ShaPasswordEncoderTests.java | 12 +- .../event/AuthenticationEventTests.java | 10 +- .../event/LoggerListenerTests.java | 2 +- ...efaultJaasAuthenticationProviderTests.java | 16 +- .../jaas/JaasAuthenticationProviderTests.java | 40 +-- .../authentication/jaas/Sec760Tests.java | 2 +- .../jaas/SecurityContextLoginModuleTests.java | 14 +- .../memory/InMemoryConfigurationTests.java | 8 +- .../RemoteAuthenticationManagerImplTests.java | 4 +- .../RemoteAuthenticationProviderTests.java | 16 +- ...RememberMeAuthenticationProviderTests.java | 14 +- .../RememberMeAuthenticationTokenTests.java | 30 +-- ...ngSecurityContextExecutorServiceTests.java | 2 +- ...yContextScheduledExecutorServiceTests.java | 2 +- ...elegatingSecurityContextCallableTests.java | 2 +- ...elegatingSecurityContextRunnableTests.java | 2 +- ...DelegatingSecurityContextSupportTests.java | 2 +- .../DelegatingApplicationListenerTests.java | 4 +- .../security/core/JavaVersionTests.java | 2 +- .../core/SpringSecurityCoreVersionTests.java | 8 +- .../core/authority/AuthorityUtilsTests.java | 10 +- .../SimpleGrantedAuthorityTests.java | 16 +- ...ributes2GrantedAuthoritiesMapperTests.java | 0 .../mapping/SimpleAuthoritiesMapperTests.java | 30 +-- .../SimpleMappableRolesRetrieverTests.java | 0 ...leRoles2GrantedAuthoritiesMapperTests.java | 0 .../context/SecurityContextHolderTests.java | 8 +- .../context/SecurityContextImplTests.java | 6 +- ...nnotationParameterNameDiscovererTests.java | 2 +- ...tSecurityParameterNameDiscovererTests.java | 2 +- .../core/session/SessionInformationTests.java | 8 +- .../session/SessionRegistryImplTests.java | 54 ++-- .../core/token/DefaultTokenTests.java | 4 +- .../KeyBasedPersistenceTokenServiceTests.java | 8 +- .../token/SecureRandomFactoryBeanTests.java | 14 +- .../UserDetailsByNameServiceWrapperTests.java | 4 +- .../security/core/userdetails/UserTests.java | 22 +- .../cache/EhCacheBasedUserCacheTests.java | 10 +- .../userdetails/cache/NullUserCacheTests.java | 2 +- .../cache/SpringCacheBasedUserCacheTests.java | 8 +- .../userdetails/jdbc/JdbcDaoImplTests.java | 44 ++-- .../memory/UserAttributeEditorTests.java | 54 ++-- .../JdbcUserDetailsManagerTests.java | 68 ++--- .../security/util/FieldUtilsTests.java | 9 +- .../security/util/InMemoryResourceTests.java | 14 +- .../util/MethodInvocationUtilsTests.java | 14 +- .../bcrypt/BCryptPasswordEncoderTests.java | 20 +- .../security/crypto/bcrypt/BCryptTests.java | 58 ++--- .../security/crypto/codec/Base64Tests.java | 6 +- .../security/crypto/codec/Utf8Tests.java | 8 +- .../crypto/encrypt/EncryptorsTests.java | 46 ++-- .../crypto/keygen/KeyGeneratorsTests.java | 26 +- .../crypto/password/DigesterTests.java | 2 +- .../StandardPasswordEncoderTests.java | 8 +- .../crypto/util/EncodingUtilsTests.java | 12 +- ...curityEvaluationContextExtensionTests.java | 2 +- gradle/javaprojects.gradle | 41 ++- ...amespaceWithMultipleInterceptorsTests.java | 6 +- .../HttpPathParameterStrippingTests.java | 8 +- .../SEC933ApplicationContextTests.java | 4 +- .../ProtectPointcutPerformanceTests.java | 2 +- .../SessionRegistryImplMTTests.java | 2 +- .../context/SecurityContextHolderMTTests.java | 10 +- ...ustomConcurrentSessionManagementTests.java | 9 +- .../InMemoryProviderWebAppTests.java | 7 +- .../security/integration/JspTaglibTests.java | 27 +- ...faultSpringSecurityContextSourceTests.java | 20 +- .../SpringSecurityLdapTemplateITests.java | 44 ++-- .../BindAuthenticatorTests.java | 6 +- .../PasswordComparisonAuthenticatorTests.java | 6 +- .../FilterBasedLdapUserSearchTests.java | 18 +- .../DefaultLdapAuthoritiesPopulatorTests.java | 44 ++-- .../LdapUserDetailsManagerTests.java | 20 +- .../NestedLdapAuthoritiesPopulatorTests.java | 40 +-- .../security/ldap/LdapUtilsTests.java | 12 +- ...ringSecurityAuthenticationSourceTests.java | 12 +- .../ldap/SpringSecurityLdapTemplateTests.java | 2 +- .../LdapAuthenticationProviderTests.java | 32 +-- .../LdapShaPasswordEncoderTests.java | 6 +- ...ectoryLdapAuthenticationProviderTests.java | 20 +- ...PasswordPolicyAwareContextSourceTests.java | 2 +- .../PasswordPolicyControlFactoryTests.java | 6 +- .../PasswordPolicyResponseControlTests.java | 24 +- .../ldap/userdetails/InetOrgPersonTests.java | 52 ++-- .../ldap/userdetails/LdapAuthorityTests.java | 26 +- .../LdapUserDetailsMapperTests.java | 8 +- .../LdapUserDetailsServiceTests.java | 8 +- ...sServiceLdapAuthoritiesPopulatorTests.java | 6 +- ...MessageSecurityExpressionHandlerTests.java | 2 +- ...ageSecurityMetadataSourceFactoryTests.java | 2 +- ...MessageExpressionConfigAttributeTests.java | 2 +- .../MessageExpressionVoterTests.java | 2 +- .../ChannelSecurityInterceptorTests.java | 2 +- ...ultMessageSecurityMetadataSourceTests.java | 2 +- ...icationPrincipalArgumentResolverTests.java | 2 +- ...ecurityContextChannelInterceptorTests.java | 2 +- .../util/matcher/AndMessageMatcherTest.java | 2 +- .../util/matcher/OrMessageMatcherTest.java | 2 +- .../SimpDestinationMessageMatcherTests.java | 2 +- .../matcher/SimpMessageTypeMatcherTests.java | 2 +- .../CsrfTokenHandshakeInterceptorTests.java | 2 +- .../openid/OpenID4JavaConsumerTests.java | 10 +- .../OpenIDAuthenticationFilterTests.java | 14 +- .../OpenIDAuthenticationProviderTests.java | 38 +-- .../remoting/dns/JndiDnsResolverTests.java | 8 +- ...SimpleHttpInvokerRequestExecutorTests.java | 4 +- ...ntextPropagatingRemoteInvocationTests.java | 4 +- .../aspectj/AspectJInterceptorTests.java | 2 +- .../sample/contact/ContactManagerTests.java | 10 +- .../data/SecurityMessageRepositoryTests.java | 2 +- .../src/test/java/DmsIntegrationTests.java | 16 +- .../test/java/SecureDmsIntegrationTests.java | 2 +- .../samples/gae/security/AppRoleTests.java | 10 +- .../users/GaeDataStoreUserRegistryTests.java | 16 +- .../authz/AbstractAuthorizeTagTests.java | 2 +- .../authz/AccessControlListTagTests.java | 46 ++-- .../taglibs/authz/AuthenticationTagTests.java | 38 +-- .../taglibs/authz/AuthorizeTagTests.java | 20 +- .../taglibs/csrf/AbstractCsrfTagTests.java | 12 +- .../taglibs/csrf/CsrfInputTagTests.java | 6 +- .../taglibs/csrf/CsrfMetaTagsTagTests.java | 6 +- .../TestSecurityContextHolderTests.java | 2 +- .../SecurityTestExecutionListenerTests.java | 2 +- .../context/showcase/WithMockUserTests.java | 2 +- .../showcase/WithUserDetailsTests.java | 2 +- ...thMockUserSecurityContextFactoryTests.java | 2 +- .../context/support/WithMockUserTests.java | 2 +- ...ityContextTestExcecutionListenerTests.java | 2 +- ...rityContextTestExecutionListenerTests.java | 2 +- ...serDetailsSecurityContextFactoryTests.java | 2 +- .../context/support/WithUserDetailsTests.java | 2 +- ...yMockMvcRequestBuildersFormLoginTests.java | 2 +- ...MockMvcRequestBuildersFormLogoutTests.java | 2 +- ...uestPostProcessorsAuthenticationTests.java | 2 +- ...RequestPostProcessorsCertificateTests.java | 2 +- ...MockMvcRequestPostProcessorsCsrfTests.java | 2 +- ...ckMvcRequestPostProcessorsDigestTests.java | 2 +- ...estPostProcessorsSecurityContextTests.java | 2 +- ...RequestPostProcessorsUserDetailsTests.java | 2 +- ...MockMvcRequestPostProcessorsUserTests.java | 2 +- .../test/web/support/WebTestUtilsTests.java | 2 +- .../web/DefaultRedirectStrategyTests.java | 6 +- .../security/web/FilterChainProxyTests.java | 15 +- .../security/web/FilterInvocationTests.java | 35 ++- .../security/web/PortMapperImplTests.java | 16 +- .../security/web/PortResolverImplTests.java | 14 +- ...tWebInvocationPrivilegeEvaluatorTests.java | 16 +- .../ExceptionTranslationFilterTests.java | 29 +-- .../ChannelDecisionManagerImplTests.java | 24 +- .../channel/ChannelProcessingFilterTests.java | 6 +- .../InsecureChannelProcessorTests.java | 26 +- .../channel/RetryWithHttpEntryPointTests.java | 8 +- .../RetryWithHttpsEntryPointTests.java | 6 +- .../channel/SecureChannelProcessorTests.java | 26 +- ...aultWebSecurityExpressionHandlerTests.java | 6 +- ...InvocationSecurityMetadataSourceTests.java | 12 +- .../expression/WebExpressionVoterTests.java | 12 +- .../WebSecurityExpressionRootTests.java | 28 +- ...InvocationSecurityMetadataSourceTests.java | 22 +- .../FilterSecurityInterceptorTests.java | 6 +- .../web/access/intercept/RequestKeyTests.java | 18 +- ...ctAuthenticationProcessingFilterTests.java | 50 ++-- .../AnonymousAuthenticationFilterTests.java | 8 +- ...DefaultLoginPageGeneratingFilterTests.java | 2 +- ...pingAuthenticationFailureHandlerTests.java | 6 +- .../HttpStatusEntryPointTests.java | 2 +- ...LoginUrlAuthenticationEntryPointTests.java | 20 +- ...wareAuthenticationSuccessHandlerTests.java | 4 +- ...eUrlAuthenticationFailureHandlerTests.java | 22 +- ...eUrlAuthenticationSuccessHandlerTests.java | 16 +- ...namePasswordAuthenticationFilterTests.java | 8 +- .../CookieClearingLogoutHandlerTests.java | 14 +- ...tusReturningLogoutSuccessHandlerTests.java | 2 +- .../logout/LogoutHandlerTests.java | 4 +- .../SecurityContextLogoutHandlerTests.java | 8 +- .../SimpleUrlLogoutSuccessHandlerTests.java | 10 +- ...PreAuthenticatedProcessingFilterTests.java | 16 +- .../Http403ForbiddenEntryPointTests.java | 2 +- ...henticatedAuthenticationProviderTests.java | 20 +- ...AuthenticatedAuthenticationTokenTests.java | 24 +- ...tedAuthoritiesUserDetailsServiceTests.java | 14 +- ...horitiesWebAuthenticationDetailsTests.java | 4 +- ...equestHeaderAuthenticationFilterTests.java | 22 +- ...edWebAuthenticationDetailsSourceTests.java | 6 +- ...PreAuthenticatedProcessingFilterTests.java | 0 .../WebXmlJ2eeDefinedRolesRetrieverTests.java | 10 +- ...PreAuthenticatedProcessingFilterTests.java | 2 +- .../SubjectDnX509PrincipalExtractorTests.java | 6 +- .../AbstractRememberMeServicesTests.java | 88 +++---- .../JdbcTokenRepositoryImplTests.java | 32 +-- .../NullRememberMeServicesTests.java | 4 +- ...tentTokenBasedRememberMeServicesTests.java | 22 +- .../RememberMeAuthenticationFilterTests.java | 10 +- .../TokenBasedRememberMeServicesTests.java | 94 +++---- ...ionControlAuthenticationStrategyTests.java | 2 +- .../switchuser/SwitchUserFilterTests.java | 46 ++-- .../BasicAuthenticationEntryPointTests.java | 10 +- .../www/BasicAuthenticationFilterTests.java | 2 +- .../www/DigestAuthUtilsTests.java | 52 ++-- .../DigestAuthenticationEntryPointTests.java | 36 +-- .../www/DigestAuthenticationFilterTests.java | 86 +++--- ...icationPrincipalArgumentResolverTests.java | 2 +- .../ConcurrentSessionFilterTests.java | 6 +- ...SessionSecurityContextRepositoryTests.java | 98 +++---- .../OnCommittedResponseWrapperTests.java | 4 +- ...xtOnUpdateOrErrorResponseWrapperTests.java | 2 +- ...SecurityContextPersistenceFilterTests.java | 14 +- ...extCallableProcessingInterceptorTests.java | 2 +- ...WebAsyncManagerIntegrationFilterTests.java | 2 +- .../csrf/CsrfAuthenticationStrategyTests.java | 2 +- .../security/web/csrf/CsrfFilterTests.java | 10 +- .../HttpSessionCsrfTokenRepositoryTests.java | 2 +- .../security/web/debug/DebugFilterTest.java | 8 +- .../firewall/DefaultHttpFirewallTests.java | 2 +- .../web/firewall/FirewalledResponseTests.java | 6 +- .../web/firewall/RequestWrapperTests.java | 14 +- .../web/header/HeaderWriterFilterTests.java | 2 +- .../CacheControlHeadersWriterTests.java | 2 +- .../header/writers/HpkpHeaderWriterTests.java | 32 +-- .../header/writers/HstsHeaderWriterTests.java | 2 +- .../writers/StaticHeaderWriterTests.java | 2 +- .../XContentTypeOptionsHeaderWriterTests.java | 2 +- .../XXssProtectionHeaderWriterTests.java | 2 +- ...equestParameterAllowFromStrategyTests.java | 2 +- .../FrameOptionsHeaderWriterTests.java | 2 +- .../StaticAllowFromStrategyTests.java | 4 +- .../JaasApiIntegrationFilterTests.java | 16 +- ...icationPrincipalArgumentResolverTests.java | 2 +- .../CsrfTokenArgumentResolverTests.java | 2 +- .../DefaultSavedRequestTests.java | 10 +- .../HttpSessionRequestCacheTests.java | 14 +- .../RequestCacheAwareFilterTests.java | 6 +- .../web/savedrequest/SavedCookieTests.java | 32 +-- .../SavedRequestAwareWrapperTests.java | 58 ++--- .../CsrfRequestDataValueProcessorTests.java | 2 +- ...yContextHolderAwareRequestFilterTests.java | 2 +- ...ContextHolderAwareRequestWrapperTests.java | 44 ++-- ...ultSessionAuthenticationStrategyTests.java | 42 +-- .../HttpSessionDestroyedEventTests.java | 14 +- .../HttpSessionEventPublisherTests.java | 26 +- .../session/SessionManagementFilterTests.java | 8 +- .../web/util/TextEscapeUtilsTests.java | 10 +- .../web/util/ThrowableAnalyzerTests.java | 22 +- .../security/web/util/UrlUtilsTests.java | 14 +- .../util/matcher/AndRequestMatcherTests.java | 2 +- .../matcher/AntPathRequestMatcherTests.java | 104 ++++---- .../util/matcher/ELRequestMatcherTests.java | 16 +- .../util/matcher/IpAddressMatcherTests.java | 30 +-- ...diaTypeRequestMatcherRequestHCNSTests.java | 2 +- .../matcher/MediaTypeRequestMatcherTests.java | 2 +- .../matcher/NegatedRequestMatcherTests.java | 2 +- .../util/matcher/OrRequestMatcherTests.java | 2 +- .../matcher/RegexRequestMatcherTests.java | 16 +- .../RequestHeaderRequestMatcherTests.java | 2 +- 355 files changed, 3036 insertions(+), 3133 deletions(-) mode change 100755 => 100644 core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java mode change 100755 => 100644 core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java mode change 100755 => 100644 core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java mode change 100755 => 100644 core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java mode change 100755 => 100644 core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java mode change 100755 => 100644 core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java mode change 100755 => 100644 crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java mode change 100755 => 100644 samples/dms-xml/src/test/java/DmsIntegrationTests.java mode change 100755 => 100644 samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java mode change 100755 => 100644 web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java diff --git a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java index 15389e7359..9986cfcbc6 100644 --- a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java +++ b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java @@ -1,9 +1,10 @@ package org.springframework.security.acls; +import static org.assertj.core.api.Assertions.*; + import org.springframework.security.acls.domain.AclFormattingUtils; import org.springframework.security.acls.model.Permission; -import junit.framework.Assert; import junit.framework.TestCase; /** @@ -19,126 +20,116 @@ public class AclFormattingUtilsTests extends TestCase { public final void testDemergePatternsParametersConstraints() throws Exception { try { AclFormattingUtils.demergePatterns(null, "SOME STRING"); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { AclFormattingUtils.demergePatterns("SOME STRING", null); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { AclFormattingUtils.demergePatterns("SOME STRING", "LONGER SOME STRING"); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { AclFormattingUtils.demergePatterns("SOME STRING", "SAME LENGTH"); - Assert.assertTrue(true); } catch (IllegalArgumentException notExpected) { - Assert.fail("It shouldn't have thrown IllegalArgumentException"); + fail("It shouldn't have thrown IllegalArgumentException"); } } public final void testDemergePatterns() throws Exception { String original = "...........................A...R"; String removeBits = "...............................R"; - Assert.assertEquals("...........................A....", - AclFormattingUtils.demergePatterns(original, removeBits)); + assertThat(AclFormattingUtils.demergePatterns(original, removeBits)).isEqualTo("...........................A...."); - Assert.assertEquals("ABCDEF", - AclFormattingUtils.demergePatterns("ABCDEF", "......")); - Assert.assertEquals("......", - AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL")); + assertThat(AclFormattingUtils.demergePatterns("ABCDEF", "......")).isEqualTo("ABCDEF"); + assertThat(AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL")).isEqualTo("......"); } public final void testMergePatternsParametersConstraints() throws Exception { try { AclFormattingUtils.mergePatterns(null, "SOME STRING"); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { AclFormattingUtils.mergePatterns("SOME STRING", null); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { AclFormattingUtils.mergePatterns("SOME STRING", "LONGER SOME STRING"); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { AclFormattingUtils.mergePatterns("SOME STRING", "SAME LENGTH"); - Assert.assertTrue(true); } catch (IllegalArgumentException notExpected) { - Assert.fail("It shouldn't have thrown IllegalArgumentException"); } } public final void testMergePatterns() throws Exception { String original = "...............................R"; String extraBits = "...........................A...."; - Assert.assertEquals("...........................A...R", - AclFormattingUtils.mergePatterns(original, extraBits)); + assertThat( + AclFormattingUtils.mergePatterns(original, extraBits)).isEqualTo("...........................A...R"); - Assert.assertEquals("ABCDEF", - AclFormattingUtils.mergePatterns("ABCDEF", "......")); - Assert.assertEquals("GHIJKL", - AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL")); + assertThat(AclFormattingUtils.mergePatterns("ABCDEF", "......")) + .isEqualTo("ABCDEF"); + assertThat(AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL")) + .isEqualTo("GHIJKL"); } public final void testBinaryPrints() throws Exception { - Assert.assertEquals("............................****", - AclFormattingUtils.printBinary(15)); + assertThat( + AclFormattingUtils.printBinary(15)) + .isEqualTo("............................****"); try { AclFormattingUtils.printBinary(15, Permission.RESERVED_ON); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException notExpected) { - Assert.assertTrue(true); } try { AclFormattingUtils.printBinary(15, Permission.RESERVED_OFF); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException notExpected) { - Assert.assertTrue(true); } - Assert.assertEquals("............................xxxx", - AclFormattingUtils.printBinary(15, 'x')); + assertThat( + AclFormattingUtils.printBinary(15, 'x')) + .isEqualTo("............................xxxx"); } public void testPrintBinaryNegative() { - Assert.assertEquals("*...............................", - AclFormattingUtils.printBinary(0x80000000)); + assertThat( + AclFormattingUtils.printBinary(0x80000000)) + .isEqualTo("*..............................."); } public void testPrintBinaryMinusOne() { - Assert.assertEquals("********************************", - AclFormattingUtils.printBinary(0xffffffff)); + assertThat( + AclFormattingUtils.printBinary(0xffffffff)) + .isEqualTo("********************************"); } } diff --git a/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java b/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java index b454654dfb..2929411099 100644 --- a/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java +++ b/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java @@ -1,6 +1,7 @@ package org.springframework.security.acls; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.*; + import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; @@ -36,7 +37,7 @@ public class AclPermissionEvaluatorTests { when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl); when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true); - assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "READ")); + assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "READ")).isTrue(); } @Test @@ -56,7 +57,7 @@ public class AclPermissionEvaluatorTests { when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl); when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true); - assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "write")); + assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "write")).isTrue(); Locale.setDefault(systemLocale); } diff --git a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java index 7d1297f34e..3beba8f3fd 100644 --- a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java +++ b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java @@ -1,8 +1,8 @@ package org.springframework.security.acls.afterinvocation; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; + +import static org.assertj.core.api.Assertions.*; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.*; @@ -42,13 +42,13 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests { Object returned = provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), new ArrayList( Arrays.asList(new Object(), new Object()))); - assertTrue(returned instanceof List); - assertTrue(((List) returned).isEmpty()); + assertThat(returned).isInstanceOf(List.class); + assertThat(((List) returned)).isEmpty(); returned = provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("UNSUPPORTED", "AFTER_ACL_COLLECTION_READ"), new Object[] { new Object(), new Object() }); - assertTrue(returned instanceof Object[]); - assertTrue(((Object[]) returned).length == 0); + assertThat(returned instanceof Object[]).isTrue(); + assertThat(((Object[]) returned).length == 0).isTrue(); } @Test @@ -57,8 +57,8 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests { mock(AclService.class), Arrays.asList(mock(Permission.class))); Object returned = new Object(); - assertSame( - returned, + assertThat(returned) + .isSameAs( provider.decide(mock(Authentication.class), new Object(), Collections. emptyList(), returned)); } @@ -69,8 +69,9 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests { AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider( service, Arrays.asList(mock(Permission.class))); - assertNull(provider.decide(mock(Authentication.class), new Object(), - SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null)); + assertThat(provider.decide(mock(Authentication.class), new Object(), + SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null)) + .isNull();; verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class)); } diff --git a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java index 6cb6f438a6..b6f830628c 100644 --- a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java +++ b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.afterinvocation; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -50,8 +50,9 @@ public class AclEntryAfterInvocationProviderTests { provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class)); Object returned = new Object(); - assertSame( - returned, + assertThat( + returned) + .isSameAs( provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_READ"), returned)); } @@ -62,8 +63,9 @@ public class AclEntryAfterInvocationProviderTests { mock(AclService.class), Arrays.asList(mock(Permission.class))); Object returned = new Object(); - assertSame( - returned, + assertThat( + returned) + .isSameAs( provider.decide(mock(Authentication.class), new Object(), Collections. emptyList(), returned)); } @@ -76,8 +78,9 @@ public class AclEntryAfterInvocationProviderTests { // Not a String Object returned = new Object(); - assertSame( - returned, + assertThat( + returned) + .isSameAs( provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_READ"), returned)); } @@ -104,7 +107,7 @@ public class AclEntryAfterInvocationProviderTests { provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("UNSUPPORTED", "MY_ATTRIBUTE"), new Object()); - fail(); + fail("Expected Exception"); } catch (AccessDeniedException expected) { } @@ -119,8 +122,9 @@ public class AclEntryAfterInvocationProviderTests { AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider( service, Arrays.asList(mock(Permission.class))); - assertNull(provider.decide(mock(Authentication.class), new Object(), - SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null)); + assertThat(provider.decide(mock(Authentication.class), new Object(), + SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null)) + .isNull();; verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class)); } } diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java index 9fdc262450..5982f919eb 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.domain; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; @@ -60,13 +60,13 @@ public class AccessControlImplEntryTests { sid, BasePermission.ADMINISTRATION, true, true, true); // and check every get() method - assertEquals(new Long(1), ace.getId()); - assertEquals(mockAcl, ace.getAcl()); - assertEquals(sid, ace.getSid()); - assertTrue(ace.isGranting()); - assertEquals(BasePermission.ADMINISTRATION, ace.getPermission()); - assertTrue(((AuditableAccessControlEntry) ace).isAuditFailure()); - assertTrue(((AuditableAccessControlEntry) ace).isAuditSuccess()); + assertThat(ace.getId()).isEqualTo(new Long(1)); + assertThat(ace.getAcl()).isEqualTo(mockAcl); + assertThat(ace.getSid()).isEqualTo(sid); + assertThat(ace.isGranting()).isTrue(); + assertThat(ace.getPermission()).isEqualTo(BasePermission.ADMINISTRATION); + assertThat(((AuditableAccessControlEntry) ace).isAuditFailure()).isTrue(); + assertThat(((AuditableAccessControlEntry) ace).isAuditSuccess()).isTrue(); } @Test @@ -80,23 +80,23 @@ public class AccessControlImplEntryTests { AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, BasePermission.ADMINISTRATION, true, true, true); - assertFalse(ace.equals(null)); - assertFalse(ace.equals(Long.valueOf(100))); - assertTrue(ace.equals(ace)); - assertTrue(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, - BasePermission.ADMINISTRATION, true, true, true))); - assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid, - BasePermission.ADMINISTRATION, true, true, true))); - assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, + assertThat(ace).isNotNull(); + assertThat(ace).isNotEqualTo(Long.valueOf(100)); + assertThat(ace).isEqualTo(ace); + assertThat(ace).isEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, + BasePermission.ADMINISTRATION, true, true, true)); + assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid, + BasePermission.ADMINISTRATION, true, true, true)); + assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, new PrincipalSid("scott"), BasePermission.ADMINISTRATION, true, true, - true))); - assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, - BasePermission.WRITE, true, true, true))); - assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, - BasePermission.ADMINISTRATION, false, true, true))); - assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, - BasePermission.ADMINISTRATION, true, false, true))); - assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, - BasePermission.ADMINISTRATION, true, true, false))); + true)); + assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, + BasePermission.WRITE, true, true, true)); + assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, + BasePermission.ADMINISTRATION, false, true, true)); + assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, + BasePermission.ADMINISTRATION, true, false, true)); + assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, + BasePermission.ADMINISTRATION, true, true, false)); } } diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index 0d3f8a3f7e..6935222d0e 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.domain; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.*; @@ -117,36 +117,36 @@ public class AclImplTests { acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true); service.updateAcl(acl); // Check it was successfully added - assertEquals(1, acl.getEntries().size()); - assertEquals(acl.getEntries().get(0).getAcl(), acl); - assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ); - assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid( + assertThat(acl.getEntries()).hasSize(1); + assertThat(acl).isEqualTo(acl.getEntries().get(0).getAcl()); + assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(0).getPermission()); + assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST1")); // Add a second permission acl.insertAce(1, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true); service.updateAcl(acl); // Check it was added on the last position - assertEquals(2, acl.getEntries().size()); - assertEquals(acl.getEntries().get(1).getAcl(), acl); - assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.READ); - assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid( + assertThat(acl.getEntries()).hasSize(2); + assertThat(acl).isEqualTo(acl.getEntries().get(1).getAcl()); + assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(1).getPermission()); + assertThat(acl.getEntries().get(1).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST2")); // Add a third permission, after the first one acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_TEST3"), false); service.updateAcl(acl); - assertEquals(3, acl.getEntries().size()); + assertThat(acl.getEntries()).hasSize(3); // Check the third entry was added between the two existent ones - assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ); - assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid( + assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(0).getPermission()); + assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST1")); - assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE); - assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid( + assertThat(BasePermission.WRITE).isEqualTo(acl.getEntries().get(1).getPermission()); + assertThat(acl.getEntries().get(1).getSid()).isEqualTo( new GrantedAuthoritySid( "ROLE_TEST3")); - assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ); - assertEquals(acl.getEntries().get(2).getSid(), new GrantedAuthoritySid( + assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(2).getPermission()); + assertThat(acl.getEntries().get(2).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST2")); } @@ -179,26 +179,26 @@ public class AclImplTests { // Delete first permission and check the order of the remaining permissions is // kept acl.deleteAce(0); - assertEquals(2, acl.getEntries().size()); - assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid( + assertThat(acl.getEntries()).hasSize(2); + assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST2")); - assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid( + assertThat(acl.getEntries().get(1).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST3")); // Add one more permission and remove the permission in the middle acl.insertAce(2, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST4"), true); service.updateAcl(acl); acl.deleteAce(1); - assertEquals(2, acl.getEntries().size()); - assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid( + assertThat(acl.getEntries()).hasSize(2); + assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST2")); - assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid( + assertThat(acl.getEntries().get(1).getSid()).isEqualTo(new GrantedAuthoritySid( "ROLE_TEST4")); // Remove remaining permissions acl.deleteAce(1); acl.deleteAce(0); - assertEquals(0, acl.getEntries().size()); + assertThat(acl.getEntries()).isEmpty(); } @Test @@ -259,18 +259,18 @@ public class AclImplTests { BasePermission.CREATE); List sids = Arrays.asList(new PrincipalSid("ben"), new GrantedAuthoritySid( "ROLE_GUEST")); - assertFalse(rootAcl.isGranted(permissions, sids, false)); + assertThat(rootAcl.isGranted(permissions, sids, false)).isFalse(); try { rootAcl.isGranted(permissions, SCOTT, false); fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { } - assertTrue(rootAcl.isGranted(WRITE, SCOTT, false)); - assertFalse(rootAcl.isGranted(WRITE, Arrays.asList(new PrincipalSid("rod"), - new GrantedAuthoritySid("WRITE_ACCESS_ROLE")), false)); - assertTrue(rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid( - "WRITE_ACCESS_ROLE"), new PrincipalSid("rod")), false)); + assertThat(rootAcl.isGranted(WRITE, SCOTT, false)).isTrue(); + assertThat(rootAcl.isGranted(WRITE, Arrays.asList(new PrincipalSid("rod"), + new GrantedAuthoritySid("WRITE_ACCESS_ROLE")), false)).isFalse(); + assertThat(rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid( + "WRITE_ACCESS_ROLE"), new PrincipalSid("rod")), false)).isTrue(); try { // Change the type of the Sid and check the granting process rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid("rod"), @@ -326,40 +326,40 @@ public class AclImplTests { childAcl1.insertAce(0, BasePermission.CREATE, new PrincipalSid("scott"), true); // Check granting process for parent1 - assertTrue(parentAcl1.isGranted(READ, SCOTT, false)); - assertTrue(parentAcl1.isGranted(READ, - Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false)); - assertTrue(parentAcl1.isGranted(WRITE, BEN, false)); - assertFalse(parentAcl1.isGranted(DELETE, BEN, false)); - assertFalse(parentAcl1.isGranted(DELETE, SCOTT, false)); + assertThat(parentAcl1.isGranted(READ, SCOTT, false)).isTrue(); + assertThat(parentAcl1.isGranted(READ, + Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false)) + .isTrue(); + assertThat(parentAcl1.isGranted(WRITE, BEN, false)).isTrue(); + assertThat(parentAcl1.isGranted(DELETE, BEN, false)).isFalse(); + assertThat(parentAcl1.isGranted(DELETE, SCOTT, false)).isFalse(); // Check granting process for parent2 - assertTrue(parentAcl2.isGranted(CREATE, BEN, false)); - assertTrue(parentAcl2.isGranted(WRITE, BEN, false)); - assertFalse(parentAcl2.isGranted(DELETE, BEN, false)); + assertThat(parentAcl2.isGranted(CREATE, BEN, false)).isTrue(); + assertThat(parentAcl2.isGranted(WRITE, BEN, false)).isTrue(); + assertThat(parentAcl2.isGranted(DELETE, BEN, false)).isFalse(); // Check granting process for child1 - assertTrue(childAcl1.isGranted(CREATE, SCOTT, false)); - assertTrue(childAcl1.isGranted(READ, - Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false)); - assertFalse(childAcl1.isGranted(DELETE, BEN, false)); + assertThat(childAcl1.isGranted(CREATE, SCOTT, false)).isTrue(); + assertThat(childAcl1.isGranted(READ, + Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false)) + .isTrue(); + assertThat(childAcl1.isGranted(DELETE, BEN, false)).isFalse(); // Check granting process for child2 (doesn't inherit the permissions from its // parent) try { - assertTrue(childAcl2.isGranted(CREATE, SCOTT, false)); + assertThat(childAcl2.isGranted(CREATE, SCOTT, false)).isTrue(); fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); } try { - assertTrue(childAcl2.isGranted(CREATE, - Arrays.asList((Sid) new PrincipalSid("joe")), false)); + childAcl2.isGranted(CREATE, + Arrays.asList((Sid) new PrincipalSid("joe")), false); fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); } } @@ -380,9 +380,9 @@ public class AclImplTests { acl.insertAce(2, BasePermission.CREATE, new PrincipalSid("ben"), true); service.updateAcl(acl); - assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ); - assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE); - assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.CREATE); + assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(0).getPermission()); + assertThat(BasePermission.WRITE).isEqualTo(acl.getEntries().get(1).getPermission()); + assertThat(BasePermission.CREATE).isEqualTo(acl.getEntries().get(2).getPermission()); // Change each permission acl.updateAce(0, BasePermission.CREATE); @@ -390,9 +390,9 @@ public class AclImplTests { acl.updateAce(2, BasePermission.READ); // Check the change was successfully made - assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.CREATE); - assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.DELETE); - assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ); + assertThat(BasePermission.CREATE).isEqualTo(acl.getEntries().get(0).getPermission()); + assertThat(BasePermission.DELETE).isEqualTo(acl.getEntries().get(1).getPermission()); + assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(2).getPermission()); } @Test @@ -411,28 +411,26 @@ public class AclImplTests { true); service.updateAcl(acl); - assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0)) - .isAuditFailure()); - assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1)) - .isAuditFailure()); - assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0)) - .isAuditSuccess()); - assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1)) - .isAuditSuccess()); + assertThat(((AuditableAccessControlEntry) acl.getEntries().get(0)) + .isAuditFailure()) + .isFalse(); + assertThat(((AuditableAccessControlEntry) acl.getEntries().get(1)) + .isAuditFailure()) + .isFalse(); + assertThat(((AuditableAccessControlEntry) acl.getEntries().get(0)) + .isAuditSuccess()) + .isFalse(); + assertThat(((AuditableAccessControlEntry) acl.getEntries().get(1)) + .isAuditSuccess()) + .isFalse(); // Change each permission ((AuditableAcl) acl).updateAuditing(0, true, true); ((AuditableAcl) acl).updateAuditing(1, true, true); // Check the change was successfuly made - assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0)) - .isAuditFailure()); - assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1)) - .isAuditFailure()); - assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0)) - .isAuditSuccess()); - assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1)) - .isAuditSuccess()); + assertThat(acl.getEntries()).extracting("auditSuccess").containsOnly(true, true); + assertThat(acl.getEntries()).extracting("auditFailure").containsOnly(true, true); } @Test @@ -454,21 +452,21 @@ public class AclImplTests { true); service.updateAcl(acl); - assertEquals(acl.getId(), 1); - assertEquals(acl.getObjectIdentity(), identity); - assertEquals(acl.getOwner(), new PrincipalSid("joe")); - assertNull(acl.getParentAcl()); - assertTrue(acl.isEntriesInheriting()); - assertEquals(2, acl.getEntries().size()); + assertThat(1).isEqualTo(acl.getId()); + assertThat(identity).isEqualTo(acl.getObjectIdentity()); + assertThat(new PrincipalSid("joe")).isEqualTo(acl.getOwner()); + assertThat(acl.getParentAcl()).isNull(); + assertThat(acl.isEntriesInheriting()).isTrue(); + assertThat(acl.getEntries()).hasSize(2); acl.setParent(parentAcl); - assertEquals(acl.getParentAcl(), parentAcl); + assertThat(parentAcl).isEqualTo(acl.getParentAcl()); acl.setEntriesInheriting(false); - assertFalse(acl.isEntriesInheriting()); + assertThat(acl.isEntriesInheriting()).isFalse(); acl.setOwner(new PrincipalSid("ben")); - assertEquals(acl.getOwner(), new PrincipalSid("ben")); + assertThat(new PrincipalSid("ben")).isEqualTo(acl.getOwner()); } @Test @@ -478,20 +476,25 @@ public class AclImplTests { MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, loadedSids, true, new PrincipalSid("joe")); - assertTrue(acl.isSidLoaded(loadedSids)); - assertTrue(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid("ROLE_IGNORED"), - new PrincipalSid("ben")))); - assertTrue(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( - "ROLE_IGNORED")))); - assertTrue(acl.isSidLoaded(BEN)); - assertTrue(acl.isSidLoaded(null)); - assertTrue(acl.isSidLoaded(new ArrayList(0))); - assertTrue(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( - "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED")))); - assertFalse(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( - "ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED")))); - assertFalse(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( - "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL")))); + assertThat(acl.isSidLoaded(loadedSids)).isTrue(); + assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid("ROLE_IGNORED"), + new PrincipalSid("ben")))) + .isTrue(); + assertThat(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid( + "ROLE_IGNORED")))) + .isTrue(); + assertThat(acl.isSidLoaded(BEN)).isTrue(); + assertThat(acl.isSidLoaded(null)).isTrue(); + assertThat(acl.isSidLoaded(new ArrayList(0))).isTrue(); + assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( + "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED")))) + .isTrue(); + assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( + "ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED")))) + .isFalse(); + assertThat(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid( + "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL")))) + .isFalse(); } @Test(expected = NotFoundException.class) @@ -558,7 +561,7 @@ public class AclImplTests { /* * Mock implementation that populates the aces list with fully initialized * AccessControlEntries - * + * * @see * org.springframework.security.acls.MutableAclService#updateAcl(org.springframework * .security.acls.MutableAcl) diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java index b25f391a72..fa122ec322 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.domain; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.security.access.AccessDeniedException; @@ -162,7 +162,7 @@ public class AclImplementationSecurityCheckTests { try { aclAuthorizationStrategy.securityCheck(aclFirstAllow, AclAuthorizationStrategy.CHANGE_AUDITING); - assertTrue(true); + } catch (AccessDeniedException notExpected) { fail("It shouldn't have thrown AccessDeniedException"); @@ -177,13 +177,13 @@ public class AclImplementationSecurityCheckTests { fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } // and still grant access for CHANGE_GENERAL try { aclAuthorizationStrategy.securityCheck(aclNoACE, AclAuthorizationStrategy.CHANGE_GENERAL); - assertTrue(true); + } catch (NotFoundException expected) { fail("It shouldn't have thrown NotFoundException"); @@ -221,7 +221,7 @@ public class AclImplementationSecurityCheckTests { fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } // Link the child with its parent and test again against the @@ -231,7 +231,7 @@ public class AclImplementationSecurityCheckTests { try { aclAuthorizationStrategy.securityCheck(childAcl, AclAuthorizationStrategy.CHANGE_OWNERSHIP); - assertTrue(true); + } catch (NotFoundException expected) { fail("It shouldn't have thrown NotFoundException"); @@ -250,7 +250,7 @@ public class AclImplementationSecurityCheckTests { try { aclAuthorizationStrategy.securityCheck(childAcl, AclAuthorizationStrategy.CHANGE_OWNERSHIP); - assertTrue(true); + } catch (NotFoundException expected) { fail("It shouldn't have thrown NotFoundException"); diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java index 2a4fb9904e..59e4649108 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.domain; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.ByteArrayOutputStream; @@ -46,14 +46,14 @@ public class AuditLoggerTests { public void nonAuditableAceIsIgnored() { AccessControlEntry ace = mock(AccessControlEntry.class); logger.logIfNeeded(true, ace); - assertEquals(0, bytes.size()); + assertThat(bytes.size()).isEqualTo(0); } @Test public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() throws Exception { when(ace.isAuditSuccess()).thenReturn(false); logger.logIfNeeded(true, ace); - assertEquals(0, bytes.size()); + assertThat(bytes.size()).isEqualTo(0); } @Test @@ -61,20 +61,20 @@ public class AuditLoggerTests { when(ace.isAuditSuccess()).thenReturn(true); logger.logIfNeeded(true, ace); - assertTrue(bytes.toString().startsWith("GRANTED due to ACE")); + assertThat(bytes.toString().startsWith("GRANTED due to ACE")).isTrue(); } @Test public void failureIsntLoggedIfAceDoesntRequireFailureAudit() throws Exception { when(ace.isAuditFailure()).thenReturn(false); logger.logIfNeeded(false, ace); - assertEquals(0, bytes.size()); + assertThat(bytes.size()).isEqualTo(0); } @Test public void failureIsLoggedIfAceRequiresFailureAudit() throws Exception { when(ace.isAuditFailure()).thenReturn(true); logger.logIfNeeded(false, ace); - assertTrue(bytes.toString().startsWith("DENIED due to ACE")); + assertThat(bytes.toString().startsWith("DENIED due to ACE")).isTrue(); } } diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java index 17c13afcd3..a4dcc204f6 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.domain; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.acls.domain.IdentityUnavailableException; @@ -66,8 +66,8 @@ public class ObjectIdentityImplTests { @Test public void gettersReturnExpectedValues() throws Exception { ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1)); - assertEquals(Long.valueOf(1), obj.getIdentifier()); - assertEquals(MockIdDomainObject.class.getName(), obj.getType()); + assertThat(obj.getIdentifier()).isEqualTo(Long.valueOf(1)); + assertThat(obj.getType()).isEqualTo(MockIdDomainObject.class.getName()); } @Test @@ -121,23 +121,22 @@ public class ObjectIdentityImplTests { mockObj.setId(Long.valueOf(1)); String string = "SOME_STRING"; - assertNotSame(obj, string); - assertFalse(obj.equals(null)); - assertFalse(obj.equals("DIFFERENT_OBJECT_TYPE")); - assertFalse(obj.equals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2)))); - assertFalse(obj - .equals(new ObjectIdentityImpl( + assertThat(string).isNotSameAs(obj); + assertThat(obj.equals(null)).isFalse(); + assertThat(obj.equals("DIFFERENT_OBJECT_TYPE")).isFalse(); + assertThat(obj.equals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2)))).isFalse(); + assertThat(obj).isNotEqualTo(new ObjectIdentityImpl( "org.springframework.security.acls.domain.ObjectIdentityImplTests$MockOtherIdDomainObject", - Long.valueOf(1)))); - assertEquals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1)), obj); - assertEquals(obj, new ObjectIdentityImpl(mockObj)); + Long.valueOf(1))); + assertThat(new ObjectIdentityImpl(DOMAIN_CLASS, 1L)).isEqualTo(obj); + assertThat(new ObjectIdentityImpl(mockObj)).isEqualTo(obj); } @Test public void hashcodeIsDifferentForDifferentJavaTypes() throws Exception { ObjectIdentity obj = new ObjectIdentityImpl(Object.class, Long.valueOf(1)); ObjectIdentity obj2 = new ObjectIdentityImpl(String.class, Long.valueOf(1)); - assertFalse(obj.hashCode() == obj2.hashCode()); + assertThat(obj.hashCode() == obj2.hashCode()).isFalse(); } @Test @@ -145,23 +144,23 @@ public class ObjectIdentityImplTests { ObjectIdentity obj = new ObjectIdentityImpl(Object.class, new Long(5)); ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Integer.valueOf(5)); - assertEquals(obj, obj2); - assertEquals(obj.hashCode(), obj2.hashCode()); + assertThat(obj2).isEqualTo(obj); + assertThat(obj2.hashCode()).isEqualTo(obj.hashCode()); } @Test public void equalStringIdsAreEqualAndHaveSameHashcode() throws Exception { ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000"); ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, "1000"); - assertEquals(obj, obj2); - assertEquals(obj.hashCode(), obj2.hashCode()); + assertThat(obj2).isEqualTo(obj); + assertThat(obj2.hashCode()).isEqualTo(obj.hashCode()); } @Test public void stringAndNumericIdsAreNotEqual() throws Exception { ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000"); ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Long.valueOf(1000)); - assertFalse(obj.equals(obj2)); + assertThat(obj.equals(obj2)).isFalse(); } // ~ Inner Classes diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java index c2eba731cc..4cfe53bca6 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java @@ -1,5 +1,8 @@ package org.springframework.security.acls.domain; + +import static org.assertj.core.api.Assertions.*; + import org.springframework.security.acls.domain.ObjectIdentityImpl; import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl; import org.springframework.security.acls.model.ObjectIdentity; @@ -23,8 +26,8 @@ public class ObjectIdentityRetrievalStrategyImplTests extends TestCase { ObjectIdentityRetrievalStrategy retStrategy = new ObjectIdentityRetrievalStrategyImpl(); ObjectIdentity identity = retStrategy.getObjectIdentity(domain); - assertNotNull(identity); - assertEquals(identity, new ObjectIdentityImpl(domain)); + assertThat(identity).isNotNull(); + assertThat(new ObjectIdentityImpl(domain)).isEqualTo(identity); } // ~ Inner Classes diff --git a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java index 74e957b528..57f958e48d 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java @@ -14,7 +14,7 @@ */ package org.springframework.security.acls.domain; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; @@ -37,82 +37,60 @@ public class PermissionTests { @Test public void basePermissionTest() { Permission p = permissionFactory.buildFromName("WRITE"); - assertNotNull(p); + assertThat(p).isNotNull(); } @Test public void expectedIntegerValues() { - assertEquals(1, BasePermission.READ.getMask()); - assertEquals(16, BasePermission.ADMINISTRATION.getMask()); - assertEquals( - 7, + assertThat(BasePermission.READ.getMask()).isEqualTo(1); + assertThat(BasePermission.ADMINISTRATION.getMask()).isEqualTo(16); + assertThat( new CumulativePermission().set(BasePermission.READ) - .set(BasePermission.WRITE).set(BasePermission.CREATE).getMask()); - assertEquals( - 17, + .set(BasePermission.WRITE).set(BasePermission.CREATE).getMask()) + .isEqualTo(7); + assertThat( new CumulativePermission().set(BasePermission.READ) - .set(BasePermission.ADMINISTRATION).getMask()); + .set(BasePermission.ADMINISTRATION).getMask()) + .isEqualTo(17); } @Test public void fromInteger() { Permission permission = permissionFactory.buildFromMask(7); - System.out.println("7 = " + permission.toString()); permission = permissionFactory.buildFromMask(4); - System.out.println("4 = " + permission.toString()); } @Test public void stringConversion() { permissionFactory.registerPublicPermissions(SpecialPermission.class); - System.out.println("R = " + BasePermission.READ.toString()); - assertEquals("BasePermission[...............................R=1]", - BasePermission.READ.toString()); + assertThat(BasePermission.READ.toString()) + .isEqualTo("BasePermission[...............................R=1]"); - System.out.println("A = " + BasePermission.ADMINISTRATION.toString()); - assertEquals("BasePermission[...........................A....=16]", - BasePermission.ADMINISTRATION.toString()); + assertThat( + BasePermission.ADMINISTRATION.toString()) + .isEqualTo("BasePermission[...........................A....=16]"); - System.out.println("R = " - + new CumulativePermission().set(BasePermission.READ).toString()); - assertEquals("CumulativePermission[...............................R=1]", - new CumulativePermission().set(BasePermission.READ).toString()); + assertThat( + new CumulativePermission().set(BasePermission.READ).toString()) + .isEqualTo("CumulativePermission[...............................R=1]"); - System.out.println("A = " - + new CumulativePermission().set(SpecialPermission.ENTER) - .set(BasePermission.ADMINISTRATION).toString()); - assertEquals( - "CumulativePermission[..........................EA....=48]", - new CumulativePermission().set(SpecialPermission.ENTER) - .set(BasePermission.ADMINISTRATION).toString()); + assertThat(new CumulativePermission().set(SpecialPermission.ENTER) + .set(BasePermission.ADMINISTRATION).toString()) + .isEqualTo("CumulativePermission[..........................EA....=48]"); - System.out.println("RA = " - + new CumulativePermission().set(BasePermission.ADMINISTRATION) - .set(BasePermission.READ).toString()); - assertEquals( - "CumulativePermission[...........................A...R=17]", - new CumulativePermission().set(BasePermission.ADMINISTRATION) - .set(BasePermission.READ).toString()); + assertThat(new CumulativePermission().set(BasePermission.ADMINISTRATION) + .set(BasePermission.READ).toString()) + .isEqualTo("CumulativePermission[...........................A...R=17]"); - System.out.println("R = " - + new CumulativePermission().set(BasePermission.ADMINISTRATION) + assertThat(new CumulativePermission().set(BasePermission.ADMINISTRATION) .set(BasePermission.READ).clear(BasePermission.ADMINISTRATION) - .toString()); - assertEquals( - "CumulativePermission[...............................R=1]", - new CumulativePermission().set(BasePermission.ADMINISTRATION) - .set(BasePermission.READ).clear(BasePermission.ADMINISTRATION) - .toString()); + .toString()) + .isEqualTo("CumulativePermission[...............................R=1]"); - System.out.println("0 = " - + new CumulativePermission().set(BasePermission.ADMINISTRATION) + assertThat(new CumulativePermission().set(BasePermission.ADMINISTRATION) .set(BasePermission.READ).clear(BasePermission.ADMINISTRATION) - .clear(BasePermission.READ).toString()); - assertEquals( - "CumulativePermission[................................=0]", - new CumulativePermission().set(BasePermission.ADMINISTRATION) - .set(BasePermission.READ).clear(BasePermission.ADMINISTRATION) - .clear(BasePermission.READ).toString()); + .clear(BasePermission.READ).toString()) + .isEqualTo("CumulativePermission[................................=0]"); } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java index b483640ff1..8c57e6a8c6 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java @@ -1,6 +1,7 @@ package org.springframework.security.acls.jdbc; -import junit.framework.Assert; +import static org.assertj.core.api.Assertions.*; + import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Ehcache; @@ -45,14 +46,12 @@ public class BasicLookupStrategyTests { @BeforeClass public static void initCacheManaer() { cacheManager = CacheManager.create(); - cacheManager - .addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30)); + cacheManager.addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30)); } @BeforeClass public static void createDatabase() throws Exception { - dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:lookupstrategytest", - "sa", "", true); + dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:lookupstrategytest", "sa", "", true); dataSource.setDriverClassName("org.hsqldb.jdbcDriver"); jdbcTemplate = new JdbcTemplate(dataSource); @@ -75,9 +74,7 @@ public class BasicLookupStrategyTests { @Before public void populateDatabase() { String query = "INSERT INTO acl_sid(ID,PRINCIPAL,SID) VALUES (1,1,'ben');" - + "INSERT INTO acl_class(ID,CLASS) VALUES (2,'" - + TARGET_CLASS - + "');" + + "INSERT INTO acl_class(ID,CLASS) VALUES (2,'" + TARGET_CLASS + "');" + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (1,2,100,null,1,1);" + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (2,2,101,1,1,1);" + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (3,2,102,2,1,1);" @@ -102,14 +99,10 @@ public class BasicLookupStrategyTests { @After public void emptyDatabase() { - String query = "DELETE FROM acl_entry;" - + "DELETE FROM acl_object_identity WHERE ID = 7;" - + "DELETE FROM acl_object_identity WHERE ID = 6;" - + "DELETE FROM acl_object_identity WHERE ID = 5;" - + "DELETE FROM acl_object_identity WHERE ID = 4;" - + "DELETE FROM acl_object_identity WHERE ID = 3;" - + "DELETE FROM acl_object_identity WHERE ID = 2;" - + "DELETE FROM acl_object_identity WHERE ID = 1;" + String query = "DELETE FROM acl_entry;" + "DELETE FROM acl_object_identity WHERE ID = 7;" + + "DELETE FROM acl_object_identity WHERE ID = 6;" + "DELETE FROM acl_object_identity WHERE ID = 5;" + + "DELETE FROM acl_object_identity WHERE ID = 4;" + "DELETE FROM acl_object_identity WHERE ID = 3;" + + "DELETE FROM acl_object_identity WHERE ID = 2;" + "DELETE FROM acl_object_identity WHERE ID = 1;" + "DELETE FROM acl_class;" + "DELETE FROM acl_sid;"; jdbcTemplate.execute(query); } @@ -123,33 +116,29 @@ public class BasicLookupStrategyTests { @Test public void testAclsRetrievalWithDefaultBatchSize() throws Exception { ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100)); - ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long( - 101)); - // Deliberately use an integer for the child, to reproduce bug report in SEC-819 - ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, - Integer.valueOf(102)); + ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101)); + // Deliberately use an integer for the child, to reproduce bug report in + // SEC-819 + ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(102)); - Map map = this.strategy.readAclsById( - Arrays.asList(topParentOid, middleParentOid, childOid), null); + Map map = this.strategy + .readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null); checkEntries(topParentOid, middleParentOid, childOid, map); } @Test public void testAclsRetrievalFromCacheOnly() throws Exception { - ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, - Integer.valueOf(100)); - ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long( - 101)); + ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(100)); + ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101)); ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102)); // Objects were put in cache - strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), - null); + strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null); // Let's empty the database to force acls retrieval from cache emptyDatabase(); - Map map = this.strategy.readAclsById( - Arrays.asList(topParentOid, middleParentOid, childOid), null); + Map map = this.strategy + .readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null); checkEntries(topParentOid, middleParentOid, childOid, map); } @@ -157,99 +146,83 @@ public class BasicLookupStrategyTests { @Test public void testAclsRetrievalWithCustomBatchSize() throws Exception { ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100)); - ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, - Integer.valueOf(101)); + ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101)); ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102)); - // Set a batch size to allow multiple database queries in order to retrieve all + // Set a batch size to allow multiple database queries in order to + // retrieve all // acls this.strategy.setBatchSize(1); - Map map = this.strategy.readAclsById( - Arrays.asList(topParentOid, middleParentOid, childOid), null); + Map map = this.strategy + .readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null); checkEntries(topParentOid, middleParentOid, childOid, map); } - private void checkEntries(ObjectIdentity topParentOid, - ObjectIdentity middleParentOid, ObjectIdentity childOid, + private void checkEntries(ObjectIdentity topParentOid, ObjectIdentity middleParentOid, ObjectIdentity childOid, Map map) throws Exception { - Assert.assertEquals(3, map.size()); + assertThat(map).hasSize(3); MutableAcl topParent = (MutableAcl) map.get(topParentOid); MutableAcl middleParent = (MutableAcl) map.get(middleParentOid); MutableAcl child = (MutableAcl) map.get(childOid); // Check the retrieved versions has IDs - Assert.assertNotNull(topParent.getId()); - Assert.assertNotNull(middleParent.getId()); - Assert.assertNotNull(child.getId()); + assertThat(topParent.getId()).isNotNull(); + assertThat(middleParent.getId()).isNotNull(); + assertThat(child.getId()).isNotNull(); // Check their parents were correctly retrieved - Assert.assertNull(topParent.getParentAcl()); - Assert.assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity()); - Assert.assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity()); + assertThat(topParent.getParentAcl()).isNull(); + assertThat(middleParent.getParentAcl().getObjectIdentity()).isEqualTo(topParentOid); + assertThat(child.getParentAcl().getObjectIdentity()).isEqualTo(middleParentOid); // Check their ACEs were correctly retrieved - Assert.assertEquals(2, topParent.getEntries().size()); - Assert.assertEquals(1, middleParent.getEntries().size()); - Assert.assertEquals(1, child.getEntries().size()); + assertThat(topParent.getEntries()).hasSize(2); + assertThat(middleParent.getEntries()).hasSize(1); + assertThat(child.getEntries()).hasSize(1); // Check object identities were correctly retrieved - Assert.assertEquals(topParentOid, topParent.getObjectIdentity()); - Assert.assertEquals(middleParentOid, middleParent.getObjectIdentity()); - Assert.assertEquals(childOid, child.getObjectIdentity()); + assertThat(topParent.getObjectIdentity()).isEqualTo(topParentOid); + assertThat(middleParent.getObjectIdentity()).isEqualTo(middleParentOid); + assertThat(child.getObjectIdentity()).isEqualTo(childOid); // Check each entry - Assert.assertTrue(topParent.isEntriesInheriting()); - Assert.assertEquals(topParent.getId(), Long.valueOf(1)); - Assert.assertEquals(topParent.getOwner(), new PrincipalSid("ben")); - Assert.assertEquals(topParent.getEntries().get(0).getId(), Long.valueOf(1)); - Assert.assertEquals(topParent.getEntries().get(0).getPermission(), - BasePermission.READ); - Assert.assertEquals(topParent.getEntries().get(0).getSid(), new PrincipalSid( - "ben")); - Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0)) - .isAuditFailure()); - Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0)) - .isAuditSuccess()); - Assert.assertTrue((topParent.getEntries().get(0)).isGranting()); + assertThat(topParent.isEntriesInheriting()).isTrue(); + assertThat(Long.valueOf(1)).isEqualTo(topParent.getId()); + assertThat(new PrincipalSid("ben")).isEqualTo(topParent.getOwner()); + assertThat(Long.valueOf(1)).isEqualTo(topParent.getEntries().get(0).getId()); + assertThat(topParent.getEntries().get(0).getPermission()).isEqualTo(BasePermission.READ); + assertThat(topParent.getEntries().get(0).getSid()).isEqualTo(new PrincipalSid("ben")); + assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(0)).isAuditFailure()).isFalse(); + assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(0)).isAuditSuccess()).isFalse(); + assertThat((topParent.getEntries().get(0)).isGranting()).isTrue(); - Assert.assertEquals(topParent.getEntries().get(1).getId(), Long.valueOf(2)); - Assert.assertEquals(topParent.getEntries().get(1).getPermission(), - BasePermission.WRITE); - Assert.assertEquals(topParent.getEntries().get(1).getSid(), new PrincipalSid( - "ben")); - Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1)) - .isAuditFailure()); - Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1)) - .isAuditSuccess()); - Assert.assertFalse(topParent.getEntries().get(1).isGranting()); + assertThat(Long.valueOf(2)).isEqualTo(topParent.getEntries().get(1).getId()); + assertThat(topParent.getEntries().get(1).getPermission()).isEqualTo(BasePermission.WRITE); + assertThat(topParent.getEntries().get(1).getSid()).isEqualTo(new PrincipalSid("ben")); + assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(1)).isAuditFailure()).isFalse(); + assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(1)).isAuditSuccess()).isFalse(); + assertThat(topParent.getEntries().get(1).isGranting()).isFalse(); - Assert.assertTrue(middleParent.isEntriesInheriting()); - Assert.assertEquals(middleParent.getId(), Long.valueOf(2)); - Assert.assertEquals(middleParent.getOwner(), new PrincipalSid("ben")); - Assert.assertEquals(middleParent.getEntries().get(0).getId(), Long.valueOf(3)); - Assert.assertEquals(middleParent.getEntries().get(0).getPermission(), - BasePermission.DELETE); - Assert.assertEquals(middleParent.getEntries().get(0).getSid(), new PrincipalSid( - "ben")); - Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries() - .get(0)).isAuditFailure()); - Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries() - .get(0)).isAuditSuccess()); - Assert.assertTrue(middleParent.getEntries().get(0).isGranting()); + assertThat(middleParent.isEntriesInheriting()).isTrue(); + assertThat(Long.valueOf(2)).isEqualTo(middleParent.getId()); + assertThat(new PrincipalSid("ben")).isEqualTo(middleParent.getOwner()); + assertThat(Long.valueOf(3)).isEqualTo(middleParent.getEntries().get(0).getId()); + assertThat(middleParent.getEntries().get(0).getPermission()).isEqualTo(BasePermission.DELETE); + assertThat(middleParent.getEntries().get(0).getSid()).isEqualTo(new PrincipalSid("ben")); + assertThat(((AuditableAccessControlEntry) middleParent.getEntries().get(0)).isAuditFailure()).isFalse(); + assertThat(((AuditableAccessControlEntry) middleParent.getEntries().get(0)).isAuditSuccess()).isFalse(); + assertThat(middleParent.getEntries().get(0).isGranting()).isTrue(); - Assert.assertTrue(child.isEntriesInheriting()); - Assert.assertEquals(child.getId(), Long.valueOf(3)); - Assert.assertEquals(child.getOwner(), new PrincipalSid("ben")); - Assert.assertEquals(child.getEntries().get(0).getId(), Long.valueOf(4)); - Assert.assertEquals(child.getEntries().get(0).getPermission(), - BasePermission.DELETE); - Assert.assertEquals(child.getEntries().get(0).getSid(), new PrincipalSid("ben")); - Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0)) - .isAuditFailure()); - Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0)) - .isAuditSuccess()); - Assert.assertFalse((child.getEntries().get(0)).isGranting()); + assertThat(child.isEntriesInheriting()).isTrue(); + assertThat(Long.valueOf(3)).isEqualTo(child.getId()); + assertThat(new PrincipalSid("ben")).isEqualTo(child.getOwner()); + assertThat(Long.valueOf(4)).isEqualTo(child.getEntries().get(0).getId()); + assertThat(child.getEntries().get(0).getPermission()).isEqualTo(BasePermission.DELETE); + assertThat(new PrincipalSid("ben")).isEqualTo(child.getEntries().get(0).getSid()); + assertThat(((AuditableAccessControlEntry) child.getEntries().get(0)).isAuditFailure()).isFalse(); + assertThat(((AuditableAccessControlEntry) child.getEntries().get(0)).isAuditSuccess()).isFalse(); + assertThat((child.getEntries().get(0)).isGranting()).isFalse(); } @Test @@ -257,36 +230,31 @@ public class BasicLookupStrategyTests { String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,103,1,1,1);"; jdbcTemplate.execute(query); - ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, - Long.valueOf(100)); - ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, - Long.valueOf(101)); + ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100)); + ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101)); ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102)); - ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS, - Long.valueOf(103)); + ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(103)); // Retrieve the child - Map map = this.strategy.readAclsById( - Arrays.asList(childOid), null); + Map map = this.strategy.readAclsById(Arrays.asList(childOid), null); // Check that the child and all its parents were retrieved - Assert.assertNotNull(map.get(childOid)); - Assert.assertEquals(childOid, map.get(childOid).getObjectIdentity()); - Assert.assertNotNull(map.get(middleParentOid)); - Assert.assertEquals(middleParentOid, map.get(middleParentOid).getObjectIdentity()); - Assert.assertNotNull(map.get(topParentOid)); - Assert.assertEquals(topParentOid, map.get(topParentOid).getObjectIdentity()); + assertThat(map.get(childOid)).isNotNull(); + assertThat(map.get(childOid).getObjectIdentity()).isEqualTo(childOid); + assertThat(map.get(middleParentOid)).isNotNull(); + assertThat(map.get(middleParentOid).getObjectIdentity()).isEqualTo(middleParentOid); + assertThat(map.get(topParentOid)).isNotNull(); + assertThat(map.get(topParentOid).getObjectIdentity()).isEqualTo(topParentOid); // The second parent shouldn't have been retrieved - Assert.assertNull(map.get(middleParent2Oid)); + assertThat(map.get(middleParent2Oid)).isNull(); } /** * Test created from SEC-590. */ @Test - public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached() - throws Exception { + public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached() throws Exception { String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,104,null,1,1);" + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (5,2,105,4,1,1);" + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (6,2,106,4,1,1);" @@ -294,15 +262,13 @@ public class BasicLookupStrategyTests { + "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (5,4,0,1,1,1,0,0)"; jdbcTemplate.execute(query); - ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, - new Long(104)); + ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104)); ObjectIdentity parent1Oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(105)); - ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS, - Integer.valueOf(106)); - ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, - Integer.valueOf(107)); + ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(106)); + ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(107)); - // First lookup only child, thus populating the cache with grandParent, parent1 + // First lookup only child, thus populating the cache with grandParent, + // parent1 // and child List checkPermission = Arrays.asList(BasePermission.READ); List sids = Arrays.asList(BEN_SID); @@ -312,25 +278,25 @@ public class BasicLookupStrategyTests { Map foundAcls = strategy.readAclsById(childOids, sids); Acl foundChildAcl = foundAcls.get(childOid); - Assert.assertNotNull(foundChildAcl); - Assert.assertTrue(foundChildAcl.isGranted(checkPermission, sids, false)); + assertThat(foundChildAcl).isNotNull(); + assertThat(foundChildAcl.isGranted(checkPermission, sids, false)).isTrue(); - // Search for object identities has to be done in the following order: last + // Search for object identities has to be done in the following order: + // last // element have to be one which - // is already in cache and the element before it must not be stored in cache - List allOids = Arrays.asList(grandParentOid, parent1Oid, - parent2Oid, childOid); + // is already in cache and the element before it must not be stored in + // cache + List allOids = Arrays.asList(grandParentOid, parent1Oid, parent2Oid, childOid); try { foundAcls = strategy.readAclsById(allOids, sids); - Assert.assertTrue(true); - } - catch (NotFoundException notExpected) { - Assert.fail("It shouldn't have thrown NotFoundException"); + + } catch (NotFoundException notExpected) { + fail("It shouldn't have thrown NotFoundException"); } Acl foundParent2Acl = foundAcls.get(parent2Oid); - Assert.assertNotNull(foundParent2Acl); - Assert.assertTrue(foundParent2Acl.isGranted(checkPermission, sids, false)); + assertThat(foundParent2Acl).isNotNull(); + assertThat(foundParent2Acl.isGranted(checkPermission, sids, false)).isTrue(); } @Test(expected = IllegalArgumentException.class) @@ -348,16 +314,16 @@ public class BasicLookupStrategyTests { public void testCreatePrincipalSid() { Sid result = strategy.createSid(true, "sid"); - Assert.assertEquals(PrincipalSid.class, result.getClass()); - Assert.assertEquals("sid", ((PrincipalSid) result).getPrincipal()); + assertThat(result.getClass()).isEqualTo(PrincipalSid.class); + assertThat(((PrincipalSid) result).getPrincipal()).isEqualTo("sid"); } @Test public void testCreateGrantedAuthority() { Sid result = strategy.createSid(false, "sid"); - Assert.assertEquals(GrantedAuthoritySid.class, result.getClass()); - Assert.assertEquals("sid", ((GrantedAuthoritySid) result).getGrantedAuthority()); + assertThat(result.getClass()).isEqualTo(GrantedAuthoritySid.class); + assertThat(((GrantedAuthoritySid) result).getGrantedAuthority()).isEqualTo("sid"); } } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java index baf3d9e99e..2e9bc069bb 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java @@ -2,8 +2,7 @@ package org.springframework.security.acls.jdbc; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; -import static org.junit.Assert.*; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import java.io.File; import java.io.FileInputStream; @@ -94,7 +93,6 @@ public class EhCacheBasedAclCacheTests { fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); } try { @@ -103,7 +101,6 @@ public class EhCacheBasedAclCacheTests { fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); } try { @@ -112,7 +109,6 @@ public class EhCacheBasedAclCacheTests { fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); } try { @@ -121,7 +117,6 @@ public class EhCacheBasedAclCacheTests { fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); } try { @@ -130,7 +125,6 @@ public class EhCacheBasedAclCacheTests { fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); } } @@ -149,15 +143,15 @@ public class EhCacheBasedAclCacheTests { MutableAcl retrieved = (MutableAcl) ois.readObject(); ois.close(); - assertEquals(acl, retrieved); + assertThat(retrieved).isEqualTo(acl); Object retrieved1 = FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy", retrieved); - assertEquals(null, retrieved1); + assertThat(retrieved1).isEqualTo(null); Object retrieved2 = FieldUtils.getProtectedFieldValue( "permissionGrantingStrategy", retrieved); - assertEquals(null, retrieved2); + assertThat(retrieved2).isEqualTo(null); } @Test diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java index 09d80760b5..5a4b9559e5 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java @@ -14,7 +14,7 @@ */ package org.springframework.security.acls.jdbc; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -147,7 +147,7 @@ public class JdbcMutableAclServiceTests extends // Let's check if we can read them back correctly Map map = jdbcMutableAclService.readAclsById(Arrays.asList( topParentOid, middleParentOid, childOid)); - assertEquals(3, map.size()); + assertThat(map).hasSize(3); // Replace our current objects with their retrieved versions topParent = (MutableAcl) map.get(topParentOid); @@ -155,19 +155,19 @@ public class JdbcMutableAclServiceTests extends child = (MutableAcl) map.get(childOid); // Check the retrieved versions has IDs - assertNotNull(topParent.getId()); - assertNotNull(middleParent.getId()); - assertNotNull(child.getId()); + assertThat(topParent.getId()).isNotNull(); + assertThat(middleParent.getId()).isNotNull(); + assertThat(child.getId()).isNotNull(); // Check their parents were correctly persisted - assertNull(topParent.getParentAcl()); - assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity()); - assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity()); + assertThat(topParent.getParentAcl()).isNull(); + assertThat(middleParent.getParentAcl().getObjectIdentity()).isEqualTo(topParentOid); + assertThat(child.getParentAcl().getObjectIdentity()).isEqualTo(middleParentOid); // Check their ACEs were correctly persisted - assertEquals(2, topParent.getEntries().size()); - assertEquals(1, middleParent.getEntries().size()); - assertEquals(1, child.getEntries().size()); + assertThat(topParent.getEntries()).hasSize(2); + assertThat(middleParent.getEntries()).hasSize(1); + assertThat(child.getEntries()).hasSize(1); // Check the retrieved rights are correct List read = Arrays.asList(BasePermission.READ); @@ -175,39 +175,39 @@ public class JdbcMutableAclServiceTests extends List delete = Arrays.asList(BasePermission.DELETE); List pSid = Arrays.asList((Sid) new PrincipalSid(auth)); - assertTrue(topParent.isGranted(read, pSid, false)); - assertFalse(topParent.isGranted(write, pSid, false)); - assertTrue(middleParent.isGranted(delete, pSid, false)); - assertFalse(child.isGranted(delete, pSid, false)); + assertThat(topParent.isGranted(read, pSid, false)).isTrue(); + assertThat(topParent.isGranted(write, pSid, false)).isFalse(); + assertThat(middleParent.isGranted(delete, pSid, false)).isTrue(); + assertThat(child.isGranted(delete, pSid, false)).isFalse(); try { child.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), pSid, false); fail("Should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } // Now check the inherited rights (when not explicitly overridden) also look OK - assertTrue(child.isGranted(read, pSid, false)); - assertFalse(child.isGranted(write, pSid, false)); - assertFalse(child.isGranted(delete, pSid, false)); + assertThat(child.isGranted(read, pSid, false)).isTrue(); + assertThat(child.isGranted(write, pSid, false)).isFalse(); + assertThat(child.isGranted(delete, pSid, false)).isFalse(); // Next change the child so it doesn't inherit permissions from above child.setEntriesInheriting(false); jdbcMutableAclService.updateAcl(child); child = (MutableAcl) jdbcMutableAclService.readAclById(childOid); - assertFalse(child.isEntriesInheriting()); + assertThat(child.isEntriesInheriting()).isFalse(); // Check the child permissions no longer inherit - assertFalse(child.isGranted(delete, pSid, true)); + assertThat(child.isGranted(delete, pSid, true)).isFalse(); try { child.isGranted(read, pSid, true); fail("Should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } try { @@ -215,7 +215,7 @@ public class JdbcMutableAclServiceTests extends fail("Should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } // Let's add an identical permission to the child, but it'll appear AFTER the @@ -228,7 +228,7 @@ public class JdbcMutableAclServiceTests extends // Save the changed child jdbcMutableAclService.updateAcl(child); child = (MutableAcl) jdbcMutableAclService.readAclById(childOid); - assertEquals(3, child.getEntries().size()); + assertThat(child.getEntries()).hasSize(3); // Output permissions for (int i = 0; i < child.getEntries().size(); i++) { @@ -236,25 +236,25 @@ public class JdbcMutableAclServiceTests extends } // Check the permissions are as they should be - assertFalse(child.isGranted(delete, pSid, true)); // as earlier permission + assertThat(child.isGranted(delete, pSid, true)).isFalse(); // as earlier permission // overrode - assertTrue(child.isGranted(Arrays.asList(BasePermission.CREATE), pSid, true)); + assertThat(child.isGranted(Arrays.asList(BasePermission.CREATE), pSid, true)).isTrue(); // Now check the first ACE (index 0) really is DELETE for our Sid and is // non-granting AccessControlEntry entry = child.getEntries().get(0); - assertEquals(BasePermission.DELETE.getMask(), entry.getPermission().getMask()); - assertEquals(new PrincipalSid(auth), entry.getSid()); - assertFalse(entry.isGranting()); - assertNotNull(entry.getId()); + assertThat(entry.getPermission().getMask()).isEqualTo(BasePermission.DELETE.getMask()); + assertThat(entry.getSid()).isEqualTo(new PrincipalSid(auth)); + assertThat(entry.isGranting()).isFalse(); + assertThat(entry.getId()).isNotNull(); // Now delete that first ACE child.deleteAce(0); // Save and check it worked child = jdbcMutableAclService.updateAcl(child); - assertEquals(2, child.getEntries().size()); - assertTrue(child.isGranted(delete, pSid, false)); + assertThat(child.getEntries()).hasSize(2); + assertThat(child.isGranted(delete, pSid, false)).isTrue(); SecurityContextHolder.clearContext(); } @@ -276,7 +276,7 @@ public class JdbcMutableAclServiceTests extends // Check the childOid really is a child of middleParentOid Acl childAcl = jdbcMutableAclService.readAclById(childOid); - assertEquals(middleParentOid, childAcl.getParentAcl().getObjectIdentity()); + assertThat(childAcl.getParentAcl().getObjectIdentity()).isEqualTo(middleParentOid); // Delete the mid-parent and test if the child was deleted, as well jdbcMutableAclService.deleteAcl(middleParentOid, true); @@ -286,19 +286,19 @@ public class JdbcMutableAclServiceTests extends fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } try { jdbcMutableAclService.readAclById(childOid); fail("It should have thrown NotFoundException"); } catch (NotFoundException expected) { - assertTrue(true); + } Acl acl = jdbcMutableAclService.readAclById(topParentOid); - assertNotNull(acl); - assertEquals(((MutableAcl) acl).getObjectIdentity(), topParentOid); + assertThat(acl).isNotNull(); + assertThat(topParentOid).isEqualTo(((MutableAcl) acl).getObjectIdentity()); } @Test @@ -398,17 +398,16 @@ public class JdbcMutableAclServiceTests extends // Remove the child and check all related database rows were removed accordingly jdbcMutableAclService.deleteAcl(childOid, false); - assertEquals( - 1, + assertThat( jdbcTemplate.queryForList(SELECT_ALL_CLASSES, - new Object[] { TARGET_CLASS }).size()); - assertEquals(0, jdbcTemplate.queryForList("select * from acl_object_identity") - .size()); - assertEquals(0, jdbcTemplate.queryForList("select * from acl_entry").size()); + new Object[] { TARGET_CLASS })).hasSize(1); + assertThat(jdbcTemplate.queryForList("select * from acl_object_identity") + ).isEmpty(); + assertThat(jdbcTemplate.queryForList("select * from acl_entry")).isEmpty(); // Check the cache - assertNull(aclCache.getFromCache(childOid)); - assertNull(aclCache.getFromCache(Long.valueOf(102))); + assertThat(aclCache.getFromCache(childOid)).isNull(); + assertThat(aclCache.getFromCache(Long.valueOf(102))).isNull(); } /** SEC-1107 */ @@ -419,8 +418,8 @@ public class JdbcMutableAclServiceTests extends ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101)); jdbcMutableAclService.createAcl(oid); - assertNotNull(jdbcMutableAclService.readAclById(new ObjectIdentityImpl( - TARGET_CLASS, Long.valueOf(101)))); + assertThat(jdbcMutableAclService.readAclById(new ObjectIdentityImpl( + TARGET_CLASS, Long.valueOf(101)))).isNotNull(); } /** @@ -454,12 +453,11 @@ public class JdbcMutableAclServiceTests extends child = (MutableAcl) jdbcMutableAclService.readAclById(childOid); parent = (MutableAcl) child.getParentAcl(); - assertEquals("Fails because child has a stale reference to its parent", 2, parent - .getEntries().size()); - assertEquals(1, parent.getEntries().get(0).getPermission().getMask()); - assertEquals(new PrincipalSid("ben"), parent.getEntries().get(0).getSid()); - assertEquals(1, parent.getEntries().get(1).getPermission().getMask()); - assertEquals(new PrincipalSid("scott"), parent.getEntries().get(1).getSid()); + assertThat(parent.getEntries()).hasSize(2).withFailMessage("Fails because child has a stale reference to its parent"); + assertThat(parent.getEntries().get(0).getPermission().getMask()).isEqualTo(1); + assertThat(parent.getEntries().get(0).getSid()).isEqualTo(new PrincipalSid("ben")); + assertThat(parent.getEntries().get(1).getPermission().getMask()).isEqualTo(1); + assertThat(parent.getEntries().get(1).getSid()).isEqualTo(new PrincipalSid("scott")); } /** @@ -492,12 +490,12 @@ public class JdbcMutableAclServiceTests extends parent = (MutableAcl) child.getParentAcl(); - assertEquals(2, parent.getEntries().size()); - assertEquals(16, parent.getEntries().get(0).getPermission().getMask()); - assertEquals(new GrantedAuthoritySid("ROLE_ADMINISTRATOR"), parent.getEntries() - .get(0).getSid()); - assertEquals(8, parent.getEntries().get(1).getPermission().getMask()); - assertEquals(new PrincipalSid("terry"), parent.getEntries().get(1).getSid()); + assertThat(parent.getEntries()).hasSize(2); + assertThat(parent.getEntries().get(0).getPermission().getMask()).isEqualTo(16); + assertThat(parent.getEntries() + .get(0).getSid()).isEqualTo(new GrantedAuthoritySid("ROLE_ADMINISTRATOR")); + assertThat(parent.getEntries().get(1).getPermission().getMask()).isEqualTo(8); + assertThat(parent.getEntries().get(1).getSid()).isEqualTo(new PrincipalSid("terry")); } @Test @@ -515,17 +513,17 @@ public class JdbcMutableAclServiceTests extends // Add an ACE permission entry Permission cm = new CumulativePermission().set(BasePermission.READ).set( BasePermission.ADMINISTRATION); - assertEquals(17, cm.getMask()); + assertThat(cm.getMask()).isEqualTo(17); Sid benSid = new PrincipalSid(auth); topParent.insertAce(0, cm, benSid, true); - assertEquals(1, topParent.getEntries().size()); + assertThat(topParent.getEntries()).hasSize(1); // Explicitly save the changed ACL topParent = jdbcMutableAclService.updateAcl(topParent); // Check the mask was retrieved correctly - assertEquals(17, topParent.getEntries().get(0).getPermission().getMask()); - assertTrue(topParent.isGranted(Arrays.asList(cm), Arrays.asList(benSid), true)); + assertThat(topParent.getEntries().get(0).getPermission().getMask()).isEqualTo(17); + assertThat(topParent.isGranted(Arrays.asList(cm), Arrays.asList(benSid), true)).isTrue(); SecurityContextHolder.clearContext(); } @@ -542,7 +540,7 @@ public class JdbcMutableAclServiceTests extends Long result = customJdbcMutableAclService.createOrRetrieveSidPrimaryKey( customSid, false); - assertEquals(result, new Long(1L)); + assertThat(new Long(1L)).isEqualTo(result); } /** diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java index 9342cdfa6b..7681bd576f 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java @@ -18,7 +18,7 @@ import org.springframework.security.util.FieldUtils; import java.util.Map; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests {@link org.springframework.security.acls.domain.SpringCacheBasedAclCache} @@ -72,12 +72,12 @@ public class SpringCacheBasedAclCacheTests { MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy, auditLogger); - assertEquals(0, realCache.size()); + assertThat(realCache).isEmpty(); myCache.putInCache(acl); // Check we can get from cache the same objects we put in - assertEquals(myCache.getFromCache(Long.valueOf(1)), acl); - assertEquals(myCache.getFromCache(identity), acl); + assertThat(acl).isEqualTo(myCache.getFromCache(Long.valueOf(1))); + assertThat(acl).isEqualTo(myCache.getFromCache(identity)); // Put another object in cache ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101)); @@ -89,17 +89,17 @@ public class SpringCacheBasedAclCacheTests { // Try to evict an entry that doesn't exist myCache.evictFromCache(Long.valueOf(3)); myCache.evictFromCache(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102))); - assertEquals(realCache.size(), 4); + assertThat(4).isEqualTo(realCache.size()); myCache.evictFromCache(Long.valueOf(1)); - assertEquals(realCache.size(), 2); + assertThat(2).isEqualTo(realCache.size()); // Check the second object inserted - assertEquals(myCache.getFromCache(Long.valueOf(2)), acl2); - assertEquals(myCache.getFromCache(identity2), acl2); + assertThat(acl2).isEqualTo(myCache.getFromCache(Long.valueOf(2))); + assertThat(acl2).isEqualTo(myCache.getFromCache(identity2)); myCache.evictFromCache(identity2); - assertEquals(realCache.size(), 0); + assertThat(0).isEqualTo(realCache.size()); } @SuppressWarnings("rawtypes") @@ -133,24 +133,24 @@ public class SpringCacheBasedAclCacheTests { acl.setParent(parentAcl); - assertEquals(0, realCache.size()); + assertThat(realCache).isEmpty(); myCache.putInCache(acl); - assertEquals(realCache.size(), 4); + assertThat(4).isEqualTo(realCache.size()); // Check we can get from cache the same objects we put in AclImpl aclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(1)); - assertEquals(acl, aclFromCache); + assertThat(aclFromCache).isEqualTo(acl); // SEC-951 check transient fields are set on parent - assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(), - "aclAuthorizationStrategy")); - assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(), - "permissionGrantingStrategy")); - assertEquals(acl, myCache.getFromCache(identity)); - assertNotNull(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy")); + assertThat(FieldUtils.getFieldValue(aclFromCache.getParentAcl(), + "aclAuthorizationStrategy")).isNotNull(); + assertThat(FieldUtils.getFieldValue(aclFromCache.getParentAcl(), + "permissionGrantingStrategy")).isNotNull(); + assertThat(myCache.getFromCache(identity)).isEqualTo(acl); + assertThat(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy")).isNotNull(); AclImpl parentAclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(2)); - assertEquals(parentAcl, parentAclFromCache); - assertNotNull(FieldUtils.getFieldValue(parentAclFromCache, - "aclAuthorizationStrategy")); - assertEquals(parentAcl, myCache.getFromCache(identityParent)); + assertThat(parentAclFromCache).isEqualTo(parentAcl); + assertThat(FieldUtils.getFieldValue(parentAclFromCache, + "aclAuthorizationStrategy")).isNotNull(); + assertThat(myCache.getFromCache(identityParent)).isEqualTo(parentAcl); } } diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java index dcd37e97fa..0f6e637a17 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java @@ -1,6 +1,6 @@ package org.springframework.security.acls.sid; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; @@ -38,19 +38,19 @@ public class SidRetrievalStrategyTests { SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl(); List sids = retrStrategy.getSids(authentication); - assertNotNull(sids); - assertEquals(4, sids.size()); - assertNotNull(sids.get(0)); - assertTrue(sids.get(0) instanceof PrincipalSid); + assertThat(sids).isNotNull(); + assertThat(sids).hasSize(4); + assertThat(sids.get(0)).isNotNull(); + assertThat(sids.get(0) instanceof PrincipalSid).isTrue(); for (int i = 1; i < sids.size(); i++) { - assertTrue(sids.get(i) instanceof GrantedAuthoritySid); + assertThat(sids.get(i) instanceof GrantedAuthoritySid).isTrue(); } - assertEquals("scott", ((PrincipalSid) sids.get(0)).getPrincipal()); - assertEquals("A", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority()); - assertEquals("B", ((GrantedAuthoritySid) sids.get(2)).getGrantedAuthority()); - assertEquals("C", ((GrantedAuthoritySid) sids.get(3)).getGrantedAuthority()); + assertThat(((PrincipalSid) sids.get(0)).getPrincipal()).isEqualTo("scott"); + assertThat(((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority()).isEqualTo("A"); + assertThat(((GrantedAuthoritySid) sids.get(2)).getGrantedAuthority()).isEqualTo("B"); + assertThat(((GrantedAuthoritySid) sids.get(3)).getGrantedAuthority()).isEqualTo("C"); } @Test @@ -62,9 +62,9 @@ public class SidRetrievalStrategyTests { SidRetrievalStrategy strat = new SidRetrievalStrategyImpl(rh); List sids = strat.getSids(authentication); - assertEquals(2, sids.size()); - assertNotNull(sids.get(0)); - assertTrue(sids.get(0) instanceof PrincipalSid); - assertEquals("D", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority()); + assertThat(sids).hasSize(2); + assertThat(sids.get(0)).isNotNull(); + assertThat(sids.get(0) instanceof PrincipalSid).isTrue(); + assertThat(((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority()).isEqualTo("D"); } } diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java index d0e7c0d233..22f3b2a031 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java @@ -1,6 +1,7 @@ package org.springframework.security.acls.sid; -import junit.framework.Assert; +import static org.assertj.core.api.Assertions.*; + import junit.framework.TestCase; import org.springframework.security.acls.domain.GrantedAuthoritySid; import org.springframework.security.acls.domain.PrincipalSid; @@ -20,57 +21,43 @@ public class SidTests extends TestCase { try { String string = null; new PrincipalSid(string); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { new PrincipalSid(""); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } - try { - new PrincipalSid("johndoe"); - Assert.assertTrue(true); - } - catch (IllegalArgumentException notExpected) { - Assert.fail("It shouldn't have thrown IllegalArgumentException"); - } + new PrincipalSid("johndoe"); + // throws no exception // Check one Authentication-argument constructor try { Authentication authentication = null; new PrincipalSid(authentication); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } try { Authentication authentication = new TestingAuthenticationToken(null, "password"); new PrincipalSid(authentication); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); } - try { - Authentication authentication = new TestingAuthenticationToken("johndoe", - "password"); - new PrincipalSid(authentication); - Assert.assertTrue(true); - } - catch (IllegalArgumentException notExpected) { - Assert.fail("It shouldn't have thrown IllegalArgumentException"); - } + Authentication authentication = new TestingAuthenticationToken("johndoe", + "password"); + new PrincipalSid(authentication); + // throws no exception } public void testGrantedAuthoritySidConstructorsRequiredFields() throws Exception { @@ -78,54 +65,54 @@ public class SidTests extends TestCase { try { String string = null; new GrantedAuthoritySid(string); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); + } try { new GrantedAuthoritySid(""); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); + } try { new GrantedAuthoritySid("ROLE_TEST"); - Assert.assertTrue(true); + } catch (IllegalArgumentException notExpected) { - Assert.fail("It shouldn't have thrown IllegalArgumentException"); + fail("It shouldn't have thrown IllegalArgumentException"); } // Check one GrantedAuthority-argument constructor try { GrantedAuthority ga = null; new GrantedAuthoritySid(ga); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); + } try { GrantedAuthority ga = new SimpleGrantedAuthority(null); new GrantedAuthoritySid(ga); - Assert.fail("It should have thrown IllegalArgumentException"); + fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - Assert.assertTrue(true); + } try { GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST"); new GrantedAuthoritySid(ga); - Assert.assertTrue(true); + } catch (IllegalArgumentException notExpected) { - Assert.fail("It shouldn't have thrown IllegalArgumentException"); + fail("It shouldn't have thrown IllegalArgumentException"); } } @@ -134,32 +121,32 @@ public class SidTests extends TestCase { "password"); Sid principalSid = new PrincipalSid(authentication); - Assert.assertFalse(principalSid.equals(null)); - Assert.assertFalse(principalSid.equals("DIFFERENT_TYPE_OBJECT")); - Assert.assertTrue(principalSid.equals(principalSid)); - Assert.assertTrue(principalSid.equals(new PrincipalSid(authentication))); - Assert.assertTrue(principalSid.equals(new PrincipalSid( + assertThat(principalSid.equals(null)).isFalse(); + assertThat(principalSid.equals("DIFFERENT_TYPE_OBJECT")).isFalse(); + assertThat(principalSid.equals(principalSid)).isTrue(); + assertThat(principalSid.equals(new PrincipalSid(authentication))).isTrue(); + assertTrue(principalSid.equals(new PrincipalSid( new TestingAuthenticationToken("johndoe", null)))); - Assert.assertFalse(principalSid.equals(new PrincipalSid( + assertFalse(principalSid.equals(new PrincipalSid( new TestingAuthenticationToken("scott", null)))); - Assert.assertTrue(principalSid.equals(new PrincipalSid("johndoe"))); - Assert.assertFalse(principalSid.equals(new PrincipalSid("scott"))); + assertThat(principalSid.equals(new PrincipalSid("johndoe"))).isTrue(); + assertThat(principalSid.equals(new PrincipalSid("scott"))).isFalse(); } public void testGrantedAuthoritySidEquals() throws Exception { GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST"); Sid gaSid = new GrantedAuthoritySid(ga); - Assert.assertFalse(gaSid.equals(null)); - Assert.assertFalse(gaSid.equals("DIFFERENT_TYPE_OBJECT")); - Assert.assertTrue(gaSid.equals(gaSid)); - Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(ga))); - Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid( + assertThat(gaSid.equals(null)).isFalse(); + assertThat(gaSid.equals("DIFFERENT_TYPE_OBJECT")).isFalse(); + assertThat(gaSid.equals(gaSid)).isTrue(); + assertThat(gaSid.equals(new GrantedAuthoritySid(ga))).isTrue(); + assertTrue(gaSid.equals(new GrantedAuthoritySid( new SimpleGrantedAuthority("ROLE_TEST")))); - Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid( + assertFalse(gaSid.equals(new GrantedAuthoritySid( new SimpleGrantedAuthority("ROLE_NOT_EQUAL")))); - Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid("ROLE_TEST"))); - Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid("ROLE_NOT_EQUAL"))); + assertThat(gaSid.equals(new GrantedAuthoritySid("ROLE_TEST"))).isTrue(); + assertThat(gaSid.equals(new GrantedAuthoritySid("ROLE_NOT_EQUAL"))).isFalse(); } public void testPrincipalSidHashCode() throws Exception { @@ -167,11 +154,10 @@ public class SidTests extends TestCase { "password"); Sid principalSid = new PrincipalSid(authentication); - Assert.assertTrue(principalSid.hashCode() == "johndoe".hashCode()); - Assert.assertTrue(principalSid.hashCode() == new PrincipalSid("johndoe") - .hashCode()); - Assert.assertTrue(principalSid.hashCode() != new PrincipalSid("scott").hashCode()); - Assert.assertTrue(principalSid.hashCode() != new PrincipalSid( + assertThat(principalSid.hashCode()).isSameAs("johndoe".hashCode()); + assertThat(principalSid.hashCode()).isSameAs(new PrincipalSid("johndoe").hashCode()); + assertThat(principalSid.hashCode()).isNotEqualTo(new PrincipalSid("scott").hashCode()); + assertThat(principalSid.hashCode()).isNotEqualTo(new PrincipalSid( new TestingAuthenticationToken("scott", "password")).hashCode()); } @@ -179,12 +165,12 @@ public class SidTests extends TestCase { GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST"); Sid gaSid = new GrantedAuthoritySid(ga); - Assert.assertTrue(gaSid.hashCode() == "ROLE_TEST".hashCode()); - Assert.assertTrue(gaSid.hashCode() == new GrantedAuthoritySid("ROLE_TEST") + assertThat(gaSid.hashCode()).isEqualTo("ROLE_TEST".hashCode()); + assertThat(gaSid.hashCode()).isEqualTo(new GrantedAuthoritySid("ROLE_TEST") .hashCode()); - Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid("ROLE_TEST_2") + assertThat(gaSid.hashCode()).isNotEqualTo(new GrantedAuthoritySid("ROLE_TEST_2") .hashCode()); - Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid( + assertThat(gaSid.hashCode()).isNotEqualTo(new GrantedAuthoritySid( new SimpleGrantedAuthority("ROLE_TEST_2")).hashCode()); } @@ -195,10 +181,10 @@ public class SidTests extends TestCase { GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST"); GrantedAuthoritySid gaSid = new GrantedAuthoritySid(ga); - Assert.assertTrue("johndoe".equals(principalSid.getPrincipal())); - Assert.assertFalse("scott".equals(principalSid.getPrincipal())); + assertThat("johndoe".equals(principalSid.getPrincipal())).isTrue(); + assertThat("scott".equals(principalSid.getPrincipal())).isFalse(); - Assert.assertTrue("ROLE_TEST".equals(gaSid.getGrantedAuthority())); - Assert.assertFalse("ROLE_TEST2".equals(gaSid.getGrantedAuthority())); + assertThat("ROLE_TEST".equals(gaSid.getGrantedAuthority())).isTrue(); + assertThat("ROLE_TEST2".equals(gaSid.getGrantedAuthority())).isFalse(); } } diff --git a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java index bce258a5f0..c5bd74869a 100644 --- a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java +++ b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.intercept.aspectj.aspect; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.Arrays; @@ -129,9 +129,9 @@ public class AnnotationSecurityAspectTests { configureForElAnnotations(); SecurityContextHolder.getContext().setAuthentication(anne); List objects = prePostSecured.postFilterMethod(); - assertEquals(2, objects.size()); - assertTrue(objects.contains("apple")); - assertTrue(objects.contains("aubergine")); + assertThat(objects).hasSize(2); + assertThat(objects.contains("apple")).isTrue(); + assertThat(objects.contains("aubergine")).isTrue(); } private void configureForElAnnotations() { diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index 387515f416..f5dccd3c7c 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -16,7 +16,7 @@ package org.springframework.security.cas.authentication; import static org.mockito.Mockito.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.jasig.cas.client.validation.Assertion; import org.jasig.cas.client.validation.AssertionImpl; @@ -90,28 +90,28 @@ public class CasAuthenticationProviderTests { Authentication result = cap.authenticate(token); // Confirm ST-123 was NOT added to the cache - assertTrue(cache.getByTicketId("ST-456") == null); + assertThat(cache.getByTicketId("ST-456") == null).isTrue(); if (!(result instanceof CasAuthenticationToken)) { fail("Should have returned a CasAuthenticationToken"); } CasAuthenticationToken casResult = (CasAuthenticationToken) result; - assertEquals(makeUserDetailsFromAuthoritiesPopulator(), casResult.getPrincipal()); - assertEquals("ST-123", casResult.getCredentials()); - assertTrue(casResult.getAuthorities().contains( - new SimpleGrantedAuthority("ROLE_A"))); - assertTrue(casResult.getAuthorities().contains( - new SimpleGrantedAuthority("ROLE_B"))); - assertEquals(cap.getKey().hashCode(), casResult.getKeyHash()); - assertEquals("details", casResult.getDetails()); + assertThat(casResult.getPrincipal()).isEqualTo(makeUserDetailsFromAuthoritiesPopulator()); + assertThat(casResult.getCredentials()).isEqualTo("ST-123"); + assertThat(casResult.getAuthorities()).contains( + new SimpleGrantedAuthority("ROLE_A")); + assertThat(casResult.getAuthorities()).contains( + new SimpleGrantedAuthority("ROLE_B")); + assertThat(casResult.getKeyHash()).isEqualTo(cap.getKey().hashCode()); + assertThat(casResult.getDetails()).isEqualTo("details"); // Now confirm the CasAuthenticationToken is automatically re-accepted. // To ensure TicketValidator not called again, set it to deliver an exception... cap.setTicketValidator(new MockTicketValidator(false)); Authentication laterResult = cap.authenticate(result); - assertEquals(result, laterResult); + assertThat(laterResult).isEqualTo(result); } @Test @@ -133,15 +133,15 @@ public class CasAuthenticationProviderTests { Authentication result = cap.authenticate(token); // Confirm ST-456 was added to the cache - assertTrue(cache.getByTicketId("ST-456") != null); + assertThat(cache.getByTicketId("ST-456") != null).isTrue(); if (!(result instanceof CasAuthenticationToken)) { fail("Should have returned a CasAuthenticationToken"); } - assertEquals(makeUserDetailsFromAuthoritiesPopulator(), result.getPrincipal()); - assertEquals("ST-456", result.getCredentials()); - assertEquals("details", result.getDetails()); + assertThat(result.getPrincipal()).isEqualTo(makeUserDetailsFromAuthoritiesPopulator()); + assertThat(result.getCredentials()).isEqualTo("ST-456"); + assertThat(result.getDetails()).isEqualTo("details"); // Now try to authenticate again. To ensure TicketValidator not // called again, set it to deliver an exception... @@ -149,8 +149,8 @@ public class CasAuthenticationProviderTests { // Previously created UsernamePasswordAuthenticationToken is OK Authentication newResult = cap.authenticate(token); - assertEquals(makeUserDetailsFromAuthoritiesPopulator(), newResult.getPrincipal()); - assertEquals("ST-456", newResult.getCredentials()); + assertThat(newResult.getPrincipal()).isEqualTo(makeUserDetailsFromAuthoritiesPopulator()); + assertThat(newResult.getCredentials()).isEqualTo("ST-456"); } @Test @@ -331,10 +331,10 @@ public class CasAuthenticationProviderTests { cap.afterPropertiesSet(); // TODO disabled because why do we need to expose this? - // assertTrue(cap.getUserDetailsService() != null); - assertEquals("qwerty", cap.getKey()); - assertTrue(cap.getStatelessTicketCache() != null); - assertTrue(cap.getTicketValidator() != null); + // assertThat(cap.getUserDetailsService() != null).isTrue(); + assertThat(cap.getKey()).isEqualTo("qwerty"); + assertThat(cap.getStatelessTicketCache() != null).isTrue(); + assertThat(cap.getTicketValidator() != null).isTrue(); } @Test @@ -349,10 +349,10 @@ public class CasAuthenticationProviderTests { TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password", "ROLE_A"); - assertFalse(cap.supports(TestingAuthenticationToken.class)); + assertThat(cap.supports(TestingAuthenticationToken.class)).isFalse(); // Try it anyway - assertEquals(null, cap.authenticate(token)); + assertThat(cap.authenticate(token)).isEqualTo(null); } @Test @@ -369,14 +369,14 @@ public class CasAuthenticationProviderTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( "some_normal_user", "password", AuthorityUtils.createAuthorityList("ROLE_A")); - assertEquals(null, cap.authenticate(token)); + assertThat(cap.authenticate(token)).isEqualTo(null); } @Test public void supportsRequiredTokens() { CasAuthenticationProvider cap = new CasAuthenticationProvider(); - assertTrue(cap.supports(UsernamePasswordAuthenticationToken.class)); - assertTrue(cap.supports(CasAuthenticationToken.class)); + assertThat(cap.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); + assertThat(cap.supports(CasAuthenticationToken.class)).isTrue(); } // ~ Inner Classes diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java index c392d6a7ce..30953aa622 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java @@ -15,6 +15,8 @@ package org.springframework.security.cas.authentication; +import static org.assertj.core.api.Assertions.*; + import junit.framework.TestCase; import org.jasig.cas.client.validation.Assertion; import org.jasig.cas.client.validation.AssertionImpl; @@ -97,7 +99,6 @@ public class CasAuthenticationTokenTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); } } @@ -110,7 +111,7 @@ public class CasAuthenticationTokenTests extends TestCase { CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion); - assertEquals(token1, token2); + assertThat(token2).isEqualTo(token1); } public void testGetters() { @@ -118,16 +119,15 @@ public class CasAuthenticationTokenTests extends TestCase { final Assertion assertion = new AssertionImpl("test"); CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion); - assertEquals("key".hashCode(), token.getKeyHash()); - assertEquals(makeUserDetails(), token.getPrincipal()); - assertEquals("Password", token.getCredentials()); - assertTrue(token.getAuthorities() - .contains(new SimpleGrantedAuthority("ROLE_ONE"))); - assertTrue(token.getAuthorities() - .contains(new SimpleGrantedAuthority("ROLE_TWO"))); - assertEquals(assertion, token.getAssertion()); - assertEquals(makeUserDetails().getUsername(), token.getUserDetails() - .getUsername()); + assertThat(token.getKeyHash()).isEqualTo("key".hashCode()); + assertThat(token.getPrincipal()).isEqualTo(makeUserDetails()); + assertThat(token.getCredentials()).isEqualTo("Password"); + assertThat(token.getAuthorities()) + .contains(new SimpleGrantedAuthority("ROLE_ONE")); + assertThat(token.getAuthorities()) + .contains(new SimpleGrantedAuthority("ROLE_TWO")); + assertThat(token.getAssertion()).isEqualTo(assertion); + assertThat(token.getUserDetails().getUsername()).isEqualTo(makeUserDetails().getUsername()); } public void testNoArgConstructorDoesntExist() { @@ -136,7 +136,7 @@ public class CasAuthenticationTokenTests extends TestCase { fail("Should have thrown NoSuchMethodException"); } catch (NoSuchMethodException expected) { - assertTrue(true); + } } @@ -150,7 +150,7 @@ public class CasAuthenticationTokenTests extends TestCase { makeUserDetails("OTHER_NAME"), "Password", ROLES, makeUserDetails(), assertion); - assertTrue(!token1.equals(token2)); + assertThat(!token1.equals(token2)).isTrue(); } public void testNotEqualsDueToDifferentAuthenticationClass() { @@ -161,7 +161,7 @@ public class CasAuthenticationTokenTests extends TestCase { UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken( "Test", "Password", ROLES); - assertTrue(!token1.equals(token2)); + assertThat(!token1.equals(token2)).isTrue(); } public void testNotEqualsDueToKey() { @@ -173,7 +173,7 @@ public class CasAuthenticationTokenTests extends TestCase { CasAuthenticationToken token2 = new CasAuthenticationToken("DIFFERENT_KEY", makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion); - assertTrue(!token1.equals(token2)); + assertThat(!token1.equals(token2)).isTrue(); } public void testNotEqualsDueToAssertion() { @@ -186,16 +186,16 @@ public class CasAuthenticationTokenTests extends TestCase { CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion2); - assertTrue(!token1.equals(token2)); + assertThat(!token1.equals(token2)).isTrue(); } public void testSetAuthenticated() { final Assertion assertion = new AssertionImpl("test"); CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion); - assertTrue(token.isAuthenticated()); + assertThat(token.isAuthenticated()).isTrue(); token.setAuthenticated(false); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); } public void testToString() { @@ -203,6 +203,6 @@ public class CasAuthenticationTokenTests extends TestCase { CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion); String result = token.toString(); - assertTrue(result.lastIndexOf("Credentials (Service/Proxy Ticket):") != -1); + assertThat(result.lastIndexOf("Credentials (Service/Proxy Ticket):") != -1).isTrue(); } } diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java index 0d542ae4b1..36d08b3f08 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java @@ -25,7 +25,7 @@ import org.junit.AfterClass; import org.springframework.security.cas.authentication.CasAuthenticationToken; import org.springframework.security.cas.authentication.EhCacheBasedTicketCache; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests {@link EhCacheBasedTicketCache}. @@ -59,15 +59,15 @@ public class EhCacheBasedTicketCacheTests extends AbstractStatelessTicketCacheTe // Check it gets stored in the cache cache.putTicketInCache(token); - assertEquals(token, cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")); + assertThat(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")).isEqualTo(token); // Check it gets removed from the cache cache.removeTicketFromCache(getToken()); - assertNull(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")); + assertThat(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")).isNull(); // Check it doesn't return values for null or unknown service tickets - assertNull(cache.getByTicketId(null)); - assertNull(cache.getByTicketId("UNKNOWN_SERVICE_TICKET")); + assertThat(cache.getByTicketId(null)).isNull(); + assertThat(cache.getByTicketId("UNKNOWN_SERVICE_TICKET")).isNull(); } @Test @@ -79,11 +79,11 @@ public class EhCacheBasedTicketCacheTests extends AbstractStatelessTicketCacheTe fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } Ehcache myCache = cacheManager.getCache("castickets"); cache.setCache(myCache); - assertEquals(myCache, cache.getCache()); + assertThat(cache.getCache()).isEqualTo(myCache); } } diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java index fb5fd88115..5cffb897a6 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java @@ -19,7 +19,7 @@ import org.springframework.security.cas.authentication.CasAuthenticationToken; import org.springframework.security.cas.authentication.NullStatelessTicketCache; import org.springframework.security.cas.authentication.StatelessTicketCache; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Test cases for the @link {@link NullStatelessTicketCache} @@ -33,14 +33,14 @@ public class NullStatelessTicketCacheTests extends AbstractStatelessTicketCacheT @Test public void testGetter() { - assertNull(cache.getByTicketId(null)); - assertNull(cache.getByTicketId("test")); + assertThat(cache.getByTicketId(null)).isNull(); + assertThat(cache.getByTicketId("test")).isNull(); } @Test public void testInsertAndGet() { final CasAuthenticationToken token = getToken(); cache.putTicketInCache(token); - assertNull(cache.getByTicketId((String) token.getCredentials())); + assertThat(cache.getByTicketId((String) token.getCredentials())).isNull(); } } diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java index 7072921247..08f5240002 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.springframework.cache.CacheManager; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests @@ -50,15 +50,15 @@ public class SpringCacheBasedTicketCacheTests extends AbstractStatelessTicketCac // Check it gets stored in the cache cache.putTicketInCache(token); - assertEquals(token, cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")); + assertThat(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")).isEqualTo(token); // Check it gets removed from the cache cache.removeTicketFromCache(getToken()); - assertNull(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")); + assertThat(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ")).isNull(); // Check it doesn't return values for null or unknown service tickets - assertNull(cache.getByTicketId(null)); - assertNull(cache.getByTicketId("UNKNOWN_SERVICE_TICKET")); + assertThat(cache.getByTicketId(null)).isNull(); + assertThat(cache.getByTicketId("UNKNOWN_SERVICE_TICKET")).isNull(); } @Test(expected = IllegalArgumentException.class) diff --git a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java index 33ced63c80..009222405b 100644 --- a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java +++ b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java @@ -1,6 +1,7 @@ package org.springframework.security.cas.userdetails; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.*; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -41,10 +42,10 @@ public class GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests { assertion, "ticket"); UserDetails user = uds.loadUserDetails(token); Set roles = AuthorityUtils.authorityListToSet(user.getAuthorities()); - assertTrue(roles.size() == 4); - assertTrue(roles.contains("role_a1")); - assertTrue(roles.contains("role_a2")); - assertTrue(roles.contains("role_b")); - assertTrue(roles.contains("role_c")); + assertThat(roles.size()).isEqualTo(4); + assertThat(roles).contains("role_a1"); + assertThat(roles).contains("role_a2"); + assertThat(roles).contains("role_b"); + assertThat(roles).contains("role_c"); } } diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java index fb27a84abd..f08bb0a732 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java @@ -15,6 +15,8 @@ package org.springframework.security.cas.web; +import static org.assertj.core.api.Assertions.*; + import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; @@ -42,7 +44,7 @@ public class CasAuthenticationEntryPointTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("loginUrl must be specified", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("loginUrl must be specified"); } } @@ -55,17 +57,17 @@ public class CasAuthenticationEntryPointTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("serviceProperties must be specified", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("serviceProperties must be specified"); } } public void testGettersSetters() { CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint(); ep.setLoginUrl("https://cas/login"); - assertEquals("https://cas/login", ep.getLoginUrl()); + assertThat(ep.getLoginUrl()).isEqualTo("https://cas/login"); ep.setServiceProperties(new ServiceProperties()); - assertTrue(ep.getServiceProperties() != null); + assertThat(ep.getServiceProperties() != null).isTrue(); } public void testNormalOperationWithRenewFalse() throws Exception { diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java index 9ce03174f0..2811ad3fc1 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.cas.web; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -81,11 +81,11 @@ public class CasAuthenticationFilterTests { } }); - assertTrue(filter.requiresAuthentication(request, new MockHttpServletResponse())); + assertThat(filter.requiresAuthentication(request, new MockHttpServletResponse())).isTrue(); Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse()); - assertTrue(result != null); + assertThat(result != null).isTrue(); } @Test(expected = AuthenticationException.class) @@ -110,7 +110,7 @@ public class CasAuthenticationFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); request.setServletPath(url); - assertTrue(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isTrue(); } @Test @@ -120,13 +120,13 @@ public class CasAuthenticationFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); request.setServletPath("/pgtCallback"); - assertFalse(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isFalse(); filter.setProxyReceptorUrl(request.getServletPath()); - assertFalse(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isFalse(); filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class)); - assertTrue(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isTrue(); request.setServletPath("/other"); - assertFalse(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isFalse(); } @Test @@ -142,23 +142,23 @@ public class CasAuthenticationFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); request.setServletPath(url); - assertTrue(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isTrue(); request.setServletPath("/other"); - assertFalse(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isFalse(); request.setParameter(properties.getArtifactParameter(), "value"); - assertTrue(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isTrue(); SecurityContextHolder.getContext().setAuthentication( new AnonymousAuthenticationToken("key", "principal", AuthorityUtils .createAuthorityList("ROLE_ANONYMOUS"))); - assertTrue(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isTrue(); SecurityContextHolder.getContext().setAuthentication( new TestingAuthenticationToken("un", "principal", AuthorityUtils .createAuthorityList("ROLE_ANONYMOUS"))); - assertTrue(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isTrue(); SecurityContextHolder.getContext().setAuthentication( new TestingAuthenticationToken("un", "principal", "ROLE_ANONYMOUS")); - assertFalse(filter.requiresAuthentication(request, response)); + assertThat(filter.requiresAuthentication(request, response)).isFalse(); } @Test @@ -170,7 +170,7 @@ public class CasAuthenticationFilterTests { request.setServletPath("/pgtCallback"); filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class)); filter.setProxyReceptorUrl(request.getServletPath()); - assertNull(filter.attemptAuthentication(request, response)); + assertThat(filter.attemptAuthentication(request, response)).isNull(); } @Test @@ -196,8 +196,8 @@ public class CasAuthenticationFilterTests { filter.afterPropertiesSet(); filter.doFilter(request, response, chain); - assertFalse("Authentication should not be null", SecurityContextHolder - .getContext().getAuthentication() == null); + assertThat(SecurityContextHolder + .getContext().getAuthentication()).isNotNull().withFailMessage("Authentication should not be null"); verify(chain).doFilter(request, response); verifyZeroInteractions(successHandler); @@ -224,4 +224,4 @@ public class CasAuthenticationFilterTests { filter.doFilter(request, response, chain); verifyZeroInteractions(chain); } -} \ No newline at end of file +} diff --git a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java index 1581725aca..b47c302b0e 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java @@ -15,7 +15,7 @@ package org.springframework.security.cas.web; -import static junit.framework.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.cas.SamlServiceProperties; @@ -60,16 +60,16 @@ public class ServicePropertiesTests { ServiceProperties[] sps = { new ServiceProperties(), new SamlServiceProperties() }; for (ServiceProperties sp : sps) { sp.setSendRenew(false); - assertFalse(sp.isSendRenew()); + assertThat(sp.isSendRenew()).isFalse(); sp.setSendRenew(true); - assertTrue(sp.isSendRenew()); + assertThat(sp.isSendRenew()).isTrue(); sp.setArtifactParameter("notticket"); - assertEquals("notticket", sp.getArtifactParameter()); + assertThat(sp.getArtifactParameter()).isEqualTo("notticket"); sp.setServiceParameter("notservice"); - assertEquals("notservice", sp.getServiceParameter()); + assertThat(sp.getServiceParameter()).isEqualTo("notservice"); sp.setService("https://mycompany.com/service"); - assertEquals("https://mycompany.com/service", sp.getService()); + assertThat(sp.getService()).isEqualTo("https://mycompany.com/service"); sp.afterPropertiesSet(); } diff --git a/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java b/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java index 432a39806c..843f9c2879 100644 --- a/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java +++ b/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.cas.web.authentication; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Pattern; @@ -71,7 +71,7 @@ public class DefaultServiceAuthenticationDetailsTests { public void getServiceUrlNullQuery() throws Exception { details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, artifactPattern); - assertEquals(UrlUtils.buildFullRequestUrl(request), details.getServiceUrl()); + assertThat(details.getServiceUrl()).isEqualTo(UrlUtils.buildFullRequestUrl(request)); } @Test @@ -81,7 +81,7 @@ public class DefaultServiceAuthenticationDetailsTests { artifactPattern); String serviceUrl = details.getServiceUrl(); request.setQueryString(null); - assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); } @Test @@ -91,7 +91,7 @@ public class DefaultServiceAuthenticationDetailsTests { artifactPattern); String serviceUrl = details.getServiceUrl(); request.setQueryString("other=value"); - assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); } @Test @@ -101,7 +101,7 @@ public class DefaultServiceAuthenticationDetailsTests { artifactPattern); String serviceUrl = details.getServiceUrl(); request.setQueryString("other=value"); - assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); } @Test @@ -111,7 +111,7 @@ public class DefaultServiceAuthenticationDetailsTests { artifactPattern); String serviceUrl = details.getServiceUrl(); request.setQueryString("other=value&last=this"); - assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl); + assertThat(serviceUrl).isEqualTo(UrlUtils.buildFullRequestUrl(request)); } @Test @@ -120,7 +120,7 @@ public class DefaultServiceAuthenticationDetailsTests { request.setServerName("evil.com"); details = new DefaultServiceAuthenticationDetails(casServiceUrl, request, artifactPattern); - assertEquals("https://example.com/cas-sample/secure/", details.getServiceUrl()); + assertThat(details.getServiceUrl()).isEqualTo("https://example.com/cas-sample/secure/"); } @Test @@ -128,7 +128,7 @@ public class DefaultServiceAuthenticationDetailsTests { casServiceUrl = "https://example.com/j_spring_security_cas"; request.setServerName("evil.com"); ServiceAuthenticationDetails details = loadServiceAuthenticationDetails("defaultserviceauthenticationdetails-explicit.xml"); - assertEquals("https://example.com/cas-sample/secure/", details.getServiceUrl()); + assertThat(details.getServiceUrl()).isEqualTo("https://example.com/cas-sample/secure/"); } private ServiceAuthenticationDetails loadServiceAuthenticationDetails( diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java index 520cba7d22..a2002d9121 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.config.ldap; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.net.ServerSocket; @@ -92,8 +92,7 @@ public class LdapServerBeanDefinitionParserTests { appCtx = new InMemoryXmlApplicationContext(""); ApacheDSContainer dsContainer = appCtx.getBean(ApacheDSContainer.class); - assertEquals("classpath*:*.ldif", - ReflectionTestUtils.getField(dsContainer, "ldifResources")); + assertThat(ReflectionTestUtils.getField(dsContainer, "ldifResources")).isEqualTo("classpath*:*.ldif"); } private int getDefaultPort() throws IOException { diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java index 45af75f4d8..662b55ccd2 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.config.ldap; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.*; @@ -50,16 +50,12 @@ public class LdapUserServiceBeanDefinitionParserTests { @Test public void beanClassNamesAreCorrect() throws Exception { - assertEquals(LDAP_SEARCH_CLASS, FilterBasedLdapUserSearch.class.getName()); - assertEquals(PERSON_MAPPER_CLASS, PersonContextMapper.class.getName()); - assertEquals(INET_ORG_PERSON_MAPPER_CLASS, - InetOrgPersonContextMapper.class.getName()); - assertEquals(LDAP_USER_MAPPER_CLASS, LdapUserDetailsMapper.class.getName()); - assertEquals(LDAP_AUTHORITIES_POPULATOR_CLASS, - DefaultLdapAuthoritiesPopulator.class.getName()); - assertEquals(LdapUserDetailsService.class.getName(), - new LdapUserServiceBeanDefinitionParser() - .getBeanClassName(mock(Element.class))); + assertThat(FilterBasedLdapUserSearch.class.getName()).isEqualTo(LDAP_SEARCH_CLASS); + assertThat(PersonContextMapper.class.getName()).isEqualTo(PERSON_MAPPER_CLASS); + assertThat(InetOrgPersonContextMapper.class.getName()).isEqualTo(INET_ORG_PERSON_MAPPER_CLASS); + assertThat(LdapUserDetailsMapper.class.getName()).isEqualTo(LDAP_USER_MAPPER_CLASS); + assertThat(DefaultLdapAuthoritiesPopulator.class.getName()).isEqualTo(LDAP_AUTHORITIES_POPULATOR_CLASS); + assertThat(new LdapUserServiceBeanDefinitionParser().getBeanClassName(mock(Element.class))).isEqualTo(LdapUserDetailsService.class.getName()); } @Test @@ -75,8 +71,8 @@ public class LdapUserServiceBeanDefinitionParserTests { UserDetails ben = uds.loadUserByUsername("ben"); Set authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities()); - assertEquals(3, authorities.size()); - assertTrue(authorities.contains("ROLE_DEVELOPERS")); + assertThat(authorities).hasSize(3); + assertThat(authorities.contains("ROLE_DEVELOPERS")).isTrue(); } @Test @@ -89,7 +85,7 @@ public class LdapUserServiceBeanDefinitionParserTests { UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetails joe = uds.loadUserByUsername("Joe Smeth"); - assertEquals("Joe Smeth", joe.getUsername()); + assertThat(joe.getUsername()).isEqualTo("Joe Smeth"); } @Test @@ -103,12 +99,12 @@ public class LdapUserServiceBeanDefinitionParserTests { UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); - assertTrue(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( "PREFIX_DEVELOPERS")); uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix"); ben = uds.loadUserByUsername("ben"); - assertTrue(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( "DEVELOPERS")); } @@ -120,8 +116,8 @@ public class LdapUserServiceBeanDefinitionParserTests { UserDetails ben = uds.loadUserByUsername("ben"); Set authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities()); - assertEquals(3, authorities.size()); - assertTrue(authorities.contains("ROLE_DEVELOPER")); + assertThat(authorities).hasSize(3); + assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); } @@ -140,7 +136,7 @@ public class LdapUserServiceBeanDefinitionParserTests { + ""); UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); - assertTrue(ben instanceof Person); + assertThat(ben instanceof Person).isTrue(); } @Test @@ -149,7 +145,7 @@ public class LdapUserServiceBeanDefinitionParserTests { + ""); UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); - assertTrue(ben instanceof InetOrgPerson); + assertThat(ben instanceof InetOrgPerson).isTrue(); } @Test @@ -161,7 +157,7 @@ public class LdapUserServiceBeanDefinitionParserTests { UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); - assertTrue(ben instanceof InetOrgPerson); + assertThat(ben instanceof InetOrgPerson).isTrue(); } private void setContext(String context) { diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java index 317c748065..2f8031f40a 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java +++ b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.config.annotation; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.LinkedList; diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.groovy b/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.groovy index f3af6247d9..550c76fd4e 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.groovy +++ b/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.groovy @@ -25,7 +25,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import javax.sql.DataSource -import static org.fest.assertions.Assertions.assertThat +import static org.assertj.core.api.Assertions.* import static org.junit.Assert.fail import org.aopalliance.intercept.MethodInterceptor diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityExpressionHandlerTests.groovy b/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityExpressionHandlerTests.groovy index 0b5792e433..8551347506 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityExpressionHandlerTests.groovy +++ b/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityExpressionHandlerTests.groovy @@ -15,7 +15,7 @@ */ package org.springframework.security.config.annotation.method.configuration -import static org.fest.assertions.Assertions.assertThat +import static org.assertj.core.api.Assertions.assertThat import static org.junit.Assert.fail import java.io.Serializable; diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.groovy b/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.groovy index 258ee3f056..70246317cf 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.groovy +++ b/config/src/test/groovy/org/springframework/security/config/annotation/method/configuration/NamespaceGlobalMethodSecurityTests.groovy @@ -17,7 +17,7 @@ package org.springframework.security.config.annotation.method.configuration import org.springframework.security.access.intercept.aspectj.AspectJMethodSecurityInterceptor -import static org.fest.assertions.Assertions.assertThat +import static org.assertj.core.api.Assertions.assertThat import static org.junit.Assert.fail import java.lang.reflect.Method diff --git a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java index 84961af278..1c7806ccbb 100644 --- a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java @@ -15,7 +15,7 @@ package org.springframework.security.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -105,7 +105,7 @@ public class FilterChainProxyConfigTests { public void pathWithNoMatchHasNoFilters() throws Exception { FilterChainProxy filterChainProxy = appCtx.getBean( "newFilterChainProxyNoDefaultPath", FilterChainProxy.class); - assertEquals(null, filterChainProxy.getFilters("/nomatch")); + assertThat(filterChainProxy.getFilters("/nomatch")).isEqualTo(null); } // SEC-1235 @@ -115,9 +115,9 @@ public class FilterChainProxyConfigTests { FilterChainProxy.class); List chains = fcp.getFilterChains(); - assertEquals("/login*", getPattern(chains.get(0))); - assertEquals("/logout", getPattern(chains.get(1))); - assertTrue(((DefaultSecurityFilterChain) chains.get(2)).getRequestMatcher() instanceof AnyRequestMatcher); + assertThat(getPattern(chains.get(0))).isEqualTo("/login*"); + assertThat(getPattern(chains.get(1))).isEqualTo("/logout"); + assertThat(((DefaultSecurityFilterChain) chains.get(2)).getRequestMatcher() instanceof AnyRequestMatcher).isTrue(); } private String getPattern(SecurityFilterChain chain) { @@ -128,24 +128,24 @@ public class FilterChainProxyConfigTests { private void checkPathAndFilterOrder(FilterChainProxy filterChainProxy) throws Exception { List filters = filterChainProxy.getFilters("/foo/blah;x=1"); - assertEquals(1, filters.size()); - assertTrue(filters.get(0) instanceof SecurityContextHolderAwareRequestFilter); + assertThat(filters).hasSize(1); + assertThat(filters.get(0) instanceof SecurityContextHolderAwareRequestFilter).isTrue(); filters = filterChainProxy.getFilters("/some;x=2,y=3/other/path;z=4/blah"); - assertNotNull(filters); - assertEquals(3, filters.size()); - assertTrue(filters.get(0) instanceof SecurityContextPersistenceFilter); - assertTrue(filters.get(1) instanceof SecurityContextHolderAwareRequestFilter); - assertTrue(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter); + assertThat(filters).isNotNull(); + assertThat(filters).hasSize(3); + assertThat(filters.get(0) instanceof SecurityContextPersistenceFilter).isTrue(); + assertThat(filters.get(1) instanceof SecurityContextHolderAwareRequestFilter).isTrue(); + assertThat(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter).isTrue(); filters = filterChainProxy.getFilters("/do/not/filter;x=7"); - assertEquals(0, filters.size()); + assertThat(filters).isEmpty(); filters = filterChainProxy.getFilters("/another/nonspecificmatch"); - assertEquals(3, filters.size()); - assertTrue(filters.get(0) instanceof SecurityContextPersistenceFilter); - assertTrue(filters.get(1) instanceof UsernamePasswordAuthenticationFilter); - assertTrue(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter); + assertThat(filters).hasSize(3); + assertThat(filters.get(0) instanceof SecurityContextPersistenceFilter).isTrue(); + assertThat(filters.get(1) instanceof UsernamePasswordAuthenticationFilter).isTrue(); + assertThat(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter).isTrue(); } private void doNormalOperation(FilterChainProxy filterChainProxy) throws Exception { diff --git a/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java index 3175fda7e3..1c8012a8c9 100644 --- a/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Test; @@ -45,10 +45,10 @@ public class InvalidConfigurationTests { } catch (BeanCreationException e) { Throwable cause = ultimateCause(e); - assertTrue(cause instanceof NoSuchBeanDefinitionException); + assertThat(cause instanceof NoSuchBeanDefinitionException).isTrue(); NoSuchBeanDefinitionException nsbe = (NoSuchBeanDefinitionException) cause; - assertEquals(BeanIds.AUTHENTICATION_MANAGER, nsbe.getBeanName()); - assertTrue(nsbe.getMessage().endsWith( + assertThat(nsbe.getBeanName()).isEqualTo(BeanIds.AUTHENTICATION_MANAGER); + assertThat(nsbe.getMessage().endsWith( AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE)); } } diff --git a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java index ad85bcf7ca..edbe849fcd 100644 --- a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.*; import static org.powermock.api.mockito.PowerMockito.*; @@ -57,7 +57,7 @@ public class SecurityNamespaceHandlerTests { fail("Expected BeanDefinitionParsingException"); } catch (BeanDefinitionParsingException expected) { - assertTrue(expected.getMessage().contains( + assertThat(expected.getMessage().contains( "You cannot use a spring-security-2.0.xsd")); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java index 2c5ae9372b..8d66251831 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.config.annotation.web.configurers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import javax.servlet.http.HttpServletResponse; diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java index 02249cb206..6175879bb7 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.config.annotation.web.configurers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import org.junit.After; diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java index 5ff6268040..3a5d338b2e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.config.annotation.web.configurers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import javax.servlet.http.HttpServletResponse; diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java index 4d6939e6f0..6f5ec1cb7f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.config.annotation.web.configurers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import javax.servlet.http.HttpServletResponse; diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java index 5992b86f72..a81b6f68b5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java @@ -31,7 +31,7 @@ import org.springframework.util.AntPathMatcher; import java.util.Collection; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java index 455220da51..0e4c39af5e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java @@ -64,8 +64,8 @@ import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { AnnotationConfigWebApplicationContext context; @@ -191,4 +191,4 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { return new SyncExecutorSubscribableChannelPostProcessor(); } } -} \ No newline at end of file +} diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java index 7daa3b6204..ec0110b441 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java @@ -14,8 +14,8 @@ */ package org.springframework.security.config.annotation.web.socket; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; import java.util.HashMap; import java.util.Map; @@ -688,4 +688,4 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { return new SyncExecutorSubscribableChannelPostProcessor(); } } -} \ No newline at end of file +} diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java index 0c132eabef..883e276e45 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ public class AuthenticationManagerBeanDefinitionParserTests { // SEC-1225 public void providersAreRegisteredAsTopLevelBeans() throws Exception { setContext(CONTEXT); - assertEquals(1, appContext.getBeansOfType(AuthenticationProvider.class).size()); + assertThat(appContext.getBeansOfType(AuthenticationProvider.class)).hasSize(1); } @Test @@ -45,11 +45,11 @@ public class AuthenticationManagerBeanDefinitionParserTests { ProviderManager pm = (ProviderManager) appContext .getBeansOfType(ProviderManager.class).values().toArray()[0]; Object eventPublisher = FieldUtils.getFieldValue(pm, "eventPublisher"); - assertNotNull(eventPublisher); - assertTrue(eventPublisher instanceof DefaultAuthenticationEventPublisher); + assertThat(eventPublisher).isNotNull(); + assertThat(eventPublisher instanceof DefaultAuthenticationEventPublisher).isTrue(); pm.authenticate(new UsernamePasswordAuthenticationToken("bob", "bobspassword")); - assertEquals(1, listener.events.size()); + assertThat(listener.events).hasSize(1); } @Test @@ -57,7 +57,7 @@ public class AuthenticationManagerBeanDefinitionParserTests { setContext(CONTEXT); ProviderManager pm = (ProviderManager) appContext .getBeansOfType(ProviderManager.class).values().toArray()[0]; - assertTrue(pm.isEraseCredentialsAfterAuthentication()); + assertThat(pm.isEraseCredentialsAfterAuthentication()).isTrue(); } @Test @@ -65,7 +65,7 @@ public class AuthenticationManagerBeanDefinitionParserTests { setContext(""); ProviderManager pm = (ProviderManager) appContext .getBeansOfType(ProviderManager.class).values().toArray()[0]; - assertFalse(pm.isEraseCredentialsAfterAuthentication()); + assertThat(pm.isEraseCredentialsAfterAuthentication()).isFalse(); } private void setContext(String context) { diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java index a53c853874..464df6693f 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.ProviderManager; @@ -118,7 +118,7 @@ public class AuthenticationProviderBeanDefinitionParserTests { ShaPasswordEncoder encoder = (ShaPasswordEncoder) FieldUtils.getFieldValue( getProvider(), "passwordEncoder"); - assertEquals("SHA-256", encoder.getAlgorithm()); + assertThat(encoder.getAlgorithm()).isEqualTo("SHA-256"); } @Test diff --git a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java index 687691d7dc..07e22170be 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.After; @@ -46,7 +46,7 @@ public class JdbcUserServiceBeanDefinitionParserTests { @Test public void beanNameIsCorrect() throws Exception { - assertEquals(JdbcUserDetailsManager.class.getName(), + assertThat(JdbcUserDetailsManager.class.getName()).isEqualTo( new JdbcUserServiceBeanDefinitionParser() .getBeanClassName(mock(Element.class))); } @@ -56,14 +56,14 @@ public class JdbcUserServiceBeanDefinitionParserTests { setContext("" + DATA_SOURCE); JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext .getBean(BeanIds.USER_DETAILS_SERVICE); - assertNotNull(mgr.loadUserByUsername("rod")); + assertThat(mgr.loadUserByUsername("rod")).isNotNull(); } @Test public void beanIdIsParsedCorrectly() { setContext("" + DATA_SOURCE); - assertTrue(appContext.getBean("myUserService") instanceof JdbcUserDetailsManager); + assertThat(appContext.getBean("myUserService") instanceof JdbcUserDetailsManager).isTrue(); } @Test @@ -76,10 +76,9 @@ public class JdbcUserServiceBeanDefinitionParserTests { + "'/>" + DATA_SOURCE); JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext .getBean("myUserService"); - assertEquals(userQuery, FieldUtils.getFieldValue(mgr, "usersByUsernameQuery")); - assertEquals(authoritiesQuery, - FieldUtils.getFieldValue(mgr, "authoritiesByUsernameQuery")); - assertTrue(mgr.loadUserByUsername("rod") != null); + assertThat(FieldUtils.getFieldValue(mgr,"usersByUsernameQuery")).isEqualTo(userQuery); + assertThat(FieldUtils.getFieldValue(mgr, "authoritiesByUsernameQuery")).isEqualTo(authoritiesQuery); + assertThat(mgr.loadUserByUsername("rod") != null).isTrue(); } @Test @@ -89,9 +88,8 @@ public class JdbcUserServiceBeanDefinitionParserTests { + "group-authorities-by-username-query='blah blah'/>" + DATA_SOURCE); JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext .getBean("myUserService"); - assertEquals("blah blah", - FieldUtils.getFieldValue(mgr, "groupAuthoritiesByUsernameQuery")); - assertTrue((Boolean) FieldUtils.getFieldValue(mgr, "enableGroups")); + assertThat(FieldUtils.getFieldValue(mgr, "groupAuthoritiesByUsernameQuery")).isEqualTo("blah blah"); + assertThat((Boolean) FieldUtils.getFieldValue(mgr, "enableGroups")).isTrue(); } @Test @@ -101,9 +99,9 @@ public class JdbcUserServiceBeanDefinitionParserTests { CachingUserDetailsService cachingUserService = (CachingUserDetailsService) appContext .getBean("myUserService" + AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX); - assertSame(cachingUserService.getUserCache(), appContext.getBean("userCache")); - assertNotNull(cachingUserService.loadUserByUsername("rod")); - assertNotNull(cachingUserService.loadUserByUsername("rod")); + assertThat(appContext.getBean("userCache")).isSameAs(cachingUserService.getUserCache()); + assertThat(cachingUserService.loadUserByUsername("rod")).isNotNull(); + assertThat(cachingUserService.loadUserByUsername("rod")).isNotNull(); } @Test @@ -128,10 +126,10 @@ public class JdbcUserServiceBeanDefinitionParserTests { .getBean(BeanIds.AUTHENTICATION_MANAGER); DaoAuthenticationProvider provider = (DaoAuthenticationProvider) mgr .getProviders().get(0); - assertSame(provider.getUserCache(), appContext.getBean("userCache")); + assertThat(appContext.getBean("userCache")).isSameAs(provider.getUserCache()); provider.authenticate(new UsernamePasswordAuthenticationToken("rod", "koala")); - assertNotNull("Cache should contain user after authentication", provider - .getUserCache().getUserFromCache("rod")); + assertThat(provider + .getUserCache().getUserFromCache("rod")).isNotNull().withFailMessage("Cache should contain user after authentication"); } @Test @@ -141,7 +139,7 @@ public class JdbcUserServiceBeanDefinitionParserTests { JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext .getBean("myUserService"); UserDetails rod = mgr.loadUserByUsername("rod"); - assertTrue(AuthorityUtils.authorityListToSet(rod.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(rod.getAuthorities()).contains( "PREFIX_ROLE_SUPERVISOR")); } diff --git a/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java index fc48ac663c..d1f78705e4 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.core.userdetails.UserDetails; @@ -56,8 +56,8 @@ public class UserServiceBeanDefinitionParserTests { UserDetailsService userService = (UserDetailsService) appContext .getBean("service"); UserDetails joe = userService.loadUserByUsername("joe"); - assertEquals("joespassword", joe.getPassword()); - assertEquals(2, joe.getAuthorities().size()); + assertThat(joe.getPassword()).isEqualTo("joespassword"); + assertThat(joe.getAuthorities()).hasSize(2); } @Test @@ -67,7 +67,7 @@ public class UserServiceBeanDefinitionParserTests { UserDetailsService userService = (UserDetailsService) appContext .getBean("service"); UserDetails joe = userService.loadUserByUsername("joe"); - assertTrue(joe.getPassword().length() > 0); + assertThat(joe.getPassword().length() > 0).isTrue(); Long.parseLong(joe.getPassword()); } @@ -79,13 +79,14 @@ public class UserServiceBeanDefinitionParserTests { + ""); UserDetailsService userService = (UserDetailsService) appContext .getBean("service"); - assertEquals("http://joe.myopenid.com/", - userService.loadUserByUsername("http://joe.myopenid.com/").getUsername()); - assertEquals( - "https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9", + assertThat( + userService.loadUserByUsername("http://joe.myopenid.com/").getUsername()) + .isEqualTo("http://joe.myopenid.com/"); + assertThat( userService.loadUserByUsername( "https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9") - .getUsername()); + .getUsername()) + .isEqualTo("https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9"); } @Test @@ -97,10 +98,10 @@ public class UserServiceBeanDefinitionParserTests { UserDetailsService userService = (UserDetailsService) appContext .getBean("service"); UserDetails joe = userService.loadUserByUsername("joe"); - assertFalse(joe.isAccountNonLocked()); + assertThat(joe.isAccountNonLocked()).isFalse(); // Check case-sensitive lookup SEC-1432 UserDetails bob = userService.loadUserByUsername("Bob"); - assertFalse(bob.isEnabled()); + assertThat(bob.isEnabled()).isFalse(); } @Test(expected = FatalBeanException.class) diff --git a/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java index 6f0f56da46..65eeba6f6d 100644 --- a/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.http; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -49,8 +49,8 @@ public class FilterSecurityMetadataSourceBeanDefinitionParserTests { .getBean("fids"); Collection cad = fids.getAttributes(createFilterInvocation( "/anything", "GET")); - assertNotNull(cad); - assertTrue(cad.contains(new SecurityConfig("ROLE_A"))); + assertThat(cad).isNotNull(); + assertThat(cad.contains(new SecurityConfig("ROLE_A"))).isTrue(); } @Test @@ -64,8 +64,8 @@ public class FilterSecurityMetadataSourceBeanDefinitionParserTests { ConfigAttribute[] cad = fids.getAttributes( createFilterInvocation("/anything", "GET")).toArray( new ConfigAttribute[0]); - assertEquals(1, cad.length); - assertEquals("hasRole('ROLE_A')", cad[0].toString()); + assertThat(cad.length).isEqualTo(1); + assertThat(cad[0].toString()).isEqualTo("hasRole('ROLE_A')"); } // SEC-1201 @@ -81,9 +81,9 @@ public class FilterSecurityMetadataSourceBeanDefinitionParserTests { .getBean("fids"); Collection cad = fids.getAttributes(createFilterInvocation( "/secure", "GET")); - assertNotNull(cad); - assertEquals(1, cad.size()); - assertTrue(cad.contains(new SecurityConfig("ROLE_A"))); + assertThat(cad).isNotNull(); + assertThat(cad).hasSize(1); + assertThat(cad.contains(new SecurityConfig("ROLE_A"))).isTrue(); } @Test diff --git a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java index 2af303d9d5..beda71be97 100644 --- a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.config.http.customconfigurer; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.config.http.customconfigurer.CustomConfigurer.customConfigurer; import java.util.Properties; diff --git a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java index d1c1f2271b..44aef02bac 100644 --- a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.method; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.springframework.security.config.ConfigTestUtils.AUTH_PROVIDER_XML; import java.util.ArrayList; @@ -93,8 +93,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { // SEC-1213. Check the order Advisor[] advisors = ((Advised) target).getAdvisors(); - assertEquals(1, advisors.length); - assertEquals(1001, ((MethodSecurityMetadataSourceAdvisor) advisors[0]).getOrder()); + assertThat(advisors.length).isEqualTo(1); + assertThat(((MethodSecurityMetadataSourceAdvisor) advisors[0]).getOrder()).isEqualTo(1001); } @Test(expected = AccessDeniedException.class) @@ -121,7 +121,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { PostProcessedMockUserDetailsService service = (PostProcessedMockUserDetailsService) appContext .getBean("myUserService"); - assertEquals("Hello from the post processor!", service.getPostProcessorWasHere()); + assertThat(service.getPostProcessorWasHere()).isEqualTo("Hello from the post processor!"); } @Test(expected = AccessDeniedException.class) @@ -237,7 +237,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { .getAdvice()).getAfterInvocationManager(); PostInvocationAdviceProvider aip = (PostInvocationAdviceProvider) pm .getProviders().get(0); - assertTrue(FieldUtils.getFieldValue(mev, "preAdvice.expressionHandler") == FieldUtils + assertThat(FieldUtils.getFieldValue(mev, "preAdvice.expressionHandler")).isSameAs(FieldUtils .getFieldValue(aip, "postAdvice.expressionHandler")); } @@ -280,8 +280,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { // Expression is (filterObject == name or filterObject == 'sam'), so "joe" should // be gone after pre-filter // PostFilter should remove sam from the return object - assertEquals(1, result.size()); - assertEquals("bob", result.get(0)); + assertThat(result).hasSize(1); + assertThat(result.get(0)).isEqualTo("bob"); } @Test @@ -293,8 +293,8 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { target = (BusinessService) appContext.getBean("target"); Object[] arg = new String[] { "joe", "bob", "sam" }; Object[] result = target.methodReturningAnArray(arg); - assertEquals(1, result.length); - assertEquals("bob", result[0]); + assertThat(result.length).isEqualTo(1); + assertThat(result[0]).isEqualTo("bob"); } // SEC-1392 @@ -348,7 +348,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) appContext .getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values() .toArray()[0]; - assertSame(ram, FieldUtils.getFieldValue(msi.getAdvice(), "runAsManager")); + assertThat(ram).isSameAs(FieldUtils.getFieldValue(msi.getAdvice(), "runAsManager")); } @Test @@ -421,7 +421,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { /* * (non-Javadoc) - * + * * @see * org.springframework.context.ApplicationContextAware#setApplicationContext(org * .springframework.context.ApplicationContext) diff --git a/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java index 33ef295ac0..411a244c53 100644 --- a/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java +++ b/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java @@ -1,6 +1,6 @@ package org.springframework.security.config.method; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.junit.runner.RunWith; @@ -50,12 +50,12 @@ public class InterceptMethodsBeanDefinitionDecoratorTests implements @Test public void targetDoesntLoseApplicationListenerInterface() { - assertEquals(1, appContext.getBeansOfType(ApplicationListener.class).size()); - assertEquals(1, appContext.getBeanNamesForType(ApplicationListener.class).length); + assertThat(appContext.getBeansOfType(ApplicationListener.class)).hasSize(1); + assertThat(appContext.getBeanNamesForType(ApplicationListener.class).length).isEqualTo(1); appContext.publishEvent(new AuthenticationSuccessEvent( new TestingAuthenticationToken("user", ""))); - assertTrue(target instanceof ApplicationListener); + assertThat(target instanceof ApplicationListener).isTrue(); } @Test diff --git a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java index 871591343b..f7c0d323fb 100644 --- a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java +++ b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java @@ -1,6 +1,6 @@ package org.springframework.security.intercept.method.aopalliance; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Before; diff --git a/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java index 022b9aa62e..1b849f01a3 100644 --- a/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java +++ b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access; -import static org.junit.Assert.assertSame; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.security.access.event.AuthorizationFailureEvent; @@ -61,8 +61,8 @@ public class AuthorizationFailureEventTests { public void gettersReturnCtorSuppliedData() throws Exception { AuthorizationFailureEvent event = new AuthorizationFailureEvent(new Object(), attributes, foo, exception); - assertSame(attributes, event.getConfigAttributes()); - assertSame(exception, event.getAccessDeniedException()); - assertSame(foo, event.getAuthentication()); + assertThat(event.getConfigAttributes()).isSameAs(attributes); + assertThat(event.getAccessDeniedException()).isSameAs(exception); + assertThat(event.getAuthentication()).isSameAs(foo); } } diff --git a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java index a810c25d9b..d471473621 100644 --- a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java +++ b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java @@ -15,7 +15,8 @@ package org.springframework.security.access; -import junit.framework.Assert; + +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.security.access.ConfigAttribute; @@ -34,7 +35,7 @@ public class SecurityConfigTests { @Test public void testHashCode() { SecurityConfig config = new SecurityConfig("TEST"); - Assert.assertEquals("TEST".hashCode(), config.hashCode()); + assertThat(config.hashCode()).isEqualTo("TEST".hashCode()); } @Test(expected = IllegalArgumentException.class) @@ -56,32 +57,32 @@ public class SecurityConfigTests { public void testObjectEquals() throws Exception { SecurityConfig security1 = new SecurityConfig("TEST"); SecurityConfig security2 = new SecurityConfig("TEST"); - Assert.assertEquals(security1, security2); + assertThat(security2).isEqualTo(security1); // SEC-311: Must observe symmetry requirement of Object.equals(Object) contract String securityString1 = "TEST"; - Assert.assertNotSame(security1, securityString1); + assertThat(securityString1).isNotSameAs(security1); String securityString2 = "NOT_EQUAL"; - Assert.assertTrue(!security1.equals(securityString2)); + assertThat(!security1.equals(securityString2)).isTrue(); SecurityConfig security3 = new SecurityConfig("NOT_EQUAL"); - Assert.assertTrue(!security1.equals(security3)); + assertThat(!security1.equals(security3)).isTrue(); MockConfigAttribute mock1 = new MockConfigAttribute("TEST"); - Assert.assertEquals(security1, mock1); + assertThat(mock1).isEqualTo(security1); MockConfigAttribute mock2 = new MockConfigAttribute("NOT_EQUAL"); - Assert.assertTrue(!security1.equals(mock2)); + assertThat(!security1.equals(mock2)).isTrue(); Integer int1 = Integer.valueOf(987); - Assert.assertTrue(!security1.equals(int1)); + assertThat(!security1.equals(int1)).isTrue(); } @Test public void testToString() { SecurityConfig config = new SecurityConfig("TEST"); - Assert.assertEquals("TEST", config.toString()); + assertThat(config.toString()).isEqualTo("TEST"); } // ~ Inner Classes diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java index 93573c1620..2ef2fa006c 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java @@ -15,8 +15,7 @@ */ package org.springframework.security.access.annotation; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; @@ -53,38 +52,37 @@ public class Jsr250MethodSecurityMetadataSourceTests { @Test public void methodWithRolesAllowedHasCorrectAttribute() throws Exception { ConfigAttribute[] accessAttributes = findAttributes("adminMethod"); - assertEquals(1, accessAttributes.length); - assertEquals("ROLE_ADMIN", accessAttributes[0].toString()); + assertThat(accessAttributes.length).isEqualTo(1); + assertThat(accessAttributes[0].toString()).isEqualTo("ROLE_ADMIN"); } @Test public void permitAllMethodHasPermitAllAttribute() throws Exception { ConfigAttribute[] accessAttributes = findAttributes("permitAllMethod"); - assertEquals(1, accessAttributes.length); - assertEquals("javax.annotation.security.PermitAll", - accessAttributes[0].toString()); + assertThat(accessAttributes).hasSize(1); + assertThat(accessAttributes[0].toString()).isEqualTo("javax.annotation.security.PermitAll"); } @Test public void noRoleMethodHasNoAttributes() throws Exception { Collection accessAttributes = mds.findAttributes(a.getClass() .getMethod("noRoleMethod"), null); - Assert.assertNull(accessAttributes); + assertThat(accessAttributes).isNull(); } @Test public void classRoleIsAppliedToNoRoleMethod() throws Exception { Collection accessAttributes = mds.findAttributes(userAllowed .getClass().getMethod("noRoleMethod"), null); - Assert.assertNull(accessAttributes); + assertThat(accessAttributes).isNull(); } @Test public void methodRoleOverridesClassRole() throws Exception { Collection accessAttributes = mds.findAttributes(userAllowed .getClass().getMethod("adminMethod"), null); - assertEquals(1, accessAttributes.size()); - assertEquals("ROLE_ADMIN", accessAttributes.toArray()[0].toString()); + assertThat(accessAttributes).hasSize(1); + assertThat(accessAttributes.toArray()[0].toString()).isEqualTo("ROLE_ADMIN"); } @Test @@ -92,8 +90,8 @@ public class Jsr250MethodSecurityMetadataSourceTests { mds.setDefaultRolePrefix("CUSTOMPREFIX_"); ConfigAttribute[] accessAttributes = findAttributes("adminMethod"); - assertEquals(1, accessAttributes.length); - assertEquals("CUSTOMPREFIX_ADMIN", accessAttributes[0].toString()); + assertThat(accessAttributes.length).isEqualTo(1); + assertThat(accessAttributes[0].toString()).isEqualTo("CUSTOMPREFIX_ADMIN"); } @Test @@ -101,8 +99,8 @@ public class Jsr250MethodSecurityMetadataSourceTests { mds.setDefaultRolePrefix(""); ConfigAttribute[] accessAttributes = findAttributes("adminMethod"); - assertEquals(1, accessAttributes.length); - assertEquals("ADMIN", accessAttributes[0].toString()); + assertThat(accessAttributes.length).isEqualTo(1); + assertThat(accessAttributes[0].toString()).isEqualTo("ADMIN"); } @Test @@ -110,15 +108,15 @@ public class Jsr250MethodSecurityMetadataSourceTests { mds.setDefaultRolePrefix(null); ConfigAttribute[] accessAttributes = findAttributes("adminMethod"); - assertEquals(1, accessAttributes.length); - assertEquals("ADMIN", accessAttributes[0].toString()); + assertThat(accessAttributes.length).isEqualTo(1); + assertThat(accessAttributes[0].toString()).isEqualTo("ADMIN"); } @Test public void alreadyHasDefaultPrefix() throws Exception { ConfigAttribute[] accessAttributes = findAttributes("roleAdminMethod"); - assertEquals(1, accessAttributes.length); - assertEquals("ROLE_ADMIN", accessAttributes[0].toString()); + assertThat(accessAttributes.length).isEqualTo(1); + assertThat(accessAttributes[0].toString()).isEqualTo("ROLE_ADMIN"); } // JSR-250 Spec Tests @@ -148,8 +146,8 @@ public class Jsr250MethodSecurityMetadataSourceTests { "overriden"); Collection accessAttributes = mds.getAttributes(mi); - assertEquals(1, accessAttributes.size()); - assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString()); + assertThat(accessAttributes).hasSize(1); + assertThat(accessAttributes.toArray()[0].toString()).isEqualTo("ROLE_DERIVED"); } @Test @@ -159,8 +157,8 @@ public class Jsr250MethodSecurityMetadataSourceTests { "defaults"); Collection accessAttributes = mds.getAttributes(mi); - assertEquals(1, accessAttributes.size()); - assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString()); + assertThat(accessAttributes).hasSize(1); + assertThat(accessAttributes.toArray()[0].toString()).isEqualTo("ROLE_DERIVED"); } @Test @@ -170,8 +168,8 @@ public class Jsr250MethodSecurityMetadataSourceTests { "explicitMethod"); Collection accessAttributes = mds.getAttributes(mi); - assertEquals(1, accessAttributes.size()); - assertEquals("ROLE_EXPLICIT", accessAttributes.toArray()[0].toString()); + assertThat(accessAttributes).hasSize(1); + assertThat(accessAttributes.toArray()[0].toString()).isEqualTo("ROLE_EXPLICIT"); } /** @@ -206,8 +204,8 @@ public class Jsr250MethodSecurityMetadataSourceTests { "overridenIgnored"); Collection accessAttributes = mds.getAttributes(mi); - assertEquals(1, accessAttributes.size()); - assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString()); + assertThat(accessAttributes).hasSize(1); + assertThat(accessAttributes.toArray()[0].toString()).isEqualTo("ROLE_DERIVED"); } // ~ Inner Classes diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java index 7e41b30d3d..b8633d11bb 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.annotation; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; @@ -27,19 +27,19 @@ public class Jsr250VoterTests { attrs.add(new Jsr250SecurityConfig("B")); attrs.add(new Jsr250SecurityConfig("C")); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote( - new TestingAuthenticationToken("user", "pwd", "A"), new Object(), attrs)); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote( - new TestingAuthenticationToken("user", "pwd", "B"), new Object(), attrs)); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote( - new TestingAuthenticationToken("user", "pwd", "C"), new Object(), attrs)); + assertThat(voter.vote( + new TestingAuthenticationToken("user", "pwd", "A"), new Object(), attrs)).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); + assertThat(voter.vote( + new TestingAuthenticationToken("user", "pwd", "B"), new Object(), attrs)).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); + assertThat(voter.vote( + new TestingAuthenticationToken("user", "pwd", "C"), new Object(), attrs)).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); - assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote( + assertThat(voter.vote( new TestingAuthenticationToken("user", "pwd", "NONE"), new Object(), - attrs)); + attrs)).isEqualTo(AccessDecisionVoter.ACCESS_DENIED); - assertEquals(AccessDecisionVoter.ACCESS_ABSTAIN, voter.vote( + assertThat(voter.vote( new TestingAuthenticationToken("user", "pwd", "A"), new Object(), - SecurityConfig.createList("A", "B", "C"))); + SecurityConfig.createList("A", "B", "C"))).isEqualTo(AccessDecisionVoter.ACCESS_ABSTAIN); } } diff --git a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java index dbba82f9ab..d101de8010 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java @@ -14,11 +14,11 @@ */ package org.springframework.security.access.annotation; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -71,14 +71,14 @@ public class SecuredAnnotationSecurityMetadataSourceTests { Collection attrs = mds.findAttributes(method, DepartmentServiceImpl.class); - assertNotNull(attrs); + assertThat(attrs).isNotNull(); // expect 1 attribute - assertTrue("Did not find 1 attribute", attrs.size() == 1); + assertThat(attrs.size() == 1).as("Did not find 1 attribute").isTrue(); // should have 1 SecurityConfig for (ConfigAttribute sc : attrs) { - assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute()); + assertThat(sc.getAttribute()).as("Found an incorrect role").isEqualTo("ROLE_ADMIN"); } Method superMethod = null; @@ -94,14 +94,14 @@ public class SecuredAnnotationSecurityMetadataSourceTests { Collection superAttrs = this.mds.findAttributes(superMethod, DepartmentServiceImpl.class); - assertNotNull(superAttrs); + assertThat(superAttrs).isNotNull(); // This part of the test relates to SEC-274 // expect 1 attribute - assertEquals("Did not find 1 attribute", 1, superAttrs.size()); + assertThat(superAttrs).as("Did not find 1 attribute").hasSize(1); // should have 1 SecurityConfig for (ConfigAttribute sc : superAttrs) { - assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute()); + assertThat(sc.getAttribute()).as("Found an incorrect role").isEqualTo("ROLE_ADMIN"); } } @@ -110,15 +110,15 @@ public class SecuredAnnotationSecurityMetadataSourceTests { Collection attrs = this.mds .findAttributes(BusinessService.class); - assertNotNull(attrs); + assertThat(attrs).isNotNull(); // expect 1 annotation - assertEquals(1, attrs.size()); + assertThat(attrs).hasSize(1); // should have 1 SecurityConfig SecurityConfig sc = (SecurityConfig) attrs.toArray()[0]; - assertEquals("ROLE_USER", sc.getAttribute()); + assertThat(sc.getAttribute()).isEqualTo("ROLE_USER"); } @Test @@ -136,17 +136,17 @@ public class SecuredAnnotationSecurityMetadataSourceTests { Collection attrs = this.mds.findAttributes(method, BusinessService.class); - assertNotNull(attrs); + assertThat(attrs).isNotNull(); // expect 2 attributes - assertEquals(2, attrs.size()); + assertThat(attrs).hasSize(2); boolean user = false; boolean admin = false; // should have 2 SecurityConfigs for (ConfigAttribute sc : attrs) { - assertTrue(sc instanceof SecurityConfig); + assertThat(sc instanceof SecurityConfig).isTrue(); if (sc.getAttribute().equals("ROLE_USER")) { user = true; @@ -157,7 +157,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { } // expect to have ROLE_USER and ROLE_ADMIN - assertTrue(user && admin); + assertThat(user && admin).isTrue(); } // SEC-1491 @@ -167,8 +167,8 @@ public class SecuredAnnotationSecurityMetadataSourceTests { new CustomSecurityAnnotationMetadataExtractor()); Collection attrs = mds .findAttributes(CustomAnnotatedService.class); - assertEquals(1, attrs.size()); - assertEquals(SecurityEnum.ADMIN, attrs.toArray()[0]); + assertThat(attrs).hasSize(1); + assertThat(attrs.toArray()[0]).isEqualTo(SecurityEnum.ADMIN); } @Test @@ -180,8 +180,8 @@ public class SecuredAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertEquals("CUSTOM", attrs[0].getAttribute()); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0].getAttribute()).isEqualTo("CUSTOM"); } @Test @@ -193,8 +193,8 @@ public class SecuredAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertEquals("CUSTOM", attrs[0].getAttribute()); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0].getAttribute()).isEqualTo("CUSTOM"); } @Test @@ -205,8 +205,8 @@ public class SecuredAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertEquals("CUSTOM", attrs[0].getAttribute()); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0].getAttribute()).isEqualTo("CUSTOM"); } @Test @@ -214,7 +214,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests { MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation(); Collection attributes = mds.getAttributes(mi); assertThat(attributes.size()).isEqualTo(1); - assertThat(attributes).onProperty("attribute").containsOnly("ROLE_PERSON"); + assertThat(attributes).extracting("attribute").containsOnly("ROLE_PERSON"); } // Inner classes diff --git a/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java b/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java index 9d9bd1ccba..b14646d072 100644 --- a/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java @@ -1,6 +1,7 @@ package org.springframework.security.access.expression; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; + import static org.mockito.Mockito.mock; import org.junit.Before; @@ -37,8 +38,8 @@ public class AbstractSecurityExpressionHandlerTests { Expression expression = handler.getExpressionParser().parseExpression( "@number10.compareTo(@number20) < 0"); - assertTrue((Boolean) expression.getValue(handler.createEvaluationContext( - mock(Authentication.class), new Object()))); + assertThat(expression.getValue(handler.createEvaluationContext( + mock(Authentication.class), new Object()))).isEqualTo(true); } @Test(expected = IllegalArgumentException.class) @@ -50,7 +51,7 @@ public class AbstractSecurityExpressionHandlerTests { public void setExpressionParser() { SpelExpressionParser parser = new SpelExpressionParser(); handler.setExpressionParser(parser); - assertTrue(parser == handler.getExpressionParser()); + assertThat(parser == handler.getExpressionParser()).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java index 8b6bef0250..5ec6712cb2 100644 --- a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java @@ -1,9 +1,9 @@ package org.springframework.security.access.expression; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; @@ -35,10 +35,10 @@ public class SecurityExpressionRootTests { @Test public void denyAllIsFalsePermitAllTrue() throws Exception { - assertFalse(root.denyAll()); - assertFalse(root.denyAll); - assertTrue(root.permitAll()); - assertTrue(root.permitAll); + assertThat(root.denyAll()).isFalse(); + assertThat(root.denyAll).isFalse(); + assertThat(root.permitAll()).isTrue(); + assertThat(root.permitAll).isTrue(); } @Test @@ -46,8 +46,8 @@ public class SecurityExpressionRootTests { AuthenticationTrustResolver atr = mock(AuthenticationTrustResolver.class); root.setTrustResolver(atr); when(atr.isRememberMe(JOE)).thenReturn(true); - assertTrue(root.isRememberMe()); - assertFalse(root.isFullyAuthenticated()); + assertThat(root.isRememberMe()).isTrue(); + assertThat(root.isFullyAuthenticated()).isFalse(); } @Test @@ -59,13 +59,13 @@ public class SecurityExpressionRootTests { } }); - assertTrue(root.hasRole("C")); - assertTrue(root.hasAuthority("ROLE_C")); - assertFalse(root.hasRole("A")); - assertFalse(root.hasRole("B")); - assertTrue(root.hasAnyRole("C", "A", "B")); - assertTrue(root.hasAnyAuthority("ROLE_C", "ROLE_A", "ROLE_B")); - assertFalse(root.hasAnyRole("A", "B")); + assertThat(root.hasRole("C")).isTrue(); + assertThat(root.hasAuthority("ROLE_C")).isTrue(); + assertThat(root.hasRole("A")).isFalse(); + assertThat(root.hasRole("B")).isFalse(); + assertThat(root.hasAnyRole("C", "A", "B")).isTrue(); + assertThat(root.hasAnyAuthority("ROLE_C", "ROLE_A", "ROLE_B")).isTrue(); + assertThat(root.hasAnyRole("A", "B")).isFalse(); } @Test diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java index 20e4ac7162..ff6122b487 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.expression.method; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.ArrayList; @@ -28,9 +28,9 @@ public class MethodExpressionVoterTests { public void hasRoleExpressionAllowsUserWithRole() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray()); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi, + assertThat(am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, - "hasRole('blah')")))); + "hasRole('blah')")))).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); } @Test @@ -39,16 +39,17 @@ public class MethodExpressionVoterTests { cad.add(new PreInvocationExpressionAttribute(null, null, "hasRole('joedoesnt')")); MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray()); - assertEquals(AccessDecisionVoter.ACCESS_DENIED, am.vote(joe, mi, cad)); + assertThat(am.vote(joe, mi, cad)).isEqualTo(AccessDecisionVoter.ACCESS_DENIED); } @Test public void matchingArgAgainstAuthenticationNameIsSuccessful() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe"); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi, + assertThat(am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, - "(#argument == principal) and (principal == 'joe')")))); + "(#argument == principal) and (principal == 'joe')")))) + .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); } @Test @@ -56,11 +57,12 @@ public class MethodExpressionVoterTests { Collection arg = createCollectionArg("joe", "bob", "sam"); MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), arg); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi, + assertThat(am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute( - "(filterObject == 'jim')", "collection", null)))); + "(filterObject == 'jim')", "collection", null)))) + .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); // All objects should have been removed, because the expression is always false - assertEquals(0, arg.size()); + assertThat(arg).isEmpty(); } @Test @@ -71,9 +73,7 @@ public class MethodExpressionVoterTests { am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute( "(filterObject == 'joe' or filterObject == 'sam')", "collection", "permitAll"))); - assertEquals("joe and sam should still be in the list", 2, arg.size()); - assertEquals("joe", arg.get(0)); - assertEquals("sam", arg.get(1)); + assertThat(arg).containsExactly("joe","sam"); } @Test(expected = IllegalArgumentException.class) @@ -104,12 +104,12 @@ public class MethodExpressionVoterTests { public void ruleDefinedInAClassMethodIsApplied() throws Exception { MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe"); - assertEquals( - AccessDecisionVoter.ACCESS_GRANTED, - am.vote(joe, - mi, - createAttributes(new PreInvocationExpressionAttribute(null, null, - "T(org.springframework.security.access.expression.method.SecurityRules).isJoe(#argument)")))); + assertThat( + + am.vote(joe, mi, + createAttributes(new PreInvocationExpressionAttribute(null, null, + "T(org.springframework.security.access.expression.method.SecurityRules).isJoe(#argument)")))) + .isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); } private List createAttributes(ConfigAttribute... attributes) { diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java index 6d0d6f9e06..72f631b955 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.expression.method; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; @@ -44,19 +44,19 @@ public class MethodSecurityExpressionRootTests { ctx.setVariable("var", "somestring"); Expression e = parser.parseExpression("#var.length() == 10"); - assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); } @Test public void isAnonymousReturnsTrueIfTrustResolverReportsAnonymous() { when(trustResolver.isAnonymous(user)).thenReturn(true); - assertTrue(root.isAnonymous()); + assertThat(root.isAnonymous()).isTrue(); } @Test public void isAnonymousReturnsFalseIfTrustResolverReportsNonAnonymous() { when(trustResolver.isAnonymous(user)).thenReturn(false); - assertFalse(root.isAnonymous()); + assertThat(root.isAnonymous()).isFalse(); } @Test @@ -68,7 +68,7 @@ public class MethodSecurityExpressionRootTests { root.setPermissionEvaluator(pe); when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(false); - assertFalse(root.hasPermission(dummyDomainObject, "ignored")); + assertThat(root.hasPermission(dummyDomainObject, "ignored")).isFalse(); } @@ -81,7 +81,7 @@ public class MethodSecurityExpressionRootTests { root.setPermissionEvaluator(pe); when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(true); - assertTrue(root.hasPermission(dummyDomainObject, "ignored")); + assertThat(root.hasPermission(dummyDomainObject, "ignored")).isTrue(); } @Test @@ -95,13 +95,13 @@ public class MethodSecurityExpressionRootTests { Expression e = parser.parseExpression("hasPermission(#domainObject, 0xA)"); // evaluator returns true - assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); e = parser.parseExpression("hasPermission(#domainObject, 10)"); // evaluator returns true - assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); e = parser.parseExpression("hasPermission(#domainObject, 0xFF)"); // evaluator returns false, make sure return value matches - assertFalse(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isFalse(); } @Test @@ -119,11 +119,11 @@ public class MethodSecurityExpressionRootTests { when(pe.hasPermission(user, "x", i)).thenReturn(true); Expression e = parser.parseExpression("hasPermission(this, 2)"); - assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); e = parser.parseExpression("hasPermission(this, 2)"); - assertFalse(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isFalse(); e = parser.parseExpression("hasPermission(this.x, 2)"); - assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx)); + assertThat(ExpressionUtils.evaluateAsBoolean(e, ctx)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java index 33e5f0f658..784ce4473a 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java @@ -1,10 +1,6 @@ package org.springframework.security.access.expression.method; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -78,12 +74,12 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(voidImpl1).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0]; - assertNotNull(pre.getAuthorizeExpression()); - assertEquals("someExpression", pre.getAuthorizeExpression().getExpressionString()); - assertNull(pre.getFilterExpression()); + assertThat(pre.getAuthorizeExpression()).isNotNull(); + assertThat(pre.getAuthorizeExpression().getExpressionString()).isEqualTo("someExpression"); + assertThat(pre.getFilterExpression()).isNull(); } @Test @@ -91,13 +87,12 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(voidImpl2).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0]; - assertEquals("someExpression", pre.getAuthorizeExpression().getExpressionString()); - assertNotNull(pre.getFilterExpression()); - assertEquals("somePreFilterExpression", pre.getFilterExpression() - .getExpressionString()); + assertThat(pre.getAuthorizeExpression().getExpressionString()).isEqualTo("someExpression"); + assertThat(pre.getFilterExpression()).isNotNull(); + assertThat(pre.getFilterExpression().getExpressionString()).isEqualTo("somePreFilterExpression"); } @Test @@ -105,13 +100,12 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(voidImpl3).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0]; - assertEquals("permitAll", pre.getAuthorizeExpression().getExpressionString()); - assertNotNull(pre.getFilterExpression()); - assertEquals("somePreFilterExpression", pre.getFilterExpression() - .getExpressionString()); + assertThat(pre.getAuthorizeExpression().getExpressionString()).isEqualTo("permitAll"); + assertThat(pre.getFilterExpression()).isNotNull(); + assertThat(pre.getFilterExpression().getExpressionString()).isEqualTo("somePreFilterExpression"); } @Test @@ -119,15 +113,14 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(listImpl1).toArray( new ConfigAttribute[0]); - assertEquals(2, attrs.length); - assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute); - assertTrue(attrs[1] instanceof PostInvocationExpressionAttribute); + assertThat(attrs.length).isEqualTo(2); + assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); + assertThat(attrs[1] instanceof PostInvocationExpressionAttribute).isTrue(); PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0]; PostInvocationExpressionAttribute post = (PostInvocationExpressionAttribute) attrs[1]; - assertEquals("permitAll", pre.getAuthorizeExpression().getExpressionString()); - assertNotNull(post.getFilterExpression()); - assertEquals("somePostFilterExpression", post.getFilterExpression() - .getExpressionString()); + assertThat(pre.getAuthorizeExpression().getExpressionString()).isEqualTo("permitAll"); + assertThat(post.getFilterExpression()).isNotNull(); + assertThat(post.getFilterExpression().getExpressionString()).isEqualTo("somePostFilterExpression"); } @Test @@ -135,15 +128,13 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(notherListImpl1).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0]; - assertNotNull(pre.getFilterExpression()); - assertNotNull(pre.getAuthorizeExpression()); - assertEquals("interfaceMethodAuthzExpression", pre.getAuthorizeExpression() - .getExpressionString()); - assertEquals("interfacePreFilterExpression", pre.getFilterExpression() - .getExpressionString()); + assertThat(pre.getFilterExpression()).isNotNull(); + assertThat(pre.getAuthorizeExpression()).isNotNull(); + assertThat(pre.getAuthorizeExpression().getExpressionString()).isEqualTo("interfaceMethodAuthzExpression"); + assertThat(pre.getFilterExpression().getExpressionString()).isEqualTo("interfacePreFilterExpression"); } @Test @@ -151,15 +142,13 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(notherListImpl2).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); - assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute); + assertThat(attrs.length).isEqualTo(1); + assertThat(attrs[0] instanceof PreInvocationExpressionAttribute).isTrue(); PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0]; - assertNotNull(pre.getFilterExpression()); - assertNotNull(pre.getAuthorizeExpression()); - assertEquals("interfaceMethodAuthzExpression", pre.getAuthorizeExpression() - .getExpressionString()); - assertEquals("classMethodPreFilterExpression", pre.getFilterExpression() - .getExpressionString()); + assertThat(pre.getFilterExpression()).isNotNull(); + assertThat(pre.getAuthorizeExpression()).isNotNull(); + assertThat(pre.getAuthorizeExpression().getExpressionString()).isEqualTo("interfaceMethodAuthzExpression"); + assertThat(pre.getFilterExpression().getExpressionString()).isEqualTo("classMethodPreFilterExpression"); } @Test @@ -167,7 +156,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); + assertThat(attrs.length).isEqualTo(1); } @Test @@ -175,7 +164,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); + assertThat(attrs.length).isEqualTo(1); } @Test @@ -183,7 +172,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests { ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray( new ConfigAttribute[0]); - assertEquals(1, attrs.length); + assertThat(attrs.length).isEqualTo(1); } @Test diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java index dc9e6b034d..831cd01b24 100644 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java +++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.hierarchicalroles; -import static junit.framework.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.*; import org.springframework.security.core.GrantedAuthority; @@ -22,13 +22,13 @@ public class RoleHierarchyAuthoritiesMapperTests { Collection authorities = mapper .mapAuthorities(AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_D")); - assertEquals(4, authorities.size()); + assertThat(authorities).hasSize(4); mapper = new RoleHierarchyAuthoritiesMapper(new NullRoleHierarchy()); authorities = mapper.mapAuthorities(AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_D")); - assertEquals(2, authorities.size()); + assertThat(authorities).hasSize(2); } } diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java old mode 100755 new mode 100644 index b7da06d488..cf998601d7 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java +++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java @@ -14,6 +14,9 @@ package org.springframework.security.access.hierarchicalroles; + +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; @@ -38,12 +41,10 @@ public class RoleHierarchyImplTests extends TestCase { RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl(); roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B"); - assertNotNull(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0)); - assertEquals(0, roleHierarchyImpl.getReachableGrantedAuthorities(authorities0) - .size()); - assertNotNull(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1)); - assertEquals(0, roleHierarchyImpl.getReachableGrantedAuthorities(authorities1) - .size()); + assertThat(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0)).isNotNull(); + assertThat(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0)).isEmpty();; + assertThat(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1)).isNotNull(); + assertThat(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1)).isEmpty();; } public void testSimpleRoleHierarchy() { diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java old mode 100755 new mode 100644 index b8427b20da..e4210f3764 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java +++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java @@ -14,7 +14,7 @@ package org.springframework.security.access.hierarchicalroles; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.Collection; @@ -45,29 +45,29 @@ public class TestHelperTests { List authorities5 = AuthorityUtils.createAuthorityList( "ROLE_A", "ROLE_A"); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, - null)); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities1)); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities2)); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities2, authorities1)); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, + null)).isTrue(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities1)).isTrue(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities2)).isTrue(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities2, authorities1)).isTrue(); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, - authorities1)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, null)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities3)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities3, authorities1)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities4)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities4, authorities1)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities4, authorities5)); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, + authorities1)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, null)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities3)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities3, authorities1)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities4)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities4, authorities1)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities4, authorities5)).isFalse(); } // SEC-863 @@ -103,25 +103,25 @@ public class TestHelperTests { authoritiesStrings5.add("ROLE_A"); authoritiesStrings5.add("ROLE_A"); - assertTrue(CollectionUtils.isEqualCollection( + assertThat(CollectionUtils.isEqualCollection( HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities1), - authoritiesStrings1)); + authoritiesStrings1)).isTrue(); - assertTrue(CollectionUtils.isEqualCollection( + assertThat(CollectionUtils.isEqualCollection( HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities2), - authoritiesStrings2)); + authoritiesStrings2)).isTrue(); - assertTrue(CollectionUtils.isEqualCollection( + assertThat(CollectionUtils.isEqualCollection( HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities3), - authoritiesStrings3)); + authoritiesStrings3)).isTrue(); - assertTrue(CollectionUtils.isEqualCollection( + assertThat(CollectionUtils.isEqualCollection( HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities4), - authoritiesStrings4)); + authoritiesStrings4)).isTrue(); - assertTrue(CollectionUtils.isEqualCollection( + assertThat(CollectionUtils.isEqualCollection( HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities5), - authoritiesStrings5)); + authoritiesStrings5)).isTrue(); } // SEC-863 @@ -138,29 +138,29 @@ public class TestHelperTests { List authorities5 = AuthorityUtils.createAuthorityList( "ROLE_A", "ROLE_A"); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, - null)); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities1)); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities2)); - assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities2, authorities1)); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, + null)).isTrue(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities1)).isTrue(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities2)).isTrue(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities2, authorities1)).isTrue(); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, - authorities1)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, null)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities3)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities3, authorities1)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities1, authorities4)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities4, authorities1)); - assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( - authorities4, authorities5)); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, + authorities1)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, null)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities3)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities3, authorities1)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities1, authorities4)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities4, authorities1)).isFalse(); + assertThat(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities( + authorities4, authorities5)).isFalse(); } // SEC-863 @@ -170,9 +170,9 @@ public class TestHelperTests { .createAuthorityList("ROLE_A", "ROLE_B"); List authorities2 = AuthorityUtils.createAuthorityList( "ROLE_A", "ROLE_B"); - assertTrue(HierarchicalRolesTestHelper + assertThat(HierarchicalRolesTestHelper .containTheSameGrantedAuthoritiesCompareByAuthorityString(authorities1, - authorities2)); + authorities2)).isTrue(); } // SEC-863 @@ -180,13 +180,13 @@ public class TestHelperTests { public void testCreateAuthorityList() { List authorities1 = HierarchicalRolesTestHelper .createAuthorityList("ROLE_A"); - assertEquals(authorities1.size(), 1); - assertEquals("ROLE_A", authorities1.get(0).getAuthority()); + assertThat(1).isEqualTo(authorities1.size()); + assertThat(authorities1.get(0).getAuthority()).isEqualTo("ROLE_A"); List authorities2 = HierarchicalRolesTestHelper .createAuthorityList("ROLE_A", "ROLE_C"); - assertEquals(authorities2.size(), 2); - assertEquals("ROLE_A", authorities2.get(0).getAuthority()); - assertEquals("ROLE_C", authorities2.get(1).getAuthority()); + assertThat(2).isEqualTo(authorities2.size()); + assertThat(authorities2.get(0).getAuthority()).isEqualTo("ROLE_A"); + assertThat(authorities2.get(1).getAuthority()).isEqualTo("ROLE_C"); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java index 5b14de781f..aa1a21de46 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java @@ -15,6 +15,8 @@ package org.springframework.security.access.intercept; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; import java.util.List; import java.util.Vector; @@ -51,7 +53,7 @@ public class AfterInvocationProviderManagerTests extends TestCase { list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP3"))); manager.setProviders(list); - assertEquals(list, manager.getProviders()); + assertThat(manager.getProviders()).isEqualTo(list); manager.afterPropertiesSet(); List attr1 = SecurityConfig @@ -65,20 +67,20 @@ public class AfterInvocationProviderManagerTests extends TestCase { List attr4 = SecurityConfig .createList(new String[] { "NEVER_CAUSES_SWAP" }); - assertEquals("swap1", manager.decide(null, new SimpleMethodInvocation(), attr1, - "content-before-swapping")); + assertThat(manager.decide(null, new SimpleMethodInvocation(), attr1, + "content-before-swapping")).isEqualTo("swap1"); - assertEquals("swap2", manager.decide(null, new SimpleMethodInvocation(), attr2, - "content-before-swapping")); + assertThat(manager.decide(null, new SimpleMethodInvocation(), attr2, + "content-before-swapping")).isEqualTo("swap2"); - assertEquals("swap3", manager.decide(null, new SimpleMethodInvocation(), attr3, - "content-before-swapping")); + assertThat(manager.decide(null, new SimpleMethodInvocation(), attr3, + "content-before-swapping")).isEqualTo("swap3"); - assertEquals("content-before-swapping", manager.decide(null, - new SimpleMethodInvocation(), attr4, "content-before-swapping")); + assertThat(manager.decide(null, + new SimpleMethodInvocation(), attr4, "content-before-swapping")).isEqualTo("content-before-swapping"); - assertEquals("swap3", manager.decide(null, new SimpleMethodInvocation(), - attr2and3, "content-before-swapping")); + assertThat(manager.decide(null, new SimpleMethodInvocation(), + attr2and3, "content-before-swapping")).isEqualTo("swap3"); } public void testRejectsEmptyProvidersList() { diff --git a/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java b/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java index c35050b477..f613bc27a1 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access.intercept; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; @@ -41,9 +41,9 @@ public class InterceptorStatusTokenTests { SecurityContext ctx = SecurityContextHolder.createEmptyContext(); InterceptorStatusToken token = new InterceptorStatusToken(ctx, true, attr, mi); - assertTrue(token.isContextHolderRefreshRequired()); - assertEquals(attr, token.getAttributes()); - assertEquals(mi, token.getSecureObject()); - assertSame(ctx, token.getSecurityContext()); + assertThat(token.isContextHolderRefreshRequired()).isTrue(); + assertThat(token.getAttributes()).isEqualTo(attr); + assertThat(token.getSecureObject()).isEqualTo(mi); + assertThat(token.getSecurityContext()).isSameAs(ctx); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java index 3d0666fd7f..9d50616ee0 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java @@ -15,6 +15,8 @@ package org.springframework.security.access.intercept; +import static org.assertj.core.api.Assertions.assertThat; + import junit.framework.TestCase; import org.springframework.security.access.SecurityConfig; @@ -35,16 +37,16 @@ public class NullRunAsManagerTests extends TestCase { public void testAlwaysReturnsNull() { NullRunAsManager runAs = new NullRunAsManager(); - assertNull(runAs.buildRunAs(null, null, null)); + assertThat(runAs.buildRunAs(null, null, null)).isNull(); } public void testAlwaysSupportsClass() { NullRunAsManager runAs = new NullRunAsManager(); - assertTrue(runAs.supports(String.class)); + assertThat(runAs.supports(String.class)).isTrue(); } public void testNeverSupportsAttribute() { NullRunAsManager runAs = new NullRunAsManager(); - assertFalse(runAs.supports(new SecurityConfig("X"))); + assertThat(runAs.supports(new SecurityConfig("X"))).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java index 45d3be3a6d..d2b2ff0f0d 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access.intercept; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.security.authentication.BadCredentialsException; @@ -54,7 +54,7 @@ public class RunAsImplAuthenticationProviderTests { result instanceof RunAsUserToken); RunAsUserToken resultCast = (RunAsUserToken) result; - assertEquals("my_password".hashCode(), resultCast.getKeyHash()); + assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode()); } @Test(expected = IllegalArgumentException.class) @@ -68,14 +68,14 @@ public class RunAsImplAuthenticationProviderTests { public void testStartupSuccess() throws Exception { RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider(); provider.setKey("hello_world"); - assertEquals("hello_world", provider.getKey()); + assertThat(provider.getKey()).isEqualTo("hello_world"); provider.afterPropertiesSet(); } @Test public void testSupports() { RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider(); - assertTrue(provider.supports(RunAsUserToken.class)); - assertTrue(!provider.supports(TestingAuthenticationToken.class)); + assertThat(provider.supports(RunAsUserToken.class)).isTrue(); + assertThat(!provider.supports(TestingAuthenticationToken.class)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java index 553c1542bb..9ace967c4b 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java @@ -15,6 +15,8 @@ package org.springframework.security.access.intercept; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Set; import junit.framework.TestCase; @@ -32,7 +34,7 @@ import org.springframework.security.core.authority.AuthorityUtils; public class RunAsManagerImplTests extends TestCase { public void testAlwaysSupportsClass() { RunAsManagerImpl runAs = new RunAsManagerImpl(); - assertTrue(runAs.supports(String.class)); + assertThat(runAs.supports(String.class)).isTrue(); } public void testDoesNotReturnAdditionalAuthoritiesIfCalledWithoutARunAsSetting() @@ -46,7 +48,7 @@ public class RunAsManagerImplTests extends TestCase { Authentication resultingToken = runAs.buildRunAs(inputToken, new Object(), SecurityConfig.createList("SOMETHING_WE_IGNORE")); - assertEquals(null, resultingToken); + assertThat(resultingToken).isEqualTo(null); } public void testRespectsRolePrefix() throws Exception { @@ -62,17 +64,17 @@ public class RunAsManagerImplTests extends TestCase { assertTrue("Should have returned a RunAsUserToken", result instanceof RunAsUserToken); - assertEquals(inputToken.getPrincipal(), result.getPrincipal()); - assertEquals(inputToken.getCredentials(), result.getCredentials()); + assertThat(result.getPrincipal()).isEqualTo(inputToken.getPrincipal()); + assertThat(result.getCredentials()).isEqualTo(inputToken.getCredentials()); Set authorities = AuthorityUtils.authorityListToSet(result .getAuthorities()); - assertTrue(authorities.contains("FOOBAR_RUN_AS_SOMETHING")); - assertTrue(authorities.contains("ONE")); - assertTrue(authorities.contains("TWO")); + assertThat(authorities.contains("FOOBAR_RUN_AS_SOMETHING")).isTrue(); + assertThat(authorities.contains("ONE")).isTrue(); + assertThat(authorities.contains("TWO")).isTrue(); RunAsUserToken resultCast = (RunAsUserToken) result; - assertEquals("my_password".hashCode(), resultCast.getKeyHash()); + assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode()); } public void testReturnsAdditionalGrantedAuthorities() throws Exception { @@ -90,17 +92,17 @@ public class RunAsManagerImplTests extends TestCase { fail("Should have returned a RunAsUserToken"); } - assertEquals(inputToken.getPrincipal(), result.getPrincipal()); - assertEquals(inputToken.getCredentials(), result.getCredentials()); + assertThat(result.getPrincipal()).isEqualTo(inputToken.getPrincipal()); + assertThat(result.getCredentials()).isEqualTo(inputToken.getCredentials()); Set authorities = AuthorityUtils.authorityListToSet(result .getAuthorities()); - assertTrue(authorities.contains("ROLE_RUN_AS_SOMETHING")); - assertTrue(authorities.contains("ROLE_ONE")); - assertTrue(authorities.contains("ROLE_TWO")); + assertThat(authorities.contains("ROLE_RUN_AS_SOMETHING")).isTrue(); + assertThat(authorities.contains("ROLE_ONE")).isTrue(); + assertThat(authorities.contains("ROLE_TWO")).isTrue(); RunAsUserToken resultCast = (RunAsUserToken) result; - assertEquals("my_password".hashCode(), resultCast.getKeyHash()); + assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode()); } public void testStartupDetectsMissingKey() throws Exception { @@ -111,7 +113,7 @@ public class RunAsManagerImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -119,13 +121,13 @@ public class RunAsManagerImplTests extends TestCase { RunAsManagerImpl runAs = new RunAsManagerImpl(); runAs.setKey("hello_world"); runAs.afterPropertiesSet(); - assertEquals("hello_world", runAs.getKey()); + assertThat(runAs.getKey()).isEqualTo("hello_world"); } public void testSupports() throws Exception { RunAsManager runAs = new RunAsManagerImpl(); - assertTrue(runAs.supports(new SecurityConfig("RUN_AS_SOMETHING"))); - assertTrue(!runAs.supports(new SecurityConfig("ROLE_WHICH_IS_IGNORED"))); - assertTrue(!runAs.supports(new SecurityConfig("role_LOWER_CASE_FAILS"))); + assertThat(runAs.supports(new SecurityConfig("RUN_AS_SOMETHING"))).isTrue(); + assertThat(!runAs.supports(new SecurityConfig("ROLE_WHICH_IS_IGNORED"))).isTrue(); + assertThat(!runAs.supports(new SecurityConfig("role_LOWER_CASE_FAILS"))).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java index 0b38193282..18d99aeff6 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access.intercept.aopalliance; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -100,11 +100,11 @@ public class MethodSecurityInterceptorTests { AfterInvocationManager aim = mock(AfterInvocationManager.class); interceptor.setRunAsManager(runAs); interceptor.setAfterInvocationManager(aim); - assertEquals(adm, interceptor.getAccessDecisionManager()); - assertEquals(runAs, interceptor.getRunAsManager()); - assertEquals(authman, interceptor.getAuthenticationManager()); - assertEquals(mds, interceptor.getSecurityMetadataSource()); - assertEquals(aim, interceptor.getAfterInvocationManager()); + assertThat(interceptor.getAccessDecisionManager()).isEqualTo(adm); + assertThat(interceptor.getRunAsManager()).isEqualTo(runAs); + assertThat(interceptor.getAuthenticationManager()).isEqualTo(authman); + assertThat(interceptor.getSecurityMetadataSource()).isEqualTo(mds); + assertThat(interceptor.getAfterInvocationManager()).isEqualTo(aim); } @Test(expected = IllegalArgumentException.class) @@ -198,17 +198,15 @@ public class MethodSecurityInterceptorTests { public void callingAPublicMethodFacadeWillNotRepeatSecurityChecksWhenPassedToTheSecuredMethodItFronts() { mdsReturnsNull(); String result = advisedTarget.publicMakeLowerCase("HELLO"); - assertEquals("hello Authentication empty", result); + assertThat(result).isEqualTo("hello Authentication empty"); } @Test public void callingAPublicMethodWhenPresentingAnAuthenticationObjectDoesntChangeItsAuthenticatedProperty() { mdsReturnsNull(); SecurityContextHolder.getContext().setAuthentication(token); - assertEquals( - "hello org.springframework.security.authentication.TestingAuthenticationToken false", - advisedTarget.publicMakeLowerCase("HELLO")); - assertTrue(!token.isAuthenticated()); + assertThat(advisedTarget.publicMakeLowerCase("HELLO")).isEqualTo("hello org.springframework.security.authentication.TestingAuthenticationToken false"); + assertThat(!token.isAuthenticated()).isTrue(); } @Test(expected = AuthenticationException.class) @@ -235,9 +233,7 @@ public class MethodSecurityInterceptorTests { String result = advisedTarget.makeLowerCase("HELLO"); // Note we check the isAuthenticated remained true in following line - assertEquals( - "hello org.springframework.security.authentication.TestingAuthenticationToken true", - result); + assertThat(result).isEqualTo("hello org.springframework.security.authentication.TestingAuthenticationToken true"); verify(eventPublisher).publishEvent(any(AuthorizedEvent.class)); } @@ -254,7 +250,7 @@ public class MethodSecurityInterceptorTests { try { advisedTarget.makeUpperCase("HELLO"); - fail(); + fail("Expected Exception"); } catch (AccessDeniedException expected) { } @@ -280,12 +276,10 @@ public class MethodSecurityInterceptorTests { .thenReturn(runAsToken); String result = advisedTarget.makeUpperCase("hello"); - assertEquals( - "HELLO org.springframework.security.access.intercept.RunAsUserToken true", - result); + assertThat(result).isEqualTo("HELLO org.springframework.security.access.intercept.RunAsUserToken true"); // Check we've changed back - assertSame(ctx, SecurityContextHolder.getContext()); - assertSame(token, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); } // SEC-1967 @@ -312,8 +306,8 @@ public class MethodSecurityInterceptorTests { } // Check we've changed back - assertSame(ctx, SecurityContextHolder.getContext()); - assertSame(token, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); } @Test(expected = AuthenticationCredentialsNotFoundException.class) diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java index 765273f22e..25d09fff68 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java @@ -15,6 +15,9 @@ package org.springframework.security.access.intercept.aopalliance; + +import static org.assertj.core.api.Assertions.assertThat; + import static org.mockito.Mockito.*; import java.lang.reflect.Method; @@ -42,7 +45,7 @@ public class MethodSecurityMetadataSourceAdvisorTests extends TestCase { when(mds.getAttributes(method, clazz)).thenReturn(null); MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor( "", mds, ""); - assertFalse(advisor.getPointcut().getMethodMatcher().matches(method, clazz)); + assertThat(advisor.getPointcut().getMethodMatcher().matches(method, clazz)).isFalse(); } public void testAdvisorReturnsTrueWhenMethodInvocationIsDefined() throws Exception { @@ -54,6 +57,6 @@ public class MethodSecurityMetadataSourceAdvisorTests extends TestCase { SecurityConfig.createList("ROLE_A")); MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor( "", mds, ""); - assertTrue(advisor.getPointcut().getMethodMatcher().matches(method, clazz)); + assertThat(advisor.getPointcut().getMethodMatcher().matches(method, clazz)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java index 56d36919b7..92ba6eb8b0 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access.intercept.aspectj; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -134,10 +134,10 @@ public class AspectJMethodSecurityInterceptorTests { when(joinPoint.getTarget()).thenReturn(to); when(joinPoint.getArgs()).thenReturn(new Object[] { "Hi" }); MethodInvocationAdapter mia = new MethodInvocationAdapter(joinPoint); - assertEquals("Hi", mia.getArguments()[0]); - assertEquals(m, mia.getStaticPart()); - assertEquals(m, mia.getMethod()); - assertSame(to, mia.getThis()); + assertThat(mia.getArguments()[0]).isEqualTo("Hi"); + assertThat(mia.getStaticPart()).isEqualTo(m); + assertThat(mia.getMethod()).isEqualTo(m); + assertThat(mia.getThis()).isSameAs(to); } @Test @@ -184,8 +184,8 @@ public class AspectJMethodSecurityInterceptorTests { } // Check we've changed back - assertSame(ctx, SecurityContextHolder.getContext()); - assertSame(token, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); } // SEC-1967 @@ -211,7 +211,7 @@ public class AspectJMethodSecurityInterceptorTests { } // Check we've changed back - assertSame(ctx, SecurityContextHolder.getContext()); - assertSame(token, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java index 1a4f5fcd61..c37618404d 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.intercept.method; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.List; @@ -35,7 +35,7 @@ public class MapBasedMethodSecurityMetadataSourceTests { public void wildcardedMatchIsOverwrittenByMoreSpecificMatch() { mds.addSecureMethod(MockService.class, "some*", ROLE_A); mds.addSecureMethod(MockService.class, "someMethod*", ROLE_B); - assertEquals(ROLE_B, mds.getAttributes(someMethodInteger, MockService.class)); + assertThat(mds.getAttributes(someMethodInteger, MockService.class)).isEqualTo(ROLE_B); } @Test @@ -43,8 +43,8 @@ public class MapBasedMethodSecurityMetadataSourceTests { mds.addSecureMethod(MockService.class, someMethodInteger, ROLE_A); mds.addSecureMethod(MockService.class, someMethodString, ROLE_B); - assertEquals(ROLE_A, mds.getAttributes(someMethodInteger, MockService.class)); - assertEquals(ROLE_B, mds.getAttributes(someMethodString, MockService.class)); + assertThat(mds.getAttributes(someMethodInteger, MockService.class)).isEqualTo(ROLE_A); + assertThat(mds.getAttributes(someMethodString, MockService.class)).isEqualTo(ROLE_B); } @SuppressWarnings("unused") diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java index c345460c5b..08b9b4d8b8 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access.intercept.method; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; @@ -80,7 +80,7 @@ public class MethodInvocationPrivilegeEvaluatorTests { mipe.setSecurityInterceptor(interceptor); mipe.afterPropertiesSet(); - assertTrue(mipe.isAllowed(mi, token)); + assertThat(mipe.isAllowed(mi, token)).isTrue(); } @Test @@ -92,7 +92,7 @@ public class MethodInvocationPrivilegeEvaluatorTests { mipe.setSecurityInterceptor(interceptor); when(mds.getAttributes(mi)).thenReturn(role); - assertTrue(mipe.isAllowed(mi, token)); + assertThat(mipe.isAllowed(mi, token)).isTrue(); } @Test @@ -105,7 +105,7 @@ public class MethodInvocationPrivilegeEvaluatorTests { when(mds.getAttributes(mi)).thenReturn(role); doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role); - assertFalse(mipe.isAllowed(mi, token)); + assertThat(mipe.isAllowed(mi, token)).isFalse(); } @Test @@ -119,6 +119,6 @@ public class MethodInvocationPrivilegeEvaluatorTests { when(mds.getAttributes(mi)).thenReturn(role); doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role); - assertFalse(mipe.isAllowed(mi, token)); + assertThat(mipe.isAllowed(mi, token)).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java index fdf619e7fa..32fd2ccc28 100644 --- a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.method; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.aopalliance.intercept.MethodInvocation; @@ -27,13 +27,13 @@ public class DelegatingMethodSecurityMetadataSourceTests { .thenReturn(null); sources.add(delegate); mds = new DelegatingMethodSecurityMetadataSource(sources); - assertSame(sources, mds.getMethodSecurityMetadataSources()); - assertTrue(mds.getAllConfigAttributes().isEmpty()); + assertThat(mds.getMethodSecurityMetadataSources()).isSameAs(sources); + assertThat(mds.getAllConfigAttributes().isEmpty()).isTrue(); MethodInvocation mi = new SimpleMethodInvocation(null, String.class.getMethod("toString")); - assertEquals(Collections.emptyList(), mds.getAttributes(mi)); + assertThat(mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); // Exercise the cached case - assertEquals(Collections.emptyList(), mds.getAttributes(mi)); + assertThat(mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); } @Test @@ -46,15 +46,14 @@ public class DelegatingMethodSecurityMetadataSourceTests { when(delegate.getAttributes(toString, String.class)).thenReturn(attributes); sources.add(delegate); mds = new DelegatingMethodSecurityMetadataSource(sources); - assertSame(sources, mds.getMethodSecurityMetadataSources()); - assertTrue(mds.getAllConfigAttributes().isEmpty()); + assertThat(mds.getMethodSecurityMetadataSources()).isSameAs(sources); + assertThat(mds.getAllConfigAttributes().isEmpty()).isTrue(); MethodInvocation mi = new SimpleMethodInvocation("", toString); - assertSame(attributes, mds.getAttributes(mi)); + assertThat(mds.getAttributes(mi)).isSameAs(attributes); // Exercise the cached case - assertSame(attributes, mds.getAttributes(mi)); - assertTrue(mds.getAttributes( - new SimpleMethodInvocation(null, String.class.getMethod("length"))) - .isEmpty()); + assertThat(mds.getAttributes(mi)).isSameAs(attributes); + assertThat(mds.getAttributes( + new SimpleMethodInvocation(null, String.class.getMethod("length")))).isEmpty();; } } diff --git a/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java b/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java index 3fec8f52dc..fd0b64a959 100644 --- a/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.prepost; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import org.aopalliance.intercept.MethodInvocation; import org.junit.Before; @@ -24,17 +24,17 @@ public class PreInvocationAuthorizationAdviceVoterTests { @Test public void supportsMethodInvocation() { - assertTrue(voter.supports(MethodInvocation.class)); + assertThat(voter.supports(MethodInvocation.class)).isTrue(); } // SEC-2031 @Test public void supportsProxyMethodInvocation() { - assertTrue(voter.supports(ProxyMethodInvocation.class)); + assertThat(voter.supports(ProxyMethodInvocation.class)).isTrue(); } @Test public void supportsMethodInvocationAdapter() { - assertTrue(voter.supports(MethodInvocationAdapter.class)); + assertThat(voter.supports(MethodInvocationAdapter.class)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java index fc75433725..c4af2b970b 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java @@ -15,6 +15,8 @@ package org.springframework.security.access.vote; +import static org.assertj.core.api.Assertions.assertThat; + import junit.framework.TestCase; import org.springframework.security.access.AccessDecisionVoter; @@ -45,9 +47,9 @@ public class AbstractAccessDecisionManagerTests extends TestCase { DenyAgainVoter denyVoter = new DenyAgainVoter(); list.add(denyVoter); MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list); - assertTrue(!mock.isAllowIfAllAbstainDecisions()); // default + assertThat(!mock.isAllowIfAllAbstainDecisions()).isTrue(); // default mock.setAllowIfAllAbstainDecisions(true); - assertTrue(mock.isAllowIfAllAbstainDecisions()); // changed + assertThat(mock.isAllowIfAllAbstainDecisions()).isTrue(); // changed } public void testDelegatesSupportsClassRequests() throws Exception { @@ -57,8 +59,8 @@ public class AbstractAccessDecisionManagerTests extends TestCase { MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list); - assertTrue(mock.supports(String.class)); - assertTrue(!mock.supports(Integer.class)); + assertThat(mock.supports(String.class)).isTrue(); + assertThat(!mock.supports(Integer.class)).isTrue(); } public void testDelegatesSupportsRequests() throws Exception { @@ -71,10 +73,10 @@ public class AbstractAccessDecisionManagerTests extends TestCase { MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list); ConfigAttribute attr = new SecurityConfig("DENY_AGAIN_FOR_SURE"); - assertTrue(mock.supports(attr)); + assertThat(mock.supports(attr)).isTrue(); ConfigAttribute badAttr = new SecurityConfig("WE_DONT_SUPPORT_THIS"); - assertTrue(!mock.supports(badAttr)); + assertThat(!mock.supports(badAttr)).isTrue(); } public void testProperlyStoresListOfVoters() throws Exception { @@ -84,7 +86,7 @@ public class AbstractAccessDecisionManagerTests extends TestCase { list.add(voter); list.add(denyVoter); MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list); - assertEquals(list.size(), mock.getDecisionVoters().size()); + assertThat(mock.getDecisionVoters().size()).isEqualTo(list.size()); } public void testRejectsEmptyList() throws Exception { @@ -95,7 +97,7 @@ public class AbstractAccessDecisionManagerTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -105,13 +107,13 @@ public class AbstractAccessDecisionManagerTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testRoleVoterAlwaysReturnsTrueToSupports() { RoleVoter rv = new RoleVoter(); - assertTrue(rv.supports(String.class)); + assertThat(rv.supports(String.class)).isTrue(); } public void testWillNotStartIfDecisionVotersNotSet() throws Exception { @@ -120,7 +122,7 @@ public class AbstractAccessDecisionManagerTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java index 69be8acbb7..114107f4d3 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.vote; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.*; @@ -28,8 +28,8 @@ public class AbstractAclVoterTests { @Test public void supportsMethodInvocations() throws Exception { - assertTrue(voter.supports(MethodInvocation.class)); - assertFalse(voter.supports(String.class)); + assertThat(voter.supports(MethodInvocation.class)).isTrue(); + assertThat(voter.supports(String.class)).isFalse(); } @Test @@ -38,7 +38,7 @@ public class AbstractAclVoterTests { voter.setProcessDomainObjectClass(String.class); MethodInvocation mi = MethodInvocationUtils.create(new TestClass(), "methodTakingAString", "The Argument"); - assertEquals("The Argument", voter.getDomainObjectInstance(mi)); + assertThat(voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); } @Test @@ -46,7 +46,7 @@ public class AbstractAclVoterTests { voter.setProcessDomainObjectClass(String.class); MethodInvocation mi = MethodInvocationUtils.create(new TestClass(), "methodTakingAListAndAString", new ArrayList(), "The Argument"); - assertEquals("The Argument", voter.getDomainObjectInstance(mi)); + assertThat(voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); } @SuppressWarnings("unused") diff --git a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java index 17cdf245a6..aaa65832dd 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java @@ -15,7 +15,8 @@ package org.springframework.security.access.vote; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -97,7 +98,7 @@ public class AffirmativeBasedTests { public void onlyAbstainVotesDeniesAccessWithDefault() throws Exception { mgr = new AffirmativeBased(Arrays.> asList( abstain, abstain, abstain)); - assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default + assertThat(!mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check default mgr.decide(user, new Object(), attrs); } @@ -108,7 +109,7 @@ public class AffirmativeBasedTests { mgr = new AffirmativeBased(Arrays.> asList( abstain, abstain, abstain)); mgr.setAllowIfAllAbstainDecisions(true); - assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed + assertThat(mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check changed mgr.decide(user, new Object(), attrs); } diff --git a/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java index 9fb190ef97..057fc28de6 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java @@ -15,6 +15,8 @@ package org.springframework.security.access.vote; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; import junit.framework.TestCase; @@ -95,19 +97,19 @@ public class AuthenticatedVoterTests extends TestCase { fail("Expected IAE"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testSupports() { AuthenticatedVoter voter = new AuthenticatedVoter(); - assertTrue(voter.supports(String.class)); + assertThat(voter.supports(String.class)).isTrue(); assertTrue(voter.supports(new SecurityConfig( AuthenticatedVoter.IS_AUTHENTICATED_ANONYMOUSLY))); assertTrue(voter.supports(new SecurityConfig( AuthenticatedVoter.IS_AUTHENTICATED_FULLY))); assertTrue(voter.supports(new SecurityConfig( AuthenticatedVoter.IS_AUTHENTICATED_REMEMBERED))); - assertFalse(voter.supports(new SecurityConfig("FOO"))); + assertThat(voter.supports(new SecurityConfig("FOO"))).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java index a32213bf0d..6193e92516 100644 --- a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java @@ -15,7 +15,7 @@ package org.springframework.security.access.vote; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.security.access.AccessDecisionVoter; @@ -39,7 +39,7 @@ public class ConsensusBasedTests { TestingAuthenticationToken auth = makeTestToken(); ConsensusBased mgr = makeDecisionManager(); mgr.setAllowIfEqualGrantedDeniedDecisions(false); - assertTrue(!mgr.isAllowIfEqualGrantedDeniedDecisions()); // check changed + assertThat(!mgr.isAllowIfEqualGrantedDeniedDecisions()).isTrue(); // check changed List config = SecurityConfig.createList("ROLE_1", "DENY_FOR_SURE"); @@ -53,13 +53,13 @@ public class ConsensusBasedTests { TestingAuthenticationToken auth = makeTestToken(); ConsensusBased mgr = makeDecisionManager(); - assertTrue(mgr.isAllowIfEqualGrantedDeniedDecisions()); // check default + assertThat(mgr.isAllowIfEqualGrantedDeniedDecisions()).isTrue(); // check default List config = SecurityConfig.createList("ROLE_1", "DENY_FOR_SURE"); mgr.decide(auth, new Object(), config); - assertTrue(true); + } @Test @@ -68,7 +68,7 @@ public class ConsensusBasedTests { ConsensusBased mgr = makeDecisionManager(); mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_2")); - assertTrue(true); + } @Test(expected = AccessDeniedException.class) @@ -85,7 +85,7 @@ public class ConsensusBasedTests { TestingAuthenticationToken auth = makeTestToken(); ConsensusBased mgr = makeDecisionManager(); - assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default + assertThat(!mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check default mgr.decide(auth, new Object(), SecurityConfig.createList("IGNORED_BY_ALL")); } @@ -95,7 +95,7 @@ public class ConsensusBasedTests { TestingAuthenticationToken auth = makeTestToken(); ConsensusBased mgr = makeDecisionManager(); mgr.setAllowIfAllAbstainDecisions(true); - assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed + assertThat(mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check changed mgr.decide(auth, new Object(), SecurityConfig.createList("IGNORED_BY_ALL")); } diff --git a/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java index 655cc37062..b43637179e 100644 --- a/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.access.vote; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.security.access.SecurityConfig; @@ -20,7 +20,6 @@ public class RoleHierarchyVoterTests { "password", "ROLE_A"); RoleHierarchyVoter voter = new RoleHierarchyVoter(roleHierarchyImpl); - assertEquals(RoleHierarchyVoter.ACCESS_GRANTED, - voter.vote(auth, new Object(), SecurityConfig.createList("ROLE_B"))); + assertThat(voter.vote(auth, new Object(), SecurityConfig.createList("ROLE_B"))).isEqualTo(RoleHierarchyVoter.ACCESS_GRANTED); } } diff --git a/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java index 6c95e98fc9..a45ab8910f 100644 --- a/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java @@ -1,7 +1,6 @@ package org.springframework.security.access.vote; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.access.AccessDecisionVoter; @@ -20,8 +19,7 @@ public class RoleVoterTests { voter.setRolePrefix(""); Authentication userAB = new TestingAuthenticationToken("user", "pass", "A", "B"); // Vote on attribute list that has two attributes A and C (i.e. only one matching) - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, - voter.vote(userAB, this, SecurityConfig.createList("A", "C"))); + assertThat(voter.vote(userAB, this, SecurityConfig.createList("A", "C"))).isEqualTo(AccessDecisionVoter.ACCESS_GRANTED); } // SEC-3128 diff --git a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java index 6a9f89579d..02e0aa18aa 100644 --- a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java @@ -15,6 +15,8 @@ package org.springframework.security.access.vote; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; import java.util.Vector; @@ -84,7 +86,6 @@ public class UnanimousBasedTests extends TestCase { fail("Should have thrown AccessDeniedException"); } catch (AccessDeniedException expected) { - assertTrue(true); } } @@ -95,7 +96,6 @@ public class UnanimousBasedTests extends TestCase { List config = SecurityConfig.createList("ROLE_2"); mgr.decide(auth, new Object(), config); - assertTrue(true); } public void testOneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception { @@ -109,7 +109,6 @@ public class UnanimousBasedTests extends TestCase { fail("Should have thrown AccessDeniedException"); } catch (AccessDeniedException expected) { - assertTrue(true); } } @@ -121,14 +120,13 @@ public class UnanimousBasedTests extends TestCase { "FOOBAR_1", "FOOBAR_2" }); mgr.decide(auth, new Object(), config); - assertTrue(true); } public void testThreeAbstainVotesDeniesAccessWithDefault() throws Exception { TestingAuthenticationToken auth = makeTestToken(); UnanimousBased mgr = makeDecisionManager(); - assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default + assertThat(!mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check default List config = SecurityConfig.createList("IGNORED_BY_ALL"); @@ -137,7 +135,6 @@ public class UnanimousBasedTests extends TestCase { fail("Should have thrown AccessDeniedException"); } catch (AccessDeniedException expected) { - assertTrue(true); } } @@ -145,12 +142,11 @@ public class UnanimousBasedTests extends TestCase { TestingAuthenticationToken auth = makeTestToken(); UnanimousBased mgr = makeDecisionManager(); mgr.setAllowIfAllAbstainDecisions(true); - assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed + assertThat(mgr.isAllowIfAllAbstainDecisions()).isTrue(); // check changed List config = SecurityConfig.createList("IGNORED_BY_ALL"); mgr.decide(auth, new Object(), config); - assertTrue(true); } public void testTwoAffirmativeVotesTwoAbstainVotesGrantsAccess() throws Exception { @@ -161,6 +157,5 @@ public class UnanimousBasedTests extends TestCase { "ROLE_2" }); mgr.decide(auth, new Object(), config); - assertTrue(true); } } diff --git a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java index 640db425a0..644a378d5c 100644 --- a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.security.core.GrantedAuthority; @@ -49,7 +49,7 @@ public class AbstractAuthenticationTokenTests { authorities); List gotAuthorities = (List) token .getAuthorities(); - assertNotSame(authorities, gotAuthorities); + assertThat(gotAuthorities).isNotSameAs(authorities); gotAuthorities.set(0, new SimpleGrantedAuthority("ROLE_SUPER_USER")); } @@ -58,9 +58,9 @@ public class AbstractAuthenticationTokenTests { public void testGetters() throws Exception { MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); - assertEquals("Test", token.getPrincipal()); - assertEquals("Password", token.getCredentials()); - assertEquals("Test", token.getName()); + assertThat(token.getPrincipal()).isEqualTo("Test"); + assertThat(token.getCredentials()).isEqualTo("Password"); + assertThat(token.getName()).isEqualTo("Test"); } @Test @@ -71,12 +71,12 @@ public class AbstractAuthenticationTokenTests { authorities); MockAuthenticationImpl token3 = new MockAuthenticationImpl(null, null, AuthorityUtils.NO_AUTHORITIES); - assertEquals(token1.hashCode(), token2.hashCode()); - assertTrue(token1.hashCode() != token3.hashCode()); + assertThat(token2.hashCode()).isEqualTo(token1.hashCode()); + assertThat(token1.hashCode() != token3.hashCode()).isTrue(); token2.setAuthenticated(true); - assertTrue(token1.hashCode() != token2.hashCode()); + assertThat(token1.hashCode() != token2.hashCode()).isTrue(); } @Test @@ -85,53 +85,53 @@ public class AbstractAuthenticationTokenTests { authorities); MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", authorities); - assertEquals(token1, token2); + assertThat(token2).isEqualTo(token1); MockAuthenticationImpl token3 = new MockAuthenticationImpl("Test", "Password_Changed", authorities); - assertTrue(!token1.equals(token3)); + assertThat(!token1.equals(token3)).isTrue(); MockAuthenticationImpl token4 = new MockAuthenticationImpl("Test_Changed", "Password", authorities); - assertTrue(!token1.equals(token4)); + assertThat(!token1.equals(token4)).isTrue(); MockAuthenticationImpl token5 = new MockAuthenticationImpl("Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO_CHANGED")); - assertTrue(!token1.equals(token5)); + assertThat(!token1.equals(token5)).isTrue(); MockAuthenticationImpl token6 = new MockAuthenticationImpl("Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE")); - assertTrue(!token1.equals(token6)); + assertThat(!token1.equals(token6)).isTrue(); MockAuthenticationImpl token7 = new MockAuthenticationImpl("Test", "Password", null); - assertTrue(!token1.equals(token7)); - assertTrue(!token7.equals(token1)); + assertThat(!token1.equals(token7)).isTrue(); + assertThat(!token7.equals(token1)).isTrue(); - assertTrue(!token1.equals(Integer.valueOf(100))); + assertThat(!token1.equals(Integer.valueOf(100))).isTrue(); } @Test public void testSetAuthenticated() throws Exception { MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); token.setAuthenticated(true); - assertTrue(token.isAuthenticated()); + assertThat(token.isAuthenticated()).isTrue(); } @Test public void testToStringWithAuthorities() { MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities); - assertTrue(token.toString().lastIndexOf("ROLE_TWO") != -1); + assertThat(token.toString().lastIndexOf("ROLE_TWO") != -1).isTrue(); } @Test public void testToStringWithNullAuthorities() { MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", null); - assertTrue(token.toString().lastIndexOf("Not granted any authorities") != -1); + assertThat(token.toString().lastIndexOf("Not granted any authorities") != -1).isTrue(); } // ~ Inner Classes diff --git a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java index 240a8e6503..210f1825ef 100644 --- a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java @@ -15,6 +15,8 @@ package org.springframework.security.authentication; +import static org.assertj.core.api.Assertions.assertThat; + import junit.framework.TestCase; import org.springframework.security.authentication.AnonymousAuthenticationToken; @@ -56,11 +58,11 @@ public class AuthenticationTrustResolverImplTests extends TestCase { assertEquals(AnonymousAuthenticationToken.class, trustResolver.getAnonymousClass()); trustResolver.setAnonymousClass(TestingAuthenticationToken.class); - assertEquals(TestingAuthenticationToken.class, trustResolver.getAnonymousClass()); + assertThat(trustResolver.getAnonymousClass()).isEqualTo(TestingAuthenticationToken.class); assertEquals(RememberMeAuthenticationToken.class, trustResolver.getRememberMeClass()); trustResolver.setRememberMeClass(TestingAuthenticationToken.class); - assertEquals(TestingAuthenticationToken.class, trustResolver.getRememberMeClass()); + assertThat(trustResolver.getRememberMeClass()).isEqualTo(TestingAuthenticationToken.class); } } diff --git a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java index ff62dee0f0..5fb5883c38 100644 --- a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -59,12 +59,12 @@ public class ProviderManagerTests { "Test", "Password"); ProviderManager mgr = makeProviderManager(); Authentication result = mgr.authenticate(token); - assertNull(result.getCredentials()); + assertThat(result.getCredentials()).isNull(); mgr.setEraseCredentialsAfterAuthentication(false); token = new UsernamePasswordAuthenticationToken("Test", "Password"); result = mgr.authenticate(token); - assertNotNull(result.getCredentials()); + assertThat(result.getCredentials()).isNotNull(); } @Test @@ -77,7 +77,7 @@ public class ProviderManagerTests { mgr.setAuthenticationEventPublisher(publisher); Authentication result = mgr.authenticate(a); - assertEquals(a, result); + assertThat(result).isEqualTo(a); verify(publisher).publishAuthenticationSuccess(result); } @@ -90,7 +90,7 @@ public class ProviderManagerTests { mgr.setAuthenticationEventPublisher(publisher); Authentication result = mgr.authenticate(a); - assertSame(a, result); + assertThat(result).isSameAs(a); verify(publisher).publishAuthenticationSuccess(result); } @@ -124,7 +124,7 @@ public class ProviderManagerTests { request.setDetails(requestDetails); Authentication result = authMgr.authenticate(request); - assertEquals(resultDetails, result.getDetails()); + assertThat(result.getDetails()).isEqualTo(resultDetails); } @Test @@ -137,8 +137,8 @@ public class ProviderManagerTests { request.setDetails(details); Authentication result = authMgr.authenticate(request); - assertNotNull(result.getCredentials()); - assertSame(details, result.getDetails()); + assertThat(result.getCredentials()).isNotNull(); + assertThat(result.getDetails()).isSameAs(details); } @Test @@ -148,7 +148,7 @@ public class ProviderManagerTests { ProviderManager mgr = new ProviderManager( Arrays.asList(createProviderWhichThrows(new BadCredentialsException("", new Throwable())), createProviderWhichReturns(authReq))); - assertSame(authReq, mgr.authenticate(mock(Authentication.class))); + assertThat(mgr.authenticate(mock(Authentication.class))).isSameAs(authReq); } @Test @@ -194,7 +194,7 @@ public class ProviderManagerTests { when(parent.authenticate(authReq)).thenReturn(authReq); ProviderManager mgr = new ProviderManager( Arrays.asList(mock(AuthenticationProvider.class)), parent); - assertSame(authReq, mgr.authenticate(authReq)); + assertThat(mgr.authenticate(authReq)).isSameAs(authReq); } @Test @@ -256,7 +256,7 @@ public class ProviderManagerTests { fail("Expected exception"); } catch (BadCredentialsException e) { - assertSame(expected, e); + assertThat(e).isSameAs(expected); } verify(publisher).publishAuthenticationFailure(expected, authReq); } @@ -276,7 +276,7 @@ public class ProviderManagerTests { fail("Expected exception"); } catch (LockedException e) { - assertSame(expected, e); + assertThat(e).isSameAs(expected); } verify(publisher).publishAuthenticationFailure(expected, authReq); } diff --git a/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java index b51d259a62..6e3ee79eb6 100644 --- a/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java @@ -15,6 +15,8 @@ package org.springframework.security.authentication; +import static org.assertj.core.api.Assertions.assertThat; + import junit.framework.TestCase; import org.springframework.security.authentication.TestingAuthenticationProvider; @@ -35,20 +37,17 @@ public class TestingAuthenticationProviderTests extends TestCase { "Password", "ROLE_ONE", "ROLE_TWO"); Authentication result = provider.authenticate(token); - assertTrue(result instanceof TestingAuthenticationToken); + assertThat(result instanceof TestingAuthenticationToken).isTrue(); TestingAuthenticationToken castResult = (TestingAuthenticationToken) result; - assertEquals("Test", castResult.getPrincipal()); - assertEquals("Password", castResult.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()) - .contains("ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()) - .contains("ROLE_TWO")); + assertThat(castResult.getPrincipal()).isEqualTo("Test"); + assertThat(castResult.getCredentials()).isEqualTo("Password"); + assertThat(AuthorityUtils.authorityListToSet(castResult.getAuthorities())).contains("ROLE_ONE","ROLE_TWO"); } public void testSupports() { TestingAuthenticationProvider provider = new TestingAuthenticationProvider(); - assertTrue(provider.supports(TestingAuthenticationToken.class)); - assertTrue(!provider.supports(String.class)); + assertThat(provider.supports(TestingAuthenticationToken.class)).isTrue(); + assertThat(!provider.supports(String.class)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java index 8606feafd5..3c756611a9 100644 --- a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java @@ -15,9 +15,9 @@ package org.springframework.security.authentication; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import org.junit.Test; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -40,22 +40,22 @@ public class UsernamePasswordAuthenticationTokenTests { // check default given we passed some GrantedAuthorty[]s (well, we passed empty // list) - assertTrue(token.isAuthenticated()); + assertThat(token.isAuthenticated()).isTrue(); // check explicit set to untrusted (we can safely go from trusted to untrusted, // but not the reverse) token.setAuthenticated(false); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); // Now let's create a UsernamePasswordAuthenticationToken without any // GrantedAuthorty[]s (different constructor) token = new UsernamePasswordAuthenticationToken("Test", "Password"); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); // check we're allowed to still set it to untrusted token.setAuthenticated(false); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); // check denied changing it to trusted try { @@ -71,11 +71,11 @@ public class UsernamePasswordAuthenticationTokenTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( "Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO")); - assertEquals("Test", token.getPrincipal()); - assertEquals("Password", token.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( + assertThat(token.getPrincipal()).isEqualTo("Test"); + assertThat(token.getCredentials()).isEqualTo("Password"); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( "ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( "ROLE_TWO")); } diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java index 1327c392c8..21374ce2e8 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication.anonymous; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.security.authentication.AnonymousAuthenticationProvider; @@ -59,7 +59,7 @@ public class AnonymousAuthenticationProviderTests { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -67,7 +67,7 @@ public class AnonymousAuthenticationProviderTests { public void testGettersSetters() throws Exception { AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider( "qwerty"); - assertEquals("qwerty", aap.getKey()); + assertThat(aap.getKey()).isEqualTo("qwerty"); } @Test @@ -77,10 +77,10 @@ public class AnonymousAuthenticationProviderTests { TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password", "ROLE_A"); - assertFalse(aap.supports(TestingAuthenticationToken.class)); + assertThat(aap.supports(TestingAuthenticationToken.class)).isFalse(); // Try it anyway - assertNull(aap.authenticate(token)); + assertThat(aap.authenticate(token)).isNull(); } @Test @@ -93,14 +93,14 @@ public class AnonymousAuthenticationProviderTests { Authentication result = aap.authenticate(token); - assertEquals(result, token); + assertThat(token).isEqualTo(result); } @Test public void testSupports() { AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider( "qwerty"); - assertTrue(aap.supports(AnonymousAuthenticationToken.class)); - assertFalse(aap.supports(TestingAuthenticationToken.class)); + assertThat(aap.supports(AnonymousAuthenticationToken.class)).isTrue(); + assertThat(aap.supports(TestingAuthenticationToken.class)).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java index 11fe02164b..4be3379248 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java @@ -15,6 +15,8 @@ package org.springframework.security.authentication.anonymous; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; import junit.framework.TestCase; @@ -73,21 +75,19 @@ public class AnonymousAuthenticationTokenTests extends TestCase { AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("key", "Test", ROLES_12); - assertEquals(token1, token2); + assertThat(token2).isEqualTo(token1); } public void testGetters() { AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key", "Test", ROLES_12); - assertEquals("key".hashCode(), token.getKeyHash()); - assertEquals("Test", token.getPrincipal()); - assertEquals("", token.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( - "ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( - "ROLE_TWO")); - assertTrue(token.isAuthenticated()); + assertThat(token.getKeyHash()).isEqualTo("key".hashCode()); + assertThat(token.getPrincipal()).isEqualTo("Test"); + assertThat(token.getCredentials()).isEqualTo(""); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains( + "ROLE_ONE","ROLE_TWO"); + assertThat(token.isAuthenticated()).isTrue(); } public void testNoArgConstructorDoesntExist() { @@ -107,7 +107,7 @@ public class AnonymousAuthenticationTokenTests extends TestCase { AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("key", "DIFFERENT_PRINCIPAL", ROLES_12); - assertFalse(token1.equals(token2)); + assertThat(token1.equals(token2)).isFalse(); } public void testNotEqualsDueToDifferentAuthenticationClass() { @@ -116,7 +116,7 @@ public class AnonymousAuthenticationTokenTests extends TestCase { UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken( "Test", "Password", ROLES_12); - assertFalse(token1.equals(token2)); + assertThat(token1.equals(token2)).isFalse(); } public void testNotEqualsDueToKey() { @@ -126,14 +126,14 @@ public class AnonymousAuthenticationTokenTests extends TestCase { AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken( "DIFFERENT_KEY", "Test", ROLES_12); - assertFalse(token1.equals(token2)); + assertThat(token1.equals(token2)).isFalse(); } public void testSetAuthenticatedIgnored() { AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key", "Test", ROLES_12); - assertTrue(token.isAuthenticated()); + assertThat(token.isAuthenticated()).isTrue(); token.setAuthenticated(false); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java index 02c3d64c89..a87cb1954f 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java @@ -15,6 +15,8 @@ package org.springframework.security.authentication.dao; +import static org.assertj.core.api.Assertions.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.mock; @@ -77,7 +79,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown BadCredentialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -94,7 +96,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Expected BadCredenialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -111,7 +113,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown AccountExpiredException"); } catch (AccountExpiredException expected) { - assertTrue(true); + } } @@ -128,7 +130,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown LockedException"); } catch (LockedException expected) { - assertTrue(true); + } } @@ -145,7 +147,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown CredentialsExpiredException"); } catch (CredentialsExpiredException expected) { - assertTrue(true); + } // Check that wrong password causes BadCredentialsException, rather than @@ -157,7 +159,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown BadCredentialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -174,7 +176,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown DisabledException"); } catch (DisabledException expected) { - assertTrue(true); + } } @@ -207,7 +209,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown BadCredentialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -224,7 +226,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown BadCredentialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -243,7 +245,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown UsernameNotFoundException"); } catch (UsernameNotFoundException expected) { - assertTrue(true); + } } @@ -252,7 +254,7 @@ public class DaoAuthenticationProviderTests extends TestCase { "INVALID_USER", "koala"); DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); - assertTrue(provider.isHideUserNotFoundExceptions()); + assertThat(provider.isHideUserNotFoundExceptions()).isTrue(); provider.setUserDetailsService(new MockAuthenticationDaoUserrod()); provider.setUserCache(new MockUserCache()); @@ -261,7 +263,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown BadCredentialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -278,7 +280,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown BadCredentialsException"); } catch (BadCredentialsException expected) { - assertTrue(true); + } } @@ -298,13 +300,11 @@ public class DaoAuthenticationProviderTests extends TestCase { } UsernamePasswordAuthenticationToken castResult = (UsernamePasswordAuthenticationToken) result; - assertEquals(User.class, castResult.getPrincipal().getClass()); - assertEquals("koala", castResult.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()) - .contains("ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()) - .contains("ROLE_TWO")); - assertEquals("192.168.0.1", castResult.getDetails()); + assertThat(castResult.getPrincipal().getClass()).isEqualTo(User.class); + assertThat(castResult.getCredentials()).isEqualTo("koala"); + assertThat(AuthorityUtils.authorityListToSet(castResult.getAuthorities())) + .contains("ROLE_ONE","ROLE_TWO"); + assertThat(castResult.getDetails()).isEqualTo("192.168.0.1"); } public void testAuthenticatesASecondTime() { @@ -328,7 +328,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have returned instance of UsernamePasswordAuthenticationToken"); } - assertEquals(result.getCredentials(), result2.getCredentials()); + assertThat(result2.getCredentials()).isEqualTo(result.getCredentials()); } public void testAuthenticatesWhenASaltIsUsed() { @@ -349,14 +349,12 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have returned instance of UsernamePasswordAuthenticationToken"); } - assertEquals(User.class, result.getPrincipal().getClass()); + assertThat(result.getPrincipal().getClass()).isEqualTo(User.class); // We expect original credentials user submitted to be returned - assertEquals("koala", result.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains( - "ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains( - "ROLE_TWO")); + assertThat(result.getCredentials()).isEqualTo("koala"); + assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities())) + .contains("ROLE_ONE","ROLE_TWO"); } public void testAuthenticatesWithForcePrincipalAsString() { @@ -375,8 +373,8 @@ public class DaoAuthenticationProviderTests extends TestCase { } UsernamePasswordAuthenticationToken castResult = (UsernamePasswordAuthenticationToken) result; - assertEquals(String.class, castResult.getPrincipal().getClass()); - assertEquals("rod", castResult.getPrincipal()); + assertThat(castResult.getPrincipal().getClass()).isEqualTo(String.class); + assertThat(castResult.getPrincipal()).isEqualTo("rod"); } public void testDetectsNullBeingReturnedFromAuthenticationDao() { @@ -400,17 +398,17 @@ public class DaoAuthenticationProviderTests extends TestCase { public void testGettersSetters() { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setPasswordEncoder(new ShaPasswordEncoder()); - assertEquals(ShaPasswordEncoder.class, provider.getPasswordEncoder().getClass()); + assertThat(provider.getPasswordEncoder().getClass()).isEqualTo(ShaPasswordEncoder.class); provider.setSaltSource(new SystemWideSaltSource()); - assertEquals(SystemWideSaltSource.class, provider.getSaltSource().getClass()); + assertThat(provider.getSaltSource().getClass()).isEqualTo(SystemWideSaltSource.class); provider.setUserCache(new EhCacheBasedUserCache()); - assertEquals(EhCacheBasedUserCache.class, provider.getUserCache().getClass()); + assertThat(provider.getUserCache().getClass()).isEqualTo(EhCacheBasedUserCache.class); - assertFalse(provider.isForcePrincipalAsString()); + assertThat(provider.isForcePrincipalAsString()).isFalse(); provider.setForcePrincipalAsString(true); - assertTrue(provider.isForcePrincipalAsString()); + assertThat(provider.isForcePrincipalAsString()).isTrue(); } public void testGoesBackToAuthenticationDaoToObtainLatestPasswordIfCachedPasswordSeemsIncorrect() { @@ -427,7 +425,7 @@ public class DaoAuthenticationProviderTests extends TestCase { provider.authenticate(token); // Check "rod = koala" ended up in the cache - assertEquals("koala", cache.getUserFromCache("rod").getPassword()); + assertThat(cache.getUserFromCache("rod").getPassword()).isEqualTo("koala"); // Now change the password the AuthenticationDao will return authenticationDao.setPassword("easternLongNeckTurtle"); @@ -438,7 +436,7 @@ public class DaoAuthenticationProviderTests extends TestCase { // To get this far, the new password was accepted // Check the cache was updated - assertEquals("easternLongNeckTurtle", cache.getUserFromCache("rod").getPassword()); + assertThat(cache.getUserFromCache("rod").getPassword()).isEqualTo("easternLongNeckTurtle"); } public void testStartupFailsIfNoAuthenticationDao() throws Exception { @@ -449,14 +447,14 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testStartupFailsIfNoUserCacheSet() throws Exception { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setUserDetailsService(new MockAuthenticationDaoUserrod()); - assertEquals(NullUserCache.class, provider.getUserCache().getClass()); + assertThat(provider.getUserCache().getClass()).isEqualTo(NullUserCache.class); provider.setUserCache(null); try { @@ -464,7 +462,7 @@ public class DaoAuthenticationProviderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -473,15 +471,15 @@ public class DaoAuthenticationProviderTests extends TestCase { UserDetailsService userDetailsService = new MockAuthenticationDaoUserrod(); provider.setUserDetailsService(userDetailsService); provider.setUserCache(new MockUserCache()); - assertEquals(userDetailsService, provider.getUserDetailsService()); + assertThat(provider.getUserDetailsService()).isEqualTo(userDetailsService); provider.afterPropertiesSet(); - assertTrue(true); + } public void testSupports() { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); - assertTrue(provider.supports(UsernamePasswordAuthenticationToken.class)); - assertTrue(!provider.supports(TestingAuthenticationToken.class)); + assertThat(provider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); + assertThat(!provider.supports(TestingAuthenticationToken.class)).isTrue(); } // SEC-2056 diff --git a/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java b/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java index baa1e9959e..1c2dc6ae72 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java @@ -55,13 +55,13 @@ public class ReflectionSaltSourceTests { ReflectionSaltSource saltSource = new ReflectionSaltSource(); saltSource.setUserPropertyToUse("getUsername"); - assertEquals("scott", saltSource.getSalt(user)); + assertThat(saltSource.getSalt(user)).isEqualTo("scott"); } @Test public void propertyNameAsPropertyToUseReturnsCorrectSaltValue() { ReflectionSaltSource saltSource = new ReflectionSaltSource(); saltSource.setUserPropertyToUse("password"); - assertEquals("wombat", saltSource.getSalt(user)); + assertThat(saltSource.getSalt(user)).isEqualTo("wombat"); } } diff --git a/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java b/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java index c0dc6cf03d..2c85ac4859 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication.dao.salt; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.springframework.security.authentication.dao.SystemWideSaltSource; @@ -57,21 +57,21 @@ public class SystemWideSaltSourceTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("A systemWideSalt must be set", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("A systemWideSalt must be set"); } } public void testGettersSetters() { SystemWideSaltSource saltSource = new SystemWideSaltSource(); saltSource.setSystemWideSalt("helloWorld"); - assertEquals("helloWorld", saltSource.getSystemWideSalt()); + assertThat(saltSource.getSystemWideSalt()).isEqualTo("helloWorld"); } public void testNormalOperation() throws Exception { SystemWideSaltSource saltSource = new SystemWideSaltSource(); saltSource.setSystemWideSalt("helloWorld"); saltSource.afterPropertiesSet(); - assertEquals("helloWorld", saltSource.getSalt(null)); + assertThat(saltSource.getSalt(null)).isEqualTo("helloWorld"); } // SEC-2173 diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java index 63f3af6be1..cda4b44a06 100644 --- a/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java @@ -34,14 +34,14 @@ public class BasePasswordEncoderTests extends TestCase { String merged = pwd.nowMergePasswordAndSalt("password", null, true); String[] demerged = pwd.nowDemergePasswordAndSalt(merged); - assertEquals("password", demerged[0]); - assertEquals("", demerged[1]); + assertThat(demerged[0]).isEqualTo("password"); + assertThat(demerged[1]).isEqualTo(""); merged = pwd.nowMergePasswordAndSalt("password", "", true); demerged = pwd.nowDemergePasswordAndSalt(merged); - assertEquals("password", demerged[0]); - assertEquals("", demerged[1]); + assertThat(demerged[0]).isEqualTo("password"); + assertThat(demerged[1]).isEqualTo(""); } public void testDemergeWithEmptyStringIsRejected() { @@ -52,7 +52,7 @@ public class BasePasswordEncoderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("Cannot pass a null or empty String", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Cannot pass a null or empty String"); } } @@ -64,7 +64,7 @@ public class BasePasswordEncoderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("Cannot pass a null or empty String", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Cannot pass a null or empty String"); } } @@ -72,34 +72,34 @@ public class BasePasswordEncoderTests extends TestCase { MockPasswordEncoder pwd = new MockPasswordEncoder(); String merged = pwd.nowMergePasswordAndSalt("password", "foo", true); - assertEquals("password{foo}", merged); + assertThat(merged).isEqualTo("password{foo}"); String[] demerged = pwd.nowDemergePasswordAndSalt(merged); - assertEquals("password", demerged[0]); - assertEquals("foo", demerged[1]); + assertThat(demerged[0]).isEqualTo("password"); + assertThat(demerged[1]).isEqualTo("foo"); } public void testMergeDemergeWithDelimitersInPassword() { MockPasswordEncoder pwd = new MockPasswordEncoder(); String merged = pwd.nowMergePasswordAndSalt("p{ass{w{o}rd", "foo", true); - assertEquals("p{ass{w{o}rd{foo}", merged); + assertThat(merged).isEqualTo("p{ass{w{o}rd{foo}"); String[] demerged = pwd.nowDemergePasswordAndSalt(merged); - assertEquals("p{ass{w{o}rd", demerged[0]); - assertEquals("foo", demerged[1]); + assertThat(demerged[0]).isEqualTo("p{ass{w{o}rd"); + assertThat(demerged[1]).isEqualTo("foo"); } public void testMergeDemergeWithNullAsPassword() { MockPasswordEncoder pwd = new MockPasswordEncoder(); String merged = pwd.nowMergePasswordAndSalt(null, "foo", true); - assertEquals("{foo}", merged); + assertThat(merged).isEqualTo("{foo}"); String[] demerged = pwd.nowDemergePasswordAndSalt(merged); - assertEquals("", demerged[0]); - assertEquals("foo", demerged[1]); + assertThat(demerged[0]).isEqualTo(""); + assertThat(demerged[1]).isEqualTo("foo"); } public void testStrictMergeRejectsDelimitersInSalt1() { @@ -110,7 +110,7 @@ public class BasePasswordEncoderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("Cannot use { or } in salt.toString()", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Cannot use { or } in salt.toString()"); } } @@ -122,7 +122,7 @@ public class BasePasswordEncoderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("Cannot use { or } in salt.toString()", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Cannot use { or } in salt.toString()"); } } diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java index ae0c267ac6..de4bdc3172 100644 --- a/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java @@ -24,45 +24,45 @@ public class Md4PasswordEncoderTests extends TestCase { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); md4.setEncodeHashAsBase64(true); String encodedPassword = md4.encodePassword("ww_uni123", null); - assertEquals("8zobtq72iAt0W6KNqavGwg==", encodedPassword); + assertThat(encodedPassword).isEqualTo("8zobtq72iAt0W6KNqavGwg=="); } public void testEncodeSaltedPassword() { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); md4.setEncodeHashAsBase64(true); String encodedPassword = md4.encodePassword("ww_uni123", "Alan K Stewart"); - assertEquals("ZplT6P5Kv6Rlu6W4FIoYNA==", encodedPassword); + assertThat(encodedPassword).isEqualTo("ZplT6P5Kv6Rlu6W4FIoYNA=="); } public void testEncodeNullPassword() { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); md4.setEncodeHashAsBase64(true); String encodedPassword = md4.encodePassword(null, null); - assertEquals("MdbP4NFq6TG3PFnX4MCJwA==", encodedPassword); + assertThat(encodedPassword).isEqualTo("MdbP4NFq6TG3PFnX4MCJwA=="); } public void testEncodeEmptyPassword() { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); md4.setEncodeHashAsBase64(true); String encodedPassword = md4.encodePassword("", null); - assertEquals("MdbP4NFq6TG3PFnX4MCJwA==", encodedPassword); + assertThat(encodedPassword).isEqualTo("MdbP4NFq6TG3PFnX4MCJwA=="); } public void testNonAsciiPasswordHasCorrectHash() { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); String encodedPassword = md4.encodePassword("\u4F60\u597d", null); - assertEquals("a7f1196539fd1f85f754ffd185b16e6e", encodedPassword); + assertThat(encodedPassword).isEqualTo("a7f1196539fd1f85f754ffd185b16e6e"); } public void testIsHexPasswordValid() { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); - assertTrue(md4.isPasswordValid("31d6cfe0d16ae931b73c59d7e0c089c0", "", null)); + assertThat(md4.isPasswordValid("31d6cfe0d16ae931b73c59d7e0c089c0", "", null)).isTrue(); } public void testIsPasswordValid() { Md4PasswordEncoder md4 = new Md4PasswordEncoder(); md4.setEncodeHashAsBase64(true); - assertTrue(md4.isPasswordValid("8zobtq72iAt0W6KNqavGwg==", "ww_uni123", null)); + assertThat(md4.isPasswordValid("8zobtq72iAt0W6KNqavGwg==", "ww_uni123", null)).isTrue(); } public void testIsSaltedPasswordValid() { diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java index 559c13865c..2df6a0f16d 100644 --- a/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication.encoding; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -40,10 +40,10 @@ public class Md5PasswordEncoderTests { String badRaw = "abc321"; String salt = "THIS_IS_A_SALT"; String encoded = pe.encodePassword(raw, salt); - assertTrue(pe.isPasswordValid(encoded, raw, salt)); - assertFalse(pe.isPasswordValid(encoded, badRaw, salt)); - assertEquals("a68aafd90299d0b137de28fb4bb68573", encoded); - assertEquals("MD5", pe.getAlgorithm()); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue(); + assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse(); + assertThat(encoded).isEqualTo("a68aafd90299d0b137de28fb4bb68573"); + assertThat(pe.getAlgorithm()).isEqualTo("MD5"); } @Test @@ -52,7 +52,7 @@ public class Md5PasswordEncoderTests { // $ echo -n "你好" | md5 // 7eca689f0d3389d9dea66ae112e5cfd7 String encodedPassword = md5.encodePassword("\u4F60\u597d", null); - assertEquals("7eca689f0d3389d9dea66ae112e5cfd7", encodedPassword); + assertThat(encodedPassword).isEqualTo("7eca689f0d3389d9dea66ae112e5cfd7"); } @Test @@ -63,9 +63,9 @@ public class Md5PasswordEncoderTests { String badRaw = "abc321"; String salt = "THIS_IS_A_SALT"; String encoded = pe.encodePassword(raw, salt); - assertTrue(pe.isPasswordValid(encoded, raw, salt)); - assertFalse(pe.isPasswordValid(encoded, badRaw, salt)); - assertTrue(encoded.length() != 32); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue(); + assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse(); + assertThat(encoded.length() != 32).isTrue(); } @Test diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java index eb9fdeff6d..846d52d2db 100644 --- a/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java +++ b/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.authentication.encoding; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -11,24 +11,24 @@ public class PasswordEncoderUtilsTests { @Test public void differentLength() { - assertFalse(PasswordEncoderUtils.equals("abc", "a")); - assertFalse(PasswordEncoderUtils.equals("a", "abc")); + assertThat(PasswordEncoderUtils.equals("abc", "a")).isFalse(); + assertThat(PasswordEncoderUtils.equals("a", "abc")).isFalse(); } @Test public void equalsNull() { - assertFalse(PasswordEncoderUtils.equals(null, "a")); - assertFalse(PasswordEncoderUtils.equals("a", null)); - assertTrue(PasswordEncoderUtils.equals(null, null)); + assertThat(PasswordEncoderUtils.equals(null, "a")).isFalse(); + assertThat(PasswordEncoderUtils.equals("a", null)).isFalse(); + assertThat(PasswordEncoderUtils.equals(null, null)).isTrue(); } @Test public void equalsCaseSensitive() { - assertFalse(PasswordEncoderUtils.equals("aBc", "abc")); + assertThat(PasswordEncoderUtils.equals("aBc", "abc")).isFalse(); } @Test public void equalsSuccess() { - assertTrue(PasswordEncoderUtils.equals("abcdef", "abcdef")); + assertThat(PasswordEncoderUtils.equals("abcdef", "abcdef")).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java index f50f6e50a9..77d5755bda 100644 --- a/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java @@ -40,14 +40,14 @@ public class PlaintextPasswordEncoderTests extends TestCase { String salt = "THIS_IS_A_SALT"; String encoded = pe.encodePassword(raw, salt); - assertEquals("abc123{THIS_IS_A_SALT}", encoded); - assertTrue(pe.isPasswordValid(encoded, raw, salt)); - assertFalse(pe.isPasswordValid(encoded, badRaw, salt)); + assertThat(encoded).isEqualTo("abc123{THIS_IS_A_SALT}"); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue(); + assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse(); // make sure default is not to ignore password case - assertFalse(pe.isIgnorePasswordCase()); + assertThat(pe.isIgnorePasswordCase()).isFalse(); encoded = pe.encodePassword(rawDiffCase, salt); - assertFalse(pe.isPasswordValid(encoded, raw, salt)); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isFalse(); // now check for ignore password case pe = new PlaintextPasswordEncoder(); @@ -55,8 +55,8 @@ public class PlaintextPasswordEncoderTests extends TestCase { // should be able to validate even without encoding encoded = pe.encodePassword(rawDiffCase, salt); - assertTrue(pe.isPasswordValid(encoded, raw, salt)); - assertFalse(pe.isPasswordValid(encoded, badRaw, salt)); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue(); + assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse(); } public void testMergeDemerge() { @@ -64,7 +64,7 @@ public class PlaintextPasswordEncoderTests extends TestCase { String merged = pwd.encodePassword("password", "foo"); String[] demerged = pwd.obtainPasswordAndSalt(merged); - assertEquals("password", demerged[0]); - assertEquals("foo", demerged[1]); + assertThat(demerged[0]).isEqualTo("password"); + assertThat(demerged[1]).isEqualTo("foo"); } } diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java index 055d8b58aa..1dc7f6c71e 100644 --- a/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java @@ -38,9 +38,9 @@ public class ShaPasswordEncoderTests extends TestCase { String badRaw = "abc321"; String salt = "THIS_IS_A_SALT"; String encoded = pe.encodePassword(raw, salt); - assertTrue(pe.isPasswordValid(encoded, raw, salt)); - assertFalse(pe.isPasswordValid(encoded, badRaw, salt)); - assertEquals("b2f50ffcbd3407fe9415c062d55f54731f340d32", encoded); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue(); + assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse(); + assertThat(encoded).isEqualTo("b2f50ffcbd3407fe9415c062d55f54731f340d32"); } @@ -51,9 +51,9 @@ public class ShaPasswordEncoderTests extends TestCase { String badRaw = "abc321"; String salt = "THIS_IS_A_SALT"; String encoded = pe.encodePassword(raw, salt); - assertTrue(pe.isPasswordValid(encoded, raw, salt)); - assertFalse(pe.isPasswordValid(encoded, badRaw, salt)); - assertTrue(encoded.length() != 40); + assertThat(pe.isPasswordValid(encoded, raw, salt)).isTrue(); + assertThat(pe.isPasswordValid(encoded, badRaw, salt)).isFalse(); + assertThat(encoded.length() != 40).isTrue(); } public void test256() throws Exception { diff --git a/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java b/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java index 88f3d20c46..6c615ad916 100644 --- a/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java +++ b/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java @@ -54,7 +54,7 @@ public class AuthenticationEventTests extends TestCase { public void testAbstractAuthenticationEvent() { Authentication auth = getAuthentication(); AbstractAuthenticationEvent event = new AuthenticationSuccessEvent(auth); - assertEquals(auth, event.getAuthentication()); + assertThat(event.getAuthentication()).isEqualTo(auth); } public void testAbstractAuthenticationFailureEvent() { @@ -62,8 +62,8 @@ public class AuthenticationEventTests extends TestCase { AuthenticationException exception = new DisabledException("TEST"); AbstractAuthenticationFailureEvent event = new AuthenticationFailureDisabledEvent( auth, exception); - assertEquals(auth, event.getAuthentication()); - assertEquals(exception, event.getException()); + assertThat(event.getAuthentication()).isEqualTo(auth); + assertThat(event.getException()).isEqualTo(exception); } public void testRejectsNullAuthentication() { @@ -74,7 +74,7 @@ public class AuthenticationEventTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -84,7 +84,7 @@ public class AuthenticationEventTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } } diff --git a/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java b/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java index decb8e5b20..4b12341a0b 100644 --- a/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java @@ -53,6 +53,6 @@ public class LoggerListenerTests extends TestCase { getAuthentication(), new LockedException("TEST")); LoggerListener listener = new LoggerListener(); listener.onApplicationEvent(event); - assertTrue(true); + } } diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java index 28f7fc30cf..660e282893 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java @@ -15,8 +15,8 @@ */ package org.springframework.security.authentication.jaas; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; @@ -101,10 +101,10 @@ public class DefaultJaasAuthenticationProviderTests { @Test public void authenticateSuccess() throws Exception { Authentication auth = provider.authenticate(token); - assertEquals(token.getPrincipal(), auth.getPrincipal()); - assertEquals(token.getCredentials(), auth.getCredentials()); - assertEquals(true, auth.isAuthenticated()); - assertEquals(false, auth.getAuthorities().isEmpty()); + assertThat(auth.getPrincipal()).isEqualTo(token.getPrincipal()); + assertThat(auth.getCredentials()).isEqualTo(token.getCredentials()); + assertThat(auth.isAuthenticated()).isEqualTo(true); + assertThat(auth.getAuthorities().isEmpty()).isEqualTo(false); verify(publisher).publishEvent(isA(JaasAuthenticationSuccessEvent.class)); verifyNoMoreInteractions(publisher); } @@ -254,8 +254,8 @@ public class DefaultJaasAuthenticationProviderTests { try { provider = context.getBean(DefaultJaasAuthenticationProvider.class); Authentication auth = provider.authenticate(token); - assertEquals(true, auth.isAuthenticated()); - assertEquals(token.getPrincipal(), auth.getPrincipal()); + assertThat(auth.isAuthenticated()).isEqualTo(true); + assertThat(auth.getPrincipal()).isEqualTo(token.getPrincipal()); } finally { context.close(); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index 988513ec7b..13713a1f24 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication.jaas; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.File; @@ -81,10 +81,10 @@ public class JaasAuthenticationProviderTests { catch (AuthenticationException e) { } - assertNotNull("Failure event not fired", eventCheck.failedEvent); + assertThat(eventCheck.failedEvent).as("Failure event not fired").isNotNull(); assertNotNull("Failure event exception was null", eventCheck.failedEvent.getException()); - assertNull("Success event was fired", eventCheck.successEvent); + assertThat(eventCheck.successEvent).as("Success event was fired").isNull(); } @Test @@ -97,10 +97,10 @@ public class JaasAuthenticationProviderTests { catch (AuthenticationException e) { } - assertNotNull("Failure event not fired", eventCheck.failedEvent); + assertThat(eventCheck.failedEvent).as("Failure event not fired").isNotNull(); assertNotNull("Failure event exception was null", eventCheck.failedEvent.getException()); - assertNull("Success event was fired", eventCheck.successEvent); + assertThat(eventCheck.successEvent).as("Success event was fired").isNull(); } @Test @@ -127,7 +127,7 @@ public class JaasAuthenticationProviderTests { fail("Should have thrown ApplicationContextException"); } catch (IllegalArgumentException expected) { - assertTrue(expected.getMessage().startsWith("loginConfig must be set on")); + assertThat(expected.getMessage().startsWith("loginConfig must be set on")).isTrue(); } } @@ -178,7 +178,7 @@ public class JaasAuthenticationProviderTests { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(expected.getMessage() + assertThat(expected.getMessage().isTrue() .startsWith("loginContextName must be set on")); } @@ -189,7 +189,7 @@ public class JaasAuthenticationProviderTests { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(expected.getMessage() + assertThat(expected.getMessage().isTrue() .startsWith("loginContextName must be set on")); } } @@ -199,14 +199,14 @@ public class JaasAuthenticationProviderTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( "user", "password", AuthorityUtils.createAuthorityList("ROLE_ONE")); - assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)); + assertThat(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); Authentication auth = jaasProvider.authenticate(token); - assertNotNull(jaasProvider.getAuthorityGranters()); - assertNotNull(jaasProvider.getCallbackHandlers()); - assertNotNull(jaasProvider.getLoginConfig()); - assertNotNull(jaasProvider.getLoginContextName()); + assertThat(jaasProvider.getAuthorityGranters()).isNotNull(); + assertThat(jaasProvider.getCallbackHandlers()).isNotNull(); + assertThat(jaasProvider.getLoginConfig()).isNotNull(); + assertThat(jaasProvider.getLoginContextName()).isNotNull(); Collection list = auth.getAuthorities(); Set set = AuthorityUtils.authorityListToSet(list); @@ -229,22 +229,22 @@ public class JaasAuthenticationProviderTests { } } - assertTrue("Could not find a JaasGrantedAuthority", foundit); + assertThat(foundit).as("Could not find a JaasGrantedAuthority").isTrue(); - assertNotNull("Success event should be fired", eventCheck.successEvent); + assertThat(eventCheck.successEvent).as("Success event should be fired").isNotNull(); assertEquals("Auth objects should be equal", auth, eventCheck.successEvent.getAuthentication()); - assertNull("Failure event should not be fired", eventCheck.failedEvent); + assertThat(eventCheck.failedEvent).as("Failure event should not be fired").isNull(); } @Test public void testGetApplicationEventPublisher() throws Exception { - assertNotNull(jaasProvider.getApplicationEventPublisher()); + assertThat(jaasProvider.getApplicationEventPublisher()).isNotNull(); } @Test public void testLoginExceptionResolver() { - assertNotNull(jaasProvider.getLoginExceptionResolver()); + assertThat(jaasProvider.getLoginExceptionResolver()).isNotNull(); jaasProvider.setLoginExceptionResolver(new LoginExceptionResolver() { public AuthenticationException resolveException(LoginException e) { return new LockedException("This is just a test!"); @@ -278,7 +278,7 @@ public class JaasAuthenticationProviderTests { jaasProvider.handleLogout(event); - assertTrue(loginContext.loggedOut); + assertThat(loginContext.loggedOut).isTrue(); } @Test @@ -286,7 +286,7 @@ public class JaasAuthenticationProviderTests { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( "user", "password"); - assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)); + assertThat(jaasProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); Authentication auth = jaasProvider.authenticate(token); assertTrue("Only ROLE_TEST1 and ROLE_TEST2 should have been returned", auth diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java b/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java index 6e7a0ac5de..e688108a01 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java @@ -54,7 +54,7 @@ public class Sec760Tests { "ROLE_TWO")); Authentication auth = p1.authenticate(token); - Assert.assertNotNull(auth); + Assert.assertThat(auth).isNotNull(); } @Test diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java index d43e72d9b3..ea5a7d7e40 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java @@ -59,11 +59,11 @@ public class SecurityContextLoginModuleTests extends TestCase { } public void testAbort() throws Exception { - assertFalse("Should return false, no auth is set", module.abort()); + assertThat(module.abort()).as("Should return false, no auth is set").isFalse(); SecurityContextHolder.getContext().setAuthentication(auth); module.login(); module.commit(); - assertTrue(module.abort()); + assertThat(module.abort()).isTrue(); } public void testLoginException() throws Exception { @@ -77,7 +77,7 @@ public class SecurityContextLoginModuleTests extends TestCase { public void testLoginSuccess() throws Exception { SecurityContextHolder.getContext().setAuthentication(auth); - assertTrue("Login should succeed, there is an authentication set", module.login()); + assertThat(module.login()).as("Login should succeed, there is an authentication set").isTrue(); assertTrue("The authentication is not null, this should return true", module.commit()); assertTrue("Principals should contain the authentication", subject @@ -87,8 +87,8 @@ public class SecurityContextLoginModuleTests extends TestCase { public void testLogout() throws Exception { SecurityContextHolder.getContext().setAuthentication(auth); module.login(); - assertTrue("Should return true as it succeeds", module.logout()); - assertEquals("Authentication should be null", null, module.getAuthentication()); + assertThat(module.logout()).as("Should return true as it succeeds").isTrue(); + assertThat(module.getAuthentication()).as("Authentication should be null").isEqualTo(null); assertFalse("Principals should not contain the authentication after logout", subject.getPrincipals().contains(auth)); @@ -112,10 +112,10 @@ public class SecurityContextLoginModuleTests extends TestCase { module.initialize(subject, null, null, options); SecurityContextHolder.getContext().setAuthentication(null); - assertFalse("Should return false and ask to be ignored", module.login()); + assertThat(module.login()).as("Should return false and ask to be ignored").isFalse(); } public void testNullLogout() throws Exception { - assertFalse(module.logout()); + assertThat(module.logout()).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java index 3515932773..3a53f5892e 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java @@ -16,7 +16,7 @@ package org.springframework.security.authentication.jaas.memory; import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNull; import java.lang.reflect.Method; @@ -54,7 +54,7 @@ public class InMemoryConfigurationTests { @Test public void constructorNullDefault() { - assertNull(new InMemoryConfiguration((AppConfigurationEntry[]) null) + assertThat(new InMemoryConfiguration((AppConfigurationEntry[]) null).isNull() .getAppConfigurationEntry("name")); } @@ -85,7 +85,7 @@ public class InMemoryConfigurationTests { @Test public void nonnullDefault() { InMemoryConfiguration configuration = new InMemoryConfiguration(defaultEntries); - assertArrayEquals(defaultEntries, configuration.getAppConfigurationEntry("name")); + assertThat(configuration.getAppConfigurationEntry("name")).isEqualTo(defaultEntries); } @Test @@ -101,6 +101,6 @@ public class InMemoryConfigurationTests { @Test public void jdk5Compatable() throws Exception { Method method = InMemoryConfiguration.class.getDeclaredMethod("refresh"); - assertEquals(InMemoryConfiguration.class, method.getDeclaringClass()); + assertThat(method.getDeclaringClass()).isEqualTo(InMemoryConfiguration.class); } } diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java index 3f1f4ed63f..3da8a7dfad 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java @@ -15,7 +15,7 @@ package org.springframework.security.authentication.rcp; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -58,7 +58,7 @@ public class RemoteAuthenticationManagerImplTests { manager.setAuthenticationManager(mock(AuthenticationManager.class)); manager.afterPropertiesSet(); - assertTrue(true); + } @Test diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java index da6ddcfc26..2cc3b1b279 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java @@ -44,14 +44,14 @@ public class RemoteAuthenticationProviderTests extends TestCase { fail("Should have thrown RemoteAuthenticationException"); } catch (RemoteAuthenticationException expected) { - assertTrue(true); + } } public void testGettersSetters() { RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider(); provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true)); - assertNotNull(provider.getRemoteAuthenticationManager()); + assertThat(provider.getRemoteAuthenticationManager()).isNotNull(); } public void testStartupChecksAuthenticationManagerSet() throws Exception { @@ -62,12 +62,12 @@ public class RemoteAuthenticationProviderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true)); provider.afterPropertiesSet(); - assertTrue(true); + } public void testSuccessfulAuthenticationCreatesObject() { @@ -76,9 +76,9 @@ public class RemoteAuthenticationProviderTests extends TestCase { Authentication result = provider .authenticate(new UsernamePasswordAuthenticationToken("rod", "password")); - assertEquals("rod", result.getPrincipal()); - assertEquals("password", result.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains( + assertThat(result.getPrincipal()).isEqualTo("rod"); + assertThat(result.getCredentials()).isEqualTo("password"); + assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities()).isTrue().contains( "foo")); } @@ -97,7 +97,7 @@ public class RemoteAuthenticationProviderTests extends TestCase { public void testSupports() { RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider(); - assertTrue(provider.supports(UsernamePasswordAuthenticationToken.class)); + assertThat(provider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); } // ~ Inner Classes diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java index ac20e3c75d..64265cfa32 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java @@ -55,7 +55,7 @@ public class RememberMeAuthenticationProviderTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -63,7 +63,7 @@ public class RememberMeAuthenticationProviderTests extends TestCase { RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider( "qwerty"); aap.afterPropertiesSet(); - assertEquals("qwerty", aap.getKey()); + assertThat(aap.getKey()).isEqualTo("qwerty"); } public void testIgnoresClassesItDoesNotSupport() throws Exception { @@ -72,10 +72,10 @@ public class RememberMeAuthenticationProviderTests extends TestCase { TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password", "ROLE_A"); - assertFalse(aap.supports(TestingAuthenticationToken.class)); + assertThat(aap.supports(TestingAuthenticationToken.class)).isFalse(); // Try it anyway - assertNull(aap.authenticate(token)); + assertThat(aap.authenticate(token)).isNull(); } public void testNormalOperation() throws Exception { @@ -87,13 +87,13 @@ public class RememberMeAuthenticationProviderTests extends TestCase { Authentication result = aap.authenticate(token); - assertEquals(result, token); + assertThat(token).isEqualTo(result); } public void testSupports() { RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider( "qwerty"); - assertTrue(aap.supports(RememberMeAuthenticationToken.class)); - assertFalse(aap.supports(TestingAuthenticationToken.class)); + assertThat(aap.supports(RememberMeAuthenticationToken.class)).isTrue(); + assertThat(aap.supports(TestingAuthenticationToken.class)).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java index 4ca5021149..aa871972a5 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java @@ -43,7 +43,7 @@ public class RememberMeAuthenticationTokenTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } try { @@ -51,7 +51,7 @@ public class RememberMeAuthenticationTokenTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } try { @@ -61,7 +61,7 @@ public class RememberMeAuthenticationTokenTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -71,21 +71,21 @@ public class RememberMeAuthenticationTokenTests extends TestCase { RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("key", "Test", ROLES_12); - assertEquals(token1, token2); + assertThat(token2).isEqualTo(token1); } public void testGetters() { RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("key", "Test", ROLES_12); - assertEquals("key".hashCode(), token.getKeyHash()); - assertEquals("Test", token.getPrincipal()); - assertEquals("", token.getCredentials()); - assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( + assertThat(token.getKeyHash()).isEqualTo("key".hashCode()); + assertThat(token.getPrincipal()).isEqualTo("Test"); + assertThat(token.getCredentials()).isEqualTo(""); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).isTrue().contains( "ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).isTrue().contains( "ROLE_TWO")); - assertTrue(token.isAuthenticated()); + assertThat(token.isAuthenticated()).isTrue(); } public void testNotEqualsDueToAbstractParentEqualsCheck() { @@ -94,7 +94,7 @@ public class RememberMeAuthenticationTokenTests extends TestCase { RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("key", "DIFFERENT_PRINCIPAL", ROLES_12); - assertFalse(token1.equals(token2)); + assertThat(token1.equals(token2)).isFalse(); } public void testNotEqualsDueToDifferentAuthenticationClass() { @@ -103,7 +103,7 @@ public class RememberMeAuthenticationTokenTests extends TestCase { UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken( "Test", "Password", ROLES_12); - assertFalse(token1.equals(token2)); + assertThat(token1.equals(token2)).isFalse(); } public void testNotEqualsDueToKey() { @@ -112,14 +112,14 @@ public class RememberMeAuthenticationTokenTests extends TestCase { RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken( "DIFFERENT_KEY", "Test", ROLES_12); - assertFalse(token1.equals(token2)); + assertThat(token1.equals(token2)).isFalse(); } public void testSetAuthenticatedIgnored() { RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("key", "Test", ROLES_12); - assertTrue(token.isAuthenticated()); + assertThat(token.isAuthenticated()).isTrue(); token.setAuthenticated(false); - assertTrue(!token.isAuthenticated()); + assertThat(!token.isAuthenticated()).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java index 554449a965..765822a00b 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.concurrent; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java index 20e9471bc3..7e746e1f70 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.concurrent; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java index a49e863344..09a133d958 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.concurrent; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java index 1f1ad3718e..d075d29377 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.concurrent; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java index c8b55fd217..34d9826407 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.concurrent; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.security.core.context.SecurityContext; diff --git a/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java b/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java index aa1b8e7176..b578637125 100644 --- a/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java +++ b/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java @@ -10,7 +10,7 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.event.SmartApplicationListener; import org.springframework.security.core.session.SessionDestroyedEvent; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -70,4 +70,4 @@ public class DelegatingApplicationListenerTests { listener.addListener(null); } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/springframework/security/core/JavaVersionTests.java b/core/src/test/java/org/springframework/security/core/JavaVersionTests.java index 47eac976ce..416342bd43 100644 --- a/core/src/test/java/org/springframework/security/core/JavaVersionTests.java +++ b/core/src/test/java/org/springframework/security/core/JavaVersionTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.core; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.DataInputStream; import java.io.InputStream; diff --git a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java index a5ac8a5ad4..8ea1c7d4cc 100644 --- a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java +++ b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.core; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -64,7 +64,7 @@ public class SpringSecurityCoreVersionTests { // Property is set by the build script String springVersion = System.getProperty("springVersion"); - assertEquals(springVersion, SpringSecurityCoreVersion.MIN_SPRING_VERSION); + assertThat(SpringSecurityCoreVersion.MIN_SPRING_VERSION).isEqualTo(springVersion); } @Test @@ -75,8 +75,8 @@ public class SpringSecurityCoreVersionTests { String serialVersion = String.valueOf( SpringSecurityCoreVersion.SERIAL_VERSION_UID).substring(0, 2); - assertEquals(version.charAt(0), serialVersion.charAt(0)); - assertEquals(version.charAt(2), serialVersion.charAt(1)); + assertThat(serialVersion.charAt(0)).isEqualTo(version.charAt(0)); + assertThat(serialVersion.charAt(1)).isEqualTo(version.charAt(2)); } diff --git a/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java b/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java index b73d17288d..88bb302d91 100644 --- a/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java @@ -21,10 +21,10 @@ public class AuthorityUtilsTests { Set authorities = AuthorityUtils.authorityListToSet(authorityArray); - assertTrue(authorities.contains("B")); - assertTrue(authorities.contains("C")); - assertTrue(authorities.contains("E")); - assertTrue(authorities.contains("ROLE_A")); - assertTrue(authorities.contains("ROLE_D")); + assertThat(authorities.contains("B")).isTrue(); + assertThat(authorities.contains("C")).isTrue(); + assertThat(authorities.contains("E")).isTrue(); + assertThat(authorities.contains("ROLE_A")).isTrue(); + assertThat(authorities.contains("ROLE_D")).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java b/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java index 9cb174372e..6e19d9da1a 100644 --- a/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java @@ -15,7 +15,7 @@ package org.springframework.security.core.authority; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.*; @@ -31,23 +31,23 @@ public class SimpleGrantedAuthorityTests { @Test public void equalsBehavesAsExpected() throws Exception { SimpleGrantedAuthority auth1 = new SimpleGrantedAuthority("TEST"); - assertEquals(auth1, auth1); - assertEquals(auth1, new SimpleGrantedAuthority("TEST")); + assertThat(auth1).isEqualTo(auth1); + assertThat(new SimpleGrantedAuthority("TEST")).isEqualTo(auth1); - assertFalse(auth1.equals("TEST")); + assertThat(auth1.equals("TEST")).isFalse(); SimpleGrantedAuthority auth3 = new SimpleGrantedAuthority("NOT_EQUAL"); - assertTrue(!auth1.equals(auth3)); + assertThat(!auth1.equals(auth3)).isTrue(); - assertFalse(auth1.equals(mock(GrantedAuthority.class))); + assertThat(auth1.equals(mock(GrantedAuthority.class))).isFalse(); - assertFalse(auth1.equals(Integer.valueOf(222))); + assertThat(auth1.equals(Integer.valueOf(222))).isFalse(); } @Test public void toStringReturnsAuthorityValue() { SimpleGrantedAuthority auth = new SimpleGrantedAuthority("TEST"); - assertEquals("TEST", auth.toString()); + assertThat(auth.toString()).isEqualTo("TEST"); } } diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java old mode 100755 new mode 100644 diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java index 0098d3bea2..e4f0aa542f 100644 --- a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java @@ -1,6 +1,6 @@ package org.springframework.security.core.authority.mapping; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.security.core.GrantedAuthority; @@ -26,8 +26,8 @@ public class SimpleAuthoritiesMapperTests { SimpleAuthorityMapper mapper = new SimpleAuthorityMapper(); Set mapped = AuthorityUtils.authorityListToSet(mapper .mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "ROLE_bbb"))); - assertTrue(mapped.contains("ROLE_AaA")); - assertTrue(mapped.contains("ROLE_bbb")); + assertThat(mapped.contains("ROLE_AaA")).isTrue(); + assertThat(mapped.contains("ROLE_bbb")).isTrue(); } @Test @@ -37,22 +37,22 @@ public class SimpleAuthoritiesMapperTests { List toMap = AuthorityUtils.createAuthorityList("AaA", "Bbb"); Set mapped = AuthorityUtils.authorityListToSet(mapper .mapAuthorities(toMap)); - assertEquals(2, mapped.size()); - assertTrue(mapped.contains("AaA")); - assertTrue(mapped.contains("Bbb")); + assertThat(mapped).hasSize(2); + assertThat(mapped.contains("AaA")).isTrue(); + assertThat(mapped.contains("Bbb")).isTrue(); mapper.setConvertToLowerCase(true); mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap)); - assertEquals(2, mapped.size()); - assertTrue(mapped.contains("aaa")); - assertTrue(mapped.contains("bbb")); + assertThat(mapped).hasSize(2); + assertThat(mapped.contains("aaa")).isTrue(); + assertThat(mapped.contains("bbb")).isTrue(); mapper.setConvertToLowerCase(false); mapper.setConvertToUpperCase(true); mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap)); - assertEquals(2, mapped.size()); - assertTrue(mapped.contains("AAA")); - assertTrue(mapped.contains("BBB")); + assertThat(mapped).hasSize(2); + assertThat(mapped.contains("AAA")).isTrue(); + assertThat(mapped.contains("BBB")).isTrue(); } @Test @@ -62,7 +62,7 @@ public class SimpleAuthoritiesMapperTests { Set mapped = AuthorityUtils.authorityListToSet(mapper .mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "AAA"))); - assertEquals(1, mapped.size()); + assertThat(mapped).hasSize(1); } @Test @@ -71,7 +71,7 @@ public class SimpleAuthoritiesMapperTests { mapper.setDefaultAuthority("ROLE_USER"); Set mapped = AuthorityUtils.authorityListToSet(mapper .mapAuthorities(AuthorityUtils.NO_AUTHORITIES)); - assertEquals(1, mapped.size()); - assertTrue(mapped.contains("ROLE_USER")); + assertThat(mapped).hasSize(1); + assertThat(mapped.contains("ROLE_USER")).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java old mode 100755 new mode 100644 diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java old mode 100755 new mode 100644 diff --git a/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java b/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java index c3fa0e0830..60abdfa35f 100644 --- a/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java +++ b/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java @@ -39,14 +39,14 @@ public class SecurityContextHolderTests extends TestCase { SecurityContext sc = new SecurityContextImpl(); sc.setAuthentication(new UsernamePasswordAuthenticationToken("Foobar", "pass")); SecurityContextHolder.setContext(sc); - assertEquals(sc, SecurityContextHolder.getContext()); + assertThat(SecurityContextHolder.getContext()).isEqualTo(sc); SecurityContextHolder.clearContext(); - assertNotSame(sc, SecurityContextHolder.getContext()); + assertThat(SecurityContextHolder.getContext()).isNotSameAs(sc); SecurityContextHolder.clearContext(); } public void testNeverReturnsNull() { - assertNotNull(SecurityContextHolder.getContext()); + assertThat(SecurityContextHolder.getContext()).isNotNull(); SecurityContextHolder.clearContext(); } @@ -56,7 +56,7 @@ public class SecurityContextHolderTests extends TestCase { fail("Should have rejected null"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } } diff --git a/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java b/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java index 5a93dfd34b..abdd9f9c47 100644 --- a/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java +++ b/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java @@ -44,14 +44,14 @@ public class SecurityContextImplTests extends TestCase { public void testEmptyObjectsAreEquals() { SecurityContextImpl obj1 = new SecurityContextImpl(); SecurityContextImpl obj2 = new SecurityContextImpl(); - assertTrue(obj1.equals(obj2)); + assertThat(obj1.equals(obj2)).isTrue(); } public void testSecurityContextCorrectOperation() { SecurityContext context = new SecurityContextImpl(); Authentication auth = new UsernamePasswordAuthenticationToken("rod", "koala"); context.setAuthentication(auth); - assertEquals(auth, context.getAuthentication()); - assertTrue(context.toString().lastIndexOf("rod") != -1); + assertThat(context.getAuthentication()).isEqualTo(auth); + assertThat(context.toString().lastIndexOf("rod") != -1).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java index 08e5791c42..ca4d0ec05b 100644 --- a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java +++ b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java @@ -1,6 +1,6 @@ package org.springframework.security.core.parameters; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java index 24a05801c9..376c182244 100644 --- a/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java +++ b/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.core.parameters; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; import java.util.List; diff --git a/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java b/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java index 3b99f1732d..907d3e3f28 100644 --- a/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java +++ b/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java @@ -37,14 +37,14 @@ public class SessionInformationTests extends TestCase { SessionInformation info = new SessionInformation(principal, sessionId, currentDate); - assertEquals(principal, info.getPrincipal()); - assertEquals(sessionId, info.getSessionId()); - assertEquals(currentDate, info.getLastRequest()); + assertThat(info.getPrincipal()).isEqualTo(principal); + assertThat(info.getSessionId()).isEqualTo(sessionId); + assertThat(info.getLastRequest()).isEqualTo(currentDate); Thread.sleep(10); info.refreshLastRequest(); - assertTrue(info.getLastRequest().after(currentDate)); + assertThat(info.getLastRequest().after(currentDate)).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java index 52eebbe2da..fd443118db 100644 --- a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java +++ b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java @@ -15,7 +15,7 @@ package org.springframework.security.core.session; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Date; import java.util.List; @@ -65,7 +65,7 @@ public class SessionRegistryImplTests { }); // Check attempts to retrieve cleared session return null - assertNull(sessionRegistry.getSessionInformation(sessionId)); + assertThat(sessionRegistry.getSessionInformation(sessionId)).isNull(); } @Test @@ -80,9 +80,9 @@ public class SessionRegistryImplTests { sessionRegistry.registerNewSession(sessionId2, principal1); sessionRegistry.registerNewSession(sessionId3, principal2); - assertEquals(2, sessionRegistry.getAllPrincipals().size()); - assertTrue(sessionRegistry.getAllPrincipals().contains(principal1)); - assertTrue(sessionRegistry.getAllPrincipals().contains(principal2)); + assertThat(sessionRegistry.getAllPrincipals()).hasSize(2); + assertThat(sessionRegistry.getAllPrincipals().contains(principal1)).isTrue(); + assertThat(sessionRegistry.getAllPrincipals().contains(principal2)).isTrue(); } @Test @@ -95,14 +95,14 @@ public class SessionRegistryImplTests { // Retrieve existing session by session ID Date currentDateTime = sessionRegistry.getSessionInformation(sessionId) .getLastRequest(); - assertEquals(principal, sessionRegistry.getSessionInformation(sessionId) + assertThat(sessionRegistry.getSessionInformation(sessionId).isEqualTo(principal) .getPrincipal()); - assertEquals(sessionId, sessionRegistry.getSessionInformation(sessionId) + assertThat(sessionRegistry.getSessionInformation(sessionId).isEqualTo(sessionId) .getSessionId()); - assertNotNull(sessionRegistry.getSessionInformation(sessionId).getLastRequest()); + assertThat(sessionRegistry.getSessionInformation(sessionId).getLastRequest()).isNotNull(); // Retrieve existing session by principal - assertEquals(1, sessionRegistry.getAllSessions(principal, false).size()); + assertThat(sessionRegistry.getAllSessions(principal, false)).hasSize(1); // Sleep to ensure SessionRegistryImpl will update time Thread.sleep(1000); @@ -112,18 +112,18 @@ public class SessionRegistryImplTests { Date retrieved = sessionRegistry.getSessionInformation(sessionId) .getLastRequest(); - assertTrue(retrieved.after(currentDateTime)); + assertThat(retrieved.after(currentDateTime)).isTrue(); // Check it retrieves correctly when looked up via principal - assertEquals(retrieved, sessionRegistry.getAllSessions(principal, false).get(0) + assertThat(sessionRegistry.getAllSessions(principal).isCloseTo(retrieved, within(false).get(0)) .getLastRequest()); // Clear session information sessionRegistry.removeSessionInformation(sessionId); // Check attempts to retrieve cleared session return null - assertNull(sessionRegistry.getSessionInformation(sessionId)); - assertEquals(0, sessionRegistry.getAllSessions(principal, false).size()); + assertThat(sessionRegistry.getSessionInformation(sessionId)).isNull(); + assertThat(sessionRegistry.getAllSessions(principal, false)).isEmpty(); } @Test @@ -135,21 +135,21 @@ public class SessionRegistryImplTests { sessionRegistry.registerNewSession(sessionId1, principal); List sessions = sessionRegistry.getAllSessions(principal, false); - assertEquals(1, sessions.size()); - assertTrue(contains(sessionId1, principal)); + assertThat(sessions).hasSize(1); + assertThat(contains(sessionId1, principal)).isTrue(); sessionRegistry.registerNewSession(sessionId2, principal); sessions = sessionRegistry.getAllSessions(principal, false); - assertEquals(2, sessions.size()); - assertTrue(contains(sessionId2, principal)); + assertThat(sessions).hasSize(2); + assertThat(contains(sessionId2, principal)).isTrue(); // Expire one session SessionInformation session = sessionRegistry.getSessionInformation(sessionId2); session.expireNow(); // Check retrieval still correct - assertTrue(sessionRegistry.getSessionInformation(sessionId2).isExpired()); - assertFalse(sessionRegistry.getSessionInformation(sessionId1).isExpired()); + assertThat(sessionRegistry.getSessionInformation(sessionId2).isExpired()).isTrue(); + assertThat(sessionRegistry.getSessionInformation(sessionId1).isExpired()).isFalse(); } @Test @@ -161,22 +161,22 @@ public class SessionRegistryImplTests { sessionRegistry.registerNewSession(sessionId1, principal); List sessions = sessionRegistry.getAllSessions(principal, false); - assertEquals(1, sessions.size()); - assertTrue(contains(sessionId1, principal)); + assertThat(sessions).hasSize(1); + assertThat(contains(sessionId1, principal)).isTrue(); sessionRegistry.registerNewSession(sessionId2, principal); sessions = sessionRegistry.getAllSessions(principal, false); - assertEquals(2, sessions.size()); - assertTrue(contains(sessionId2, principal)); + assertThat(sessions).hasSize(2); + assertThat(contains(sessionId2, principal)).isTrue(); sessionRegistry.removeSessionInformation(sessionId1); sessions = sessionRegistry.getAllSessions(principal, false); - assertEquals(1, sessions.size()); - assertTrue(contains(sessionId2, principal)); + assertThat(sessions).hasSize(1); + assertThat(contains(sessionId2, principal)).isTrue(); sessionRegistry.removeSessionInformation(sessionId2); - assertNull(sessionRegistry.getSessionInformation(sessionId2)); - assertEquals(0, sessionRegistry.getAllSessions(principal, false).size()); + assertThat(sessionRegistry.getSessionInformation(sessionId2)).isNull(); + assertThat(sessionRegistry.getAllSessions(principal, false)).isEmpty(); } private boolean contains(String sessionId, Object principal) { diff --git a/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java b/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java index 3ce6f350cd..e175ce14e1 100644 --- a/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java +++ b/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java @@ -22,7 +22,7 @@ public class DefaultTokenTests { DefaultToken t1 = new DefaultToken(key, created, extendedInformation); DefaultToken t2 = new DefaultToken(key, created, extendedInformation); - Assert.assertEquals(t1, t2); + Assert.assertThat(t2).isEqualTo(t1); } @Test(expected = IllegalArgumentException.class) @@ -39,6 +39,6 @@ public class DefaultTokenTests { DefaultToken t1 = new DefaultToken(key, created, "length1"); DefaultToken t2 = new DefaultToken(key, created, "longerLength2"); - Assert.assertFalse(t1.equals(t2)); + Assert.assertThat(t1.equals(t2)).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java b/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java index d50b753882..aa4c863cb7 100644 --- a/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java +++ b/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java @@ -40,7 +40,7 @@ public class KeyBasedPersistenceTokenServiceTests { KeyBasedPersistenceTokenService service = getService(); Token token = service.allocateToken("Hello world"); Token result = service.verifyToken(token.getKey()); - Assert.assertEquals(token, result); + Assert.assertThat(result).isEqualTo(token); } @Test @@ -48,7 +48,7 @@ public class KeyBasedPersistenceTokenServiceTests { KeyBasedPersistenceTokenService service = getService(); Token token = service.allocateToken("Hello:world:::"); Token result = service.verifyToken(token.getKey()); - Assert.assertEquals(token, result); + Assert.assertThat(result).isEqualTo(token); } @Test @@ -57,7 +57,7 @@ public class KeyBasedPersistenceTokenServiceTests { service.setPseudoRandomNumberBytes(0); Token token = service.allocateToken("Hello:world:::"); Token result = service.verifyToken(token.getKey()); - Assert.assertEquals(token, result); + Assert.assertThat(result).isEqualTo(token); } @Test @@ -65,7 +65,7 @@ public class KeyBasedPersistenceTokenServiceTests { KeyBasedPersistenceTokenService service = getService(); Token token = service.allocateToken(""); Token result = service.verifyToken(token.getKey()); - Assert.assertEquals(token, result); + Assert.assertThat(result).isEqualTo(token); } @Test(expected = IllegalArgumentException.class) diff --git a/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java b/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java index 4ba655aa6f..4ae78812cd 100644 --- a/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java +++ b/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java @@ -19,22 +19,22 @@ public class SecureRandomFactoryBeanTests { @Test public void testObjectType() { SecureRandomFactoryBean factory = new SecureRandomFactoryBean(); - Assert.assertEquals(SecureRandom.class, factory.getObjectType()); + Assert.assertThat(factory.getObjectType()).isEqualTo(SecureRandom.class); } @Test public void testIsSingleton() { SecureRandomFactoryBean factory = new SecureRandomFactoryBean(); - Assert.assertFalse(factory.isSingleton()); + Assert.assertThat(factory.isSingleton()).isFalse(); } @Test public void testCreatesUsingDefaults() throws Exception { SecureRandomFactoryBean factory = new SecureRandomFactoryBean(); Object result = factory.getObject(); - Assert.assertTrue(result instanceof SecureRandom); + Assert.assertThat(result instanceof SecureRandom).isTrue(); int rnd = ((SecureRandom) result).nextInt(); - Assert.assertTrue(rnd != 0); + Assert.assertThat(rnd != 0).isTrue(); } @Test @@ -42,12 +42,12 @@ public class SecureRandomFactoryBeanTests { SecureRandomFactoryBean factory = new SecureRandomFactoryBean(); Resource resource = new ClassPathResource( "org/springframework/security/core/token/SecureRandomFactoryBeanTests.class"); - Assert.assertNotNull(resource); + Assert.assertThat(resource).isNotNull(); factory.setSeed(resource); Object result = factory.getObject(); - Assert.assertTrue(result instanceof SecureRandom); + Assert.assertThat(result instanceof SecureRandom).isTrue(); int rnd = ((SecureRandom) result).nextInt(); - Assert.assertTrue(rnd != 0); + Assert.assertThat(rnd != 0).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java old mode 100755 new mode 100644 index 726e9c0379..332241f2a5 --- a/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java @@ -43,10 +43,10 @@ public class UserDetailsByNameServiceWrapperTests extends TestCase { svc.afterPropertiesSet(); UserDetails result1 = svc.loadUserDetails(new TestingAuthenticationToken("dummy", "dummy")); - assertEquals("Result doesn't match original user", user, result1); + assertThat(result1).as("Result doesn't match original user").isEqualTo(user); UserDetails result2 = svc.loadUserDetails(new TestingAuthenticationToken( "dummy2", "dummy")); - assertNull("Result should have been null", result2); + assertThat(result2).as("Result should have been null").isNull(); } } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java index 904e70c0ed..3b62bcf51e 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java @@ -15,7 +15,7 @@ package org.springframework.security.core.userdetails; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; @@ -44,9 +44,9 @@ public class UserTests { public void equalsReturnsTrueIfUsernamesAreTheSame() { User user1 = new User("rod", "koala", true, true, true, true, ROLE_12); - assertFalse(user1.equals(null)); - assertFalse(user1.equals("A STRING")); - assertTrue(user1.equals(user1)); + assertThat(user1.equals(null)).isFalse(); + assertThat(user1.equals("A STRING")).isFalse(); + assertThat(user1.equals(user1)).isTrue(); assertTrue(user1.equals(new User("rod", "notthesame", true, true, true, true, ROLE_12))); } @@ -120,20 +120,20 @@ public class UserTests { public void testUserGettersSetter() throws Exception { UserDetails user = new User("rod", "koala", true, true, true, true, AuthorityUtils.createAuthorityList("ROLE_TWO", "ROLE_ONE")); - assertEquals("rod", user.getUsername()); - assertEquals("koala", user.getPassword()); - assertTrue(user.isEnabled()); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(user.getUsername()).isEqualTo("rod"); + assertThat(user.getPassword()).isEqualTo("koala"); + assertThat(user.isEnabled()).isTrue(); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_ONE")); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_TWO")); - assertTrue(user.toString().indexOf("rod") != -1); + assertThat(user.toString().indexOf("rod") != -1).isTrue(); } @Test public void enabledFlagIsFalseForDisabledAccount() throws Exception { UserDetails user = new User("rod", "koala", false, true, true, true, ROLE_12); - assertFalse(user.isEnabled()); + assertThat(user.isEnabled()).isFalse(); } @Test diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java index dccfc61de7..15739f0bc8 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java @@ -15,7 +15,7 @@ package org.springframework.security.core.userdetails.cache; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Ehcache; @@ -75,11 +75,11 @@ public class EhCacheBasedUserCacheTests { // Check it gets removed from the cache cache.removeUserFromCache(getUser()); - assertNull(cache.getUserFromCache(getUser().getUsername())); + assertThat(cache.getUserFromCache(getUser().getUsername())).isNull(); // Check it doesn't return values for null or unknown users - assertNull(cache.getUserFromCache(null)); - assertNull(cache.getUserFromCache("UNKNOWN_USER")); + assertThat(cache.getUserFromCache(null)).isNull(); + assertThat(cache.getUserFromCache("UNKNOWN_USER")).isNull(); } @Test(expected = IllegalArgumentException.class) @@ -91,6 +91,6 @@ public class EhCacheBasedUserCacheTests { Ehcache myCache = getCache(); cache.setCache(myCache); - assertEquals(myCache, cache.getCache()); + assertThat(cache.getCache()).isEqualTo(myCache); } } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java index c26590a105..5331f3eb21 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java @@ -39,7 +39,7 @@ public class NullUserCacheTests extends TestCase { public void testCacheOperation() throws Exception { NullUserCache cache = new NullUserCache(); cache.putUserInCache(getUser()); - assertNull(cache.getUserFromCache(null)); + assertThat(cache.getUserFromCache(null)).isNull(); cache.removeUserFromCache(null); } } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java index b13d0c5f14..6f725be75e 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java @@ -24,7 +24,7 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.User; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests @@ -71,11 +71,11 @@ public class SpringCacheBasedUserCacheTests { // Check it gets removed from the cache cache.removeUserFromCache(getUser()); - assertNull(cache.getUserFromCache(getUser().getUsername())); + assertThat(cache.getUserFromCache(getUser().getUsername())).isNull(); // Check it doesn't return values for null or unknown users - assertNull(cache.getUserFromCache(null)); - assertNull(cache.getUserFromCache("UNKNOWN_USER")); + assertThat(cache.getUserFromCache(null)).isNull(); + assertThat(cache.getUserFromCache("UNKNOWN_USER")).isNull(); } @Test(expected = IllegalArgumentException.class) diff --git a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java index 043870b0be..543c993719 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java @@ -52,37 +52,37 @@ public class JdbcDaoImplTests extends TestCase { public void testCheckDaoAccessUserSuccess() throws Exception { JdbcDaoImpl dao = makePopulatedJdbcDao(); UserDetails user = dao.loadUserByUsername("rod"); - assertEquals("rod", user.getUsername()); - assertEquals("koala", user.getPassword()); - assertTrue(user.isEnabled()); + assertThat(user.getUsername()).isEqualTo("rod"); + assertThat(user.getPassword()).isEqualTo("koala"); + assertThat(user.isEnabled()).isTrue(); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_TELLER")); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_SUPERVISOR")); } public void testCheckDaoOnlyReturnsGrantedAuthoritiesGrantedToUser() throws Exception { JdbcDaoImpl dao = makePopulatedJdbcDao(); UserDetails user = dao.loadUserByUsername("scott"); - assertEquals(1, user.getAuthorities().size()); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(user.getAuthorities()).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_TELLER")); } public void testCheckDaoReturnsCorrectDisabledProperty() throws Exception { JdbcDaoImpl dao = makePopulatedJdbcDao(); UserDetails user = dao.loadUserByUsername("peter"); - assertTrue(!user.isEnabled()); + assertThat(!user.isEnabled()).isTrue(); } public void testGettersSetters() { JdbcDaoImpl dao = new JdbcDaoImpl(); dao.setAuthoritiesByUsernameQuery("SELECT * FROM FOO"); - assertEquals("SELECT * FROM FOO", dao.getAuthoritiesByUsernameQuery()); + assertThat(dao.getAuthoritiesByUsernameQuery()).isEqualTo("SELECT * FROM FOO"); dao.setUsersByUsernameQuery("SELECT USERS FROM FOO"); - assertEquals("SELECT USERS FROM FOO", dao.getUsersByUsernameQuery()); + assertThat(dao.getUsersByUsernameQuery()).isEqualTo("SELECT USERS FROM FOO"); } public void testLookupFailsIfUserHasNoGrantedAuthorities() throws Exception { @@ -104,27 +104,27 @@ public class JdbcDaoImplTests extends TestCase { fail("Should have thrown UsernameNotFoundException"); } catch (UsernameNotFoundException expected) { - assertTrue(true); + } } public void testLookupSuccessWithMixedCase() throws Exception { JdbcDaoImpl dao = makePopulatedJdbcDao(); - assertEquals("koala", dao.loadUserByUsername("rod").getPassword()); - assertEquals("wombat", dao.loadUserByUsername("ScOTt").getPassword()); + assertThat(dao.loadUserByUsername("rod").getPassword()).isEqualTo("koala"); + assertThat(dao.loadUserByUsername("ScOTt").getPassword()).isEqualTo("wombat"); } public void testRolePrefixWorks() throws Exception { JdbcDaoImpl dao = makePopulatedJdbcDaoWithRolePrefix(); - assertEquals("ARBITRARY_PREFIX_", dao.getRolePrefix()); + assertThat(dao.getRolePrefix()).isEqualTo("ARBITRARY_PREFIX_"); UserDetails user = dao.loadUserByUsername("rod"); - assertEquals("rod", user.getUsername()); - assertEquals(2, user.getAuthorities().size()); + assertThat(user.getUsername()).isEqualTo("rod"); + assertThat(user.getAuthorities()).hasSize(2); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ARBITRARY_PREFIX_ROLE_TELLER")); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ARBITRARY_PREFIX_ROLE_SUPERVISOR")); } @@ -134,7 +134,7 @@ public class JdbcDaoImplTests extends TestCase { dao.setEnableGroups(true); UserDetails jerry = dao.loadUserByUsername("jerry"); - assertEquals(3, jerry.getAuthorities().size()); + assertThat(jerry.getAuthorities()).hasSize(3); } public void testDuplicateGroupAuthoritiesAreRemoved() throws Exception { @@ -143,7 +143,7 @@ public class JdbcDaoImplTests extends TestCase { dao.setEnableGroups(true); // Tom has roles A, B, C and B, C duplicates UserDetails tom = dao.loadUserByUsername("tom"); - assertEquals(3, tom.getAuthorities().size()); + assertThat(tom.getAuthorities()).hasSize(3); } public void testStartupFailsIfDataSourceNotSet() throws Exception { @@ -154,7 +154,7 @@ public class JdbcDaoImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -167,7 +167,7 @@ public class JdbcDaoImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java index 3296a813f8..10de291765 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java @@ -32,10 +32,10 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("password ,ROLE_ONE,ROLE_TWO "); UserAttribute user = (UserAttribute) editor.getValue(); - assertEquals("password", user.getPassword()); - assertEquals(2, user.getAuthorities().size()); - assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority()); - assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority()); + assertThat(user.getPassword()).isEqualTo("password"); + assertThat(user.getAuthorities()).hasSize(2); + assertThat(user.getAuthorities().get(0).getAuthority()).isEqualTo("ROLE_ONE"); + assertThat(user.getAuthorities().get(1).getAuthority()).isEqualTo("ROLE_TWO"); } public void testCorrectOperationWithoutEnabledDisabledKeyword() { @@ -43,12 +43,12 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("password,ROLE_ONE,ROLE_TWO"); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user.isValid()); - assertTrue(user.isEnabled()); // default - assertEquals("password", user.getPassword()); - assertEquals(2, user.getAuthorities().size()); - assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority()); - assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority()); + assertThat(user.isValid()).isTrue(); + assertThat(user.isEnabled()).isTrue(); // default + assertThat(user.getPassword()).isEqualTo("password"); + assertThat(user.getAuthorities()).hasSize(2); + assertThat(user.getAuthorities().get(0).getAuthority()).isEqualTo("ROLE_ONE"); + assertThat(user.getAuthorities().get(1).getAuthority()).isEqualTo("ROLE_TWO"); } public void testDisabledKeyword() { @@ -56,12 +56,12 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("password,disabled,ROLE_ONE,ROLE_TWO"); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user.isValid()); - assertTrue(!user.isEnabled()); - assertEquals("password", user.getPassword()); - assertEquals(2, user.getAuthorities().size()); - assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority()); - assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority()); + assertThat(user.isValid()).isTrue(); + assertThat(!user.isEnabled()).isTrue(); + assertThat(user.getPassword()).isEqualTo("password"); + assertThat(user.getAuthorities()).hasSize(2); + assertThat(user.getAuthorities().get(0).getAuthority()).isEqualTo("ROLE_ONE"); + assertThat(user.getAuthorities().get(1).getAuthority()).isEqualTo("ROLE_TWO"); } public void testEmptyStringReturnsNull() { @@ -69,7 +69,7 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText(""); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user == null); + assertThat(user == null).isTrue(); } public void testEnabledKeyword() { @@ -77,12 +77,12 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("password,ROLE_ONE,enabled,ROLE_TWO"); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user.isValid()); - assertTrue(user.isEnabled()); - assertEquals("password", user.getPassword()); - assertEquals(2, user.getAuthorities().size()); - assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority()); - assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority()); + assertThat(user.isValid()).isTrue(); + assertThat(user.isEnabled()).isTrue(); + assertThat(user.getPassword()).isEqualTo("password"); + assertThat(user.getAuthorities()).hasSize(2); + assertThat(user.getAuthorities().get(0).getAuthority()).isEqualTo("ROLE_ONE"); + assertThat(user.getAuthorities().get(1).getAuthority()).isEqualTo("ROLE_TWO"); } public void testMalformedStringReturnsNull() { @@ -90,7 +90,7 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("MALFORMED_STRING"); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user == null); + assertThat(user == null).isTrue(); } public void testNoPasswordOrRolesReturnsNull() { @@ -98,7 +98,7 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("disabled"); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user == null); + assertThat(user == null).isTrue(); } public void testNoRolesReturnsNull() { @@ -106,7 +106,7 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText("password,enabled"); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user == null); + assertThat(user == null).isTrue(); } public void testNullReturnsNull() { @@ -114,6 +114,6 @@ public class UserAttributeEditorTests extends TestCase { editor.setAsText(null); UserAttribute user = (UserAttribute) editor.getValue(); - assertTrue(user == null); + assertThat(user == null).isTrue(); } } diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java index b0f6b24353..5d78a7e04e 100644 --- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java @@ -1,8 +1,8 @@ package org.springframework.security.provisioning; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; import java.util.HashMap; @@ -98,7 +98,7 @@ public class JdbcUserDetailsManagerTests { UserDetails joe2 = manager.loadUserByUsername("joe"); - assertEquals(joe, joe2); + assertThat(joe2).isEqualTo(joe); } @Test @@ -106,9 +106,9 @@ public class JdbcUserDetailsManagerTests { insertJoe(); manager.deleteUser("joe"); - assertEquals(0, template.queryForList(SELECT_JOE_SQL).size()); - assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size()); - assertFalse(cache.getUserMap().containsKey("joe")); + assertThat(template.queryForList(SELECT_JOE_SQL)).isEmpty(); + assertThat(template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); + assertThat(cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -121,20 +121,20 @@ public class JdbcUserDetailsManagerTests { UserDetails joe = manager.loadUserByUsername("joe"); - assertEquals(newJoe, joe); - assertFalse(cache.getUserMap().containsKey("joe")); + assertThat(joe).isEqualTo(newJoe); + assertThat(cache.getUserMap().containsKey("joe")).isFalse(); } @Test public void userExistsReturnsFalseForNonExistentUsername() { - assertFalse(manager.userExists("joe")); + assertThat(manager.userExists("joe")).isFalse(); } @Test public void userExistsReturnsTrueForExistingUsername() { insertJoe(); - assertTrue(manager.userExists("joe")); - assertTrue(cache.getUserMap().containsKey("joe")); + assertThat(manager.userExists("joe")).isTrue(); + assertThat(cache.getUserMap().containsKey("joe")).isTrue(); } @Test(expected = AccessDeniedException.class) @@ -149,8 +149,8 @@ public class JdbcUserDetailsManagerTests { manager.changePassword("wrongpassword", "newPassword"); UserDetails newJoe = manager.loadUserByUsername("joe"); - assertEquals("newPassword", newJoe.getPassword()); - assertFalse(cache.getUserMap().containsKey("joe")); + assertThat(newJoe.getPassword()).isEqualTo("newPassword"); + assertThat(cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -164,13 +164,13 @@ public class JdbcUserDetailsManagerTests { manager.changePassword("password", "newPassword"); UserDetails newJoe = manager.loadUserByUsername("joe"); - assertEquals("newPassword", newJoe.getPassword()); + assertThat(newJoe.getPassword()).isEqualTo("newPassword"); // The password in the context should also be altered Authentication newAuth = SecurityContextHolder.getContext().getAuthentication(); - assertEquals("joe", newAuth.getName()); - assertEquals(currentAuth.getDetails(), newAuth.getDetails()); + assertThat(newAuth.getName()).isEqualTo("joe"); + assertThat(newAuth.getDetails()).isEqualTo(currentAuth.getDetails()); assertThat(newAuth.getCredentials()).isNull(); - assertFalse(cache.getUserMap().containsKey("joe")); + assertThat(cache.getUserMap().containsKey("joe")).isFalse(); } @Test @@ -192,31 +192,31 @@ public class JdbcUserDetailsManagerTests { // Check password hasn't changed. UserDetails newJoe = manager.loadUserByUsername("joe"); - assertEquals("password", newJoe.getPassword()); - assertEquals("password", SecurityContextHolder.getContext().getAuthentication() + assertThat(newJoe.getPassword()).isEqualTo("password"); + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("password") .getCredentials()); - assertTrue(cache.getUserMap().containsKey("joe")); + assertThat(cache.getUserMap().containsKey("joe")).isTrue(); } @Test public void findAllGroupsReturnsExpectedGroupNames() { List groups = manager.findAllGroups(); - assertEquals(4, groups.size()); + assertThat(groups).hasSize(4); Collections.sort(groups); - assertEquals("GROUP_0", groups.get(0)); - assertEquals("GROUP_1", groups.get(1)); - assertEquals("GROUP_2", groups.get(2)); - assertEquals("GROUP_3", groups.get(3)); + assertThat(groups.get(0)).isEqualTo("GROUP_0"); + assertThat(groups.get(1)).isEqualTo("GROUP_1"); + assertThat(groups.get(2)).isEqualTo("GROUP_2"); + assertThat(groups.get(3)).isEqualTo("GROUP_3"); } @Test public void findGroupMembersReturnsCorrectData() { List groupMembers = manager.findUsersInGroup("GROUP_0"); - assertEquals(1, groupMembers.size()); - assertEquals("jerry", groupMembers.get(0)); + assertThat(groupMembers).hasSize(1); + assertThat(groupMembers.get(0)).isEqualTo("jerry"); groupMembers = manager.findUsersInGroup("GROUP_1"); - assertEquals(2, groupMembers.size()); + assertThat(groupMembers).hasSize(2); } @Test @@ -229,7 +229,7 @@ public class JdbcUserDetailsManagerTests { .queryForList("select ga.authority from groups g, group_authorities ga " + "where ga.group_id = g.id " + "and g.group_name = 'TEST_GROUP'"); - assertEquals(2, roles.size()); + assertThat(roles).hasSize(2); } @Test @@ -239,9 +239,9 @@ public class JdbcUserDetailsManagerTests { manager.deleteGroup("GROUP_2"); manager.deleteGroup("GROUP_3"); - assertEquals(0, template.queryForList("select * from group_authorities").size()); - assertEquals(0, template.queryForList("select * from group_members").size()); - assertEquals(0, template.queryForList("select id from groups").size()); + assertThat(template.queryForList("select * from group_authorities")).isEmpty(); + assertThat(template.queryForList("select * from group_members")).isEmpty(); + assertThat(template.queryForList("select id from groups")).isEmpty(); } @Test @@ -315,7 +315,7 @@ public class JdbcUserDetailsManagerTests { throws Exception { manager.setEnableAuthorities(false); manager.createUser(joe); - assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size()); + assertThat(template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); } // SEC-1156 @@ -326,7 +326,7 @@ public class JdbcUserDetailsManagerTests { insertJoe(); template.execute("delete from authorities where username='joe'"); manager.updateUser(joe); - assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size()); + assertThat(template.queryForList(SELECT_JOE_AUTHORITIES_SQL)).isEmpty(); } // SEC-2166 diff --git a/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java b/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java index 3d86aa2b39..3f9d05ad9e 100644 --- a/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java +++ b/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java @@ -1,6 +1,7 @@ package org.springframework.security.util; -import static org.junit.Assert.*; + +import static org.assertj.core.api.Assertions.assertThat; import org.junit.*; @@ -15,10 +16,10 @@ public class FieldUtilsTests { Object tc = new TestClass(); - assertEquals("x", FieldUtils.getProtectedFieldValue("protectedField", tc)); - assertEquals("z", FieldUtils.getFieldValue(tc, "nested.protectedField")); + assertThat(FieldUtils.getProtectedFieldValue("protectedField", tc)).isEqualTo("x"); + assertThat(FieldUtils.getFieldValue(tc, "nested.protectedField")).isEqualTo("z"); FieldUtils.setProtectedFieldValue("protectedField", tc, "y"); - assertEquals("y", FieldUtils.getProtectedFieldValue("protectedField", tc)); + assertThat(FieldUtils.getProtectedFieldValue("protectedField", tc)).isEqualTo("y"); try { FieldUtils.getProtectedFieldValue("nonExistentField", tc); diff --git a/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java b/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java index e7512829db..2333f51e54 100644 --- a/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java +++ b/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.util; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; @@ -12,15 +12,15 @@ public class InMemoryResourceTests { @Test public void resourceContainsExpectedData() throws Exception { InMemoryResource resource = new InMemoryResource("blah"); - assertNull(resource.getDescription()); - assertEquals(1, resource.hashCode()); - assertNotNull(resource.getInputStream()); + assertThat(resource.getDescription()).isNull(); + assertThat(resource.hashCode()).isEqualTo(1); + assertThat(resource.getInputStream()).isNotNull(); } @Test public void resourceIsEqualToOneWithSameContent() throws Exception { - assertEquals(new InMemoryResource("xxx"), new InMemoryResource("xxx")); - assertFalse(new InMemoryResource("xxx").equals(new InMemoryResource("xxxx"))); - assertFalse(new InMemoryResource("xxx").equals(new Object())); + assertThat(new InMemoryResource("xxx")).isEqualTo(new InMemoryResource("xxx")); + assertThat(new InMemoryResource("xxx").equals(new InMemoryResource("xxxx"))).isFalse(); + assertThat(new InMemoryResource("xxx").equals(new Object())).isFalse(); } } diff --git a/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java b/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java index c2a5724b43..b6507ddad8 100644 --- a/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java +++ b/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.util; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.aopalliance.intercept.MethodInvocation; import org.junit.*; @@ -21,14 +21,14 @@ public class MethodInvocationUtilsTests { MethodInvocation mi = MethodInvocationUtils.createFromClass(String.class, "length"); - assertNotNull(mi); + assertThat(mi).isNotNull(); } @Test public void createFromClassReturnsMethodIfArgInfoOmittedAndMethodNameIsUnique() { MethodInvocation mi = MethodInvocationUtils.createFromClass( BusinessServiceImpl.class, "methodReturningAnArray"); - assertNotNull(mi); + assertThat(mi).isNotNull(); } @Test(expected = IllegalArgumentException.class) @@ -41,7 +41,7 @@ public class MethodInvocationUtilsTests { public void createFromClassReturnsMethodIfGivenArgInfoForMethodWithArgs() { MethodInvocation mi = MethodInvocationUtils.createFromClass(null, String.class, "compareTo", new Class[] { String.class }, new Object[] { "" }); - assertNotNull(mi); + assertThat(mi).isNotNull(); } @Test @@ -52,13 +52,13 @@ public class MethodInvocationUtilsTests { Blah.class }); MethodInvocation mi = MethodInvocationUtils.create(t, "blah"); - assertNotNull(mi); + assertThat(mi).isNotNull(); t.setProxyTargetClass(true); mi = MethodInvocationUtils.create(t, "blah"); - assertNotNull(mi); + assertThat(mi).isNotNull(); - assertNull(MethodInvocationUtils.create(t, "blah", "non-existent arg")); + assertThat(MethodInvocationUtils.create(t, "blah", "non-existent arg")).isNull(); } interface Blah { diff --git a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java index c6ff7105af..ab961bd6d9 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java @@ -32,55 +32,55 @@ public class BCryptPasswordEncoderTests { public void matches() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); String result = encoder.encode("password"); - assertFalse(result.equals("password")); - assertTrue(encoder.matches("password", result)); + assertThat(result.equals("password")).isFalse(); + assertThat(encoder.matches("password", result)).isTrue(); } @Test public void unicode() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); String result = encoder.encode("passw\u9292rd"); - assertFalse(encoder.matches("pass\u9292\u9292rd", result)); - assertTrue(encoder.matches("passw\u9292rd", result)); + assertThat(encoder.matches("pass\u9292\u9292rd", result)).isFalse(); + assertThat(encoder.matches("passw\u9292rd", result)).isTrue(); } @Test public void notMatches() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); String result = encoder.encode("password"); - assertFalse(encoder.matches("bogus", result)); + assertThat(encoder.matches("bogus", result)).isFalse(); } @Test public void customStrength() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(8); String result = encoder.encode("password"); - assertTrue(encoder.matches("password", result)); + assertThat(encoder.matches("password", result)).isTrue(); } @Test public void customRandom() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(8, new SecureRandom()); String result = encoder.encode("password"); - assertTrue(encoder.matches("password", result)); + assertThat(encoder.matches("password", result)).isTrue(); } @Test public void doesntMatchNullEncodedValue() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); - assertFalse(encoder.matches("password", null)); + assertThat(encoder.matches("password", null)).isFalse(); } @Test public void doesntMatchEmptyEncodedValue() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); - assertFalse(encoder.matches("password", "")); + assertThat(encoder.matches("password", "")).isFalse(); } @Test public void doesntMatchBogusEncodedValue() { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); - assertFalse(encoder.matches("password", "012345678901234567890123456789")); + assertThat(encoder.matches("password", "012345678901234567890123456789")).isFalse(); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java old mode 100755 new mode 100644 index 86bd49dce9..41efeebf42 --- a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java @@ -17,7 +17,7 @@ package org.springframework.security.crypto.bcrypt; import java.util.Arrays; import org.junit.Test; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * JUnit unit tests for BCrypt routines @@ -86,7 +86,7 @@ public class BCryptTests { String salt = test_vectors[i][1]; String expected = test_vectors[i][2]; String hashed = BCrypt.hashpw(plain, salt); - assertEquals(hashed, expected); + assertThat(expected).isEqualTo(hashed); print("."); } println(""); @@ -105,7 +105,7 @@ public class BCryptTests { String salt = BCrypt.gensalt(i); String hashed1 = BCrypt.hashpw(plain, salt); String hashed2 = BCrypt.hashpw(plain, hashed1); - assertEquals(hashed1, hashed2); + assertThat(hashed2).isEqualTo(hashed1); print("."); } } @@ -123,7 +123,7 @@ public class BCryptTests { String salt = BCrypt.gensalt(); String hashed1 = BCrypt.hashpw(plain, salt); String hashed2 = BCrypt.hashpw(plain, hashed1); - assertEquals(hashed1, hashed2); + assertThat(hashed2).isEqualTo(hashed1); print("."); } println(""); @@ -138,7 +138,7 @@ public class BCryptTests { for (int i = 0; i < test_vectors.length; i++) { String plain = test_vectors[i][0]; String expected = test_vectors[i][2]; - assertTrue(BCrypt.checkpw(plain, expected)); + assertThat(BCrypt.checkpw(plain, expected)).isTrue(); print("."); } println(""); @@ -154,7 +154,7 @@ public class BCryptTests { int broken_index = (i + 4) % test_vectors.length; String plain = test_vectors[i][0]; String expected = test_vectors[broken_index][2]; - assertFalse(BCrypt.checkpw(plain, expected)); + assertThat(BCrypt.checkpw(plain, expected)).isFalse(); print("."); } println(""); @@ -170,19 +170,19 @@ public class BCryptTests { String pw2 = "????????"; String h1 = BCrypt.hashpw(pw1, BCrypt.gensalt()); - assertFalse(BCrypt.checkpw(pw2, h1)); + assertThat(BCrypt.checkpw(pw2, h1)).isFalse(); print("."); String h2 = BCrypt.hashpw(pw2, BCrypt.gensalt()); - assertFalse(BCrypt.checkpw(pw1, h2)); + assertThat(BCrypt.checkpw(pw1, h2)).isFalse(); print("."); println(""); } @Test public void roundsForDoesNotOverflow() { - assertEquals(1024, BCrypt.roundsForLogRounds(10)); - assertEquals(0x80000000L, BCrypt.roundsForLogRounds(31)); + assertThat(BCrypt.roundsForLogRounds(10)).isEqualTo(1024); + assertThat(BCrypt.roundsForLogRounds(31)).isEqualTo(0x80000000L); } @Test(expected = IllegalArgumentException.class) @@ -209,29 +209,29 @@ public class BCryptTests { @Test public void testBase64EncodeSimpleByteArrays() { - assertEquals("..", encode_base64(new byte[] { 0 }, 1)); - assertEquals("...", encode_base64(new byte[] { 0, 0 }, 2)); - assertEquals("....", encode_base64(new byte[] { 0, 0, 0 }, 3)); + assertThat(1)).as("..").isEqualTo(encode_base64(new byte[] { 0 }); + assertThat(0 }).as("...").isCloseTo(encode_base64(new byte[] { 0, within(2))); + assertThat(0 }).as("....").isCloseTo(encode_base64(new byte[] { 0, 0, within(3))); } @Test public void decodingCharsOutsideAsciiGivesNoResults() { byte[] ba = BCrypt.decode_base64("ππππππππ", 1); - assertEquals(0, ba.length); + assertThat(ba.length).isEqualTo(0); } @Test public void decodingStopsWithFirstInvalidCharacter() { - assertEquals(1, BCrypt.decode_base64("....", 1).length); - assertEquals(0, BCrypt.decode_base64(" ....", 1).length); + assertThat(1).length).isEqualTo(1, BCrypt.decode_base64("...."); + assertThat(1).length).isEqualTo(0, BCrypt.decode_base64(" ...."); } @Test public void decodingOnlyProvidesAvailableBytes() { - assertEquals(0, BCrypt.decode_base64("", 1).length); - assertEquals(3, BCrypt.decode_base64("......", 3).length); - assertEquals(4, BCrypt.decode_base64("......", 4).length); - assertEquals(4, BCrypt.decode_base64("......", 5).length); + assertThat(1).length).isEqualTo(0, BCrypt.decode_base64(""); + assertThat(3).length).isEqualTo(3, BCrypt.decode_base64("......"); + assertThat(4).length).isEqualTo(4, BCrypt.decode_base64("......"); + assertThat(5).length).isEqualTo(4, BCrypt.decode_base64("......"); } /** @@ -247,10 +247,10 @@ public class BCryptTests { ba[i] = (byte) b; String s = encode_base64(ba, 3); - assertEquals(4, s.length()); + assertThat(s.length()).isEqualTo(4); byte[] decoded = BCrypt.decode_base64(s, 3); - assertArrayEquals(ba, decoded); + assertThat(decoded).isEqualTo(ba); } } } @@ -267,8 +267,8 @@ public class BCryptTests { @Test public void genSaltGeneratesCorrectSaltPrefix() { - assertTrue(BCrypt.gensalt(4).startsWith("$2a$04$")); - assertTrue(BCrypt.gensalt(31).startsWith("$2a$31$")); + assertThat(BCrypt.gensalt(4).startsWith("$2a$04$")).isTrue(); + assertThat(BCrypt.gensalt(31).startsWith("$2a$31$")).isTrue(); } @Test(expected = IllegalArgumentException.class) @@ -294,12 +294,12 @@ public class BCryptTests { @Test public void equalsOnStringsIsCorrect() { - assertTrue(BCrypt.equalsNoEarlyReturn("", "")); - assertTrue(BCrypt.equalsNoEarlyReturn("test", "test")); + assertThat(BCrypt.equalsNoEarlyReturn("", "")).isTrue(); + assertThat(BCrypt.equalsNoEarlyReturn("test", "test")).isTrue(); - assertFalse(BCrypt.equalsNoEarlyReturn("test", "")); - assertFalse(BCrypt.equalsNoEarlyReturn("", "test")); + assertThat(BCrypt.equalsNoEarlyReturn("test", "")).isFalse(); + assertThat(BCrypt.equalsNoEarlyReturn("", "test")).isFalse(); - assertFalse(BCrypt.equalsNoEarlyReturn("test", "pass")); + assertThat(BCrypt.equalsNoEarlyReturn("test", "pass")).isFalse(); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java b/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java index 902a13e0c2..3440bf751f 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java @@ -1,6 +1,6 @@ package org.springframework.security.crypto.codec; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; @@ -13,14 +13,14 @@ public class Base64Tests { public void isBase64ReturnsTrueForValidBase64() { new Base64(); // unused - assertTrue(Base64.isBase64(new byte[] { (byte) 'A', (byte) 'B', (byte) 'C', + assertThat(Base64.isBase64(new byte[] { (byte) 'A', (byte) 'B', (byte).isTrue() 'C', (byte) 'D' })); } @Test public void isBase64ReturnsFalseForInvalidBase64() throws Exception { // Include invalid '`' character - assertFalse(Base64.isBase64(new byte[] { (byte) 'A', (byte) 'B', (byte) 'C', + assertThat(Base64.isBase64(new byte[] { (byte) 'A', (byte) 'B', (byte).isFalse() 'C', (byte) '`' })); } diff --git a/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java b/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java index d57c2f566c..a0585634eb 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java @@ -1,6 +1,6 @@ package org.springframework.security.crypto.codec; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; @@ -15,11 +15,11 @@ public class Utf8Tests { @Test public void utf8EncodesAndDecodesCorrectly() throws Exception { byte[] bytes = Utf8.encode("6048b75ed560785c"); - assertEquals(16, bytes.length); - assertTrue(Arrays.equals("6048b75ed560785c".getBytes("UTF-8"), bytes)); + assertThat(bytes.length).isEqualTo(16); + assertThat(Arrays.equals("6048b75ed560785c".getBytes("UTF-8"), bytes)).isTrue(); String decoded = Utf8.decode(bytes); - assertEquals("6048b75ed560785c", decoded); + assertThat(decoded).isEqualTo("6048b75ed560785c"); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java index f6c1224c36..1c631d2855 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.crypto.encrypt; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -20,10 +20,10 @@ public class EncryptorsTests { BytesEncryptor encryptor = Encryptors.stronger("password", "5c0744940b5c369b"); byte[] result = encryptor.encrypt("text".getBytes("UTF-8")); - assertNotNull(result); - assertFalse(new String(result).equals("text")); - assertEquals("text", new String(encryptor.decrypt(result))); - assertFalse(new String(result).equals(new String(encryptor.encrypt("text" + assertThat(result).isNotNull(); + assertThat(new String(result).equals("text")).isFalse(); + assertThat(new String(encryptor.decrypt(result))).isEqualTo("text"); + assertThat(new String(result).isFalse().equals(new String(encryptor.encrypt("text" .getBytes())))); } @@ -31,10 +31,10 @@ public class EncryptorsTests { public void standard() throws Exception { BytesEncryptor encryptor = Encryptors.standard("password", "5c0744940b5c369b"); byte[] result = encryptor.encrypt("text".getBytes("UTF-8")); - assertNotNull(result); - assertFalse(new String(result).equals("text")); - assertEquals("text", new String(encryptor.decrypt(result))); - assertFalse(new String(result).equals(new String(encryptor.encrypt("text" + assertThat(result).isNotNull(); + assertThat(new String(result).equals("text")).isFalse(); + assertThat(new String(encryptor.decrypt(result))).isEqualTo("text"); + assertThat(new String(result).isFalse().equals(new String(encryptor.encrypt("text" .getBytes())))); } @@ -44,20 +44,20 @@ public class EncryptorsTests { TextEncryptor encryptor = Encryptors.delux("password", "5c0744940b5c369b"); String result = encryptor.encrypt("text"); - assertNotNull(result); - assertFalse(result.equals("text")); - assertEquals("text", encryptor.decrypt(result)); - assertFalse(result.equals(encryptor.encrypt("text"))); + assertThat(result).isNotNull(); + assertThat(result.equals("text")).isFalse(); + assertThat(encryptor.decrypt(result)).isEqualTo("text"); + assertThat(result.equals(encryptor.encrypt("text"))).isFalse(); } @Test public void text() { TextEncryptor encryptor = Encryptors.text("password", "5c0744940b5c369b"); String result = encryptor.encrypt("text"); - assertNotNull(result); - assertFalse(result.equals("text")); - assertEquals("text", encryptor.decrypt(result)); - assertFalse(result.equals(encryptor.encrypt("text"))); + assertThat(result).isNotNull(); + assertThat(result.equals("text")).isFalse(); + assertThat(encryptor.decrypt(result)).isEqualTo("text"); + assertThat(result.equals(encryptor.encrypt("text"))).isFalse(); } @Test @@ -65,17 +65,17 @@ public class EncryptorsTests { TextEncryptor encryptor = Encryptors .queryableText("password", "5c0744940b5c369b"); String result = encryptor.encrypt("text"); - assertNotNull(result); - assertFalse(result.equals("text")); - assertEquals("text", encryptor.decrypt(result)); - assertTrue(result.equals(encryptor.encrypt("text"))); + assertThat(result).isNotNull(); + assertThat(result.equals("text")).isFalse(); + assertThat(encryptor.decrypt(result)).isEqualTo("text"); + assertThat(result.equals(encryptor.encrypt("text"))).isTrue(); } @Test public void noOpText() { TextEncryptor encryptor = Encryptors.noOpText(); - assertEquals("text", encryptor.encrypt("text")); - assertEquals("text", encryptor.decrypt("text")); + assertThat(encryptor.encrypt("text")).isEqualTo("text"); + assertThat(encryptor.decrypt("text")).isEqualTo("text"); } private boolean isAesGcmAvailable() { diff --git a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java b/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java index c2c58569bc..65ec65f946 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.crypto.keygen; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; @@ -12,41 +12,41 @@ public class KeyGeneratorsTests { @Test public void secureRandom() { BytesKeyGenerator keyGenerator = KeyGenerators.secureRandom(); - assertEquals(8, keyGenerator.getKeyLength()); + assertThat(keyGenerator.getKeyLength()).isEqualTo(8); byte[] key = keyGenerator.generateKey(); - assertEquals(8, key.length); + assertThat(key.length).isEqualTo(8); byte[] key2 = keyGenerator.generateKey(); - assertFalse(Arrays.equals(key, key2)); + assertThat(Arrays.equals(key, key2)).isFalse(); } @Test public void secureRandomCustomLength() { BytesKeyGenerator keyGenerator = KeyGenerators.secureRandom(21); - assertEquals(21, keyGenerator.getKeyLength()); + assertThat(keyGenerator.getKeyLength()).isEqualTo(21); byte[] key = keyGenerator.generateKey(); - assertEquals(21, key.length); + assertThat(key.length).isEqualTo(21); byte[] key2 = keyGenerator.generateKey(); - assertFalse(Arrays.equals(key, key2)); + assertThat(Arrays.equals(key, key2)).isFalse(); } @Test public void shared() throws Exception { BytesKeyGenerator keyGenerator = KeyGenerators.shared(21); - assertEquals(21, keyGenerator.getKeyLength()); + assertThat(keyGenerator.getKeyLength()).isEqualTo(21); byte[] key = keyGenerator.generateKey(); - assertEquals(21, key.length); + assertThat(key.length).isEqualTo(21); byte[] key2 = keyGenerator.generateKey(); - assertTrue(Arrays.equals(key, key2)); + assertThat(Arrays.equals(key, key2)).isTrue(); } @Test public void string() { StringKeyGenerator keyGenerator = KeyGenerators.string(); String hexStringKey = keyGenerator.generateKey(); - assertEquals(16, hexStringKey.length()); - assertEquals(8, Hex.decode(hexStringKey).length); + assertThat(hexStringKey.length()).isEqualTo(16); + assertThat(Hex.decode(hexStringKey).length).isEqualTo(8); String hexStringKey2 = keyGenerator.generateKey(); - assertFalse(hexStringKey.equals(hexStringKey2)); + assertThat(hexStringKey.equals(hexStringKey2)).isFalse(); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java index f0980626aa..ee37106dd0 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.crypto.password; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import java.security.MessageDigest; diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java index 197c449070..17c36b7bcc 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java @@ -12,20 +12,20 @@ public class StandardPasswordEncoderTests { @Test public void matches() { String result = encoder.encode("password"); - assertFalse(result.equals("password")); - assertTrue(encoder.matches("password", result)); + assertThat(result.equals("password")).isFalse(); + assertThat(encoder.matches("password", result)).isTrue(); } @Test public void matchesLengthChecked() { String result = encoder.encode("password"); - assertFalse(encoder.matches("password", result.substring(0, result.length() - 2))); + assertThat(encoder.matches("password", result.substring(0, result.length() - 2))).isFalse(); } @Test public void notMatches() { String result = encoder.encode("password"); - assertFalse(encoder.matches("bogus", result)); + assertThat(encoder.matches("bogus", result)).isFalse(); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java b/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java index 8d8b54292d..856b674260 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.crypto.util; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; import java.util.Arrays; @@ -15,7 +15,7 @@ public class EncodingUtilsTests { byte[] bytes = new byte[] { (byte) 0x01, (byte) 0xFF, (byte) 65, (byte) 66, (byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 }; String result = new String(Hex.encode(bytes)); - assertEquals("01ff414243c0c1c2", result); + assertThat(result).isEqualTo("01ff414243c0c1c2"); } @Test @@ -23,7 +23,7 @@ public class EncodingUtilsTests { byte[] bytes = new byte[] { (byte) 0x01, (byte) 0xFF, (byte) 65, (byte) 66, (byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 }; byte[] result = Hex.decode("01ff414243c0c1c2"); - assertTrue(Arrays.equals(bytes, result)); + assertThat(Arrays.equals(bytes, result)).isTrue(); } @Test @@ -33,7 +33,7 @@ public class EncodingUtilsTests { byte[] one = new byte[] { (byte) 0x01 }; byte[] two = new byte[] { (byte) 0xFF, (byte) 65, (byte) 66 }; byte[] three = new byte[] { (byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 }; - assertTrue(Arrays.equals(bytes, EncodingUtils.concatenate(one, two, three))); + assertThat(Arrays.equals(bytes, EncodingUtils.concatenate(one, two, three))).isTrue(); } @Test @@ -42,8 +42,8 @@ public class EncodingUtilsTests { (byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 }; byte[] two = new byte[] { (byte) 0xFF, (byte) 65, (byte) 66 }; byte[] subArray = EncodingUtils.subArray(bytes, 1, 4); - assertEquals(3, subArray.length); - assertTrue(Arrays.equals(two, subArray)); + assertThat(subArray.length).isEqualTo(3); + assertThat(Arrays.equals(two, subArray)).isTrue(); } } diff --git a/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java b/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java index a555815903..b351b54500 100644 --- a/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java +++ b/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java @@ -22,7 +22,7 @@ import org.springframework.security.access.expression.SecurityExpressionRoot; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SecurityEvaluationContextExtensionTests { SecurityEvaluationContextExtension securityExtension; diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index b519c2fb9f..89fc3d1dc8 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -79,12 +79,12 @@ ext.jstlDependencies = [ ] ext.apachedsDependencies = [ - "org.apache.directory.server:apacheds-core:$apacheDsVersion", - "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion", - "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion", - "org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion", - "org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion", - 'org.apache.directory.shared:shared-ldap:0.9.15' + "org.apache.directory.server:apacheds-core:$apacheDsVersion", + "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion", + "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion", + "org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion", + "org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion", + 'org.apache.directory.shared:shared-ldap:0.9.15' ] // Integration test setup @@ -151,8 +151,7 @@ dependencies { testCompile "junit:junit:$junitVersion", 'org.mockito:mockito-core:1.10.19', "org.springframework:spring-test:$springVersion", - 'org.easytesting:fest-assert:1.4', - "org.assertj:assertj-core:2.3.0" + 'org.assertj:assertj-core:2.2.0' // Use slf4j/logback for logging testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion", @@ -246,19 +245,19 @@ project.eclipse.classpath.file.whenMerged { classpath -> // GRADLE-1422 project.eclipseClasspath.doFirst { - // delay adding whenMerged till the entryAttributes are added (must be the last whenMerged) - project.eclipse.classpath.file.whenMerged { classpath -> - def includeDeps = project.configurations.getByName('runtime').collect {f -> f.absolutePath } as Set - classpath.entries.each { cp -> - if(cp instanceof org.gradle.plugins.ide.eclipse.model.Library) { - def include = includeDeps.contains(cp.path) - def attr = 'org.eclipse.jst.component.dependency' - if(!include) { - cp.entryAttributes.remove(attr) - } - } - } - } + // delay adding whenMerged till the entryAttributes are added (must be the last whenMerged) + project.eclipse.classpath.file.whenMerged { classpath -> + def includeDeps = project.configurations.getByName('runtime').collect {f -> f.absolutePath } as Set + classpath.entries.each { cp -> + if(cp instanceof org.gradle.plugins.ide.eclipse.model.Library) { + def include = includeDeps.contains(cp.path) + def attr = 'org.eclipse.jst.component.dependency' + if(!include) { + cp.entryAttributes.remove(attr) + } + } + } + } } project.idea.module { diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java index 7a5c24df2a..7081dfe933 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.integration; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import javax.servlet.http.HttpSession; @@ -33,7 +33,7 @@ public class HttpNamespaceWithMultipleInterceptorsTests { request.setSession(createAuthenticatedSession("ROLE_0", "ROLE_1", "ROLE_2")); MockHttpServletResponse response = new MockHttpServletResponse(); fcp.doFilter(request, response, new MockFilterChain()); - assertEquals(200, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(200); } @Test @@ -45,7 +45,7 @@ public class HttpNamespaceWithMultipleInterceptorsTests { request.setSession(createAuthenticatedSession("ROLE_0")); MockHttpServletResponse response = new MockHttpServletResponse(); fcp.doFilter(request, response, new MockFilterChain()); - assertEquals(403, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(403); } public HttpSession createAuthenticatedSession(String... roles) { diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java index 096ac390f2..88803dacef 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java @@ -1,6 +1,6 @@ package org.springframework.security.integration; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,7 +33,7 @@ public class HttpPathParameterStrippingTests { request.setSession(createAuthenticatedSession("ROLE_USER")); MockHttpServletResponse response = new MockHttpServletResponse(); fcp.doFilter(request, response, new MockFilterChain()); - assertEquals(403, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(403); } @Test @@ -43,7 +43,7 @@ public class HttpPathParameterStrippingTests { request.setSession(createAuthenticatedSession("ROLE_USER")); MockHttpServletResponse response = new MockHttpServletResponse(); fcp.doFilter(request, response, new MockFilterChain()); - assertEquals(403, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(403); // Try with pathInfo request = new MockHttpServletRequest(); @@ -52,7 +52,7 @@ public class HttpPathParameterStrippingTests { request.setSession(createAuthenticatedSession("ROLE_USER")); response = new MockHttpServletResponse(); fcp.doFilter(request, response, new MockFilterChain()); - assertEquals(403, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(403); } public HttpSession createAuthenticatedSession(String... roles) { diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java index 93b242ca0f..33eab229be 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java @@ -1,6 +1,6 @@ package org.springframework.security.integration; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -18,6 +18,6 @@ public class SEC933ApplicationContextTests { @Test public void testSimpleApplicationContextBootstrap() throws Exception { - assertNotNull(userDetailsService); + assertThat(userDetailsService).isNotNull(); } } diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java index 1775baaaa2..9fc6c19be3 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java @@ -44,7 +44,7 @@ public class ProtectPointcutPerformanceTests implements ApplicationContextAware } } sw.stop(); - // assertTrue(sw.getTotalTimeMillis() < 1000); + // assertThat(sw.getTotalTimeMillis() < 1000).isTrue(); } diff --git a/itest/misc/src/integration-test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java b/itest/misc/src/integration-test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java index b2d2eb37c1..836c6cc206 100644 --- a/itest/misc/src/integration-test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java +++ b/itest/misc/src/integration-test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java @@ -69,7 +69,7 @@ public class SessionRegistryImplMTTests extends TestCase { pause(250); } - assertFalse("Thread errors detected; review log output for details", errorOccurred); + assertThat(errorOccurred).as("Thread errors detected; review log output for details").isFalse(); } public void testConcurrentRemovalIsSafe() { diff --git a/itest/misc/src/integration-test/java/org/springframework/security/context/SecurityContextHolderMTTests.java b/itest/misc/src/integration-test/java/org/springframework/security/context/SecurityContextHolderMTTests.java index cb1cc0e911..8ae604853b 100644 --- a/itest/misc/src/integration-test/java/org/springframework/security/context/SecurityContextHolderMTTests.java +++ b/itest/misc/src/integration-test/java/org/springframework/security/context/SecurityContextHolderMTTests.java @@ -27,17 +27,17 @@ public class SecurityContextHolderMTTests extends TestCase{ public void testSynchronizationCustomStrategyLoading() { SecurityContextHolder.setStrategyName(InheritableThreadLocalSecurityContextHolderStrategy.class.getName()); - assertTrue(new SecurityContextHolder().toString() + assertThat(new SecurityContextHolder().toString().isTrue() .lastIndexOf("SecurityContextHolder[strategy='org.springframework.security.context.InheritableThreadLocalSecurityContextHolderStrategy'") != -1); loadStartAndWaitForThreads(true, "Main_", NUM_THREADS, false, true); - assertEquals("Thread errors detected; review log output for details", 0, errors); + assertThat(errors).as("Thread errors detected; review log output for details").isEqualTo(0); } public void testSynchronizationGlobal() throws Exception { SecurityContextHolder.clearContext(); SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_GLOBAL); loadStartAndWaitForThreads(true, "Main_", NUM_THREADS, true, false); - assertEquals("Thread errors detected; review log output for details", 0, errors); + assertThat(errors).as("Thread errors detected; review log output for details").isEqualTo(0); } public void testSynchronizationInheritableThreadLocal() @@ -45,14 +45,14 @@ public class SecurityContextHolderMTTests extends TestCase{ SecurityContextHolder.clearContext(); SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL); loadStartAndWaitForThreads(true, "Main_", NUM_THREADS, false, true); - assertEquals("Thread errors detected; review log output for details", 0, errors); + assertThat(errors).as("Thread errors detected; review log output for details").isEqualTo(0); } public void testSynchronizationThreadLocal() throws Exception { SecurityContextHolder.clearContext(); SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_THREADLOCAL); loadStartAndWaitForThreads(true, "Main_", NUM_THREADS, false, false); - assertEquals("Thread errors detected; review log output for details", 0, errors); + assertThat(errors).as("Thread errors detected; review log output for details").isEqualTo(0); } private void startAndRun(Thread[] threads) { diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java index 7830c89ed0..6536cd447c 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java @@ -2,7 +2,8 @@ package org.springframework.security.integration; import net.sourceforge.jwebunit.junit.WebTester; -import org.junit.Assert; +import static org.assertj.core.api.Assertions.*; + import org.springframework.security.core.session.SessionRegistry; import org.testng.annotations.Test; @@ -29,8 +30,8 @@ public class CustomConcurrentSessionManagementTests extends tester2.setTextField("password", "jimispassword"); tester2.setIgnoreFailingStatusCodes(true); tester2.submit(); - Assert.assertTrue(tester2.getServerResponse().contains( - "Maximum sessions of 1 for this principal exceeded")); + assertThat(tester2.getServerResponse()).contains( + "Maximum sessions of 1 for this principal exceeded"); } @Test @@ -50,6 +51,6 @@ public class CustomConcurrentSessionManagementTests extends tester2.setTextField("password", "bessiespassword"); tester2.setIgnoreFailingStatusCodes(true); tester2.submit(); - Assert.assertTrue(tester2.getServerResponse().contains("A secure page")); + assertThat(tester2.getServerResponse()).contains("A secure page"); } } diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java index 471c6b16e2..2020064341 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java @@ -1,11 +1,10 @@ package org.springframework.security.integration; -import static org.testng.Assert.*; + +import static org.assertj.core.api.Assertions.*; import javax.servlet.http.Cookie; -import net.sourceforge.jwebunit.junit.WebTester; - import org.testng.annotations.Test; /** @@ -65,7 +64,7 @@ public class InMemoryProviderWebAppTests extends AbstractWebServerIntegrationTes tester.checkCheckbox("remember-me"); login("jimi", "jimispassword"); Cookie rememberMe = getRememberMeCookie(); - assertNotNull(rememberMe); + assertThat(rememberMe).isNotNull(); tester.closeBrowser(); tester.getTestContext().addCookie(rememberMe); diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java index e41a7dde05..15a8daa89e 100644 --- a/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java +++ b/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java @@ -1,6 +1,7 @@ package org.springframework.security.integration; -import static org.testng.Assert.*; + +import static org.assertj.core.api.Assertions.*; import org.testng.annotations.Test; @@ -20,14 +21,14 @@ public final class JspTaglibTests extends AbstractWebServerIntegrationTests { beginAt("secure/authenticationTagTestPage.jsp"); login("theescapist<>&.", "theescapistspassword"); String response = tester.getServerResponse(); - assertTrue(response - .contains("This is the unescaped authentication name: theescapist<>&.")); - assertTrue(response - .contains("This is the unescaped principal.username: theescapist<>&.")); - assertTrue(response - .contains("This is the authentication name: theescapist<>&.")); - assertTrue(response - .contains("This is the principal.username: theescapist<>&.")); + assertThat(response) + .contains("This is the unescaped authentication name: theescapist<>&."); + assertThat(response) + .contains("This is the unescaped principal.username: theescapist<>&."); + assertThat(response) + .contains("This is the authentication name: theescapist<>&."); + assertThat(response) + .contains("This is the principal.username: theescapist<>&."); } @Test @@ -35,10 +36,10 @@ public final class JspTaglibTests extends AbstractWebServerIntegrationTests { beginAt("secure/authorizationTagTestPage.jsp"); login("bessie", "bessiespassword"); String response = tester.getServerResponse(); - assertTrue(response - .contains("Users can see this and 'allowed' variable is true.")); - assertFalse(response.contains("Role X users (nobody) can see this.")); - assertTrue(response.contains("Role X expression evaluates to false")); + assertThat(response) + .contains("Users can see this and 'allowed' variable is true."); + assertThat(response).doesNotContain("Role X users (nobody) can see this."); + assertThat(response).contains("Role X expression evaluates to false"); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java index f816e3b9ae..766de161ed 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.ldap; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.Hashtable; @@ -21,8 +21,8 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra public void instantiationSucceedsWithExpectedProperties() { DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource( "ldap://blah:789/dc=springframework,dc=org"); - assertFalse(ctxSrc.isAnonymousReadOnly()); - assertTrue(ctxSrc.isPooled()); + assertThat(ctxSrc.isAnonymousReadOnly()).isFalse(); + assertThat(ctxSrc.isPooled()).isTrue(); } @Test @@ -39,7 +39,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra ctxSrc.setUserDn("manager"); ctxSrc.setPassword("password"); ctxSrc.afterPropertiesSet(); - assertTrue(ctxSrc.getAuthenticatedEnvForTest("manager", "password").containsKey( + assertThat(ctxSrc.getAuthenticatedEnvForTest("manager", "password").isTrue().containsKey( AbstractContextSource.SUN_LDAP_POOLING_FLAG)); } @@ -51,7 +51,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra ctxSrc.setUserDn("manager"); ctxSrc.setPassword("password"); ctxSrc.afterPropertiesSet(); - assertFalse(ctxSrc.getAuthenticatedEnvForTest("user", "password").containsKey( + assertThat(ctxSrc.getAuthenticatedEnvForTest("user", "password").isFalse().containsKey( AbstractContextSource.SUN_LDAP_POOLING_FLAG)); } @@ -66,7 +66,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra } catch (Exception e) { } - assertNotNull(ctx); + assertThat(ctx).isNotNull(); // com.sun.jndi.ldap.LdapPoolManager.showStats(System.out); ctx.close(); // com.sun.jndi.ldap.LdapPoolManager.showStats(System.out); @@ -104,8 +104,8 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource( serverUrls, "dc=springframework,dc=org"); - assertFalse(ctxSrc.isAnonymousReadOnly()); - assertTrue(ctxSrc.isPooled()); + assertThat(ctxSrc.isAnonymousReadOnly()).isFalse(); + assertThat(ctxSrc.isPooled()).isTrue(); } // SEC-2308 @@ -119,8 +119,8 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource( serverUrls, baseDn); - assertFalse(ctxSrc.isAnonymousReadOnly()); - assertTrue(ctxSrc.isPooled()); + assertThat(ctxSrc.isAnonymousReadOnly()).isFalse(); + assertThat(ctxSrc.isPooled()).isTrue(); } @Test(expected = IllegalArgumentException.class) diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index a667f52dda..4ff927a54e 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.List; import java.util.Map; @@ -51,7 +51,7 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes @Test public void compareOfCorrectValueSucceeds() { - assertTrue(template.compare("uid=bob,ou=people", "uid", "bob")); + assertThat(template.compare("uid=bob,ou=people", "uid", "bob")).isTrue(); } @Test @@ -68,17 +68,17 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes @Test public void compareOfWrongValueFails() { - assertFalse(template.compare("uid=bob,ou=people", "uid", "wrongvalue")); + assertThat(template.compare("uid=bob,ou=people", "uid", "wrongvalue")).isFalse(); } // @Test // public void testNameExistsForInValidNameFails() { - // assertFalse(template.nameExists("ou=doesntexist,dc=springframework,dc=org")); + // assertThat(template.nameExists("ou=doesntexist,dc=springframework,dc=org")).isFalse(); // } // // @Test // public void testNameExistsForValidNameSucceeds() { - // assertTrue(template.nameExists("ou=groups,dc=springframework,dc=org")); + // assertThat(template.nameExists("ou=groups,dc=springframework,dc=org")).isTrue(); // } @Test @@ -103,10 +103,10 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes Set values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] { param }, "ou"); - assertEquals("Expected 3 results from search", 3, values.size()); - assertTrue(values.contains("developer")); - assertTrue(values.contains("manager")); - assertTrue(values.contains("submanager")); + assertThat(values).as("Expected 3 results from search").hasSize(3); + assertThat(values.contains("developer")).isTrue(); + assertThat(values.contains("manager")).isTrue(); + assertThat(values.contains("submanager")).isTrue(); } @Test @@ -114,14 +114,14 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes Set>> values = template .searchForMultipleAttributeValues("ou=people", "(uid={0})", new String[] { "bob" }, null); - assertEquals(1, values.size()); + assertThat(values).hasSize(1); Map> record = values.iterator().next(); assertAttributeValue(record, "uid", "bob"); assertAttributeValue(record, "objectclass", "top", "person", "organizationalPerson", "inetOrgPerson"); assertAttributeValue(record, "cn", "Bob Hamilton"); assertAttributeValue(record, "sn", "Hamilton"); - assertFalse(record.containsKey("userPassword")); + assertThat(record.containsKey("userPassword")).isFalse(); } @Test @@ -129,14 +129,14 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes Set>> values = template .searchForMultipleAttributeValues("ou=people", "(uid={0})", new String[] { "bob" }, new String[0]); - assertEquals(1, values.size()); + assertThat(values).hasSize(1); Map> record = values.iterator().next(); assertAttributeValue(record, "uid", "bob"); assertAttributeValue(record, "objectclass", "top", "person", "organizationalPerson", "inetOrgPerson"); assertAttributeValue(record, "cn", "Bob Hamilton"); assertAttributeValue(record, "sn", "Hamilton"); - assertFalse(record.containsKey("userPassword")); + assertThat(record.containsKey("userPassword")).isFalse(); } @Test @@ -144,21 +144,21 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes Set>> values = template .searchForMultipleAttributeValues("ou=people", "(uid={0})", new String[] { "bob" }, new String[] { "uid", "cn", "sn" }); - assertEquals(1, values.size()); + assertThat(values).hasSize(1); Map> record = values.iterator().next(); assertAttributeValue(record, "uid", "bob"); assertAttributeValue(record, "cn", "Bob Hamilton"); assertAttributeValue(record, "sn", "Hamilton"); - assertFalse(record.containsKey("userPassword")); - assertFalse(record.containsKey("objectclass")); + assertThat(record.containsKey("userPassword")).isFalse(); + assertThat(record.containsKey("objectclass")).isFalse(); } protected void assertAttributeValue(Map> record, String attributeName, String... values) { - assertTrue(record.containsKey(attributeName)); - assertEquals(values.length, record.get(attributeName).size()); + assertThat(record.containsKey(attributeName)).isTrue(); + assertThat(record.get(attributeName).size()).isEqualTo(values.length); for (int i = 0; i < values.length; i++) { - assertEquals(values[i], record.get(attributeName).get(i)); + assertThat(record.get(attributeName).get(i)).isEqualTo(values[i]); } } @@ -169,7 +169,7 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes Set values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] { param }, "mail"); - assertEquals(0, values.size()); + assertThat(values).isEmpty(); } @Test @@ -179,7 +179,7 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes Set values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] { param }, "cn"); - assertEquals(1, values.size()); + assertThat(values).hasSize(1); } @Test @@ -202,7 +202,7 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes "ou=groups,dc=springframework,dc=org", "(member={0})", new String[] { param }, controls); - assertTrue("Expected a result", results.hasMore()); + assertThat(results.hasMore()).as("Expected a result").isTrue(); } @Test diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java index a31a8700ad..f20d1eda7e 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.ldap.core.DirContextOperations; @@ -60,7 +60,7 @@ public class BindAuthenticatorTests extends AbstractLdapIntegrationTests { "cn={0},ou=people" }); DirContextOperations user = authenticator.authenticate(bob); - assertEquals("bob", user.getStringAttribute("uid")); + assertThat(user.getStringAttribute("uid")).isEqualTo("bob"); authenticator.authenticate(new UsernamePasswordAuthenticationToken( "mouse, jerry", "jerryspassword")); } @@ -141,6 +141,6 @@ public class BindAuthenticatorTests extends AbstractLdapIntegrationTests { @Test public void testUserDnPatternReturnsCorrectDn() { authenticator.setUserDnPatterns(new String[] { "cn={0},ou=people" }); - assertEquals("cn=Joe,ou=people", authenticator.getUserDns("Joe").get(0)); + assertThat(authenticator.getUserDns("Joe").get(0)).isEqualTo("cn=Joe,ou=people"); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java index d68dd16af6..c5c2abd22b 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java @@ -28,7 +28,7 @@ import org.springframework.security.ldap.AbstractLdapIntegrationTests; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * Tests for {@link PasswordComparisonAuthenticator}. @@ -59,7 +59,7 @@ public class PasswordComparisonAuthenticatorTests extends AbstractLdapIntegratio public void testAllAttributesAreRetrievedByDefault() { DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob); // System.out.println(user.getAttributes().toString()); - assertEquals("User should have 5 attributes", 5, user.getAttributes().size()); + assertThat(user.getAttributes()).as("User should have 5 attributes").hasSize(5); } @Test @@ -99,7 +99,7 @@ public class PasswordComparisonAuthenticatorTests extends AbstractLdapIntegratio authenticator.setUserAttributes(new String[] { "uid", "userPassword" }); DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob); - assertEquals("Should have retrieved 2 attribute (uid, userPassword)", 2, user + assertThat(userPassword).isEqualTo("Should have retrieved 2 attribute (uid)", 2, user .getAttributes().size()); } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java index 1b184fd3fa..5b80dbaff2 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.search; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import javax.naming.ldap.LdapName; @@ -41,9 +41,9 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapIntegrationTests locator.setDerefLinkFlag(false); DirContextOperations bob = locator.searchForUser("bob"); - assertEquals("bob", bob.getStringAttribute("uid")); + assertThat(bob.getStringAttribute("uid")).isEqualTo("bob"); - assertEquals(new LdapName("uid=bob,ou=people"), bob.getDn()); + assertThat(bob.getDn()).isEqualTo(new LdapName("uid=bob,ou=people")); } @Test @@ -53,9 +53,9 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapIntegrationTests locator.setSearchSubtree(false); DirContextOperations jerry = locator.searchForUser("jerry"); - assertEquals("jerry", jerry.getStringAttribute("uid")); + assertThat(jerry.getStringAttribute("uid")).isEqualTo("jerry"); - assertEquals(new LdapName("cn=mouse\\, jerry,ou=people"), jerry.getDn()); + assertThat(jerry.getDn()).isEqualTo(new LdapName("cn=mouse\\, jerry,ou=people")); } // Try some funny business with filters. @@ -68,7 +68,7 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapIntegrationTests // Search for bob, get back ben... DirContextOperations ben = locator.searchForUser("bob"); - assertEquals("Ben Alex", ben.getStringAttribute("cn")); + assertThat(ben.getStringAttribute("cn")).isEqualTo("Ben Alex"); } @Test(expected = IncorrectResultSizeDataAccessException.class) @@ -93,9 +93,9 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapIntegrationTests locator.setSearchSubtree(true); DirContextOperations ben = locator.searchForUser("Ben Alex"); - assertEquals("ben", ben.getStringAttribute("uid")); + assertThat(ben.getStringAttribute("uid")).isEqualTo("ben"); - assertEquals(new LdapName("uid=ben,ou=people"), ben.getDn()); + assertThat(ben.getDn()).isEqualTo(new LdapName("uid=ben,ou=people")); } @Test @@ -103,7 +103,7 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapIntegrationTests FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch( "ou=otherpeople", "(cn={0})", getContextSource()); DirContextOperations joe = locator.searchForUser("Joe Smeth"); - assertEquals("Joe Smeth", joe.getStringAttribute("cn")); + assertThat(joe.getStringAttribute("cn")).isEqualTo("Joe Smeth"); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java index 4b899318cb..6e78a14b47 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.userdetails; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.*; import org.springframework.ldap.core.DirContextAdapter; @@ -47,15 +47,15 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio @Test public void defaultRoleIsAssignedWhenSet() { populator.setDefaultRole("ROLE_USER"); - assertSame(getContextSource(), populator.getContextSource()); + assertThat(populator.getContextSource()).isSameAs(getContextSource()); DirContextAdapter ctx = new DirContextAdapter( new DistinguishedName("cn=notfound")); Collection authorities = populator.getGrantedAuthorities(ctx, "notfound"); - assertEquals(1, authorities.size()); - assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")); + assertThat(authorities).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")).isTrue(); } @Test @@ -65,8 +65,8 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Collection authorities = populator.getGrantedAuthorities( new DirContextAdapter(new DistinguishedName("cn=notused")), "notused"); - assertEquals(1, authorities.size()); - assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")); + assertThat(authorities).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")).isTrue(); } @Test @@ -84,10 +84,10 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Set authorities = AuthorityUtils.authorityListToSet(populator .getGrantedAuthorities(ctx, "ben")); - assertEquals("Should have 2 roles", 2, authorities.size()); + assertThat(authorities).as("Should have 2 roles").hasSize(2); - assertTrue(authorities.contains("ROLE_DEVELOPER")); - assertTrue(authorities.contains("ROLE_MANAGER")); + assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); + assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); } @Test @@ -102,8 +102,8 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Set authorities = AuthorityUtils.authorityListToSet(populator .getGrantedAuthorities(ctx, "manager")); - assertEquals("Should have 1 role", 1, authorities.size()); - assertTrue(authorities.contains("ROLE_MANAGER")); + assertThat(authorities).as("Should have 1 role").hasSize(1); + assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); } @Test @@ -117,9 +117,9 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Set authorities = AuthorityUtils.authorityListToSet(populator .getGrantedAuthorities(ctx, "manager")); - assertEquals("Should have 2 roles", 2, authorities.size()); - assertTrue(authorities.contains("ROLE_MANAGER")); - assertTrue(authorities.contains("ROLE_DEVELOPER")); + assertThat(authorities).as("Should have 2 roles").hasSize(2); + assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); + assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); } @Test @@ -134,10 +134,10 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Set authorities = AuthorityUtils.authorityListToSet(populator .getGrantedAuthorities(ctx, "manager")); - assertEquals("Should have 3 roles", 3, authorities.size()); - assertTrue(authorities.contains("ROLE_MANAGER")); - assertTrue(authorities.contains("ROLE_SUBMANAGER")); - assertTrue(authorities.contains("ROLE_DEVELOPER")); + assertThat(authorities).as("Should have 3 roles").hasSize(3); + assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); + assertThat(authorities.contains("ROLE_SUBMANAGER")).isTrue(); + assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); } @Test @@ -153,8 +153,8 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Collection authorities = populator.getGrantedAuthorities( new DirContextAdapter(new DistinguishedName("cn=notused")), "notused"); - assertEquals(1, authorities.size()); - assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_EXTRA")); + assertThat(authorities).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_EXTRA")).isTrue(); } @Test @@ -169,7 +169,7 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio Set authorities = AuthorityUtils.authorityListToSet(populator .getGrantedAuthorities(ctx, "notused")); - assertEquals("Should have 1 role", 1, authorities.size()); - assertTrue(authorities.contains("ROLE_MANAGER")); + assertThat(authorities).as("Should have 1 role").hasSize(1); + assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); } } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java index 3d99cebf95..080ce7ca80 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java @@ -14,10 +14,10 @@ */ package org.springframework.security.ldap.userdetails; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import java.util.List; @@ -100,11 +100,11 @@ public class LdapUserDetailsManagerTests extends AbstractLdapIntegrationTests { mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid")); mgr.setGroupSearchBase("ou=groups"); LdapUserDetails bob = (LdapUserDetails) mgr.loadUserByUsername("bob"); - assertEquals("bob", bob.getUsername()); - assertEquals("uid=bob,ou=people,dc=springframework,dc=org", bob.getDn()); - assertEquals("bobspassword", bob.getPassword()); + assertThat(bob.getUsername()).isEqualTo("bob"); + assertThat(bob.getDn()).isEqualTo("uid=bob,ou=people,dc=springframework,dc=org"); + assertThat(bob.getPassword()).isEqualTo("bobspassword"); - assertEquals(1, bob.getAuthorities().size()); + assertThat(bob.getAuthorities()).hasSize(1); } @Test(expected = UsernameNotFoundException.class) @@ -115,12 +115,12 @@ public class LdapUserDetailsManagerTests extends AbstractLdapIntegrationTests { @Test public void testUserExistsReturnsTrueForValidUser() { mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid")); - assertTrue(mgr.userExists("bob")); + assertThat(mgr.userExists("bob")).isTrue(); } @Test public void testUserExistsReturnsFalseForInValidUser() { - assertFalse(mgr.userExists("jim")); + assertThat(mgr.userExists("jim")).isFalse(); } @Test @@ -160,7 +160,7 @@ public class LdapUserDetailsManagerTests extends AbstractLdapIntegrationTests { InetOrgPerson don = (InetOrgPerson) mgr.loadUserByUsername("don"); - assertEquals(2, don.getAuthorities().size()); + assertThat(don.getAuthorities()).hasSize(2); mgr.deleteUser("don"); @@ -173,7 +173,7 @@ public class LdapUserDetailsManagerTests extends AbstractLdapIntegrationTests { } // Check that no authorities are left - assertEquals(0, mgr.getUserAuthorities(mgr.usernameMapper.buildDn("don"), "don") + assertThat("don").isEqualTo(0, mgr.getUserAuthorities(mgr.usernameMapper.buildDn("don")) .size()); } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java index d090a56e5a..9e863bf123 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * @author Filip Hanik @@ -71,7 +71,7 @@ public class NestedLdapAuthoritiesPopulatorTests extends AbstractLdapIntegration "uid=scaladude,ou=people,dc=springframework,dc=org"); Collection authorities = populator.getGrantedAuthorities(ctx, "scaladude"); - assertEquals(5, authorities.size()); + assertThat(authorities).hasSize(5); assertEquals(Arrays.asList(javaDevelopers, scalaDevelopers, circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities); } @@ -82,8 +82,8 @@ public class NestedLdapAuthoritiesPopulatorTests extends AbstractLdapIntegration "uid=javadude,ou=people,dc=springframework,dc=org"); Collection authorities = populator.getGrantedAuthorities(ctx, "javadude"); - assertEquals(3, authorities.size()); - assertEquals(Arrays.asList(javaDevelopers, circularJavaDevelopers, jDevelopers), + assertThat(authorities).hasSize(3); + assertThat(circularJavaDevelopers).isCloseTo(Arrays.asList(javaDevelopers, within(jDevelopers)), authorities); } @@ -94,8 +94,8 @@ public class NestedLdapAuthoritiesPopulatorTests extends AbstractLdapIntegration "uid=scaladude,ou=people,dc=springframework,dc=org"); Collection authorities = populator.getGrantedAuthorities(ctx, "scaladude"); - assertEquals(1, authorities.size()); - assertEquals(Arrays.asList(scalaDevelopers), authorities); + assertThat(authorities).hasSize(1); + assertThat(authorities).isEqualTo(Arrays.asList(scalaDevelopers)); } @Test @@ -104,7 +104,7 @@ public class NestedLdapAuthoritiesPopulatorTests extends AbstractLdapIntegration "uid=groovydude,ou=people,dc=springframework,dc=org"); Collection authorities = populator.getGrantedAuthorities(ctx, "groovydude"); - assertEquals(4, authorities.size()); + assertThat(authorities).hasSize(4); assertEquals(Arrays.asList(javaDevelopers, circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities); } @@ -117,34 +117,34 @@ public class NestedLdapAuthoritiesPopulatorTests extends AbstractLdapIntegration "uid=closuredude,ou=people,dc=springframework,dc=org"); Collection authorities = populator.getGrantedAuthorities(ctx, "closuredude"); - assertEquals(5, authorities.size()); + assertThat(authorities).hasSize(5); assertEquals(Arrays.asList(closureDevelopers, javaDevelopers, circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities); LdapAuthority[] ldapAuthorities = authorities.toArray(new LdapAuthority[0]); - assertEquals(5, ldapAuthorities.length); + assertThat(ldapAuthorities.length).isEqualTo(5); // closure group - assertTrue(ldapAuthorities[0].getAttributes().containsKey("member")); - assertNotNull(ldapAuthorities[0].getAttributes().get("member")); - assertEquals(1, ldapAuthorities[0].getAttributes().get("member").size()); + assertThat(ldapAuthorities[0].getAttributes().containsKey("member")).isTrue(); + assertThat(ldapAuthorities[0].getAttributes().get("member")).isNotNull(); + assertThat(ldapAuthorities[0].getAttributes().get("member")).hasSize(1); assertEquals("uid=closuredude,ou=people,dc=springframework,dc=org", ldapAuthorities[0].getFirstAttributeValue("member")); // java group - assertTrue(ldapAuthorities[1].getAttributes().containsKey("member")); - assertNotNull(ldapAuthorities[1].getAttributes().get("member")); - assertEquals(3, ldapAuthorities[1].getAttributes().get("member").size()); + assertThat(ldapAuthorities[1].getAttributes().containsKey("member")).isTrue(); + assertThat(ldapAuthorities[1].getAttributes().get("member")).isNotNull(); + assertThat(ldapAuthorities[1].getAttributes().get("member")).hasSize(3); assertEquals(groovyDevelopers.getDn(), ldapAuthorities[1].getFirstAttributeValue("member")); - assertEquals(new String[] { groovyDevelopers.getDn(), scalaDevelopers.getDn(), + assertThat(scalaDevelopers.getDn().isEqualTo(new String[] { groovyDevelopers.getDn()), "uid=javadude,ou=people,dc=springframework,dc=org" }, ldapAuthorities[1] .getAttributes().get("member")); // test non existent attribute - assertNull(ldapAuthorities[2].getFirstAttributeValue("test")); - assertNotNull(ldapAuthorities[2].getAttributeValues("test")); - assertEquals(0, ldapAuthorities[2].getAttributeValues("test").size()); + assertThat(ldapAuthorities[2].getFirstAttributeValue("test")).isNull(); + assertThat(ldapAuthorities[2].getAttributeValues("test")).isNotNull(); + assertThat(ldapAuthorities[2].getAttributeValues("test")).isEmpty(); // test role name - assertEquals(jDevelopers.getAuthority(), ldapAuthorities[3].getAuthority()); + assertThat(ldapAuthorities[3].getAuthority()).isEqualTo(jDevelopers.getAuthority()); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java b/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java index 3a0694d160..3423f8ffd9 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import javax.naming.NamingException; @@ -48,7 +48,7 @@ public class LdapUtilsTests { when(mockCtx.getNameInNamespace()).thenReturn("dc=springframework,dc=org"); - assertEquals("", LdapUtils.getRelativeName("dc=springframework,dc=org", mockCtx)); + assertThat(dc=org").as("").isCloseTo(LdapUtils.getRelativeName("dc=springframework, within(mockCtx))); } @Test @@ -71,10 +71,10 @@ public class LdapUtilsTests { @Test public void testRootDnsAreParsedFromUrlsCorrectly() { - assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine")); - assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine:11389")); - assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine/")); - assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine.co.uk/")); + assertThat(LdapUtils.parseRootDnFromUrl("ldap://monkeymachine")).isEqualTo(""); + assertThat(LdapUtils.parseRootDnFromUrl("ldap://monkeymachine:11389")).isEqualTo(""); + assertThat(LdapUtils.parseRootDnFromUrl("ldap://monkeymachine/")).isEqualTo(""); + assertThat(LdapUtils.parseRootDnFromUrl("ldap://monkeymachine.co.uk/")).isEqualTo(""); assertEquals( "dc=springframework,dc=org", LdapUtils diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java index 41bef7be4f..60f7e586e7 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java @@ -10,7 +10,7 @@ import org.springframework.ldap.core.AuthenticationSource; import org.springframework.ldap.core.DistinguishedName; import org.junit.After; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; @@ -27,8 +27,8 @@ public class SpringSecurityAuthenticationSourceTests { @Test public void principalAndCredentialsAreEmptyWithNoAuthentication() { AuthenticationSource source = new SpringSecurityAuthenticationSource(); - assertEquals("", source.getPrincipal()); - assertEquals("", source.getCredentials()); + assertThat(source.getPrincipal()).isEqualTo(""); + assertThat(source.getCredentials()).isEqualTo(""); } @Test @@ -38,7 +38,7 @@ public class SpringSecurityAuthenticationSourceTests { SecurityContextHolder.getContext().setAuthentication( new AnonymousAuthenticationToken("key", "anonUser", AuthorityUtils .createAuthorityList("ignored"))); - assertEquals("", source.getPrincipal()); + assertThat(source.getPrincipal()).isEqualTo(""); } @Test(expected = IllegalArgumentException.class) @@ -56,7 +56,7 @@ public class SpringSecurityAuthenticationSourceTests { SecurityContextHolder.getContext().setAuthentication( new TestingAuthenticationToken(new Object(), "password")); - assertEquals("password", source.getCredentials()); + assertThat(source.getCredentials()).isEqualTo("password"); } @Test @@ -68,6 +68,6 @@ public class SpringSecurityAuthenticationSourceTests { SecurityContextHolder.getContext().setAuthentication( new TestingAuthenticationToken(user.createUserDetails(), null)); - assertEquals("uid=joe,ou=users", source.getPrincipal()); + assertThat(source.getPrincipal()).isEqualTo("uid=joe,ou=users"); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java index f37ce4f386..80fef9e6b9 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.ldap; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java index 6b6eebea1b..9794ddd399 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; @@ -52,7 +52,7 @@ public class LdapAuthenticationProviderTests { LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider( new MockAuthenticator(), new MockAuthoritiesPopulator()); - assertTrue(ldapProvider.supports(UsernamePasswordAuthenticationToken.class)); + assertThat(ldapProvider.supports(UsernamePasswordAuthenticationToken.class)).isTrue(); } @Test @@ -60,7 +60,7 @@ public class LdapAuthenticationProviderTests { LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider( new MockAuthenticator(), new MockAuthoritiesPopulator()); - assertTrue(ldapProvider.getUserDetailsContextMapper() instanceof LdapUserDetailsMapper); + assertThat(ldapProvider.getUserDetailsContextMapper() instanceof LdapUserDetailsMapper).isTrue(); } @Test @@ -121,24 +121,24 @@ public class LdapAuthenticationProviderTests { userMapper.setRoleAttributes(new String[] { "ou" }); ldapProvider.setUserDetailsContextMapper(userMapper); - assertNotNull(ldapProvider.getAuthoritiesPopulator()); + assertThat(ldapProvider.getAuthoritiesPopulator()).isNotNull(); UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken( "ben", "benspassword"); Object authDetails = new Object(); authRequest.setDetails(authDetails); Authentication authResult = ldapProvider.authenticate(authRequest); - assertEquals("benspassword", authResult.getCredentials()); - assertSame(authDetails, authResult.getDetails()); + assertThat(authResult.getCredentials()).isEqualTo("benspassword"); + assertThat(authResult.getDetails()).isSameAs(authDetails); UserDetails user = (UserDetails) authResult.getPrincipal(); - assertEquals(2, user.getAuthorities().size()); - assertEquals("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=", user.getPassword()); - assertEquals("ben", user.getUsername()); - assertEquals("ben", populator.getRequestedUsername()); + assertThat(user.getAuthorities()).hasSize(2); + assertThat(user.getPassword()).isEqualTo("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ="); + assertThat(user.getUsername()).isEqualTo("ben"); + assertThat(populator.getRequestedUsername()).isEqualTo("ben"); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_FROM_ENTRY")); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_FROM_POPULATOR")); } @@ -151,7 +151,7 @@ public class LdapAuthenticationProviderTests { UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken( "ben", "benspassword"); Authentication authResult = ldapProvider.authenticate(authRequest); - assertEquals("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=", authResult.getCredentials()); + assertThat(authResult.getCredentials()).isEqualTo("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ="); } @@ -166,8 +166,8 @@ public class LdapAuthenticationProviderTests { "ben", "benspassword"); UserDetails user = (UserDetails) ldapProvider.authenticate(authRequest) .getPrincipal(); - assertEquals(1, user.getAuthorities().size()); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(user.getAuthorities()).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_FROM_ENTRY")); } @@ -187,7 +187,7 @@ public class LdapAuthenticationProviderTests { fail("Expected Exception"); } catch (InternalAuthenticationServiceException success) { - assertSame(expectedCause, success.getCause()); + assertThat(success.getCause()).isSameAs(expectedCause); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java index e0c4de9927..89770cc289 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; @@ -109,13 +109,13 @@ public class LdapShaPasswordEncoderTests { sha.setForceLowerCasePrefix(false); assertEquals("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", sha.encodePassword("boabspasswurd", null)); - assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith( + assertThat(sha.encodePassword("somepassword", "salt".getBytes()).isTrue().startsWith( "{SSHA}")); sha.setForceLowerCasePrefix(true); assertEquals("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", sha.encodePassword("boabspasswurd", null)); - assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith( + assertThat(sha.encodePassword("somepassword", "salt".getBytes()).isTrue().startsWith( "{ssha}")); } diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java index cb15d5df34..302a08606b 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java @@ -45,10 +45,10 @@ import javax.naming.directory.SearchResult; import java.util.Hashtable; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.*; import static org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider.ContextFactory; @@ -72,8 +72,8 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { @Test public void bindPrincipalIsCreatedCorrectly() throws Exception { - assertEquals("joe@mydomain.eu", provider.createBindPrincipal("joe")); - assertEquals("joe@mydomain.eu", provider.createBindPrincipal("joe@mydomain.eu")); + assertThat(provider.createBindPrincipal("joe")).isEqualTo("joe@mydomain.eu"); + assertThat(provider.createBindPrincipal("joe@mydomain.eu")).isEqualTo("joe@mydomain.eu"); } @Test @@ -107,7 +107,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { Authentication result = customProvider.authenticate(joe); // then - assertTrue(result.isAuthenticated()); + assertThat(result.isAuthenticated()).isTrue(); } @Test @@ -134,7 +134,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { Authentication result = customProvider.authenticate(joe); // then - assertTrue(result.isAuthenticated()); + assertThat(result.isAuthenticated()).isTrue(); verify(ctx).search(any(DistinguishedName.class), eq(defaultSearchFilter), any(Object[].class), any(SearchControls.class)); } @@ -166,7 +166,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { // then assertThat(captor.getValue()).containsOnly("joe@mydomain.eu"); - assertTrue(result.isAuthenticated()); + assertThat(result.isAuthenticated()).isTrue(); } @Test(expected = IllegalArgumentException.class) @@ -429,13 +429,13 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { Authentication result = provider.authenticate(joe); - assertEquals(0, result.getAuthorities().size()); + assertThat(result.getAuthorities()).isEmpty(); dca.addAttributeValue("memberOf", "CN=Admin,CN=Users,DC=mydomain,DC=eu"); result = provider.authenticate(joe); - assertEquals(1, result.getAuthorities().size()); + assertThat(result.getAuthorities()).hasSize(1); } static class MockNamingEnumeration implements NamingEnumeration { diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java index 59cf07358a..00a606921c 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java @@ -42,7 +42,7 @@ public class PasswordPolicyAwareContextSourceTests { @Test public void contextIsReturnedWhenNoControlsAreSetAndReconnectIsSuccessful() throws Exception { - assertNotNull(ctxSource.getContext("user", "ignored")); + assertThat(ctxSource.getContext("user", "ignored")).isNotNull(); } @Test(expected = UncategorizedLdapException.class) diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java index 258cbdb63f..cc86d44ced 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java @@ -1,6 +1,6 @@ package org.springframework.security.ldap.ppolicy; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.*; @@ -19,7 +19,7 @@ public class PasswordPolicyControlFactoryTests { Control wrongCtrl = mock(Control.class); when(wrongCtrl.getID()).thenReturn("wrongId"); - assertNull(ctrlFactory.getControlInstance(wrongCtrl)); + assertThat(ctrlFactory.getControlInstance(wrongCtrl)).isNull(); } @Test @@ -31,7 +31,7 @@ public class PasswordPolicyControlFactoryTests { when(control.getEncodedValue()).thenReturn( PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL); Control result = ctrlFactory.getControlInstance(control); - assertNotNull(result); + assertThat(result).isNotNull(); assertTrue(Arrays.equals(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL, result.getEncodedValue())); } diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java index 065c60953a..669eafc99a 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java @@ -15,7 +15,7 @@ package org.springframework.security.ldap.ppolicy; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -66,7 +66,7 @@ public class PasswordPolicyResponseControlTests { // PasswordPolicyResponseControl ctrl = getPPolicyResponseCtl(ctx); // System.out.println(ctrl); // - // assertNotNull(ctrl); + // assertThat(ctrl).isNotNull(); // // //com.sun.jndi.ldap.LdapPoolManager.showStats(System.out); // } @@ -90,8 +90,8 @@ public class PasswordPolicyResponseControlTests { PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes); - assertTrue(ctrl.hasWarning()); - assertEquals(33, ctrl.getTimeBeforeExpiration()); + assertThat(ctrl.hasWarning()).isTrue(); + assertThat(ctrl.getTimeBeforeExpiration()).isEqualTo(33); } @Test @@ -101,8 +101,8 @@ public class PasswordPolicyResponseControlTests { PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes); - assertTrue(ctrl.hasWarning()); - assertEquals(496, ctrl.getGraceLoginsRemaining()); + assertThat(ctrl.hasWarning()).isTrue(); + assertThat(ctrl.getGraceLoginsRemaining()).isEqualTo(496); } static final byte[] OPENLDAP_5_LOGINS_REMAINING_CTRL = { 0x30, 0x05, (byte) 0xA0, @@ -113,8 +113,8 @@ public class PasswordPolicyResponseControlTests { PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl( OPENLDAP_5_LOGINS_REMAINING_CTRL); - assertTrue(ctrl.hasWarning()); - assertEquals(5, ctrl.getGraceLoginsRemaining()); + assertThat(ctrl.hasWarning()).isTrue(); + assertThat(ctrl.getGraceLoginsRemaining()).isEqualTo(5); } static final byte[] OPENLDAP_LOCKED_CTRL = { 0x30, 0x03, (byte) 0xA1, 0x01, 0x01 }; @@ -124,8 +124,8 @@ public class PasswordPolicyResponseControlTests { PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl( OPENLDAP_LOCKED_CTRL); - assertTrue(ctrl.hasError() && ctrl.isLocked()); - assertFalse(ctrl.hasWarning()); + assertThat(ctrl.hasError() && ctrl.isLocked()).isTrue(); + assertThat(ctrl.hasWarning()).isFalse(); } @Test @@ -134,7 +134,7 @@ public class PasswordPolicyResponseControlTests { PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes); - assertTrue(ctrl.hasError() && ctrl.isExpired()); - assertFalse(ctrl.hasWarning()); + assertThat(ctrl.hasError() && ctrl.isExpired()).isTrue(); + assertThat(ctrl.hasWarning()).isFalse(); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java index ccc2c78f34..9562aa4934 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java @@ -1,6 +1,6 @@ package org.springframework.security.ldap.userdetails; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.HashSet; import java.util.Set; @@ -19,7 +19,7 @@ public class InetOrgPersonTests { InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext()); InetOrgPerson p = (InetOrgPerson) essence.createUserDetails(); - assertEquals("ghengis", p.getUsername()); + assertThat(p.getUsername()).isEqualTo("ghengis"); } @Test @@ -30,7 +30,7 @@ public class InetOrgPersonTests { InetOrgPerson p2 = (InetOrgPerson) essence.createUserDetails(); Set set = new HashSet(); set.add(p); - assertTrue(set.contains(p2)); + assertThat(set.contains(p2)).isTrue(); } @Test @@ -39,8 +39,8 @@ public class InetOrgPersonTests { essence.setUsername("joe"); InetOrgPerson p = (InetOrgPerson) essence.createUserDetails(); - assertEquals("joe", p.getUsername()); - assertEquals("ghengis", p.getUid()); + assertThat(p.getUsername()).isEqualTo("joe"); + assertThat(p.getUid()).isEqualTo("ghengis"); } @Test @@ -48,24 +48,24 @@ public class InetOrgPersonTests { InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext()); InetOrgPerson p = (InetOrgPerson) essence.createUserDetails(); - assertEquals("HORS1", p.getCarLicense()); - assertEquals("ghengis@mongolia", p.getMail()); - assertEquals("Ghengis", p.getGivenName()); - assertEquals("Khan", p.getSn()); - assertEquals("Ghengis Khan", p.getCn()[0]); - assertEquals("00001", p.getEmployeeNumber()); - assertEquals("+442075436521", p.getTelephoneNumber()); - assertEquals("Steppes", p.getHomePostalAddress()); - assertEquals("+467575436521", p.getHomePhone()); - assertEquals("Hordes", p.getO()); - assertEquals("Horde1", p.getOu()); - assertEquals("On the Move", p.getPostalAddress()); - assertEquals("Changes Frequently", p.getPostalCode()); - assertEquals("Yurt 1", p.getRoomNumber()); - assertEquals("Westward Avenue", p.getStreet()); - assertEquals("Scary", p.getDescription()); - assertEquals("Ghengis McCann", p.getDisplayName()); - assertEquals("G", p.getInitials()); + assertThat(p.getCarLicense()).isEqualTo("HORS1"); + assertThat(p.getMail()).isEqualTo("ghengis@mongolia"); + assertThat(p.getGivenName()).isEqualTo("Ghengis"); + assertThat(p.getSn()).isEqualTo("Khan"); + assertThat(p.getCn()[0]).isEqualTo("Ghengis Khan"); + assertThat(p.getEmployeeNumber()).isEqualTo("00001"); + assertThat(p.getTelephoneNumber()).isEqualTo("+442075436521"); + assertThat(p.getHomePostalAddress()).isEqualTo("Steppes"); + assertThat(p.getHomePhone()).isEqualTo("+467575436521"); + assertThat(p.getO()).isEqualTo("Hordes"); + assertThat(p.getOu()).isEqualTo("Horde1"); + assertThat(p.getPostalAddress()).isEqualTo("On the Move"); + assertThat(p.getPostalCode()).isEqualTo("Changes Frequently"); + assertThat(p.getRoomNumber()).isEqualTo("Yurt 1"); + assertThat(p.getStreet()).isEqualTo("Westward Avenue"); + assertThat(p.getDescription()).isEqualTo("Scary"); + assertThat(p.getDisplayName()).isEqualTo("Ghengis McCann"); + assertThat(p.getInitials()).isEqualTo("G"); } @Test @@ -73,7 +73,7 @@ public class InetOrgPersonTests { InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext()); InetOrgPerson p = (InetOrgPerson) essence.createUserDetails(); - assertEquals("pillage", p.getPassword()); + assertThat(p.getPassword()).isEqualTo("pillage"); } @Test @@ -87,7 +87,7 @@ public class InetOrgPersonTests { .createUserDetails(); p.populateContext(ctx2); - assertEquals(ctx1, ctx2); + assertThat(ctx2).isEqualTo(ctx1); } @Test @@ -103,7 +103,7 @@ public class InetOrgPersonTests { .createUserDetails(); p2.populateContext(ctx2); - assertEquals(ctx1, ctx2); + assertThat(ctx2).isEqualTo(ctx1); } private DirContextAdapter createUserContext() { diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java index fcabde8a11..fa8b6dc288 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; /** @@ -31,9 +31,9 @@ public class LdapAuthorityTests { @Test public void testGetDn() throws Exception { - assertEquals(DN, authority.getDn()); - assertNotNull(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)); - assertEquals(1, authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY) + assertThat(authority.getDn()).isEqualTo(DN); + assertThat(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)).isNotNull(); + assertThat(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY).isEqualTo(1) .size()); assertEquals(DN, authority.getFirstAttributeValue(SpringSecurityLdapTemplate.DN_KEY)); @@ -41,17 +41,17 @@ public class LdapAuthorityTests { @Test public void testGetAttributes() throws Exception { - assertNotNull(authority.getAttributes()); - assertNotNull(authority.getAttributeValues("mail")); - assertEquals(2, authority.getAttributeValues("mail").size()); - assertEquals("filip@ldap.test.org", authority.getFirstAttributeValue("mail")); - assertEquals("filip@ldap.test.org", authority.getAttributeValues("mail").get(0)); - assertEquals("filip@ldap.test2.org", authority.getAttributeValues("mail").get(1)); + assertThat(authority.getAttributes()).isNotNull(); + assertThat(authority.getAttributeValues("mail")).isNotNull(); + assertThat(authority.getAttributeValues("mail")).hasSize(2); + assertThat(authority.getFirstAttributeValue("mail")).isEqualTo("filip@ldap.test.org"); + assertThat(authority.getAttributeValues("mail").get(0)).isEqualTo("filip@ldap.test.org"); + assertThat(authority.getAttributeValues("mail").get(1)).isEqualTo("filip@ldap.test2.org"); } @Test public void testGetAuthority() throws Exception { - assertNotNull(authority.getAuthority()); - assertEquals("testRole", authority.getAuthority()); + assertThat(authority.getAuthority()).isNotNull(); + assertThat(authority.getAuthority()).isEqualTo("testRole"); } -} \ No newline at end of file +} diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java index ba361a4014..90466ea453 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java @@ -46,7 +46,7 @@ public class LdapUserDetailsMapperTests extends TestCase { LdapUserDetailsImpl user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx, "ani", AuthorityUtils.NO_AUTHORITIES); - assertEquals(3, user.getAuthorities().size()); + assertThat(user.getAuthorities()).hasSize(3); } /** @@ -67,8 +67,8 @@ public class LdapUserDetailsMapperTests extends TestCase { LdapUserDetailsImpl user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx, "ani", AuthorityUtils.NO_AUTHORITIES); - assertEquals(1, user.getAuthorities().size()); - assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( + assertThat(user.getAuthorities()).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).isTrue().contains( "ROLE_X")); } @@ -86,6 +86,6 @@ public class LdapUserDetailsMapperTests extends TestCase { LdapUserDetails user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx, "ani", AuthorityUtils.NO_AUTHORITIES); - assertEquals("mypassword", user.getPassword()); + assertThat(user.getPassword()).isEqualTo("mypassword"); } } diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java index d8c377064b..743541242b 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.ldap.userdetails; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Collection; import java.util.Set; @@ -45,8 +45,8 @@ public class LdapUserDetailsServiceTests { Set authorities = AuthorityUtils .authorityListToSet(user.getAuthorities()); - assertEquals(1, authorities.size()); - assertTrue(authorities.contains("ROLE_FROM_POPULATOR")); + assertThat(authorities).hasSize(1); + assertThat(authorities.contains("ROLE_FROM_POPULATOR")).isTrue(); } @Test @@ -57,7 +57,7 @@ public class LdapUserDetailsServiceTests { LdapUserDetailsService service = new LdapUserDetailsService(new MockUserSearch( userData)); UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway"); - assertEquals(0, user.getAuthorities().size()); + assertThat(user.getAuthorities()).isEmpty(); } class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator { diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java index f53ccc128e..5a2a370e1c 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java @@ -1,6 +1,6 @@ package org.springframework.security.ldap.userdetails; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Collection; @@ -32,7 +32,7 @@ public class UserDetailsServiceLdapAuthoritiesPopulatorTests { Collection auths = populator.getGrantedAuthorities( new DirContextAdapter(), "joe"); - assertEquals(1, auths.size()); - assertTrue(AuthorityUtils.authorityListToSet(auths).contains("ROLE_USER")); + assertThat(auths).hasSize(1); + assertThat(AuthorityUtils.authorityListToSet(auths).contains("ROLE_USER")).isTrue(); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java index 8f7d009558..abe965b42b 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.access.expression; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Before; diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java index a03d612d9f..71a057e142 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.access.expression; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.powermock.api.mockito.PowerMockito.when; import static org.springframework.security.messaging.access.expression.ExpressionBasedMessageSecurityMetadataSourceFactory.*; diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java index 3fa59c4c13..c8f1b68f1a 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java @@ -22,7 +22,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.expression.Expression; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java index 9c817a58eb..42297e6dc9 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java @@ -31,7 +31,7 @@ import org.springframework.security.core.Authentication; import java.util.Arrays; import java.util.Collection; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; import static org.springframework.security.access.AccessDecisionVoter.*; diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java index eea4db176f..e93fe27c45 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java @@ -36,7 +36,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doThrow; diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java index 7be6d7a643..19f8f30d6d 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java @@ -30,7 +30,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashMap; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.powermock.api.mockito.PowerMockito.when; @RunWith(MockitoJUnitRunner.class) diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java index 9390950487..d56888f335 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.context; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java index 0805ba2b61..0141bc3965 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java @@ -20,7 +20,7 @@ import org.springframework.security.messaging.context.SecurityContextChannelInte import java.security.Principal; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.core.context.SecurityContextHolder.*; @RunWith(MockitoJUnitRunner.class) diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java index cb8d33c209..3bb88e6323 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import java.util.Arrays; diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java index 748a253c32..bd58e6c785 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import java.util.Arrays; diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java index 1e2c3a9a5f..789827a497 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java index f6985f65bf..d82716e993 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.messaging.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java index 34674ed489..e9742c0734 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java @@ -31,7 +31,7 @@ import org.springframework.web.socket.WebSocketHandler; import java.util.HashMap; import java.util.Map; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * diff --git a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java index 5152723452..27d3ad3d9d 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.openid; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -113,7 +113,7 @@ public class OpenID4JavaConsumerTests { OpenIDAuthenticationToken auth = consumer.endConsumption(request); - assertEquals(OpenIDAuthenticationStatus.FAILURE, auth.getStatus()); + assertThat(auth.getStatus()).isEqualTo(OpenIDAuthenticationStatus.FAILURE); } @Test @@ -184,7 +184,7 @@ public class OpenID4JavaConsumerTests { OpenIDAuthenticationToken auth = consumer.endConsumption(request); - assertEquals(OpenIDAuthenticationStatus.SUCCESS, auth.getStatus()); + assertThat(auth.getStatus()).isEqualTo(OpenIDAuthenticationStatus.SUCCESS); } @Test @@ -199,8 +199,8 @@ public class OpenID4JavaConsumerTests { List fetched = consumer.fetchAxAttributes(msg, attributes); - assertEquals(1, fetched.size()); - assertEquals(2, fetched.get(0).getValues().size()); + assertThat(fetched).hasSize(1); + assertThat(fetched.get(0).getValues()).hasSize(2); } @Test(expected = OpenIDConsumerException.class) diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java index f47b0086fd..24bd64ae9e 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.openid; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -59,16 +59,16 @@ public class OpenIDAuthenticationFilterTests { public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm) throws OpenIDConsumerException { - assertEquals(CLAIMED_IDENTITY_URL, claimedIdentity); - assertEquals(DEFAULT_TARGET_URL, returnToUrl); - assertEquals("http://localhost:8080/", realm); + assertThat(claimedIdentity).isEqualTo(CLAIMED_IDENTITY_URL); + assertThat(returnToUrl).isEqualTo(DEFAULT_TARGET_URL); + assertThat(realm).isEqualTo("http://localhost:8080/"); return REDIRECT_URL; } }); FilterChain fc = mock(FilterChain.class); filter.doFilter(req, response, fc); - assertEquals(REDIRECT_URL, response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo(REDIRECT_URL); // Filter chain shouldn't proceed verify(fc, never()).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); @@ -88,8 +88,8 @@ public class OpenIDAuthenticationFilterTests { URI returnTo = new URI(filter.buildReturnToUrl(req)); String query = returnTo.getRawQuery(); - assertEquals(1, count(query, '=')); - assertEquals(0, count(query, '&')); + assertThat(count(query).isCloseTo(1, within('='))); + assertThat(count(query).isCloseTo(0, within('&'))); } /** diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java index 2be560d104..3132a6e551 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java @@ -54,14 +54,14 @@ public class OpenIDAuthenticationProviderTests extends TestCase { Authentication preAuth = new OpenIDAuthenticationToken( OpenIDAuthenticationStatus.CANCELLED, USERNAME, "", null); - assertFalse(preAuth.isAuthenticated()); + assertThat(preAuth.isAuthenticated()).isFalse(); try { provider.authenticate(preAuth); fail("Should throw an AuthenticationException"); } catch (AuthenticationCancelledException expected) { - assertEquals("Log in cancelled", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Log in cancelled"); } } @@ -76,14 +76,14 @@ public class OpenIDAuthenticationProviderTests extends TestCase { Authentication preAuth = new OpenIDAuthenticationToken( OpenIDAuthenticationStatus.ERROR, USERNAME, "", null); - assertFalse(preAuth.isAuthenticated()); + assertThat(preAuth.isAuthenticated()).isFalse(); try { provider.authenticate(preAuth); fail("Should throw an AuthenticationException"); } catch (AuthenticationServiceException expected) { - assertEquals("Error message from server: ", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Error message from server: "); } } @@ -99,7 +99,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase { Authentication preAuth = new OpenIDAuthenticationToken( OpenIDAuthenticationStatus.FAILURE, USERNAME, "", null); - assertFalse(preAuth.isAuthenticated()); + assertThat(preAuth.isAuthenticated()).isFalse(); try { provider.authenticate(preAuth); @@ -122,7 +122,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase { Authentication preAuth = new OpenIDAuthenticationToken( OpenIDAuthenticationStatus.SETUP_NEEDED, USERNAME, "", null); - assertFalse(preAuth.isAuthenticated()); + assertThat(preAuth.isAuthenticated()).isFalse(); try { provider.authenticate(preAuth); @@ -145,19 +145,19 @@ public class OpenIDAuthenticationProviderTests extends TestCase { Authentication preAuth = new OpenIDAuthenticationToken( OpenIDAuthenticationStatus.SUCCESS, USERNAME, "", null); - assertFalse(preAuth.isAuthenticated()); + assertThat(preAuth.isAuthenticated()).isFalse(); Authentication postAuth = provider.authenticate(preAuth); - assertNotNull(postAuth); - assertTrue(postAuth instanceof OpenIDAuthenticationToken); - assertTrue(postAuth.isAuthenticated()); - assertNotNull(postAuth.getPrincipal()); - assertTrue(postAuth.getPrincipal() instanceof UserDetails); - assertNotNull(postAuth.getAuthorities()); - assertTrue(postAuth.getAuthorities().size() > 0); - assertTrue(((OpenIDAuthenticationToken) postAuth).getStatus() == OpenIDAuthenticationStatus.SUCCESS); - assertTrue(((OpenIDAuthenticationToken) postAuth).getMessage() == null); + assertThat(postAuth).isNotNull(); + assertThat(postAuth instanceof OpenIDAuthenticationToken).isTrue(); + assertThat(postAuth.isAuthenticated()).isTrue(); + assertThat(postAuth.getPrincipal()).isNotNull(); + assertThat(postAuth.getPrincipal() instanceof UserDetails).isTrue(); + assertThat(postAuth.getAuthorities()).isNotNull(); + assertThat(postAuth.getAuthorities().size() > 0).isTrue(); + assertThat(((OpenIDAuthenticationToken) postAuth).getStatus() == OpenIDAuthenticationStatus.SUCCESS).isTrue(); + assertThat(((OpenIDAuthenticationToken) postAuth).getMessage() == null).isTrue(); } public void testDetectsMissingAuthoritiesPopulator() throws Exception { @@ -180,7 +180,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase { OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); provider.setUserDetailsService(new MockUserDetailsService()); - assertFalse(provider.supports(UsernamePasswordAuthenticationToken.class)); + assertThat(provider.supports(UsernamePasswordAuthenticationToken.class)).isFalse(); } /* @@ -193,7 +193,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase { UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( USERNAME, "password"); - assertEquals(null, provider.authenticate(token)); + assertThat(provider.authenticate(token)).isEqualTo(null); } /* @@ -204,7 +204,7 @@ public class OpenIDAuthenticationProviderTests extends TestCase { OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); provider.setUserDetailsService(new MockUserDetailsService()); - assertTrue(provider.supports(OpenIDAuthenticationToken.class)); + assertThat(provider.supports(OpenIDAuthenticationToken.class)).isTrue(); } public void testValidation() throws Exception { diff --git a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java index 99b1f0b149..800d9266c9 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java @@ -16,7 +16,7 @@ package org.springframework.security.remoting.dns; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import javax.naming.NameNotFoundException; @@ -57,7 +57,7 @@ public class JndiDnsResolverTests { .thenReturn(records); String ipAddress = dnsResolver.resolveIpAddress("www.springsource.com"); - assertEquals("63.246.7.80", ipAddress); + assertThat(ipAddress).isEqualTo("63.246.7.80"); } @Test(expected = DnsEntryNotFoundException.class) @@ -76,7 +76,7 @@ public class JndiDnsResolverTests { .thenReturn(records); String hostname = dnsResolver.resolveServiceEntry("ldap", "springsource.com"); - assertEquals("kdc.springsource.com", hostname); + assertThat(hostname).isEqualTo("kdc.springsource.com"); } @Test(expected = DnsEntryNotFoundException.class) @@ -98,7 +98,7 @@ public class JndiDnsResolverTests { String ipAddress = dnsResolver .resolveServiceIpAddress("ldap", "springsource.com"); - assertEquals("63.246.7.80", ipAddress); + assertThat(ipAddress).isEqualTo("63.246.7.80"); } @Test(expected = DnsLookupException.class) diff --git a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java index ae3a056848..13ae5cfef6 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java @@ -78,7 +78,7 @@ public class AuthenticationSimpleHttpInvokerRequestExecutorTests extends TestCas executor.prepareConnection(conn, 10); // Check connection properties (shouldn't be an Authorization header) - assertNull(conn.getRequestProperty("Authorization")); + assertThat(conn.getRequestProperty("Authorization")).isNull(); } // SEC-1975 @@ -94,7 +94,7 @@ public class AuthenticationSimpleHttpInvokerRequestExecutorTests extends TestCas executor.prepareConnection(conn, 10); // Check connection properties (shouldn't be an Authorization header) - assertNull(conn.getRequestProperty("Authorization")); + assertThat(conn.getRequestProperty("Authorization")).isNull(); } // ~ Inner Classes diff --git a/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java b/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java index 659090b01d..99338e03d3 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java @@ -71,7 +71,7 @@ public class ContextPropagatingRemoteInvocationTests extends TestCase { // expected } - assertNull("Authentication must be null ", SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().as("Authentication must be null ").isNull() .getAuthentication()); } @@ -112,6 +112,6 @@ public class ContextPropagatingRemoteInvocationTests extends TestCase { SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication); ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation(); - assertEquals(null, ReflectionTestUtils.getField(remoteInvocation, "credentials")); + assertThat("credentials")).isEqualTo(null, ReflectionTestUtils.getField(remoteInvocation); } } diff --git a/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java index d8161f1eac..5bf562eb40 100644 --- a/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java +++ b/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java @@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.lang.reflect.Proxy; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = AspectjSecurityConfig.class) diff --git a/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java b/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java index 7f618e7e10..26d27c90bc 100644 --- a/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java +++ b/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java @@ -14,8 +14,8 @@ */ package sample.contact; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; import java.util.List; @@ -120,7 +120,7 @@ public class ContactManagerTests { makeActiveUser("dianne"); // has ROLE_USER List contacts = contactManager.getAll(); - assertEquals(4, contacts.size()); + assertThat(contacts).hasSize(4); assertContainsContact(4, contacts); assertContainsContact(5, contacts); @@ -138,7 +138,7 @@ public class ContactManagerTests { List contacts = contactManager.getAll(); - assertEquals(4, contacts.size()); + assertThat(contacts).hasSize(4); assertContainsContact(1, contacts); assertContainsContact(2, contacts); @@ -161,7 +161,7 @@ public class ContactManagerTests { List contacts = contactManager.getAll(); - assertEquals(5, contacts.size()); + assertThat(contacts).hasSize(5); assertContainsContact(4, contacts); assertContainsContact(6, contacts); diff --git a/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java b/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java index 4d0b878fd8..c85f498b44 100644 --- a/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java +++ b/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java @@ -30,7 +30,7 @@ import samples.DataConfig; import java.util.List; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Rob Winch diff --git a/samples/dms-xml/src/test/java/DmsIntegrationTests.java b/samples/dms-xml/src/test/java/DmsIntegrationTests.java old mode 100755 new mode 100644 index bb7fc74503..7fb84a471b --- a/samples/dms-xml/src/test/java/DmsIntegrationTests.java +++ b/samples/dms-xml/src/test/java/DmsIntegrationTests.java @@ -1,4 +1,4 @@ -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Test; @@ -40,9 +40,9 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex @Test public void testBasePopulation() { - assertEquals(9, (int) jdbcTemplate.queryForObject("select count(id) from DIRECTORY", Integer.class)); - assertEquals(90, (int) jdbcTemplate.queryForObject("select count(id) from FILE", Integer.class)); - assertEquals(3, documentDao.findElements(Directory.ROOT_DIRECTORY).length); + assertThat(Integer.class)).isEqualTo(9, (int) jdbcTemplate.queryForObject("select count(id) from DIRECTORY"); + assertThat(Integer.class)).isEqualTo(90, (int) jdbcTemplate.queryForObject("select count(id) from FILE"); + assertThat(documentDao.findElements(Directory.ROOT_DIRECTORY).length).isEqualTo(3); } @Test @@ -66,7 +66,7 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex System.out.println("------ Test for username: " + username + " ------"); AbstractElement[] rootElements = documentDao .findElements(Directory.ROOT_DIRECTORY); - assertEquals(3, rootElements.length); + assertThat(rootElements.length).isEqualTo(3); Directory homeDir = null; Directory nonHomeDir = null; for (int i = 0; i < rootElements.length; i++) { @@ -81,11 +81,11 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex System.out.println("Non-home directory..: " + nonHomeDir.getFullName()); AbstractElement[] homeElements = documentDao.findElements(homeDir); - assertEquals(12, homeElements.length); // confidential and shared directories, + assertThat(homeElements.length).isEqualTo(12); // confidential and shared directories, // plus 10 files AbstractElement[] nonHomeElements = documentDao.findElements(nonHomeDir); - assertEquals(shouldBeFiltered ? 11 : 12, nonHomeElements.length); // cannot see + assertThat(nonHomeElements.length).isEqualTo(shouldBeFiltered ? 11 : 12); // cannot see // the user's // "confidential" // sub-directory @@ -110,7 +110,7 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex else { System.out.println("Inaccessible dir....: " + nonHomeConfidentialDir.getFullName()); - assertEquals(10, documentDao.findElements(nonHomeConfidentialDir).length); // 10 + assertThat(documentDao.findElements(nonHomeConfidentialDir).length).isEqualTo(10); // 10 // files // (no // sub-directories) diff --git a/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java b/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java old mode 100755 new mode 100644 index 42db15302d..a676e24942 --- a/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java +++ b/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java @@ -1,4 +1,4 @@ -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java b/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java index b1068ab0be..f87565be2b 100644 --- a/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java +++ b/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java @@ -1,6 +1,6 @@ package samples.gae.security; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static samples.gae.security.AppRole.*; import org.junit.Test; @@ -15,15 +15,15 @@ public class AppRoleTests { public void getAuthorityReturnsRoleName() { GrantedAuthority admin = ADMIN; - assertEquals("ROLE_ADMIN", admin.getAuthority()); + assertThat(admin.getAuthority()).isEqualTo("ROLE_ADMIN"); } @Test public void bitsAreCorrect() throws Exception { // If this fails, someone has modified the Enum and the Datastore is probably // corrupt! - assertEquals(0, ADMIN.getBit()); - assertEquals(1, NEW_USER.getBit()); - assertEquals(2, USER.getBit()); + assertThat(ADMIN.getBit()).isEqualTo(0); + assertThat(NEW_USER.getBit()).isEqualTo(1); + assertThat(USER.getBit()).isEqualTo(2); } } diff --git a/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java b/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java index bed032bb9a..1924409f8c 100644 --- a/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java +++ b/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java @@ -1,6 +1,6 @@ package samples.gae.users; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import java.util.EnumSet; import java.util.Set; @@ -43,12 +43,12 @@ public class GaeDataStoreUserRegistryTests { GaeUser loadedUser = registry.findUser(userId); - assertEquals(loadedUser.getUserId(), origUser.getUserId()); - assertEquals(true, loadedUser.isEnabled()); - assertEquals(roles, loadedUser.getAuthorities()); - assertEquals("nick", loadedUser.getNickname()); - assertEquals("nick@blah.com", loadedUser.getEmail()); - assertEquals("Forename", loadedUser.getForename()); - assertEquals("Surname", loadedUser.getSurname()); + assertThat(origUser.getUserId()).isEqualTo(loadedUser.getUserId()); + assertThat(loadedUser.isEnabled()).isEqualTo(true); + assertThat(loadedUser.getAuthorities()).isEqualTo(roles); + assertThat(loadedUser.getNickname()).isEqualTo("nick"); + assertThat(loadedUser.getEmail()).isEqualTo("nick@blah.com"); + assertThat(loadedUser.getForename()).isEqualTo("Forename"); + assertThat(loadedUser.getSurname()).isEqualTo("Surname"); } } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java index 8f90860cba..9152baa509 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.taglibs.authz; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java index caee1e8a3d..ac6259244f 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.taglibs.authz; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.*; @@ -77,11 +77,11 @@ public class AccessControlListTagTests { tag.setDomainObject(domainObject); tag.setHasPermission("READ"); tag.setVar("allowed"); - assertSame(domainObject, tag.getDomainObject()); - assertEquals("READ", tag.getHasPermission()); + assertThat(tag.getDomainObject()).isSameAs(domainObject); + assertThat(tag.getHasPermission()).isEqualTo("READ"); - assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag()); - assertTrue((Boolean) pageContext.getAttribute("allowed")); + assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); } @Test @@ -98,11 +98,11 @@ public class AccessControlListTagTests { tag.setDomainObject(domainObject); tag.setHasPermission("READ"); tag.setVar("allowed"); - assertSame(domainObject, tag.getDomainObject()); - assertEquals("READ", tag.getHasPermission()); + assertThat(tag.getDomainObject()).isSameAs(domainObject); + assertThat(tag.getHasPermission()).isEqualTo("READ"); - assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag()); - assertTrue((Boolean) pageContext.getAttribute("allowed")); + assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); } // SEC-2022 @@ -115,11 +115,11 @@ public class AccessControlListTagTests { tag.setDomainObject(domainObject); tag.setHasPermission("READ,WRITE"); tag.setVar("allowed"); - assertSame(domainObject, tag.getDomainObject()); - assertEquals("READ,WRITE", tag.getHasPermission()); + assertThat(tag.getDomainObject()).isSameAs(domainObject); + assertThat(tag.getHasPermission()).isEqualTo("READ,WRITE"); - assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag()); - assertTrue((Boolean) pageContext.getAttribute("allowed")); + assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); verify(pe).hasPermission(bob, domainObject, "READ"); verify(pe).hasPermission(bob, domainObject, "WRITE"); verifyNoMoreInteractions(pe); @@ -135,11 +135,11 @@ public class AccessControlListTagTests { tag.setDomainObject(domainObject); tag.setHasPermission("1,2"); tag.setVar("allowed"); - assertSame(domainObject, tag.getDomainObject()); - assertEquals("1,2", tag.getHasPermission()); + assertThat(tag.getDomainObject()).isSameAs(domainObject); + assertThat(tag.getHasPermission()).isEqualTo("1,2"); - assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag()); - assertTrue((Boolean) pageContext.getAttribute("allowed")); + assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); verify(pe).hasPermission(bob, domainObject, 1); verify(pe).hasPermission(bob, domainObject, 2); verifyNoMoreInteractions(pe); @@ -154,11 +154,11 @@ public class AccessControlListTagTests { tag.setDomainObject(domainObject); tag.setHasPermission("1,WRITE"); tag.setVar("allowed"); - assertSame(domainObject, tag.getDomainObject()); - assertEquals("1,WRITE", tag.getHasPermission()); + assertThat(tag.getDomainObject()).isSameAs(domainObject); + assertThat(tag.getHasPermission()).isEqualTo("1,WRITE"); - assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag()); - assertTrue((Boolean) pageContext.getAttribute("allowed")); + assertThat(tag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); + assertThat((Boolean) pageContext.getAttribute("allowed")).isTrue(); verify(pe).hasPermission(bob, domainObject, 1); verify(pe).hasPermission(bob, domainObject, "WRITE"); verifyNoMoreInteractions(pe); @@ -173,7 +173,7 @@ public class AccessControlListTagTests { tag.setHasPermission("READ"); tag.setVar("allowed"); - assertEquals(Tag.SKIP_BODY, tag.doStartTag()); - assertFalse((Boolean) pageContext.getAttribute("allowed")); + assertThat(tag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat((Boolean) pageContext.getAttribute("allowed")).isFalse(); } } diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java index d19bc9fc8a..b49dd69b21 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java @@ -15,7 +15,7 @@ package org.springframework.security.taglibs.authz; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; @@ -55,9 +55,9 @@ public class AuthenticationTagTests { SecurityContextHolder.getContext().setAuthentication(auth); authenticationTag.setProperty("name"); - assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag()); - assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag()); - assertEquals("rodUserDetails", authenticationTag.getLastMessage()); + assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(authenticationTag.getLastMessage()).isEqualTo("rodUserDetails"); } @Test @@ -67,9 +67,9 @@ public class AuthenticationTagTests { AuthorityUtils.NO_AUTHORITIES)); authenticationTag.setProperty("principal"); - assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag()); - assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag()); - assertEquals("rodAsString", authenticationTag.getLastMessage()); + assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(authenticationTag.getLastMessage()).isEqualTo("rodAsString"); } @Test @@ -77,9 +77,9 @@ public class AuthenticationTagTests { SecurityContextHolder.getContext().setAuthentication(auth); authenticationTag.setProperty("principal.username"); - assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag()); - assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag()); - assertEquals("rodUserDetails", authenticationTag.getLastMessage()); + assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(authenticationTag.getLastMessage()).isEqualTo("rodUserDetails"); } @Test @@ -89,8 +89,8 @@ public class AuthenticationTagTests { AuthorityUtils.NO_AUTHORITIES)); authenticationTag.setProperty("principal"); - assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag()); - assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag()); + assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); } @Test @@ -98,16 +98,16 @@ public class AuthenticationTagTests { SecurityContextHolder.getContext().setAuthentication(null); authenticationTag.setProperty("principal"); - assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag()); - assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag()); - assertEquals(null, authenticationTag.getLastMessage()); + assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); + assertThat(authenticationTag.getLastMessage()).isEqualTo(null); } @Test public void testSkipsBodyIfNullOrEmptyOperation() throws Exception { authenticationTag.setProperty(""); - assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag()); - assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag()); + assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); + assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE); } @Test @@ -131,7 +131,7 @@ public class AuthenticationTagTests { authenticationTag.setProperty("name"); authenticationTag.doStartTag(); authenticationTag.doEndTag(); - assertEquals("<>& ", authenticationTag.getLastMessage()); + assertThat(authenticationTag.getLastMessage()).isEqualTo("<>& "); } @Test @@ -142,7 +142,7 @@ public class AuthenticationTagTests { authenticationTag.setHtmlEscape("false"); authenticationTag.doStartTag(); authenticationTag.doEndTag(); - assertEquals("<>& ", authenticationTag.getLastMessage()); + assertThat(authenticationTag.getLastMessage()).isEqualTo("<>& "); } // ~ Inner Classes diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java index da79150ebe..43229c26b0 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java @@ -16,7 +16,7 @@ package org.springframework.security.taglibs.authz; import static org.mockito.Mockito.*; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; @@ -96,33 +96,33 @@ public class AuthorizeTagTests { when(permissionEvaluator.hasPermission(eq(currentUser), eq(domain), anyString())) .thenReturn(true); - assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } @Test public void skipsBodyIfNoAuthenticationPresent() throws Exception { SecurityContextHolder.clearContext(); authorizeTag.setAccess("permitAll"); - assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void skipsBodyIfAccessExpressionDeniesAccess() throws Exception { authorizeTag.setAccess("denyAll"); - assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void showsBodyIfAccessExpressionAllowsAccess() throws Exception { authorizeTag.setAccess("permitAll"); - assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } @Test public void requestAttributeIsResolvedAsElVariable() throws JspException { request.setAttribute("blah", "blah"); authorizeTag.setAccess("#blah == 'blah'"); - assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } // url attribute tests @@ -130,27 +130,27 @@ public class AuthorizeTagTests { public void skipsBodyWithUrlSetIfNoAuthenticationPresent() throws Exception { SecurityContextHolder.clearContext(); authorizeTag.setUrl("/something"); - assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void skipsBodyIfUrlIsNotAllowed() throws Exception { authorizeTag.setUrl("/notallowed"); - assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } @Test public void evaluatesBodyIfUrlIsAllowed() throws Exception { authorizeTag.setUrl("/allowed"); authorizeTag.setMethod("GET"); - assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.EVAL_BODY_INCLUDE); } @Test public void skipsBodyIfMethodIsNotAllowed() throws Exception { authorizeTag.setUrl("/allowed"); authorizeTag.setMethod("POST"); - assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag()); + assertThat(authorizeTag.doStartTag()).isEqualTo(Tag.SKIP_BODY); } public static class MockWebInvocationPrivilegeEvaluator implements diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java index d2862bb5fe..f8848af398 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java @@ -14,7 +14,7 @@ import javax.servlet.jsp.tagext.TagSupport; import java.io.UnsupportedEncodingException; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * @author Nick Williams @@ -43,7 +43,7 @@ public class AbstractCsrfTagTests { int returned = this.tag.doEndTag(); - assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned); + assertThat(returned).as("The returned value is not correct.").isEqualTo(TagSupport.EVAL_PAGE); assertEquals("The output value is not correct.", "", this.response.getContentAsString()); } @@ -60,10 +60,10 @@ public class AbstractCsrfTagTests { int returned = this.tag.doEndTag(); - assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned); + assertThat(returned).as("The returned value is not correct.").isEqualTo(TagSupport.EVAL_PAGE); assertEquals("The output value is not correct.", "fooBarBazQux", this.response.getContentAsString()); - assertSame("The token is not correct.", token, this.tag.token); + assertThat(this.tag.token).as("The token is not correct.").isSameAs(token); } @Test @@ -78,10 +78,10 @@ public class AbstractCsrfTagTests { int returned = this.tag.doEndTag(); - assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned); + assertThat(returned).as("The returned value is not correct.").isEqualTo(TagSupport.EVAL_PAGE); assertEquals("The output value is not correct.", "", this.response.getContentAsString()); - assertSame("The token is not correct.", token, this.tag.token); + assertThat(this.tag.token).as("The token is not correct.").isSameAs(token); } private static class MockTag extends AbstractCsrfTag { diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java index fcc5dd6fa0..2978202eb3 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.csrf.DefaultCsrfToken; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * @author Nick Williams @@ -26,7 +26,7 @@ public class CsrfInputTagTests { String value = this.tag.handleToken(token); - assertNotNull("The returned value should not be null.", value); + assertThat(value).as("The returned value should not be null.").isNotNull(); assertEquals("The output is not correct.", "", value); @@ -39,7 +39,7 @@ public class CsrfInputTagTests { String value = this.tag.handleToken(token); - assertNotNull("The returned value should not be null.", value); + assertThat(value).as("The returned value should not be null.").isNotNull(); assertEquals( "The output is not correct.", "", diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java index 5880799039..03b9e8a056 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.csrf.DefaultCsrfToken; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; /** * @author Nick Williams @@ -26,7 +26,7 @@ public class CsrfMetaTagsTagTests { String value = this.tag.handleToken(token); - assertNotNull("The returned value should not be null.", value); + assertThat(value).as("The returned value should not be null.").isNotNull(); assertEquals("The output is not correct.", "" + "" @@ -40,7 +40,7 @@ public class CsrfMetaTagsTagTests { String value = this.tag.handleToken(token); - assertNotNull("The returned value should not be null.", value); + assertThat(value).as("The returned value should not be null.").isNotNull(); assertEquals("The output is not correct.", "" + "" diff --git a/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java b/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java index 9f3e81edfb..4b071d9ee1 100644 --- a/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java +++ b/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.After; import org.junit.Before; diff --git a/test/src/test/java/org/springframework/security/test/context/annotation/SecurityTestExecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/annotation/SecurityTestExecutionListenerTests.java index cb66a03ade..fd956fa698 100644 --- a/test/src/test/java/org/springframework/security/test/context/annotation/SecurityTestExecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/annotation/SecurityTestExecutionListenerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.annotation; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java index 9cd1a206e4..42c3db951d 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.showcase; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java index a1fdfaf610..ce36f9c64f 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.showcase; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java index 6c844092c9..062f78ae8d 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.support; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; import org.junit.Before; diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java index 0fba1171ff..0ada5b8948 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.support; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.core.annotation.AnnotationUtils; diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java index d52731d52e..696323532a 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.support; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.when; diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java index 81a5826c14..029b860401 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.support; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java index b2df84d4a8..4f6846ec88 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.support; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import org.junit.Before; diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java index a95f57bf34..d4726c35ca 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.context.support; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.core.annotation.AnnotationUtils; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java index deedb9d06f..c20984c610 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; import org.junit.Before; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java index 5652fd505e..16b7ebec06 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.logout; import org.junit.Before; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java index a9bcf5fbc6..8560733fa8 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java index 1a93aaaf86..76655d4683 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java @@ -24,7 +24,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import java.security.cert.X509Certificate; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.x509; @RunWith(MockitoJUnitRunner.class) diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java index f3aa392634..54076c8640 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java index f41f4cc043..2c64c3bf59 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java @@ -36,7 +36,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import java.io.IOException; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.digest; public class SecurityMockMvcRequestPostProcessorsDigestTests { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java index d01a5b93db..0c7994dd4b 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java index 05184ca9b4..52ade4916c 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java index d62329374d..1ad2a3b4e5 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.servlet.request; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java b/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java index 243423a9aa..dbca9698a0 100644 --- a/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.test.web.support; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.security.test.web.support.WebTestUtils.getCsrfTokenRepository; import static org.springframework.security.test.web.support.WebTestUtils.getSecurityContextRepository; diff --git a/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java b/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java index 40db4d2ef8..9b7390067b 100644 --- a/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; @@ -23,7 +23,7 @@ public class DefaultRedirectStrategyTests { rds.sendRedirect(request, response, "http://context.blah.com/context/remainder"); - assertEquals("remainder", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("remainder"); } // SEC-2177 @@ -39,6 +39,6 @@ public class DefaultRedirectStrategyTests { rds.sendRedirect(request, response, "http://http://context.blah.com/context/remainder"); - assertEquals("remainder", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("remainder"); } } diff --git a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java index 4c9c5407b6..c333fa3902 100644 --- a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java +++ b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.After; @@ -75,8 +75,8 @@ public class FilterChainProxyTests { public void securityFilterChainIsNotInvokedIfMatchFails() throws Exception { when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false); fcp.doFilter(request, response, chain); - assertEquals(1, fcp.getFilterChains().size()); - assertSame(filter, fcp.getFilterChains().get(0).getFilters().get(0)); + assertThat(fcp.getFilterChains()).hasSize(1); + assertThat(fcp.getFilterChains().get(0).getFilters().get(0)).isSameAs(filter); verifyZeroInteractions(filter); // The actual filter chain should be invoked though @@ -183,7 +183,7 @@ public class FilterChainProxyTests { fcp.doFilter(request, response, chain); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test @@ -205,7 +205,7 @@ public class FilterChainProxyTests { catch (ServletException success) { } - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } // SEC-2027 @@ -227,8 +227,7 @@ public class FilterChainProxyTests { any(HttpServletResponse.class), any(FilterChain.class)); ; fcp.doFilter(request, response, innerChain); - assertSame(expected, SecurityContextHolder.getContext() - .getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(expected); return null; } }).when(filter).doFilter(any(HttpServletRequest.class), @@ -238,6 +237,6 @@ public class FilterChainProxyTests { verify(innerChain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } } diff --git a/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java b/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java index adf0c51f47..02504df5bf 100644 --- a/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java +++ b/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import javax.servlet.FilterChain; @@ -53,17 +53,14 @@ public class FilterInvocationTests { MockHttpServletResponse response = new MockHttpServletResponse(); FilterChain chain = mock(FilterChain.class); FilterInvocation fi = new FilterInvocation(request, response, chain); - assertEquals(request, fi.getRequest()); - assertEquals(request, fi.getHttpRequest()); - assertEquals(response, fi.getResponse()); - assertEquals(response, fi.getHttpResponse()); - assertEquals(chain, fi.getChain()); - assertEquals("/HelloWorld/some/more/segments.html", fi.getRequestUrl()); - assertEquals("FilterInvocation: URL: /HelloWorld/some/more/segments.html", - fi.toString()); - assertEquals( - "http://www.example.com/mycontext/HelloWorld/some/more/segments.html", - fi.getFullRequestUrl()); + assertThat(fi.getRequest()).isEqualTo(request); + assertThat(fi.getHttpRequest()).isEqualTo(request); + assertThat(fi.getResponse()).isEqualTo(response); + assertThat(fi.getHttpResponse()).isEqualTo(response); + assertThat(fi.getChain()).isEqualTo(chain); + assertThat(fi.getRequestUrl()).isEqualTo("/HelloWorld/some/more/segments.html"); + assertThat(fi.toString()).isEqualTo("FilterInvocation: URL: /HelloWorld/some/more/segments.html"); + assertThat(fi.getFullRequestUrl()).isEqualTo("http://www.example.com/mycontext/HelloWorld/some/more/segments.html"); } @Test(expected = IllegalArgumentException.class) @@ -102,10 +99,9 @@ public class FilterInvocationTests { MockHttpServletResponse response = new MockHttpServletResponse(); FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class)); - assertEquals("/HelloWorld?foo=bar", fi.getRequestUrl()); - assertEquals("FilterInvocation: URL: /HelloWorld?foo=bar", fi.toString()); - assertEquals("http://www.example.com/mycontext/HelloWorld?foo=bar", - fi.getFullRequestUrl()); + assertThat(fi.getRequestUrl()).isEqualTo("/HelloWorld?foo=bar"); + assertThat(fi.toString()).isEqualTo("FilterInvocation: URL: /HelloWorld?foo=bar"); + assertThat(fi.getFullRequestUrl()).isEqualTo("http://www.example.com/mycontext/HelloWorld?foo=bar"); } @Test @@ -121,10 +117,9 @@ public class FilterInvocationTests { MockHttpServletResponse response = new MockHttpServletResponse(); FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class)); - assertEquals("/HelloWorld", fi.getRequestUrl()); - assertEquals("FilterInvocation: URL: /HelloWorld", fi.toString()); - assertEquals("http://www.example.com/mycontext/HelloWorld", - fi.getFullRequestUrl()); + assertThat(fi.getRequestUrl()).isEqualTo("/HelloWorld"); + assertThat(fi.toString()).isEqualTo("FilterInvocation: URL: /HelloWorld"); + assertThat(fi.getFullRequestUrl()).isEqualTo("http://www.example.com/mycontext/HelloWorld"); } @Test(expected = UnsupportedOperationException.class) diff --git a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java index 06d99deff4..ac5da21b74 100644 --- a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java @@ -15,6 +15,8 @@ package org.springframework.security.web; +import static org.assertj.core.api.Assertions.assertThat; + import junit.framework.TestCase; import java.util.HashMap; @@ -33,7 +35,7 @@ public class PortMapperImplTests extends TestCase { public void testDefaultMappingsAreKnown() throws Exception { PortMapperImpl portMapper = new PortMapperImpl(); - assertEquals(Integer.valueOf(80), portMapper.lookupHttpPort(Integer.valueOf(443))); + assertThat(portMapper.lookupHttpPort(Integer.valueOf(443))).isEqualTo(Integer.valueOf(80)); assertEquals(Integer.valueOf(8080), portMapper.lookupHttpPort(Integer.valueOf(8443))); assertEquals(Integer.valueOf(443), @@ -50,7 +52,7 @@ public class PortMapperImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -62,13 +64,13 @@ public class PortMapperImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testGetTranslatedPortMappings() { PortMapperImpl portMapper = new PortMapperImpl(); - assertEquals(2, portMapper.getTranslatedPortMappings().size()); + assertThat(portMapper.getTranslatedPortMappings()).hasSize(2); } public void testRejectsOutOfRangeMappings() { @@ -81,13 +83,13 @@ public class PortMapperImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testReturnsNullIfHttpPortCannotBeFound() { PortMapperImpl portMapper = new PortMapperImpl(); - assertTrue(portMapper.lookupHttpPort(Integer.valueOf("34343")) == null); + assertThat(portMapper.lookupHttpPort(Integer.valueOf("34343")) == null).isTrue(); } public void testSupportsCustomMappings() { @@ -97,7 +99,7 @@ public class PortMapperImplTests extends TestCase { portMapper.setPortMappings(map); - assertEquals(Integer.valueOf(79), portMapper.lookupHttpPort(Integer.valueOf(442))); + assertThat(portMapper.lookupHttpPort(Integer.valueOf(442))).isEqualTo(Integer.valueOf(79)); assertEquals(Integer.valueOf(442), portMapper.lookupHttpsPort(Integer.valueOf(79))); } diff --git a/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java index 09f96b2081..45f5d2b149 100644 --- a/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java @@ -15,6 +15,8 @@ package org.springframework.security.web; +import static org.assertj.core.api.Assertions.assertThat; + import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; @@ -51,7 +53,7 @@ public class PortResolverImplTests extends TestCase { MockHttpServletRequest request = new MockHttpServletRequest(); request.setServerPort(8443); request.setScheme("HTtP"); // proves case insensitive handling - assertEquals(8080, pr.getServerPort(request)); + assertThat(pr.getServerPort(request)).isEqualTo(8080); } public void testDetectsBuggyIeHttpsRequest() throws Exception { @@ -60,7 +62,7 @@ public class PortResolverImplTests extends TestCase { MockHttpServletRequest request = new MockHttpServletRequest(); request.setServerPort(8080); request.setScheme("HTtPs"); // proves case insensitive handling - assertEquals(8443, pr.getServerPort(request)); + assertThat(pr.getServerPort(request)).isEqualTo(8443); } public void testDetectsEmptyPortMapper() throws Exception { @@ -71,15 +73,15 @@ public class PortResolverImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testGettersSetters() throws Exception { PortResolverImpl pr = new PortResolverImpl(); - assertTrue(pr.getPortMapper() != null); + assertThat(pr.getPortMapper() != null).isTrue(); pr.setPortMapper(new PortMapperImpl()); - assertTrue(pr.getPortMapper() != null); + assertThat(pr.getPortMapper() != null).isTrue(); } public void testNormalOperation() throws Exception { @@ -88,6 +90,6 @@ public class PortResolverImplTests extends TestCase { MockHttpServletRequest request = new MockHttpServletRequest(); request.setScheme("http"); request.setServerPort(1021); - assertEquals(1021, pr.getServerPort(request)); + assertThat(pr.getServerPort(request)).isEqualTo(1021); } } diff --git a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java index e60127622b..c3e86965dd 100644 --- a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.access; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; @@ -67,8 +67,8 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator( interceptor); when(ods.getAttributes(anyObject())).thenReturn(null); - assertTrue(wipe.isAllowed("/context", "/foo/index.jsp", "GET", - mock(Authentication.class))); + assertThat(wipe.isAllowed("/context", "/foo/index.jsp", "GET", + mock(Authentication.class))).isTrue(); } @Test @@ -78,15 +78,15 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { interceptor); when(ods.getAttributes(anyObject())).thenReturn(null); interceptor.setRejectPublicInvocations(true); - assertFalse(wipe.isAllowed("/context", "/foo/index.jsp", "GET", - mock(Authentication.class))); + assertThat(wipe.isAllowed("/context", "/foo/index.jsp", "GET", + mock(Authentication.class))).isFalse(); } @Test public void deniesAccessIfAuthenticationIsNull() throws Exception { DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator( interceptor); - assertFalse(wipe.isAllowed("/foo/index.jsp", null)); + assertThat(wipe.isAllowed("/foo/index.jsp", null)).isFalse(); } @Test @@ -95,7 +95,7 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { "MOCK_INDEX"); DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator( interceptor); - assertTrue(wipe.isAllowed("/foo/index.jsp", token)); + assertThat(wipe.isAllowed("/foo/index.jsp", token)).isTrue(); } @SuppressWarnings("unchecked") @@ -109,6 +109,6 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests { doThrow(new AccessDeniedException("")).when(adm).decide( any(Authentication.class), anyObject(), anyList()); - assertFalse(wipe.isAllowed("/foo/index.jsp", token)); + assertThat(wipe.isAllowed("/foo/index.jsp", token)).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java b/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java index 488580d5d0..59a2d5a504 100644 --- a/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.access; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -97,13 +97,12 @@ public class ExceptionTranslationFilterTests { // Test ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); filter.setAuthenticationTrustResolver(new AuthenticationTrustResolverImpl()); - assertNotNull(filter.getAuthenticationTrustResolver()); + assertThat(filter.getAuthenticationTrustResolver()).isNotNull(); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, fc); - assertEquals("/mycontext/login.jsp", response.getRedirectedUrl()); - assertEquals("http://www.example.com/mycontext/secure/page.html", - getSavedRequestUrl(request)); + assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp"); + assertThat(getSavedRequestUrl(request)).isEqualTo("http://www.example.com/mycontext/secure/page.html"); } @Test @@ -131,9 +130,8 @@ public class ExceptionTranslationFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, fc); - assertEquals(403, response.getStatus()); - assertEquals(AccessDeniedException.class, - request.getAttribute(WebAttributes.ACCESS_DENIED_403).getClass()); + assertThat(response.getStatus()).isEqualTo(403); + assertThat(request.getAttribute(WebAttributes.ACCESS_DENIED_403)).isExactlyInstanceOf(AccessDeniedException.class); } @Test @@ -158,9 +156,8 @@ public class ExceptionTranslationFilterTests { filter.afterPropertiesSet(); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, fc); - assertEquals("/mycontext/login.jsp", response.getRedirectedUrl()); - assertEquals("http://www.example.com/mycontext/secure/page.html", - getSavedRequestUrl(request)); + assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp"); + assertThat(getSavedRequestUrl(request)).isEqualTo("http://www.example.com/mycontext/secure/page.html"); } @Test @@ -188,9 +185,8 @@ public class ExceptionTranslationFilterTests { filter.afterPropertiesSet(); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, fc); - assertEquals("/mycontext/login.jsp", response.getRedirectedUrl()); - assertEquals("http://www.example.com:8080/mycontext/secure/page.html", - getSavedRequestUrl(request)); + assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/login.jsp"); + assertThat(getSavedRequestUrl(request)).isEqualTo("http://www.example.com:8080/mycontext/secure/page.html"); } @Test(expected = IllegalArgumentException.class) @@ -211,7 +207,7 @@ public class ExceptionTranslationFilterTests { // Test ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint); - assertSame(mockEntryPoint, filter.getAuthenticationEntryPoint()); + assertThat(filter.getAuthenticationEntryPoint()).isSameAs(mockEntryPoint); MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, mock(FilterChain.class)); @@ -236,8 +232,7 @@ public class ExceptionTranslationFilterTests { fail("Should have thrown Exception"); } catch (Exception expected) { - assertSame("The exception thrown should not have been wrapped", e, - expected); + assertThat(expected).isSameAs(e); } } } diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java index ea67f5e515..0a7f51c34c 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java @@ -55,7 +55,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("A list of ChannelProcessors is required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("A list of ChannelProcessors is required"); } } @@ -70,7 +70,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } @@ -83,7 +83,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("A list of ChannelProcessors is required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("A list of ChannelProcessors is required"); } } @@ -105,7 +105,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { List cad = SecurityConfig.createList("xyz"); cdm.decide(fi, cad); - assertTrue(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isTrue(); } public void testAnyChannelAttributeCausesProcessorsToBeSkipped() throws Exception { @@ -122,7 +122,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { mock(FilterChain.class)); cdm.decide(fi, SecurityConfig.createList(new String[] { "abc", "ANY_CHANNEL" })); - assertFalse(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isFalse(); } public void testDecideIteratesAllProcessorsIfNoneCommitAResponse() throws Exception { @@ -141,7 +141,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { mock(FilterChain.class)); cdm.decide(fi, SecurityConfig.createList("SOME_ATTRIBUTE_NO_PROCESSORS_SUPPORT")); - assertFalse(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isFalse(); } public void testDelegatesSupports() throws Exception { @@ -154,14 +154,14 @@ public class ChannelDecisionManagerImplTests extends TestCase { cdm.setChannelProcessors(list); cdm.afterPropertiesSet(); - assertTrue(cdm.supports(new SecurityConfig("xyz"))); - assertTrue(cdm.supports(new SecurityConfig("abc"))); - assertFalse(cdm.supports(new SecurityConfig("UNSUPPORTED"))); + assertThat(cdm.supports(new SecurityConfig("xyz"))).isTrue(); + assertThat(cdm.supports(new SecurityConfig("abc"))).isTrue(); + assertThat(cdm.supports(new SecurityConfig("UNSUPPORTED"))).isFalse(); } public void testGettersSetters() { ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl(); - assertNull(cdm.getChannelProcessors()); + assertThat(cdm.getChannelProcessors()).isNull(); MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false); MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false); @@ -170,7 +170,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { list.add(cpAbc); cdm.setChannelProcessors(list); - assertEquals(list, cdm.getChannelProcessors()); + assertThat(cdm.getChannelProcessors()).isEqualTo(list); } public void testStartupFailsWithEmptyChannelProcessorsList() throws Exception { @@ -181,7 +181,7 @@ public class ChannelDecisionManagerImplTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("A list of ChannelProcessors is required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("A list of ChannelProcessors is required"); } } diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java index c23dde73c9..09928dc925 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.access.channel; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import java.io.IOException; @@ -150,13 +150,13 @@ public class ChannelProcessingFilterTests { public void testGetterSetters() throws Exception { ChannelProcessingFilter filter = new ChannelProcessingFilter(); filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "MOCK")); - assertTrue(filter.getChannelDecisionManager() != null); + assertThat(filter.getChannelDecisionManager() != null).isTrue(); MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap( "/path", false, "MOCK"); filter.setSecurityMetadataSource(fids); - assertSame(fids, filter.getSecurityMetadataSource()); + assertThat(filter.getSecurityMetadataSource()).isSameAs(fids); filter.afterPropertiesSet(); } diff --git a/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java index e9f2e16e7b..841fe68327 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java @@ -51,7 +51,7 @@ public class InsecureChannelProcessorTests extends TestCase { processor.decide(fi, SecurityConfig.createList("SOME_IGNORED_ATTRIBUTE", "REQUIRES_INSECURE_CHANNEL")); - assertFalse(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isFalse(); } public void testDecideDetectsUnacceptableChannel() throws Exception { @@ -74,7 +74,7 @@ public class InsecureChannelProcessorTests extends TestCase { SecurityConfig.createList(new String[] { "SOME_IGNORED_ATTRIBUTE", "REQUIRES_INSECURE_CHANNEL" })); - assertTrue(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isTrue(); } public void testDecideRejectsNulls() throws Exception { @@ -86,19 +86,19 @@ public class InsecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testGettersSetters() { InsecureChannelProcessor processor = new InsecureChannelProcessor(); - assertEquals("REQUIRES_INSECURE_CHANNEL", processor.getInsecureKeyword()); + assertThat(processor.getInsecureKeyword()).isEqualTo("REQUIRES_INSECURE_CHANNEL"); processor.setInsecureKeyword("X"); - assertEquals("X", processor.getInsecureKeyword()); + assertThat(processor.getInsecureKeyword()).isEqualTo("X"); - assertTrue(processor.getEntryPoint() != null); + assertThat(processor.getEntryPoint() != null).isTrue(); processor.setEntryPoint(null); - assertTrue(processor.getEntryPoint() == null); + assertThat(processor.getEntryPoint() == null).isTrue(); } public void testMissingEntryPoint() throws Exception { @@ -110,7 +110,7 @@ public class InsecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("entryPoint required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("entryPoint required"); } } @@ -123,7 +123,7 @@ public class InsecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("insecureKeyword required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("insecureKeyword required"); } processor.setInsecureKeyword(""); @@ -133,14 +133,14 @@ public class InsecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("insecureKeyword required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("insecureKeyword required"); } } public void testSupports() { InsecureChannelProcessor processor = new InsecureChannelProcessor(); - assertTrue(processor.supports(new SecurityConfig("REQUIRES_INSECURE_CHANNEL"))); - assertFalse(processor.supports(null)); - assertFalse(processor.supports(new SecurityConfig("NOT_SUPPORTED"))); + assertThat(processor.supports(new SecurityConfig("REQUIRES_INSECURE_CHANNEL"))).isTrue(); + assertThat(processor.supports(null)).isFalse(); + assertThat(processor.supports(new SecurityConfig("NOT_SUPPORTED"))).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java index e32c2d1d09..70a148f507 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java @@ -72,9 +72,9 @@ public class RetryWithHttpEntryPointTests extends TestCase { ep.setPortMapper(portMapper); ep.setPortResolver(portResolver); ep.setRedirectStrategy(redirector); - assertSame(portMapper, ep.getPortMapper()); - assertSame(portResolver, ep.getPortResolver()); - assertSame(redirector, ep.getRedirectStrategy()); + assertThat(ep.getPortMapper()).isSameAs(portMapper); + assertThat(ep.getPortResolver()).isSameAs(portResolver); + assertThat(ep.getRedirectStrategy()).isSameAs(redirector); } public void testNormalOperation() throws Exception { @@ -128,7 +128,7 @@ public class RetryWithHttpEntryPointTests extends TestCase { ep.setPortResolver(new MockPortResolver(8768, 1234)); ep.commence(request, response); - assertEquals("/bigWebApp?open=true", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/bigWebApp?open=true"); } public void testOperationWithNonStandardPort() throws Exception { diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java index 5d8de9e37a..1e2e49cd64 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java @@ -63,8 +63,8 @@ public class RetryWithHttpsEntryPointTests extends TestCase { RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint(); ep.setPortMapper(new PortMapperImpl()); ep.setPortResolver(new MockPortResolver(8080, 8443)); - assertTrue(ep.getPortMapper() != null); - assertTrue(ep.getPortResolver() != null); + assertThat(ep.getPortMapper() != null).isTrue(); + assertThat(ep.getPortResolver() != null).isTrue(); } public void testNormalOperation() throws Exception { @@ -118,7 +118,7 @@ public class RetryWithHttpsEntryPointTests extends TestCase { ep.setPortResolver(new MockPortResolver(8768, 1234)); ep.commence(request, response); - assertEquals("/bigWebApp?open=true", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/bigWebApp?open=true"); } public void testOperationWithNonStandardPort() throws Exception { diff --git a/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java index a82dc3a18a..37993600f9 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java @@ -54,7 +54,7 @@ public class SecureChannelProcessorTests extends TestCase { processor.decide(fi, SecurityConfig.createList("SOME_IGNORED_ATTRIBUTE", "REQUIRES_SECURE_CHANNEL")); - assertFalse(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isFalse(); } public void testDecideDetectsUnacceptableChannel() throws Exception { @@ -76,7 +76,7 @@ public class SecureChannelProcessorTests extends TestCase { SecurityConfig.createList(new String[] { "SOME_IGNORED_ATTRIBUTE", "REQUIRES_SECURE_CHANNEL" })); - assertTrue(fi.getResponse().isCommitted()); + assertThat(fi.getResponse().isCommitted()).isTrue(); } public void testDecideRejectsNulls() throws Exception { @@ -88,19 +88,19 @@ public class SecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testGettersSetters() { SecureChannelProcessor processor = new SecureChannelProcessor(); - assertEquals("REQUIRES_SECURE_CHANNEL", processor.getSecureKeyword()); + assertThat(processor.getSecureKeyword()).isEqualTo("REQUIRES_SECURE_CHANNEL"); processor.setSecureKeyword("X"); - assertEquals("X", processor.getSecureKeyword()); + assertThat(processor.getSecureKeyword()).isEqualTo("X"); - assertTrue(processor.getEntryPoint() != null); + assertThat(processor.getEntryPoint() != null).isTrue(); processor.setEntryPoint(null); - assertTrue(processor.getEntryPoint() == null); + assertThat(processor.getEntryPoint() == null).isTrue(); } public void testMissingEntryPoint() throws Exception { @@ -112,7 +112,7 @@ public class SecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("entryPoint required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("entryPoint required"); } } @@ -125,7 +125,7 @@ public class SecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("secureKeyword required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("secureKeyword required"); } processor.setSecureKeyword(""); @@ -135,14 +135,14 @@ public class SecureChannelProcessorTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("secureKeyword required", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("secureKeyword required"); } } public void testSupports() { SecureChannelProcessor processor = new SecureChannelProcessor(); - assertTrue(processor.supports(new SecurityConfig("REQUIRES_SECURE_CHANNEL"))); - assertFalse(processor.supports(null)); - assertFalse(processor.supports(new SecurityConfig("NOT_SUPPORTED"))); + assertThat(processor.supports(new SecurityConfig("REQUIRES_SECURE_CHANNEL"))).isTrue(); + assertThat(processor.supports(null)).isFalse(); + assertThat(processor.supports(new SecurityConfig("NOT_SUPPORTED"))).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java b/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java index 2ee7cace39..6cbe91055a 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.access.expression; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -71,9 +71,9 @@ public class DefaultWebSecurityExpressionHandlerTests { EvaluationContext ctx = handler.createEvaluationContext( mock(Authentication.class), mock(FilterInvocation.class)); ExpressionParser parser = handler.getExpressionParser(); - assertTrue(parser.parseExpression("@role.getAttribute() == 'ROLE_A'").getValue( + assertThat(parser.parseExpression("@role.getAttribute() == 'ROLE_A'").isTrue().getValue( ctx, Boolean.class)); - assertTrue(parser.parseExpression("@role.attribute == 'ROLE_A'").getValue(ctx, + assertThat(parser.parseExpression("@role.attribute == 'ROLE_A'").isTrue().getValue(ctx, Boolean.class)); } diff --git a/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java index f839e77cdd..cdf47a3fa1 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.access.expression; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.access.ConfigAttribute; @@ -24,15 +24,15 @@ public class ExpressionBasedFilterInvocationSecurityMetadataSourceTests { requestMap.put(AnyRequestMatcher.INSTANCE, SecurityConfig.createList(expression)); ExpressionBasedFilterInvocationSecurityMetadataSource mds = new ExpressionBasedFilterInvocationSecurityMetadataSource( requestMap, new DefaultWebSecurityExpressionHandler()); - assertEquals(1, mds.getAllConfigAttributes().size()); + assertThat(mds.getAllConfigAttributes()).hasSize(1); Collection attrs = mds.getAttributes(new FilterInvocation( "/path", "GET")); - assertEquals(1, attrs.size()); + assertThat(attrs).hasSize(1); WebExpressionConfigAttribute attribute = (WebExpressionConfigAttribute) attrs .toArray()[0]; - assertNull(attribute.getAttribute()); - assertEquals(expression, attribute.getAuthorizeExpression().getExpressionString()); - assertEquals(expression, attribute.toString()); + assertThat(attribute.getAttribute()).isNull(); + assertThat(attribute.getAuthorizeExpression().getExpressionString()).isEqualTo(expression); + assertThat(attribute.toString()).isEqualTo(expression); } @Test(expected = IllegalArgumentException.class) diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java index 56ca20a86c..53fe1dfbc7 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java @@ -1,7 +1,7 @@ package org.springframework.security.web.access.expression; -import static org.fest.assertions.Assertions.*; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; @@ -37,8 +37,8 @@ public class WebExpressionVoterTests { WebExpressionVoter voter = new WebExpressionVoter(); assertTrue(voter .supports(new WebExpressionConfigAttribute(mock(Expression.class), mock(SecurityEvaluationContextPostProcessor.class)))); - assertTrue(voter.supports(FilterInvocation.class)); - assertFalse(voter.supports(MethodInvocation.class)); + assertThat(voter.supports(FilterInvocation.class)).isTrue(); + assertThat(voter.supports(MethodInvocation.class)).isFalse(); } @@ -73,10 +73,10 @@ public class WebExpressionVoterTests { attributes.addAll(SecurityConfig.createList("A", "B", "C")); attributes.add(weca); - assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(user, fi, attributes)); + assertThat(fi).isCloseTo(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(user, within(attributes))); // Second time false - assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(user, fi, attributes)); + assertThat(fi).isCloseTo(AccessDecisionVoter.ACCESS_DENIED, voter.vote(user, within(attributes))); } // SEC-2507 diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java index 5d78f30790..ed8d12ab6f 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.access.expression; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import javax.servlet.FilterChain; @@ -30,11 +30,11 @@ public class WebSecurityExpressionRootTests { mock(Authentication.class), new FilterInvocation(request, mock(HttpServletResponse.class), mock(FilterChain.class))); - assertTrue(root.hasIpAddress("192.168.1.1")); + assertThat(root.hasIpAddress("192.168.1.1")).isTrue(); // IPv6 Address request.setRemoteAddr("fa:db8:85a3::8a2e:370:7334"); - assertTrue(root.hasIpAddress("fa:db8:85a3::8a2e:370:7334")); + assertThat(root.hasIpAddress("fa:db8:85a3::8a2e:370:7334")).isTrue(); } @Test @@ -46,28 +46,28 @@ public class WebSecurityExpressionRootTests { mock(HttpServletResponse.class), mock(FilterChain.class))); for (int i = 0; i < 255; i++) { request.setRemoteAddr("192.168.1." + i); - assertTrue(root.hasIpAddress("192.168.1.0/24")); + assertThat(root.hasIpAddress("192.168.1.0/24")).isTrue(); } request.setRemoteAddr("192.168.1.127"); // 25 = FF FF FF 80 - assertTrue(root.hasIpAddress("192.168.1.0/25")); + assertThat(root.hasIpAddress("192.168.1.0/25")).isTrue(); // encroach on the mask request.setRemoteAddr("192.168.1.128"); - assertFalse(root.hasIpAddress("192.168.1.0/25")); + assertThat(root.hasIpAddress("192.168.1.0/25")).isFalse(); request.setRemoteAddr("192.168.1.255"); - assertTrue(root.hasIpAddress("192.168.1.128/25")); - assertTrue(root.hasIpAddress("192.168.1.192/26")); - assertTrue(root.hasIpAddress("192.168.1.224/27")); - assertTrue(root.hasIpAddress("192.168.1.240/27")); - assertTrue(root.hasIpAddress("192.168.1.255/32")); + assertThat(root.hasIpAddress("192.168.1.128/25")).isTrue(); + assertThat(root.hasIpAddress("192.168.1.192/26")).isTrue(); + assertThat(root.hasIpAddress("192.168.1.224/27")).isTrue(); + assertThat(root.hasIpAddress("192.168.1.240/27")).isTrue(); + assertThat(root.hasIpAddress("192.168.1.255/32")).isTrue(); request.setRemoteAddr("202.24.199.127"); - assertTrue(root.hasIpAddress("202.24.0.0/14")); + assertThat(root.hasIpAddress("202.24.0.0/14")).isTrue(); request.setRemoteAddr("202.25.179.135"); - assertTrue(root.hasIpAddress("202.24.0.0/14")); + assertThat(root.hasIpAddress("202.24.0.0/14")).isTrue(); request.setRemoteAddr("202.26.179.135"); - assertTrue(root.hasIpAddress("202.24.0.0/14")); + assertThat(root.hasIpAddress("202.24.0.0/14")).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java index e6bec774f2..0d3dd555da 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.access.intercept; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import java.util.Collection; @@ -56,7 +56,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { FilterInvocation fi = createFilterInvocation("/SeCuRE/super/somefile.html", null, null, null); - assertEquals(def, fids.getAttributes(fi)); + assertThat(fids.getAttributes(fi)).isEqualTo(def); } /** @@ -71,7 +71,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { null, null); Collection response = fids.getAttributes(fi); - assertEquals(def, response); + assertThat(response).isEqualTo(def); } @Test @@ -82,7 +82,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { null, null); Collection response = fids.getAttributes(fi); - assertEquals(def, response); + assertThat(response).isEqualTo(def); } @Test @@ -93,7 +93,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { "a=/test", null); Collection response = fids.getAttributes(fi); - assertEquals(def, response); // see SEC-161 (it should truncate after ? sign) + assertThat(response); // see SEC-161 (it should truncate after ? sign).isEqualTo(def) } @Test(expected = IllegalArgumentException.class) @@ -107,7 +107,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { FilterInvocation fi = createFilterInvocation("/somepage", null, null, "GET"); Collection attrs = fids.getAttributes(fi); - assertEquals(def, attrs); + assertThat(attrs).isEqualTo(def); } @Test @@ -116,7 +116,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { FilterInvocation fi = createFilterInvocation("/somepage", null, null, "GET"); Collection attrs = fids.getAttributes(fi); - assertEquals(def, attrs); + assertThat(attrs).isEqualTo(def); } @Test @@ -125,7 +125,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { FilterInvocation fi = createFilterInvocation("/somepage", null, null, "POST"); Collection attrs = fids.getAttributes(fi); - assertNull(attrs); + assertThat(attrs).isNull(); } // SEC-1236 @@ -141,7 +141,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { FilterInvocation fi = createFilterInvocation("/user", null, null, "GET"); Collection attrs = fids.getAttributes(fi); - assertEquals(userAttrs, attrs); + assertThat(attrs).isEqualTo(userAttrs); } /** @@ -155,12 +155,12 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests { null); Collection response = fids.getAttributes(fi); - assertEquals(def, response); + assertThat(response).isEqualTo(def); fi = createFilterInvocation("/someAdminPage.html", null, "?", null); response = fids.getAttributes(fi); - assertEquals(def, response); + assertThat(response).isEqualTo(def); } private FilterInvocation createFilterInvocation(String servletPath, String pathInfo, diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java index e58d9d36da..ce6d44f889 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.access.intercept; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -174,8 +174,8 @@ public class FilterSecurityInterceptorTests { } // Check we've changed back - assertSame(ctx, SecurityContextHolder.getContext()); - assertSame(token, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext()).isSameAs(ctx); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(token); } private FilterInvocation createinvocation() { diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java index 32218cc2a0..703aeddf52 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.access.intercept; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.web.access.intercept.RequestKey; @@ -17,10 +17,10 @@ public class RequestKeyTests { RequestKey key1 = new RequestKey("/someurl"); RequestKey key2 = new RequestKey("/someurl"); - assertEquals(key1, key2); + assertThat(key2).isEqualTo(key1); key1 = new RequestKey("/someurl", "GET"); - assertFalse(key1.equals(key2)); - assertFalse(key2.equals(key1)); + assertThat(key1.equals(key2)).isFalse(); + assertThat(key2.equals(key1)).isFalse(); } @Test @@ -28,7 +28,7 @@ public class RequestKeyTests { RequestKey key1 = new RequestKey("/someurl", "GET"); RequestKey key2 = new RequestKey("/someurl", "GET"); - assertEquals(key1, key2); + assertThat(key2).isEqualTo(key1); } @Test @@ -36,8 +36,8 @@ public class RequestKeyTests { RequestKey key1 = new RequestKey("/someurl", "GET"); RequestKey key2 = new RequestKey("/someurl", "POST"); - assertFalse(key1.equals(key2)); - assertFalse(key2.equals(key1)); + assertThat(key1.equals(key2)).isFalse(); + assertThat(key2.equals(key1)).isFalse(); } @Test @@ -45,7 +45,7 @@ public class RequestKeyTests { RequestKey key1 = new RequestKey("/someurl", "GET"); RequestKey key2 = new RequestKey("/anotherurl", "GET"); - assertFalse(key1.equals(key2)); - assertFalse(key2.equals(key1)); + assertThat(key1.equals(key2)).isFalse(); + assertThat(key2.equals(key1)).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java index e0e6a0105a..4e3328ee60 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java @@ -15,11 +15,11 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -110,7 +110,7 @@ public class AbstractAuthenticationProcessingFilterTests { // the firewall ensures that path parameters are ignored HttpServletRequest firewallRequest = firewall.getFirewalledRequest(request); - assertTrue(filter.requiresAuthentication(firewallRequest, response)); + assertThat(filter.requiresAuthentication(firewallRequest, response)).isTrue(); } @Test @@ -135,9 +135,9 @@ public class AbstractAuthenticationProcessingFilterTests { // Test filter.doFilter(request, response, chain); - assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl()); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals("test", SecurityContextHolder.getContext().getAuthentication() + assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/logged_in.jsp"); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("test") .getPrincipal().toString()); } @@ -148,12 +148,12 @@ public class AbstractAuthenticationProcessingFilterTests { filter.setFilterProcessesUrl("/p"); filter.afterPropertiesSet(); - assertNotNull(filter.getRememberMeServices()); + assertThat(filter.getRememberMeServices()).isNotNull(); filter.setRememberMeServices(new TokenBasedRememberMeServices("key", new AbstractRememberMeServicesTests.MockUserDetailsService())); - assertEquals(TokenBasedRememberMeServices.class, filter.getRememberMeServices() + assertThat(filter.getRememberMeServices().isEqualTo(TokenBasedRememberMeServices.class) .getClass()); - assertTrue(filter.getAuthenticationManager() != null); + assertThat(filter.getAuthenticationManager() != null).isTrue(); } @Test @@ -204,12 +204,12 @@ public class AbstractAuthenticationProcessingFilterTests { // Test filter.doFilter(request, response, chain); - assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl()); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals("test", SecurityContextHolder.getContext().getAuthentication() + assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/logged_in.jsp"); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("test") .getPrincipal().toString()); // Should still have the same session - assertEquals(sessionPreAuth, request.getSession()); + assertThat(request.getSession()).isEqualTo(sessionPreAuth); } @Test @@ -225,7 +225,7 @@ public class AbstractAuthenticationProcessingFilterTests { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("authenticationManager must be specified", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("authenticationManager must be specified"); } } @@ -241,7 +241,7 @@ public class AbstractAuthenticationProcessingFilterTests { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("Pattern cannot be null or empty", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("Pattern cannot be null or empty"); } } @@ -266,9 +266,9 @@ public class AbstractAuthenticationProcessingFilterTests { // Test filter.doFilter(request, response, chain); - assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl()); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals("test", SecurityContextHolder.getContext().getAuthentication() + assertThat(response.getRedirectedUrl()).isEqualTo("/mycontext/logged_in.jsp"); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("test") .getPrincipal().toString()); // Now try again but this time have filter deny access @@ -285,7 +285,7 @@ public class AbstractAuthenticationProcessingFilterTests { // Test filter.doFilter(request, response, chain); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test @@ -314,7 +314,7 @@ public class AbstractAuthenticationProcessingFilterTests { verify(successHandler).onAuthenticationSuccess(any(HttpServletRequest.class), any(HttpServletResponse.class), any(Authentication.class)); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); } @Test @@ -341,7 +341,7 @@ public class AbstractAuthenticationProcessingFilterTests { verify(failureHandler).onAuthenticationFailure(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AuthenticationException.class)); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } /** @@ -362,7 +362,7 @@ public class AbstractAuthenticationProcessingFilterTests { filter.doFilter(request, response, chain); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } /** @@ -382,7 +382,7 @@ public class AbstractAuthenticationProcessingFilterTests { filter.doFilter(request, response, chain); - assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_UNAUTHORIZED); } /** @@ -407,7 +407,7 @@ public class AbstractAuthenticationProcessingFilterTests { filter.doFilter(request, response, chain); verify(logger).error(anyString(), eq(filter.exceptionToThrow)); - assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_UNAUTHORIZED); } // ~ Inner Classes @@ -450,7 +450,7 @@ public class AbstractAuthenticationProcessingFilterTests { public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { if (expectToProceed) { - assertTrue(true); + } else { fail("Did not expect filter chain to proceed"); diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java index f682a22e95..70a0483520 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.*; @@ -84,7 +84,7 @@ public class AnonymousAuthenticationFilterTests { new MockHttpServletResponse(), new MockFilterChain(true)); // Ensure filter didn't change our original object - assertEquals(originalAuth, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isEqualTo(originalAuth); } @Test @@ -101,8 +101,8 @@ public class AnonymousAuthenticationFilterTests { new MockHttpServletResponse(), new MockFilterChain(true)); Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - assertEquals("anonymousUsername", auth.getPrincipal()); - assertTrue(AuthorityUtils.authorityListToSet(auth.getAuthorities()).contains( + assertThat(auth.getPrincipal()).isEqualTo("anonymousUsername"); + assertThat(AuthorityUtils.authorityListToSet(auth.getAuthorities()).isTrue().contains( "ROLE_ANONYMOUS")); SecurityContextHolder.getContext().setAuthentication(null); // so anonymous fires // again diff --git a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java index b79e06bf47..05499ea48f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import java.util.Locale; diff --git a/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java index 975e4513fa..250fe603d0 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; @@ -24,7 +24,7 @@ public class ExceptionMappingAuthenticationFailureHandlerTests { fh.onAuthenticationFailure(new MockHttpServletRequest(), response, new BadCredentialsException("")); - assertEquals("/failed", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/failed"); } @Test @@ -40,7 +40,7 @@ public class ExceptionMappingAuthenticationFailureHandlerTests { fh.onAuthenticationFailure(new MockHttpServletRequest(), response, new BadCredentialsException("")); - assertEquals("/badcreds", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/badcreds"); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java index be07255f76..6a20f68f80 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.authentication; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java index 59d9cb6792..ddce1988cb 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.*; @@ -60,17 +60,17 @@ public class LoginUrlAuthenticationEntryPointTests { "/hello"); ep.setPortMapper(new PortMapperImpl()); ep.setPortResolver(new MockPortResolver(8080, 8443)); - assertEquals("/hello", ep.getLoginFormUrl()); - assertTrue(ep.getPortMapper() != null); - assertTrue(ep.getPortResolver() != null); + assertThat(ep.getLoginFormUrl()).isEqualTo("/hello"); + assertThat(ep.getPortMapper() != null).isTrue(); + assertThat(ep.getPortResolver() != null).isTrue(); ep.setForceHttps(false); - assertFalse(ep.isForceHttps()); + assertThat(ep.isForceHttps()).isFalse(); ep.setForceHttps(true); - assertTrue(ep.isForceHttps()); - assertFalse(ep.isUseForward()); + assertThat(ep.isForceHttps()).isTrue(); + assertThat(ep.isUseForward()).isFalse(); ep.setUseForward(true); - assertTrue(ep.isUseForward()); + assertThat(ep.isUseForward()).isTrue(); } @Test @@ -227,7 +227,7 @@ public class LoginUrlAuthenticationEntryPointTests { MockHttpServletResponse response = new MockHttpServletResponse(); ep.commence(request, response, null); - assertEquals("/hello", response.getForwardedUrl()); + assertThat(response.getForwardedUrl()).isEqualTo("/hello"); } @Test @@ -263,7 +263,7 @@ public class LoginUrlAuthenticationEntryPointTests { ep.afterPropertiesSet(); MockHttpServletResponse response = new MockHttpServletResponse(); ep.commence(new MockHttpServletRequest("GET", "/someUrl"), response, null); - assertEquals(loginFormUrl, response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo(loginFormUrl); } @Test(expected = IllegalArgumentException.class) diff --git a/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java index 395e3ff86f..b44afd1aaf 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.*; import org.junit.Test; @@ -47,4 +47,4 @@ public class SavedRequestAwareAuthenticationSuccessHandlerTests { verify(redirectStrategy).sendRedirect(request, response, redirectUrl); } -} \ No newline at end of file +} diff --git a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java index 4d187b2cdd..defa7a71e2 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import org.junit.Test; @@ -21,13 +21,13 @@ public class SimpleUrlAuthenticationFailureHandlerTests { SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler(); RedirectStrategy rs = mock(RedirectStrategy.class); afh.setRedirectStrategy(rs); - assertSame(rs, afh.getRedirectStrategy()); + assertThat(afh.getRedirectStrategy()).isSameAs(rs); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); afh.onAuthenticationFailure(request, response, mock(AuthenticationException.class)); - assertEquals(401, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -42,7 +42,7 @@ public class SimpleUrlAuthenticationFailureHandlerTests { afh.onAuthenticationFailure(request, response, e); assertSame(e, request.getSession().getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION)); - assertEquals("/target", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/target"); } @Test @@ -50,13 +50,13 @@ public class SimpleUrlAuthenticationFailureHandlerTests { SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler( "/target"); afh.setAllowSessionCreation(false); - assertFalse(afh.isAllowSessionCreation()); + assertThat(afh.isAllowSessionCreation()).isFalse(); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); afh.onAuthenticationFailure(request, response, mock(AuthenticationException.class)); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } // SEC-462 @@ -65,18 +65,18 @@ public class SimpleUrlAuthenticationFailureHandlerTests { SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler( "/target"); afh.setUseForward(true); - assertTrue(afh.isUseForward()); + assertThat(afh.isUseForward()).isTrue(); MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); AuthenticationException e = mock(AuthenticationException.class); afh.onAuthenticationFailure(request, response, e); - assertNull(request.getSession(false)); - assertNull(response.getRedirectedUrl()); - assertEquals("/target", response.getForwardedUrl()); + assertThat(request.getSession(false)).isNull(); + assertThat(response.getRedirectedUrl()).isNull(); + assertThat(response.getForwardedUrl()).isEqualTo("/target"); // Request scope should be used for forward - assertSame(e, request.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION)); + assertThat(request.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION)).isSameAs(e); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java index cbdf0a806f..361649c55d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; @@ -22,7 +22,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { ash.onAuthenticationSuccess(request, response, mock(Authentication.class)); - assertEquals("/", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/"); } // SEC-1428 @@ -35,7 +35,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { response.setCommitted(true); ash.onAuthenticationSuccess(request, response, mock(Authentication.class)); - assertNull(response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isNull(); } /** @@ -50,13 +50,13 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { request.setParameter("targetUrl", "/target"); ash.onAuthenticationSuccess(request, response, mock(Authentication.class)); - assertEquals("/defaultTarget", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/defaultTarget"); // Try with parameter set ash.setTargetUrlParameter("targetUrl"); response = new MockHttpServletResponse(); ash.onAuthenticationSuccess(request, response, mock(Authentication.class)); - assertEquals("/target", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/target"); } @Test @@ -69,7 +69,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { request.addHeader("Referer", "http://www.springsource.com/"); ash.onAuthenticationSuccess(request, response, mock(Authentication.class)); - assertEquals("http://www.springsource.com/", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("http://www.springsource.com/"); } /** @@ -85,7 +85,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { ash.onAuthenticationSuccess(request, response, mock(Authentication.class)); - assertEquals("https://monkeymachine.co.uk/", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("https://monkeymachine.co.uk/"); } @Test @@ -93,7 +93,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler(); ash.setTargetUrlParameter("targetUrl"); ash.setTargetUrlParameter(null); - assertEquals(null, ash.getTargetUrlParameter()); + assertThat(ash.getTargetUrlParameter()).isEqualTo(null); } @Test diff --git a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java index afd0e271d0..1514eef01d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java @@ -57,7 +57,7 @@ public class UsernamePasswordAuthenticationFilterTests extends TestCase { Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse()); - assertTrue(result != null); + assertThat(result != null).isTrue(); assertEquals("127.0.0.1", ((WebAuthenticationDetails) result.getDetails()).getRemoteAddress()); } @@ -101,7 +101,7 @@ public class UsernamePasswordAuthenticationFilterTests extends TestCase { Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse()); - assertNotNull(result); + assertThat(result).isNotNull(); assertEquals("127.0.0.1", ((WebAuthenticationDetails) result.getDetails()).getRemoteAddress()); } @@ -121,7 +121,7 @@ public class UsernamePasswordAuthenticationFilterTests extends TestCase { Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse()); - assertEquals("rod", result.getName()); + assertThat(result.getName()).isEqualTo("rod"); } @Test @@ -158,7 +158,7 @@ public class UsernamePasswordAuthenticationFilterTests extends TestCase { filter.attemptAuthentication(request, new MockHttpServletResponse()); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } private AuthenticationManager createAuthenticationManager() { diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java index 427e45f8cb..91e8355068 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.logout; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import javax.servlet.http.Cookie; @@ -23,10 +23,10 @@ public class CookieClearingLogoutHandlerTests { request.setContextPath(""); CookieClearingLogoutHandler handler = new CookieClearingLogoutHandler("my_cookie"); handler.logout(request, response, mock(Authentication.class)); - assertEquals(1, response.getCookies().length); + assertThat(response.getCookies().length).isEqualTo(1); for (Cookie c : response.getCookies()) { - assertEquals("/", c.getPath()); - assertEquals(0, c.getMaxAge()); + assertThat(c.getPath()).isEqualTo("/"); + assertThat(c.getMaxAge()).isEqualTo(0); } } @@ -38,10 +38,10 @@ public class CookieClearingLogoutHandlerTests { CookieClearingLogoutHandler handler = new CookieClearingLogoutHandler( "my_cookie", "my_cookie_too"); handler.logout(request, response, mock(Authentication.class)); - assertEquals(2, response.getCookies().length); + assertThat(response.getCookies().length).isEqualTo(2); for (Cookie c : response.getCookies()) { - assertEquals("/app", c.getPath()); - assertEquals(0, c.getMaxAge()); + assertThat(c.getPath()).isEqualTo("/app"); + assertThat(c.getMaxAge()).isEqualTo(0); } } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/HttpStatusReturningLogoutSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/HttpStatusReturningLogoutSuccessHandlerTests.java index 395f47b423..2eddafbef5 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/HttpStatusReturningLogoutSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/HttpStatusReturningLogoutSuccessHandlerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.authentication.logout; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import org.junit.Assert; diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java index c97b6370c2..3aac16b1c3 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java @@ -27,7 +27,7 @@ public class LogoutHandlerTests extends TestCase { request.setQueryString("otherparam=blah"); DefaultHttpFirewall fw = new DefaultHttpFirewall(); - assertTrue(filter.requiresLogout(fw.getFirewalledRequest(request), response)); + assertThat(filter.requiresLogout(fw.getFirewalledRequest(request), response)).isTrue(); } public void testRequiresLogoutUrlWorksWithQueryParams() { @@ -39,7 +39,7 @@ public class LogoutHandlerTests extends TestCase { request.setRequestURI("/context/logout?param=blah"); request.setQueryString("otherparam=blah"); - assertTrue(filter.requiresLogout(request, response)); + assertThat(filter.requiresLogout(request, response)).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java index 6f4ec6568b..36fa27f3b0 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.web.authentication.logout; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.After; import org.junit.Before; @@ -59,7 +59,7 @@ public class SecurityContextLogoutHandlerTests { SecurityContext beforeContext = SecurityContextHolder.getContext(); handler.logout(request, response, SecurityContextHolder.getContext() .getAuthentication()); - assertNull(beforeContext.getAuthentication()); + assertThat(beforeContext.getAuthentication()).isNull(); } @Test @@ -70,7 +70,7 @@ public class SecurityContextLogoutHandlerTests { handler.logout(request, response, SecurityContextHolder.getContext() .getAuthentication()); - assertNotNull(beforeContext.getAuthentication()); - assertSame(beforeAuthentication, beforeContext.getAuthentication()); + assertThat(beforeContext.getAuthentication()).isNotNull(); + assertThat(beforeContext.getAuthentication()).isSameAs(beforeAuthentication); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java index 8c15558698..56068a8105 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.logout; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import org.junit.Test; @@ -22,9 +22,9 @@ public class SimpleUrlLogoutSuccessHandlerTests { MockHttpServletResponse response = new MockHttpServletResponse(); response.setCommitted(true); lsh.onLogoutSuccess(request, response, mock(Authentication.class)); - assertNull(request.getSession(false)); - assertNull(response.getRedirectedUrl()); - assertNull(response.getForwardedUrl()); + assertThat(request.getSession(false)).isNull(); + assertThat(response.getRedirectedUrl()).isNull(); + assertThat(response.getForwardedUrl()).isNull(); } @Test @@ -34,7 +34,7 @@ public class SimpleUrlLogoutSuccessHandlerTests { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); lsh.onLogoutSuccess(request, response, mock(Authentication.class)); - assertEquals("http://someurl.com/", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("http://someurl.com/"); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java index 8cd4a2dbc4..ee764449a5 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java @@ -12,10 +12,10 @@ */ package org.springframework.security.web.authentication.preauth; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -79,7 +79,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { filter.afterPropertiesSet(); filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class)); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } /* SEC-881 */ @@ -94,7 +94,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { filter.afterPropertiesSet(); filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class)); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test @@ -118,7 +118,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { AuthenticationManager am = mock(AuthenticationManager.class); filter.setAuthenticationManager(am); filter.afterPropertiesSet(); - assertTrue(filter.initFilterBeanInvoked); + assertThat(filter.initFilterBeanInvoked).isTrue(); } @Test @@ -143,7 +143,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), new MockFilterChain()); - assertEquals(null, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isEqualTo(null); } @Test @@ -158,7 +158,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), new MockFilterChain()); - assertEquals(authentication, SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().isEqualTo(authentication) .getAuthentication()); } @@ -332,7 +332,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { MockHttpServletRequest req = new MockHttpServletRequest(); MockHttpServletResponse res = new MockHttpServletResponse(); getFilter(grantAccess).doFilter(req, res, new MockFilterChain()); - assertEquals(grantAccess, null != SecurityContextHolder.getContext() + assertThat(null != SecurityContextHolder.getContext().isEqualTo(grantAccess) .getAuthentication()); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java old mode 100755 new mode 100644 index 89a00a0565..b996885d9b --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java @@ -22,7 +22,7 @@ public class Http403ForbiddenEntryPointTests extends TestCase { try { fep.commence(req, resp, new AuthenticationCredentialsNotFoundException("test")); - assertEquals("Incorrect status", resp.getStatus(), + assertThat(resp.getStatus().isEqualTo("Incorrect status"), HttpServletResponse.SC_FORBIDDEN); } catch (IOException e) { diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java old mode 100755 new mode 100644 index efde222d30..a921813e18 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.preauth; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -39,7 +39,7 @@ public class PreAuthenticatedAuthenticationProviderTests { Authentication request = new UsernamePasswordAuthenticationToken("dummyUser", "dummyPwd"); Authentication result = provider.authenticate(request); - assertNull(result); + assertThat(result).isNull(); } @Test @@ -47,7 +47,7 @@ public class PreAuthenticatedAuthenticationProviderTests { PreAuthenticatedAuthenticationProvider provider = new PreAuthenticatedAuthenticationProvider(); Authentication request = new PreAuthenticatedAuthenticationToken(null, "dummyPwd"); Authentication result = provider.authenticate(request); - assertNull(result); + assertThat(result).isNull(); } @Test @@ -58,8 +58,8 @@ public class PreAuthenticatedAuthenticationProviderTests { Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser", "dummyPwd"); Authentication result = provider.authenticate(request); - assertNotNull(result); - assertEquals(result.getPrincipal(), ud); + assertThat(result).isNotNull(); + assertThat(ud).isEqualTo(result.getPrincipal()); // @TODO: Add more asserts? } @@ -71,8 +71,8 @@ public class PreAuthenticatedAuthenticationProviderTests { Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser1", "dummyPwd2"); Authentication result = provider.authenticate(request); - assertNotNull(result); - assertEquals(result.getPrincipal(), ud); + assertThat(result).isNotNull(); + assertThat(ud).isEqualTo(result.getPrincipal()); // @TODO: Add more asserts? } @@ -89,20 +89,20 @@ public class PreAuthenticatedAuthenticationProviderTests { @Test public final void supportsArbitraryObject() throws Exception { PreAuthenticatedAuthenticationProvider provider = getProvider(null); - assertFalse(provider.supports(Authentication.class)); + assertThat(provider.supports(Authentication.class)).isFalse(); } @Test public final void supportsPreAuthenticatedAuthenticationToken() throws Exception { PreAuthenticatedAuthenticationProvider provider = getProvider(null); - assertTrue(provider.supports(PreAuthenticatedAuthenticationToken.class)); + assertThat(provider.supports(PreAuthenticatedAuthenticationToken.class)).isTrue(); } @Test public void getSetOrder() throws Exception { PreAuthenticatedAuthenticationProvider provider = getProvider(null); provider.setOrder(333); - assertEquals(provider.getOrder(), 333); + assertThat(333).isEqualTo(provider.getOrder()); } private PreAuthenticatedAuthenticationProvider getProvider(UserDetails aUserDetails) diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java old mode 100755 new mode 100644 index da67325edd..6061250586 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java @@ -23,10 +23,10 @@ public class PreAuthenticatedAuthenticationTokenTests extends TestCase { PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken( principal, credentials); token.setDetails(details); - assertEquals(principal, token.getPrincipal()); - assertEquals(credentials, token.getCredentials()); - assertEquals(details, token.getDetails()); - assertTrue(token.getAuthorities().isEmpty()); + assertThat(token.getPrincipal()).isEqualTo(principal); + assertThat(token.getCredentials()).isEqualTo(credentials); + assertThat(token.getDetails()).isEqualTo(details); + assertThat(token.getAuthorities().isEmpty()).isTrue(); } public void testPreAuthenticatedAuthenticationTokenRequestWithoutDetails() { @@ -34,10 +34,10 @@ public class PreAuthenticatedAuthenticationTokenTests extends TestCase { Object credentials = "dummyCredentials"; PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken( principal, credentials); - assertEquals(principal, token.getPrincipal()); - assertEquals(credentials, token.getCredentials()); - assertNull(token.getDetails()); - assertTrue(token.getAuthorities().isEmpty()); + assertThat(token.getPrincipal()).isEqualTo(principal); + assertThat(token.getCredentials()).isEqualTo(credentials); + assertThat(token.getDetails()).isNull(); + assertThat(token.getAuthorities().isEmpty()).isTrue(); } public void testPreAuthenticatedAuthenticationTokenResponse() { @@ -46,10 +46,10 @@ public class PreAuthenticatedAuthenticationTokenTests extends TestCase { List gas = AuthorityUtils.createAuthorityList("Role1"); PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken( principal, credentials, gas); - assertEquals(principal, token.getPrincipal()); - assertEquals(credentials, token.getCredentials()); - assertNull(token.getDetails()); - assertNotNull(token.getAuthorities()); + assertThat(token.getPrincipal()).isEqualTo(principal); + assertThat(token.getCredentials()).isEqualTo(credentials); + assertThat(token.getDetails()).isNull(); + assertThat(token.getAuthorities()).isNotNull(); Collection resultColl = token.getAuthorities(); assertTrue("GrantedAuthority collections do not match; result: " + resultColl + ", expected: " + gas, diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java old mode 100755 new mode 100644 index 047a3304b6..8f0ab7edac --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.preauth; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.*; @@ -58,15 +58,15 @@ public class PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests { } }); UserDetails ud = svc.loadUserDetails(token); - assertTrue(ud.isAccountNonExpired()); - assertTrue(ud.isAccountNonLocked()); - assertTrue(ud.isCredentialsNonExpired()); - assertTrue(ud.isEnabled()); - assertEquals(ud.getUsername(), userName); + assertThat(ud.isAccountNonExpired()).isTrue(); + assertThat(ud.isAccountNonLocked()).isTrue(); + assertThat(ud.isCredentialsNonExpired()).isTrue(); + assertThat(ud.isEnabled()).isTrue(); + assertThat(userName).isEqualTo(ud.getUsername()); // Password is not saved by // PreAuthenticatedGrantedAuthoritiesUserDetailsService - // assertEquals(ud.getPassword(),password); + // assertThat(password).isEqualTo(ud.getPassword()); assertTrue( "GrantedAuthority collections do not match; result: " diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java old mode 100755 new mode 100644 index 3942f97b92..eb3af81fda --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java @@ -24,8 +24,8 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests { PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails( getRequest("testUser", new String[] {}), gas); String toString = details.toString(); - assertTrue("toString should contain Role1", toString.contains("Role1")); - assertTrue("toString should contain Role2", toString.contains("Role2")); + assertThat(toString.contains("Role1")).as("toString should contain Role1").isTrue(); + assertThat(toString.contains("Role2")).as("toString should contain Role2").isTrue(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java index 136ebf72b6..41fe702dca 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.preauth.header; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -50,10 +50,10 @@ public class RequestHeaderAuthenticationFilterTests { filter.setAuthenticationManager(createAuthenticationManager()); filter.doFilter(request, response, chain); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals("cat", SecurityContextHolder.getContext().getAuthentication() + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("cat") .getName()); - assertEquals("N/A", SecurityContextHolder.getContext().getAuthentication() + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("N/A") .getCredentials()); } @@ -68,8 +68,8 @@ public class RequestHeaderAuthenticationFilterTests { filter.setPrincipalRequestHeader("myUsernameHeader"); filter.doFilter(request, response, chain); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals("wolfman", SecurityContextHolder.getContext().getAuthentication() + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(SecurityContextHolder.getContext().getAuthentication().isEqualTo("wolfman") .getName()); } @@ -85,8 +85,8 @@ public class RequestHeaderAuthenticationFilterTests { request.addHeader("myCredentialsHeader", "catspassword"); filter.doFilter(request, response, chain); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals("catspassword", SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(SecurityContextHolder.getContext().isEqualTo("catspassword") .getAuthentication().getCredentials()); } @@ -104,13 +104,13 @@ public class RequestHeaderAuthenticationFilterTests { request.addHeader("SM_USER", "dog"); filter.doFilter(request, response, new MockFilterChain()); Authentication dog = SecurityContextHolder.getContext().getAuthentication(); - assertNotNull(dog); - assertEquals("dog", dog.getName()); + assertThat(dog).isNotNull(); + assertThat(dog.getName()).isEqualTo("dog"); // Make sure authentication doesn't occur every time (i.e. if the header *doesn't // change) filter.setAuthenticationManager(mock(AuthenticationManager.class)); filter.doFilter(request, response, new MockFilterChain()); - assertSame(dog, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(dog); } @Test(expected = PreAuthenticatedCredentialsNotFoundException.class) diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java old mode 100755 new mode 100644 index c4daf00b11..2451fcd4e8 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java @@ -91,15 +91,15 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests extend String[] expectedRoles) { J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource src = getJ2eeBasedPreAuthenticatedWebAuthenticationDetailsSource(mappedRoles); Object o = src.buildDetails(getRequest("testUser", userRoles)); - assertNotNull(o); + assertThat(o).isNotNull(); assertTrue( "Returned object not of type PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails, actual type: " + o.getClass(), o instanceof PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails); PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = (PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails) o; List gas = details.getGrantedAuthorities(); - assertNotNull("Granted authorities should not be null", gas); - assertEquals(expectedRoles.length, gas.size()); + assertThat(gas).as("Granted authorities should not be null").isNotNull(); + assertThat(gas.size()).isEqualTo(expectedRoles.length); Collection expectedRolesColl = Arrays.asList(expectedRoles); Collection gasRolesSet = new HashSet(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java old mode 100755 new mode 100644 diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java old mode 100755 new mode 100644 index 4f0658cdd6..8cfbcbaa11 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.preauth.j2ee; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.List; @@ -32,11 +32,11 @@ public class WebXmlJ2eeDefinedRolesRetrieverTests { rolesRetriever.afterPropertiesSet(); Set j2eeRoles = rolesRetriever.getMappableAttributes(); - assertNotNull(j2eeRoles); - assertTrue("J2eeRoles expected size: " + ROLE1TO4_EXPECTED_ROLES.size() + assertThat(j2eeRoles).isNotNull(); + assertThat("J2eeRoles expected size: " + ROLE1TO4_EXPECTED_ROLES.size().isTrue() + ", actual size: " + j2eeRoles.size(), j2eeRoles.size() == ROLE1TO4_EXPECTED_ROLES.size()); - assertTrue("J2eeRoles expected contents (arbitrary order): " + assertThat("J2eeRoles expected contents (arbitrary order).isTrue(): " + ROLE1TO4_EXPECTED_ROLES + ", actual content: " + j2eeRoles, j2eeRoles.containsAll(ROLE1TO4_EXPECTED_ROLES)); } @@ -56,7 +56,7 @@ public class WebXmlJ2eeDefinedRolesRetrieverTests { }); rolesRetriever.afterPropertiesSet(); Set j2eeRoles = rolesRetriever.getMappableAttributes(); - assertEquals("J2eeRoles expected size: 0, actual size: " + j2eeRoles.size(), 0, + assertThat(actual size: " + j2eeRoles.size().isEqualTo("J2eeRoles expected size: 0), 0, j2eeRoles.size()); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java index 58d0000f51..da76ee6c37 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.preauth.websphere; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java index bdc832a6c1..c24ce667fe 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java @@ -30,7 +30,7 @@ public class SubjectDnX509PrincipalExtractorTests { public void defaultCNPatternReturnsExcpectedPrincipal() throws Exception { Object principal = extractor.extractPrincipal(X509TestUtils .buildTestCertificate()); - assertEquals("Luke Taylor", principal); + assertThat(principal).isEqualTo("Luke Taylor"); } @Test @@ -38,7 +38,7 @@ public class SubjectDnX509PrincipalExtractorTests { extractor.setSubjectDnRegex("emailAddress=(.*?),"); Object principal = extractor.extractPrincipal(X509TestUtils .buildTestCertificate()); - assertEquals("luke@monkeymachine", principal); + assertThat(principal).isEqualTo("luke@monkeymachine"); } @Test(expected = BadCredentialsException.class) @@ -51,6 +51,6 @@ public class SubjectDnX509PrincipalExtractorTests { public void defaultCNPatternReturnsPrincipalAtEndOfDNString() throws Exception { Object principal = extractor.extractPrincipal(X509TestUtils .buildTestCertificateWithCnAtEnd()); - assertEquals("Duke", principal); + assertThat(principal).isEqualTo("Duke"); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java index 4819b46403..55ca14d3e1 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java @@ -1,8 +1,8 @@ package org.springframework.security.web.authentication.rememberme; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.powermock.api.mockito.PowerMockito.*; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -61,19 +61,19 @@ public class AbstractRememberMeServicesTests { @Test public void setAndGetAreConsistent() throws Exception { MockRememberMeServices services = new MockRememberMeServices(uds); - assertNotNull(services.getCookieName()); - assertNotNull(services.getParameter()); - assertEquals("xxxx", services.getKey()); + assertThat(services.getCookieName()).isNotNull(); + assertThat(services.getParameter()).isNotNull(); + assertThat(services.getKey()).isEqualTo("xxxx"); services.setParameter("rm"); - assertEquals("rm", services.getParameter()); + assertThat(services.getParameter()).isEqualTo("rm"); services.setCookieName("kookie"); - assertEquals("kookie", services.getCookieName()); + assertThat(services.getCookieName()).isEqualTo("kookie"); services.setTokenValiditySeconds(600); - assertEquals(600, services.getTokenValiditySeconds()); - assertSame(uds, services.getUserDetailsService()); + assertThat(services.getTokenValiditySeconds()).isEqualTo(600); + assertThat(services.getUserDetailsService()).isSameAs(uds); AuthenticationDetailsSource ads = mock(AuthenticationDetailsSource.class); services.setAuthenticationDetailsSource(ads); - assertSame(ads, services.getAuthenticationDetailsSource()); + assertThat(services.getAuthenticationDetailsSource()).isSameAs(ads); services.afterPropertiesSet(); } @@ -84,14 +84,14 @@ public class AbstractRememberMeServicesTests { String encoded = services.encodeCookie(cookie); // '=' aren't allowed in version 0 cookies. - assertFalse(encoded.endsWith("=")); + assertThat(encoded.endsWith("=")).isFalse(); String[] decoded = services.decodeCookie(encoded); - assertEquals(4, decoded.length); - assertEquals("name", decoded[0]); - assertEquals("cookie", decoded[1]); - assertEquals("tokens", decoded[2]); - assertEquals("blah", decoded[3]); + assertThat(decoded.length).isEqualTo(4); + assertThat(decoded[0]).isEqualTo("name"); + assertThat(decoded[1]).isEqualTo("cookie"); + assertThat(decoded[2]).isEqualTo("tokens"); + assertThat(decoded[3]).isEqualTo("blah"); } @Test @@ -101,14 +101,14 @@ public class AbstractRememberMeServicesTests { MockRememberMeServices services = new MockRememberMeServices(uds); String[] decoded = services.decodeCookie(services.encodeCookie(cookie)); - assertEquals(4, decoded.length); - assertEquals("http://id.openid.zz", decoded[0]); + assertThat(decoded.length).isEqualTo(4); + assertThat(decoded[0]).isEqualTo("http://id.openid.zz"); // Check https (SEC-1410) cookie[0] = "https://id.openid.zz"; decoded = services.decodeCookie(services.encodeCookie(cookie)); - assertEquals(4, decoded.length); - assertEquals("https://id.openid.zz", decoded[0]); + assertThat(decoded.length).isEqualTo(4); + assertThat(decoded[0]).isEqualTo("https://id.openid.zz"); } @Test @@ -117,7 +117,7 @@ public class AbstractRememberMeServicesTests { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); // shouldn't try to invalidate our cookie assertNull(response @@ -127,7 +127,7 @@ public class AbstractRememberMeServicesTests { response = new MockHttpServletResponse(); // set non-login cookie request.setCookies(new Cookie("mycookie", "cookie")); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); assertNull(response .getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)); } @@ -136,7 +136,7 @@ public class AbstractRememberMeServicesTests { public void successfulAutoLoginReturnsExpectedAuthentication() throws Exception { MockRememberMeServices services = new MockRememberMeServices(uds); services.afterPropertiesSet(); - assertNotNull(services.getUserDetailsService()); + assertThat(services.getUserDetailsService()).isNotNull(); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -145,7 +145,7 @@ public class AbstractRememberMeServicesTests { Authentication result = services.autoLogin(request, response); - assertNotNull(result); + assertThat(result).isNotNull(); } @Test @@ -157,7 +157,7 @@ public class AbstractRememberMeServicesTests { request.setCookies(new Cookie( AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, "ZZZ")); Authentication result = services.autoLogin(request, response); - assertNull(result); + assertThat(result).isNull(); assertCookieCancelled(response); } @@ -170,7 +170,7 @@ public class AbstractRememberMeServicesTests { request.setCookies(new Cookie( AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, "")); Authentication result = services.autoLogin(request, response); - assertNull(result); + assertThat(result).isNull(); assertCookieCancelled(response); } @@ -186,7 +186,7 @@ public class AbstractRememberMeServicesTests { Authentication result = services.autoLogin(request, response); - assertNull(result); + assertThat(result).isNull(); assertCookieCancelled(response); } @@ -202,7 +202,7 @@ public class AbstractRememberMeServicesTests { Authentication result = services.autoLogin(request, response); - assertNull(result); + assertThat(result).isNull(); assertCookieCancelled(response); } @@ -220,7 +220,7 @@ public class AbstractRememberMeServicesTests { Authentication result = services.autoLogin(request, response); - assertNull(result); + assertThat(result).isNull(); assertCookieCancelled(response); } @@ -284,32 +284,32 @@ public class AbstractRememberMeServicesTests { // No parameter set services.loginSuccess(request, response, auth); - assertFalse(services.loginSuccessCalled); + assertThat(services.loginSuccessCalled).isFalse(); // Parameter set to true services = new MockRememberMeServices(uds); request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "true"); services.loginSuccess(request, response, auth); - assertTrue(services.loginSuccessCalled); + assertThat(services.loginSuccessCalled).isTrue(); // Different parameter name, set to true services = new MockRememberMeServices(uds); services.setParameter("my_parameter"); request.setParameter("my_parameter", "true"); services.loginSuccess(request, response, auth); - assertTrue(services.loginSuccessCalled); + assertThat(services.loginSuccessCalled).isTrue(); // Parameter set to false services = new MockRememberMeServices(uds); request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "false"); services.loginSuccess(request, response, auth); - assertFalse(services.loginSuccessCalled); + assertThat(services.loginSuccessCalled).isFalse(); // alwaysRemember set to true services = new MockRememberMeServices(uds); services.setAlwaysRemember(true); services.loginSuccess(request, response, auth); - assertTrue(services.loginSuccessCalled); + assertThat(services.loginSuccessCalled).isTrue(); } @Test @@ -326,11 +326,11 @@ public class AbstractRememberMeServicesTests { services.setCookie(new String[] { "mycookie" }, 1000, request, response); Cookie cookie = response.getCookie("mycookiename"); - assertNotNull(cookie); - assertEquals("mycookie", cookie.getValue()); - assertEquals("mycookiename", cookie.getName()); - assertEquals("contextpath", cookie.getPath()); - assertFalse(cookie.getSecure()); + assertThat(cookie).isNotNull(); + assertThat(cookie.getValue()).isEqualTo("mycookie"); + assertThat(cookie.getName()).isEqualTo("mycookiename"); + assertThat(cookie.getPath()).isEqualTo("contextpath"); + assertThat(cookie.getSecure()).isFalse(); } @Test @@ -348,7 +348,7 @@ public class AbstractRememberMeServicesTests { services.setCookie(new String[] { "mycookie" }, 1000, request, response); Cookie cookie = response .getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertTrue(cookie.getSecure()); + assertThat(cookie.getSecure()).isTrue(); } @Test @@ -358,11 +358,11 @@ public class AbstractRememberMeServicesTests { .thenReturn(null); MockRememberMeServices services = new MockRememberMeServices(uds); - assertNull(ReflectionTestUtils.getField(services, "setHttpOnlyMethod")); + assertThat(ReflectionTestUtils.getField(services, "setHttpOnlyMethod")).isNull(); services = new MockRememberMeServices("key", new MockUserDetailsService(joe, false)); - assertNull(ReflectionTestUtils.getField(services, "setHttpOnlyMethod")); + assertThat(ReflectionTestUtils.getField(services, "setHttpOnlyMethod")).isNull(); } // SEC-2791 @@ -420,8 +420,8 @@ public class AbstractRememberMeServicesTests { private void assertCookieCancelled(MockHttpServletResponse response) { Cookie returnedCookie = response .getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } // ~ Inner Classes diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java index 9020bd189d..a10320547f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.authentication.rememberme; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; @@ -90,10 +90,10 @@ public class JdbcTokenRepositoryImplTests { Map results = template .queryForMap("select * from persistent_logins"); - assertEquals(currentDate, results.get("last_used")); - assertEquals("joeuser", results.get("username")); - assertEquals("joesseries", results.get("series")); - assertEquals("atoken", results.get("token")); + assertThat(results.get("last_used")).isEqualTo(currentDate); + assertThat(results.get("username")).isEqualTo("joeuser"); + assertThat(results.get("series")).isEqualTo("joesseries"); + assertThat(results.get("token")).isEqualTo("atoken"); } @Test @@ -103,10 +103,10 @@ public class JdbcTokenRepositoryImplTests { + "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')"); PersistentRememberMeToken token = repo.getTokenForSeries("joesseries"); - assertEquals("joeuser", token.getUsername()); - assertEquals("joesseries", token.getSeries()); - assertEquals("atoken", token.getTokenValue()); - assertEquals(Timestamp.valueOf("2007-10-09 18:19:25.000000000"), token.getDate()); + assertThat(token.getUsername()).isEqualTo("joeuser"); + assertThat(token.getSeries()).isEqualTo("joesseries"); + assertThat(token.getTokenValue()).isEqualTo("atoken"); + assertThat(token.getDate()).isEqualTo(Timestamp.valueOf("2007-10-09 18:19:25.000000000")); } @Test @@ -119,7 +119,7 @@ public class JdbcTokenRepositoryImplTests { // List results = // template.queryForList("select * from persistent_logins where series = 'joesseries'"); - assertNull(repo.getTokenForSeries("joesseries")); + assertThat(repo.getTokenForSeries("joesseries")).isNull(); } // SEC-1964 @@ -127,7 +127,7 @@ public class JdbcTokenRepositoryImplTests { public void retrievingTokenWithNoSeriesReturnsNull() { when(logger.isDebugEnabled()).thenReturn(true); - assertNull(repo.getTokenForSeries("missingSeries")); + assertThat(repo.getTokenForSeries("missingSeries")).isNull(); verify(logger).isDebugEnabled(); verify(logger).debug( @@ -151,7 +151,7 @@ public class JdbcTokenRepositoryImplTests { List> results = template .queryForList("select * from persistent_logins where username = 'joeuser'"); - assertEquals(0, results.size()); + assertThat(results).isEmpty(); } @Test @@ -164,11 +164,11 @@ public class JdbcTokenRepositoryImplTests { Map results = template .queryForMap("select * from persistent_logins where series = 'joesseries'"); - assertEquals("joeuser", results.get("username")); - assertEquals("joesseries", results.get("series")); - assertEquals("newtoken", results.get("token")); + assertThat(results.get("username")).isEqualTo("joeuser"); + assertThat(results.get("series")).isEqualTo("joesseries"); + assertThat(results.get("token")).isEqualTo("newtoken"); Date lastUsed = (Date) results.get("last_used"); - assertTrue(lastUsed.getTime() > ts.getTime()); + assertThat(lastUsed.getTime() > ts.getTime()).isTrue(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java index c44c616e5d..0ad25b96ec 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java @@ -30,9 +30,9 @@ public class NullRememberMeServicesTests extends TestCase { public void testAlwaysReturnsNull() { NullRememberMeServices services = new NullRememberMeServices(); - assertNull(services.autoLogin(null, null)); + assertThat(services.autoLogin(null, null)).isNull(); services.loginFail(null, null); services.loginSuccess(null, null, null); - assertTrue(true); + } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java index 6f3dce54d3..c01d56440c 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.authentication.rememberme; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.util.Date; import java.util.concurrent.TimeUnit; @@ -81,12 +81,12 @@ public class PersistentTokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), response); - assertEquals("series", repo.getStoredToken().getSeries()); - assertEquals(16, repo.getStoredToken().getTokenValue().length()); + assertThat(repo.getStoredToken().getSeries()).isEqualTo("series"); + assertThat(repo.getStoredToken().getTokenValue().length()).isEqualTo(16); String[] cookie = services.decodeCookie(response.getCookie("mycookiename") .getValue()); - assertEquals("series", cookie[0]); - assertEquals(repo.getStoredToken().getTokenValue(), cookie[1]); + assertThat(cookie[0]).isEqualTo("series"); + assertThat(cookie[1]).isEqualTo(repo.getStoredToken().getTokenValue()); } @Test @@ -98,14 +98,14 @@ public class PersistentTokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); services.loginSuccess(new MockHttpServletRequest(), response, new UsernamePasswordAuthenticationToken("joe", "password")); - assertEquals(16, repo.getStoredToken().getSeries().length()); - assertEquals(16, repo.getStoredToken().getTokenValue().length()); + assertThat(repo.getStoredToken().getSeries().length()).isEqualTo(16); + assertThat(repo.getStoredToken().getTokenValue().length()).isEqualTo(16); String[] cookie = services.decodeCookie(response.getCookie("mycookiename") .getValue()); - assertEquals(repo.getStoredToken().getSeries(), cookie[0]); - assertEquals(repo.getStoredToken().getTokenValue(), cookie[1]); + assertThat(cookie[0]).isEqualTo(repo.getStoredToken().getSeries()); + assertThat(cookie[1]).isEqualTo(repo.getStoredToken().getTokenValue()); } @Test @@ -119,8 +119,8 @@ public class PersistentTokenBasedRememberMeServicesTests { services.logout(request, response, new TestingAuthenticationToken("joe", "somepass", "SOME_AUTH")); Cookie returnedCookie = response.getCookie("mycookiename"); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); // SEC-1280 services.logout(request, response, null); diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java index afc35331ab..4788e7976e 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.authentication.rememberme; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -88,7 +88,7 @@ public class RememberMeAuthenticationFilterTests { filter.doFilter(request, new MockHttpServletResponse(), fc); // Ensure filter didn't change our original object - assertSame(originalAuth, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth); verify(fc) .doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @@ -108,7 +108,7 @@ public class RememberMeAuthenticationFilterTests { filter.doFilter(request, new MockHttpServletResponse(), fc); // Ensure filter setup with our remembered authentication object - assertSame(remembered, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(remembered); verify(fc) .doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @@ -136,7 +136,7 @@ public class RememberMeAuthenticationFilterTests { request.setRequestURI("x"); filter.doFilter(request, new MockHttpServletResponse(), fc); - assertSame(failedAuth, SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(failedAuth); verify(fc) .doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class)); } @@ -156,7 +156,7 @@ public class RememberMeAuthenticationFilterTests { request.setRequestURI("x"); filter.doFilter(request, response, fc); - assertEquals("/target", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/target"); // Should return after success handler is invoked, so chain should not proceed verifyZeroInteractions(fc); diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java index f714cc418c..3b5ffeaaaa 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.authentication.rememberme; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; import static org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices.*; @@ -103,9 +103,9 @@ public class TokenBasedRememberMeServicesTests { Authentication result = services .autoLogin(new MockHttpServletRequest(), response); - assertNull(result); + assertThat(result).isNull(); // No cookie set - assertNull(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)); + assertThat(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)).isNull(); } @Test @@ -117,8 +117,8 @@ public class TokenBasedRememberMeServicesTests { Authentication result = services.autoLogin(request, response); - assertNull(result); - assertNull(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)); + assertThat(result).isNull(); + assertThat(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY)).isNull(); } @Test @@ -132,11 +132,11 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response .getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } @Test @@ -148,12 +148,12 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response .getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } @Test @@ -164,12 +164,12 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response .getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } @Test @@ -185,12 +185,12 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response .getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } @Test @@ -202,12 +202,12 @@ public class TokenBasedRememberMeServicesTests { request.setCookies(cookie); MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response .getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } @Test @@ -222,12 +222,12 @@ public class TokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); - assertNull(services.autoLogin(request, response)); + assertThat(services.autoLogin(request, response)).isNull(); Cookie returnedCookie = response .getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(returnedCookie); - assertEquals(0, returnedCookie.getMaxAge()); + assertThat(returnedCookie).isNotNull(); + assertThat(returnedCookie.getMaxAge()).isEqualTo(0); } @Test @@ -244,22 +244,22 @@ public class TokenBasedRememberMeServicesTests { Authentication result = services.autoLogin(request, response); - assertNotNull(result); - assertEquals(user, result.getPrincipal()); + assertThat(result).isNotNull(); + assertThat(result.getPrincipal()).isEqualTo(user); } @Test public void testGettersSetters() { - assertEquals(uds, services.getUserDetailsService()); + assertThat(services.getUserDetailsService()).isEqualTo(uds); - assertEquals("key", services.getKey()); + assertThat(services.getKey()).isEqualTo("key"); - assertEquals(DEFAULT_PARAMETER, services.getParameter()); + assertThat(services.getParameter()).isEqualTo(DEFAULT_PARAMETER); services.setParameter("some_param"); - assertEquals("some_param", services.getParameter()); + assertThat(services.getParameter()).isEqualTo("some_param"); services.setTokenValiditySeconds(12); - assertEquals(12, services.getTokenValiditySeconds()); + assertThat(services.getTokenValiditySeconds()).isEqualTo(12); } @Test @@ -269,8 +269,8 @@ public class TokenBasedRememberMeServicesTests { services.loginFail(request, response); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(cookie); - assertEquals(0, cookie.getMaxAge()); + assertThat(cookie).isNotNull(); + assertThat(cookie.getMaxAge()).isEqualTo(0); } @Test @@ -285,7 +285,7 @@ public class TokenBasedRememberMeServicesTests { "someone", "password", "ROLE_ABC")); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNull(cookie); + assertThat(cookie).isNull(); } @Test @@ -303,11 +303,11 @@ public class TokenBasedRememberMeServicesTests { String expiryTime = services.decodeCookie(cookie.getValue())[1]; long expectedExpiryTime = 1000L * 500000000; expectedExpiryTime += System.currentTimeMillis(); - assertTrue(Long.parseLong(expiryTime) > expectedExpiryTime - 10000); - assertNotNull(cookie); - assertEquals(services.getTokenValiditySeconds(), cookie.getMaxAge()); - assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes())); - assertTrue(new Date().before(new Date( + assertThat(Long.parseLong(expiryTime) > expectedExpiryTime - 10000).isTrue(); + assertThat(cookie).isNotNull(); + assertThat(cookie.getMaxAge()).isEqualTo(services.getTokenValiditySeconds()); + assertThat(Base64.isArrayByteBase64(cookie.getValue().getBytes())).isTrue(); + assertThat(new Date().isTrue().before(new Date( determineExpiryTimeFromBased64EncodedToken(cookie.getValue())))); } @@ -321,10 +321,10 @@ public class TokenBasedRememberMeServicesTests { "someone", "password", "ROLE_ABC")); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(cookie); - assertEquals(services.getTokenValiditySeconds(), cookie.getMaxAge()); - assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes())); - assertTrue(new Date().before(new Date( + assertThat(cookie).isNotNull(); + assertThat(cookie.getMaxAge()).isEqualTo(services.getTokenValiditySeconds()); + assertThat(Base64.isArrayByteBase64(cookie.getValue().getBytes())).isTrue(); + assertThat(new Date().isTrue().before(new Date( determineExpiryTimeFromBased64EncodedToken(cookie.getValue())))); } @@ -333,7 +333,7 @@ public class TokenBasedRememberMeServicesTests { public void obtainPasswordReturnsNullForTokenWithNullCredentials() throws Exception { TestingAuthenticationToken token = new TestingAuthenticationToken("username", null); - assertNull(services.retrievePassword(token)); + assertThat(services.retrievePassword(token)).isNull(); } // SEC-949 @@ -349,11 +349,11 @@ public class TokenBasedRememberMeServicesTests { "someone", "password", "ROLE_ABC")); Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY); - assertNotNull(cookie); + assertThat(cookie).isNotNull(); // Check the expiry time is within 50ms of two weeks from current time - assertTrue(determineExpiryTimeFromBased64EncodedToken(cookie.getValue()) + assertThat(determineExpiryTimeFromBased64EncodedToken(cookie.getValue()).isTrue() - System.currentTimeMillis() > TWO_WEEKS_S - 50); - assertEquals(-1, cookie.getMaxAge()); - assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes())); + assertThat(cookie.getMaxAge()).isEqualTo(-1); + assertThat(Base64.isArrayByteBase64(cookie.getValue().getBytes())).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java index 892abe5875..f33e5dc36d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java @@ -16,7 +16,7 @@ package org.springframework.security.web.authentication.session; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.when; diff --git a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java index 75d421933c..0cf25ddf88 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.authentication.switchuser; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.*; @@ -108,7 +108,7 @@ public class SwitchUserFilterTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRequestURI("/j_spring_security_my_exit_user"); - assertTrue(filter.requiresExitUser(request)); + assertThat(filter.requiresExitUser(request)).isTrue(); } @Test @@ -119,7 +119,7 @@ public class SwitchUserFilterTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRequestURI("/j_spring_security_my_switch_user"); - assertTrue(filter.requiresSwitchUser(request)); + assertThat(filter.requiresSwitchUser(request)).isTrue(); } @Test(expected = UsernameNotFoundException.class) @@ -156,7 +156,7 @@ public class SwitchUserFilterTests { @Test public void attemptSwitchUserIsSuccessfulWithValidUser() throws Exception { - assertNotNull(switchToUser("jacklord")); + assertThat(switchToUser("jacklord")).isNotNull(); } @Test @@ -176,7 +176,7 @@ public class SwitchUserFilterTests { filter.doFilter(request, response, chain); verify(chain, never()).doFilter(request, response); - assertNotNull(response.getErrorMessage()); + assertThat(response.getErrorMessage()).isNotNull(); // Now check for the redirect request.setContextPath("/mywebapp"); @@ -192,8 +192,8 @@ public class SwitchUserFilterTests { filter.doFilter(request, response, chain); verify(chain, never()).doFilter(request, response); - assertEquals("/mywebapp/switchfailed", response.getRedirectedUrl()); - assertEquals("/switchfailed", + assertThat(response.getRedirectedUrl()).isEqualTo("/mywebapp/switchfailed"); + assertThat("/switchfailed").isEqualTo( FieldUtils.getFieldValue(filter, "switchFailureUrl")); } @@ -222,7 +222,7 @@ public class SwitchUserFilterTests { filter.setSwitchUserUrl("/login/impersonate"); request.setRequestURI("/webapp/login/impersonate;jsessionid=8JHDUD723J8"); - assertTrue(filter.requiresSwitchUser(request)); + assertThat(filter.requiresSwitchUser(request)).isTrue(); } @Test @@ -260,8 +260,8 @@ public class SwitchUserFilterTests { // check current user, should be back to original user (dano) Authentication targetAuth = SecurityContextHolder.getContext() .getAuthentication(); - assertNotNull(targetAuth); - assertEquals("dano", targetAuth.getPrincipal()); + assertThat(targetAuth).isNotNull(); + assertThat(targetAuth.getPrincipal()).isEqualTo("dano"); } @Test(expected = AuthenticationException.class) @@ -305,7 +305,7 @@ public class SwitchUserFilterTests { verify(chain, never()).doFilter(request, response); - assertEquals("/webapp/someOtherUrl", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/webapp/someOtherUrl"); } @Test @@ -338,7 +338,7 @@ public class SwitchUserFilterTests { verify(chain, never()).doFilter(request, response); - assertEquals("/someOtherUrl", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/someOtherUrl"); } @Test @@ -373,9 +373,9 @@ public class SwitchUserFilterTests { // check current user Authentication targetAuth = SecurityContextHolder.getContext() .getAuthentication(); - assertNotNull(targetAuth); - assertTrue(targetAuth.getPrincipal() instanceof UserDetails); - assertEquals("jacklord", ((User) targetAuth.getPrincipal()).getUsername()); + assertThat(targetAuth).isNotNull(); + assertThat(targetAuth.getPrincipal() instanceof UserDetails).isTrue(); + assertThat(((User) targetAuth.getPrincipal()).getUsername()).isEqualTo("jacklord"); } @Test @@ -401,9 +401,9 @@ public class SwitchUserFilterTests { }); Authentication result = filter.attemptSwitchUser(request); - assertTrue(result != null); - assertEquals(2, result.getAuthorities().size()); - assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains( + assertThat(result != null).isTrue(); + assertThat(result.getAuthorities()).hasSize(2); + assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains( "ROLE_NEW")); } @@ -426,8 +426,8 @@ public class SwitchUserFilterTests { } } - assertNotNull(switchedFrom); - assertSame(source, switchedFrom.getSource()); + assertThat(switchedFrom).isNotNull(); + assertThat(source).isSameAs(switchedFrom.getSource()); } // gh-3697 @@ -459,9 +459,9 @@ public class SwitchUserFilterTests { } } - assertNotNull(switchedFrom); - assertSame(source, switchedFrom.getSource()); - assertEquals(switchAuthorityRole, switchedFrom.getAuthority()); + assertThat(switchedFrom).isNotNull(); + assertThat(switchedFrom.getSource()).isSameAs(source); + assertThat(switchAuthorityRole).isEqualTo(switchedFrom.getAuthority()); } // ~ Inner Classes diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java index 64dd0ed76d..d5a176b40f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java @@ -58,14 +58,14 @@ public class BasicAuthenticationEntryPointTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("realmName must be specified", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("realmName must be specified"); } } public void testGettersSetters() { BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint(); ep.setRealmName("realm"); - assertEquals("realm", ep.getRealmName()); + assertThat(ep.getRealmName()).isEqualTo("realm"); } public void testNormalOperation() throws Exception { @@ -83,9 +83,9 @@ public class BasicAuthenticationEntryPointTests extends TestCase { String msg = "These are the jokes kid"; ep.commence(request, response, new DisabledException(msg)); - assertEquals(401, response.getStatus()); - assertEquals(msg, response.getErrorMessage()); + assertThat(response.getStatus()).isEqualTo(401); + assertThat(response.getErrorMessage()).isEqualTo(msg); - assertEquals("Basic realm=\"hello\"", response.getHeader("WWW-Authenticate")); + assertThat(response.getHeader("WWW-Authenticate")).isEqualTo("Basic realm=\"hello\""); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java index d538c02f9e..95daf43eae 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.authentication.www; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.AdditionalMatchers.not; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java index aa61d6e8f9..61f027ca99 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java @@ -40,18 +40,18 @@ public class DigestAuthUtilsTests extends TestCase { Map headerMap = DigestAuthUtils .splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertEquals("rod", headerMap.get("username")); - assertEquals("Contacts Realm", headerMap.get("realm")); + assertThat(headerMap.get("username")).isEqualTo("rod"); + assertThat(headerMap.get("realm")).isEqualTo("Contacts Realm"); assertEquals("MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==", headerMap.get("nonce")); assertEquals( "/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4", headerMap.get("uri")); - assertEquals("38644211cf9ac3da63ab639807e2baff", headerMap.get("response")); - assertEquals("auth", headerMap.get("qop")); - assertEquals("00000004", headerMap.get("nc")); - assertEquals("2b8d329a8571b99a", headerMap.get("cnonce")); - assertEquals(8, headerMap.size()); + assertThat(headerMap.get("response")).isEqualTo("38644211cf9ac3da63ab639807e2baff"); + assertThat(headerMap.get("qop")).isEqualTo("auth"); + assertThat(headerMap.get("nc")).isEqualTo("00000004"); + assertThat(headerMap.get("cnonce")).isEqualTo("2b8d329a8571b99a"); + assertThat(headerMap).hasSize(8); } public void testSplitEachArrayElementAndCreateMapRespectsInstructionNotToRemoveCharacters() { @@ -60,31 +60,31 @@ public class DigestAuthUtilsTests extends TestCase { Map headerMap = DigestAuthUtils .splitEachArrayElementAndCreateMap(headerEntries, "=", null); - assertEquals("\"rod\"", headerMap.get("username")); - assertEquals("\"Contacts Realm\"", headerMap.get("realm")); + assertThat(headerMap.get("username")).isEqualTo("\"rod\""); + assertThat(headerMap.get("realm")).isEqualTo("\"Contacts Realm\""); assertEquals( "\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\"", headerMap.get("nonce")); assertEquals( "\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\"", headerMap.get("uri")); - assertEquals("\"38644211cf9ac3da63ab639807e2baff\"", headerMap.get("response")); - assertEquals("auth", headerMap.get("qop")); - assertEquals("00000004", headerMap.get("nc")); - assertEquals("\"2b8d329a8571b99a\"", headerMap.get("cnonce")); - assertEquals(8, headerMap.size()); + assertThat(headerMap.get("response")).isEqualTo("\"38644211cf9ac3da63ab639807e2baff\""); + assertThat(headerMap.get("qop")).isEqualTo("auth"); + assertThat(headerMap.get("nc")).isEqualTo("00000004"); + assertThat(headerMap.get("cnonce")).isEqualTo("\"2b8d329a8571b99a\""); + assertThat(headerMap).hasSize(8); } public void testSplitEachArrayElementAndCreateMapReturnsNullIfArrayEmptyOrNull() { - assertNull(DigestAuthUtils.splitEachArrayElementAndCreateMap(null, "=", "\"")); + assertThat(DigestAuthUtils.splitEachArrayElementAndCreateMap(null, "=", "\"")).isNull(); assertNull(DigestAuthUtils.splitEachArrayElementAndCreateMap(new String[] {}, "=", "\"")); } public void testSplitNormalOperation() { String unsplit = "username=\"rod==\""; - assertEquals("username", DigestAuthUtils.split(unsplit, "=")[0]); - assertEquals("\"rod==\"", DigestAuthUtils.split(unsplit, "=")[1]); // should not + assertThat("=")[0]).as("username").isEqualTo(DigestAuthUtils.split(unsplit); + assertThat("=")[1]).as("\"rod==\"").isEqualTo(DigestAuthUtils.split(unsplit); // should not // remove // quotes or // extra @@ -97,7 +97,7 @@ public class DigestAuthUtilsTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } try { @@ -105,7 +105,7 @@ public class DigestAuthUtilsTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } try { @@ -113,7 +113,7 @@ public class DigestAuthUtilsTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } try { @@ -121,7 +121,7 @@ public class DigestAuthUtilsTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } try { @@ -129,16 +129,16 @@ public class DigestAuthUtilsTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertTrue(true); + } } public void testSplitWorksWithDifferentDelimiters() { - assertEquals(2, DigestAuthUtils.split("18/rod", "/").length); - assertNull(DigestAuthUtils.split("18/rod", "!")); + assertThat("/").length).isEqualTo(2, DigestAuthUtils.split("18/rod"); + assertThat(DigestAuthUtils.split("18/rod", "!")).isNull(); // only guarantees to split at FIRST delimiter, not EACH delimiter - assertEquals(2, DigestAuthUtils.split("18|rod|foo|bar", "|").length); + assertThat("|").length).isEqualTo(2, DigestAuthUtils.split("18|rod|foo|bar"); } public void testAuthorizationHeaderWithCommasIsSplitCorrectly() { @@ -147,6 +147,6 @@ public class DigestAuthUtilsTests extends TestCase { String[] parts = DigestAuthUtils.splitIgnoringQuotes(header, ','); - assertEquals(8, parts.length); + assertThat(parts.length).isEqualTo(8); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java index a35ae27d2c..df3c74e36d 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java @@ -39,14 +39,14 @@ public class DigestAuthenticationEntryPointTests extends TestCase { // Check the nonce seems to be generated correctly // format of nonce is: // base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key)) - assertTrue(Base64.isArrayByteBase64(nonce.getBytes())); + assertThat(Base64.isArrayByteBase64(nonce.getBytes())).isTrue(); String decodedNonce = new String(Base64.decodeBase64(nonce.getBytes())); String[] nonceTokens = StringUtils.delimitedListToStringArray(decodedNonce, ":"); - assertEquals(2, nonceTokens.length); + assertThat(nonceTokens.length).isEqualTo(2); String expectedNonceSignature = DigestUtils.md5Hex(nonceTokens[0] + ":" + "key"); - assertEquals(expectedNonceSignature, nonceTokens[1]); + assertThat(nonceTokens[1]).isEqualTo(expectedNonceSignature); } public void testDetectsMissingKey() throws Exception { @@ -58,7 +58,7 @@ public class DigestAuthenticationEntryPointTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("key must be specified", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("key must be specified"); } } @@ -72,19 +72,19 @@ public class DigestAuthenticationEntryPointTests extends TestCase { fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { - assertEquals("realmName must be specified", expected.getMessage()); + assertThat(expected.getMessage()).isEqualTo("realmName must be specified"); } } public void testGettersSetters() { DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint(); - assertEquals(300, ep.getNonceValiditySeconds()); // 5 mins default + assertThat(ep.getNonceValiditySeconds()).isEqualTo(300); // 5 mins default ep.setRealmName("realm"); - assertEquals("realm", ep.getRealmName()); + assertThat(ep.getRealmName()).isEqualTo("realm"); ep.setKey("dcdc"); - assertEquals("dcdc", ep.getKey()); + assertThat(ep.getKey()).isEqualTo("dcdc"); ep.setNonceValiditySeconds(12); - assertEquals(12, ep.getNonceValiditySeconds()); + assertThat(ep.getNonceValiditySeconds()).isEqualTo(12); } public void testNormalOperation() throws Exception { @@ -102,7 +102,7 @@ public class DigestAuthenticationEntryPointTests extends TestCase { ep.commence(request, response, new DisabledException("foobar")); // Check response is properly formed - assertEquals(401, response.getStatus()); + assertThat(response.getStatus()).isEqualTo(401); assertEquals(true, response.getHeader("WWW-Authenticate").toString().startsWith("Digest ")); @@ -112,9 +112,9 @@ public class DigestAuthenticationEntryPointTests extends TestCase { Map headerMap = DigestAuthUtils .splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertEquals("hello", headerMap.get("realm")); - assertEquals("auth", headerMap.get("qop")); - assertNull(headerMap.get("stale")); + assertThat(headerMap.get("realm")).isEqualTo("hello"); + assertThat(headerMap.get("qop")).isEqualTo("auth"); + assertThat(headerMap.get("stale")).isNull(); checkNonceValid((String) headerMap.get("nonce")); } @@ -134,8 +134,8 @@ public class DigestAuthenticationEntryPointTests extends TestCase { ep.commence(request, response, new NonceExpiredException("expired nonce")); // Check response is properly formed - assertEquals(401, response.getStatus()); - assertTrue(response.getHeader("WWW-Authenticate").toString() + assertThat(response.getStatus()).isEqualTo(401); + assertThat(response.getHeader("WWW-Authenticate").toString().isTrue() .startsWith("Digest ")); // Break up response header @@ -144,9 +144,9 @@ public class DigestAuthenticationEntryPointTests extends TestCase { Map headerMap = DigestAuthUtils .splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertEquals("hello", headerMap.get("realm")); - assertEquals("auth", headerMap.get("qop")); - assertEquals("true", headerMap.get("stale")); + assertThat(headerMap.get("realm")).isEqualTo("hello"); + assertThat(headerMap.get("qop")).isEqualTo("auth"); + assertThat(headerMap.get("stale")).isEqualTo("true"); checkNonceValid((String) headerMap.get("nonce")); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java index 3b136be7cb..46512113ce 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java @@ -15,9 +15,9 @@ package org.springframework.security.web.authentication.www; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -160,14 +160,14 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); String header = response.getHeader("WWW-Authenticate").toString().substring(7); String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header); Map headerMap = DigestAuthUtils .splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertEquals("true", headerMap.get("stale")); + assertThat(headerMap.get("stale")).isEqualTo("true"); } @Test @@ -175,22 +175,22 @@ public class DigestAuthenticationFilterTests { throws Exception { executeFilterInContainerSimulator(filter, request, true); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test public void testGettersSetters() { DigestAuthenticationFilter filter = new DigestAuthenticationFilter(); filter.setUserDetailsService(mock(UserDetailsService.class)); - assertTrue(filter.getUserDetailsService() != null); + assertThat(filter.getUserDetailsService() != null).isTrue(); filter.setAuthenticationEntryPoint(new DigestAuthenticationEntryPoint()); - assertTrue(filter.getAuthenticationEntryPoint() != null); + assertThat(filter.getAuthenticationEntryPoint() != null).isTrue(); filter.setUserCache(null); - assertNull(filter.getUserCache()); + assertThat(filter.getUserCache()).isNull(); filter.setUserCache(new NullUserCache()); - assertNotNull(filter.getUserCache()); + assertThat(filter.getUserCache()).isNotNull(); } @Test @@ -203,8 +203,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertEquals(401, response.getStatus()); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(response.getStatus()).isEqualTo(401); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test @@ -214,8 +214,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -233,8 +233,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -253,8 +253,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -272,8 +272,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -292,8 +292,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -310,8 +310,8 @@ public class DigestAuthenticationFilterTests { executeFilterInContainerSimulator(filter, request, true); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(USERNAME, ((UserDetails) SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(((UserDetails) SecurityContextHolder.getContext().isEqualTo(USERNAME) .getAuthentication().getPrincipal()).getUsername()); } @@ -327,10 +327,10 @@ public class DigestAuthenticationFilterTests { executeFilterInContainerSimulator(filter, request, true); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(USERNAME, ((UserDetails) SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(((UserDetails) SecurityContextHolder.getContext().isEqualTo(USERNAME) .getAuthentication().getPrincipal()).getUsername()); - assertFalse(SecurityContextHolder.getContext().getAuthentication() + assertThat(SecurityContextHolder.getContext().getAuthentication().isFalse() .isAuthenticated()); } @@ -348,12 +348,12 @@ public class DigestAuthenticationFilterTests { filter.setCreateAuthenticatedToken(true); executeFilterInContainerSimulator(filter, request, true); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(USERNAME, ((UserDetails) SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); + assertThat(((UserDetails) SecurityContextHolder.getContext().isEqualTo(USERNAME) .getAuthentication().getPrincipal()).getUsername()); - assertTrue(SecurityContextHolder.getContext().getAuthentication() + assertThat(SecurityContextHolder.getContext().getAuthentication().isTrue() .isAuthenticated()); - assertEquals(AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), + assertThat("ROLE_TWO").isEqualTo(AuthorityUtils.createAuthorityList("ROLE_ONE"), SecurityContextHolder.getContext().getAuthentication().getAuthorities()); } @@ -363,7 +363,7 @@ public class DigestAuthenticationFilterTests { executeFilterInContainerSimulator(filter, request, true); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test(expected = IllegalArgumentException.class) @@ -393,7 +393,7 @@ public class DigestAuthenticationFilterTests { executeFilterInContainerSimulator(filter, request, true); - assertNotNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull(); // Now retry, giving an invalid nonce responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, @@ -409,8 +409,8 @@ public class DigestAuthenticationFilterTests { request, false); // Check we lost our previous authentication - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -428,8 +428,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -446,8 +446,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -464,8 +464,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } @Test @@ -481,8 +481,8 @@ public class DigestAuthenticationFilterTests { MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false); - assertNull(SecurityContextHolder.getContext().getAuthentication()); - assertEquals(401, response.getStatus()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); + assertThat(response.getStatus()).isEqualTo(401); } // SEC-3108 diff --git a/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java index 3e32d12c74..60f0d5164f 100644 --- a/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.bind.support; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java index f396da20f3..f7f542595a 100644 --- a/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.concurrent; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Date; @@ -66,7 +66,7 @@ public class ConcurrentSessionFilterTests { // Expect that the filter chain will not be invoked, as we redirect to expiredUrl verifyZeroInteractions(fc); - assertEquals("/expired.jsp", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/expired.jsp"); } // As above, but with no expiredUrl set. @@ -126,7 +126,7 @@ public class ConcurrentSessionFilterTests { filter.doFilter(request, response, fc); verify(fc).doFilter(request, response); - assertTrue(registry.getSessionInformation(session.getId()).getLastRequest() + assertThat(registry.getSessionInformation(session.getId()).getLastRequest().isTrue() .after(lastRequest)); } } diff --git a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java index 63e8756e30..68733d7b40 100644 --- a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java @@ -12,8 +12,8 @@ */ package org.springframework.security.web.context; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; @@ -119,9 +119,9 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); repo.saveContext(context, holder.getRequest(), holder.getResponse()); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } @Test @@ -136,7 +136,7 @@ public class HttpSessionSecurityContextRepositoryTests { // Change context context.setAuthentication(testToken); repo.saveContext(context, holder.getRequest(), holder.getResponse()); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } @Test @@ -152,12 +152,12 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); - assertNotNull(context); - assertEquals(testToken, context.getAuthentication()); + assertThat(context).isNotNull(); + assertThat(context.getAuthentication()).isEqualTo(testToken); // Won't actually be saved as it hasn't changed, but go through the use case // anyway repo.saveContext(context, holder.getRequest(), holder.getResponse()); - assertEquals(context, request.getSession().getAttribute("imTheContext")); + assertThat(request.getSession().getAttribute("imTheContext")).isEqualTo(context); } // SEC-1528 @@ -175,7 +175,7 @@ public class HttpSessionSecurityContextRepositoryTests { request.setSession(session); HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse()); - assertSame(ctx, repo.loadContext(holder)); + assertThat(repo.loadContext(holder)).isSameAs(ctx); // Modify context contents. Same user, different role SecurityContextHolder.getContext().setAuthentication( @@ -197,8 +197,8 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); - assertNotNull(context); - assertNull(context.getAuthentication()); + assertThat(context).isNotNull(); + assertThat(context.getAuthentication()).isNull(); } @Test @@ -209,11 +209,11 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); // Simulate authentication during the request context.setAuthentication(testToken); repo.saveContext(context, holder.getRequest(), holder.getResponse()); - assertNotNull(request.getSession(false)); + assertThat(request.getSession(false)).isNotNull(); assertEquals(context, request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)); } @@ -229,14 +229,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().sendRedirect("/doesntmatter"); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -251,14 +251,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().sendError(404); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -274,14 +274,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().flushBuffer(); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -297,14 +297,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().getWriter().flush(); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -320,14 +320,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().getWriter().close(); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -343,14 +343,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().getOutputStream().flush(); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -366,14 +366,14 @@ public class HttpSessionSecurityContextRepositoryTests { SecurityContextHolder.setContext(repo.loadContext(holder)); SecurityContextHolder.getContext().setAuthentication(testToken); holder.getResponse().getOutputStream().close(); - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); - assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()) + assertThat(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse()).isTrue() .isContextSaved()); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); // Check it's still the same - assertEquals(SecurityContextHolder.getContext(), request.getSession() + assertThat(request.getSession().isEqualTo(SecurityContextHolder.getContext()) .getAttribute("imTheContext")); } @@ -425,7 +425,7 @@ public class HttpSessionSecurityContextRepositoryTests { request.getSession().invalidate(); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } // SEC-1315 @@ -442,7 +442,7 @@ public class HttpSessionSecurityContextRepositoryTests { .createAuthorityList("ANON"))); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } // SEC-1587 @@ -460,7 +460,7 @@ public class HttpSessionSecurityContextRepositoryTests { new AnonymousAuthenticationToken("x", "x", testToken.getAuthorities())); repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); - assertNull(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)); + assertThat(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)).isNull(); } @Test @@ -477,7 +477,7 @@ public class HttpSessionSecurityContextRepositoryTests { // Save an empty context repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse()); - assertNull(request.getSession().getAttribute("imTheContext")); + assertThat(request.getSession().getAttribute("imTheContext")).isNull(); } // SEC-1735 @@ -516,7 +516,7 @@ public class HttpSessionSecurityContextRepositoryTests { ctxInSession.setAuthentication(null); repo.saveContext(ctxInSession, holder.getRequest(), holder.getResponse()); - assertNull(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)); + assertThat(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)).isNull(); } @Test @@ -551,17 +551,17 @@ public class HttpSessionSecurityContextRepositoryTests { response); repo.loadContext(holder); String url = "/aUrl"; - assertEquals(url + sessionId, holder.getResponse().encodeRedirectUrl(url)); - assertEquals(url + sessionId, holder.getResponse().encodeRedirectURL(url)); - assertEquals(url + sessionId, holder.getResponse().encodeUrl(url)); - assertEquals(url + sessionId, holder.getResponse().encodeURL(url)); + assertThat(holder.getResponse().encodeRedirectUrl(url)).isEqualTo(url + sessionId); + assertThat(holder.getResponse().encodeRedirectURL(url)).isEqualTo(url + sessionId); + assertThat(holder.getResponse().encodeUrl(url)).isEqualTo(url + sessionId); + assertThat(holder.getResponse().encodeURL(url)).isEqualTo(url + sessionId); repo.setDisableUrlRewriting(true); holder = new HttpRequestResponseHolder(request, response); repo.loadContext(holder); - assertEquals(url, holder.getResponse().encodeRedirectUrl(url)); - assertEquals(url, holder.getResponse().encodeRedirectURL(url)); - assertEquals(url, holder.getResponse().encodeUrl(url)); - assertEquals(url, holder.getResponse().encodeURL(url)); + assertThat(holder.getResponse().encodeRedirectUrl(url)).isEqualTo(url); + assertThat(holder.getResponse().encodeRedirectURL(url)).isEqualTo(url); + assertThat(holder.getResponse().encodeUrl(url)).isEqualTo(url); + assertThat(holder.getResponse().encodeURL(url)).isEqualTo(url); } @Test @@ -596,14 +596,14 @@ public class HttpSessionSecurityContextRepositoryTests { HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response); SecurityContext context = repo.loadContext(holder); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); // Simulate authentication during the request context.setAuthentication(testToken); repo.saveContext(context, new HttpServletRequestWrapper(holder.getRequest()), new HttpServletResponseWrapper(holder.getResponse())); - assertNotNull(request.getSession(false)); + assertThat(request.getSession(false)).isNotNull(); assertEquals(context, request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY)); } diff --git a/web/src/test/java/org/springframework/security/web/context/OnCommittedResponseWrapperTests.java b/web/src/test/java/org/springframework/security/web/context/OnCommittedResponseWrapperTests.java index 12c86c70d4..d47c60e731 100644 --- a/web/src/test/java/org/springframework/security/web/context/OnCommittedResponseWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/context/OnCommittedResponseWrapperTests.java @@ -28,7 +28,7 @@ import org.mockito.runners.MockitoJUnitRunner; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -1119,4 +1119,4 @@ public class OnCommittedResponseWrapperTests { assertThat(committed).isFalse(); } -} \ No newline at end of file +} diff --git a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java index 0a23f9d7d4..0b2acaef98 100644 --- a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.web.context; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import javax.servlet.http.HttpServletResponse; diff --git a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java index d0ec0c31b3..5571f4cb12 100644 --- a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.context; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -38,7 +38,7 @@ public class SecurityContextPersistenceFilterTests { filter.doFilter(request, response, chain); verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class)); - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test @@ -57,7 +57,7 @@ public class SecurityContextPersistenceFilterTests { catch (IOException expected) { } - assertNull(SecurityContextHolder.getContext().getAuthentication()); + assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull(); } @Test @@ -80,7 +80,7 @@ public class SecurityContextPersistenceFilterTests { final FilterChain chain = new FilterChain() { public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { - assertEquals(beforeAuth, SecurityContextHolder.getContext() + assertThat(SecurityContextHolder.getContext().isEqualTo(beforeAuth) .getAuthentication()); // Change the context here SecurityContextHolder.setContext(scExpectedAfter); @@ -114,7 +114,7 @@ public class SecurityContextPersistenceFilterTests { SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(); filter.setForceEagerSessionCreation(true); filter.doFilter(request, response, chain); - assertNotNull(request.getSession(false)); + assertThat(request.getSession(false)).isNotNull(); } @Test @@ -127,7 +127,7 @@ public class SecurityContextPersistenceFilterTests { SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter( repo); filter.doFilter(request, response, chain); - assertFalse(repo.containsContext(request)); - assertNull(request.getSession(false)); + assertThat(repo.containsContext(request)).isFalse(); + assertThat(request.getSession(false)).isNull(); } } diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java index 8099e63130..edc8c01a67 100644 --- a/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java +++ b/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.web.context.request.async; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.Callable; diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java index 37848ce5f9..eda267af01 100644 --- a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.web.context.request.async; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import java.util.concurrent.Callable; diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java index ff1f5af7a8..0143a1fcdc 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.csrf; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java index ae4a85d5fd..5fe68038a7 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.csrf; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.times; @@ -31,8 +31,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.fest.assertions.GenericAssert; -import org.fest.assertions.ObjectAssert; +import org.assertj.core.api.AbstractObjectAssert; +import org.assertj.core.api.ObjectAssert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -361,7 +361,7 @@ public class CsrfFilterTests { } private static class CsrfTokenAssert extends - GenericAssert { + AbstractObjectAssert { /** * Creates a new {@link ObjectAssert}. @@ -369,7 +369,7 @@ public class CsrfFilterTests { * @param actual the target to verify. */ protected CsrfTokenAssert(CsrfToken actual) { - super(CsrfTokenAssert.class, actual); + super(actual,CsrfTokenAssert.class); } public CsrfTokenAssert isEqualTo(CsrfToken expected) { diff --git a/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java b/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java index 35f3f57641..7164a2d20b 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.csrf; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java index 203169c565..ff2362f213 100644 --- a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java +++ b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java @@ -1,7 +1,7 @@ package org.springframework.security.web.debug; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -73,7 +73,7 @@ public class DebugFilterTest { verify(logger).info(anyString()); verify(request).setAttribute(requestAttr, Boolean.TRUE); verify(fcp).doFilter(requestCaptor.capture(), eq(response), eq(filterChain)); - assertEquals(DebugRequestWrapper.class, requestCaptor.getValue().getClass()); + assertThat(requestCaptor.getValue().getClass()).isEqualTo(DebugRequestWrapper.class); verify(request).removeAttribute(requestAttr); } @@ -121,4 +121,4 @@ public class DebugFilterTest { + "A: A Value, Another Value\n" + "B: B Value\n" + "\n" + "\n" + "Security filter chain: no match"); } -} \ No newline at end of file +} diff --git a/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java b/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java index 14b93b5f9f..7407c34131 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.firewall; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java b/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java index 91676e2757..c7d0219dcc 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java @@ -1,7 +1,7 @@ package org.springframework.security.web.firewall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; import org.junit.*; import org.springframework.mock.web.MockHttpServletResponse; @@ -17,7 +17,7 @@ public class FirewalledResponseTests { FirewalledResponse fwResponse = new FirewalledResponse(response); fwResponse.sendRedirect("/theURL"); - assertEquals("/theURL", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/theURL"); try { fwResponse.sendRedirect("/theURL\r\nsomething"); diff --git a/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java b/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java index e92328bc3b..3ccf903b6f 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.firewall; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.LinkedHashMap; @@ -40,9 +40,9 @@ public class RequestWrapperTests { String expectedResult = entry.getValue(); request.setServletPath(path); RequestWrapper wrapper = new RequestWrapper(request); - assertEquals(expectedResult, wrapper.getServletPath()); + assertThat(wrapper.getServletPath()).isEqualTo(expectedResult); wrapper.reset(); - assertEquals(path, wrapper.getServletPath()); + assertThat(wrapper.getServletPath()).isEqualTo(path); } } @@ -59,9 +59,9 @@ public class RequestWrapperTests { } request.setPathInfo(path); RequestWrapper wrapper = new RequestWrapper(request); - assertEquals(expectedResult, wrapper.getPathInfo()); + assertThat(wrapper.getPathInfo()).isEqualTo(expectedResult); wrapper.reset(); - assertEquals(path, wrapper.getPathInfo()); + assertThat(wrapper.getPathInfo()).isEqualTo(path); } } @@ -82,7 +82,7 @@ public class RequestWrapperTests { verify(mockRequest).getRequestDispatcher(forwardPath); verify(mockDispatcher).forward(mockRequest, mockResponse); - assertEquals(denormalizedPath, wrapper.getPathInfo()); + assertThat(wrapper.getPathInfo()).isEqualTo(denormalizedPath); verify(mockRequest, times(2)).getPathInfo(); // validate wrapper.getServletPath() delegates to the mock wrapper.getServletPath(); @@ -98,6 +98,6 @@ public class RequestWrapperTests { when(request.getRequestDispatcher(path)).thenReturn(dispatcher); RequestWrapper wrapper = new RequestWrapper(request); wrapper.reset(); - assertSame(dispatcher, wrapper.getRequestDispatcher(path)); + assertThat(wrapper.getRequestDispatcher(path)).isSameAs(dispatcher); } } diff --git a/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java b/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java index 4df830eafc..a6e9c80a54 100644 --- a/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import java.util.ArrayList; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java index 90806c87a2..2fa90c8335 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java index 5ff52fe3ae..24493f3ae7 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java @@ -15,10 +15,7 @@ */ package org.springframework.security.web.header.writers; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; +import static org.assertj.core.api.Assertions.assertThat; import java.net.URI; import java.net.URISyntaxException; @@ -26,7 +23,10 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import static org.fest.assertions.Assertions.assertThat; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; /** * @author Tim Ysewyn @@ -66,7 +66,7 @@ public class HpkpHeaderWriterTests { public void writeHeadersDefaultValues() { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @@ -78,7 +78,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @@ -90,7 +90,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; includeSubDomains"); } @@ -101,7 +101,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; includeSubDomains"); } @@ -112,7 +112,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=2592000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @@ -123,7 +123,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; includeSubDomains"); } @@ -134,7 +134,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\""); } @@ -146,7 +146,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; report-uri=\"http://example.com/pkp-report\""); } @@ -158,7 +158,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; report-uri=\"http://example.com/pkp-report\""); } @@ -168,7 +168,7 @@ public class HpkpHeaderWriterTests { writer.addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", "E9CZ9INDbd+2eRQozYqqbQ2yXLVKB9+xcprMF+44U1g="); writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().size()).isEqualTo(1); + assertThat(response.getHeaderNames()).hasSize(1); assertThat(response.getHeader("Public-Key-Pins-Report-Only")).isEqualTo( "max-age=5184000 ; pin-sha256=\"d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=\" ; pin-sha256=\"E9CZ9INDbd+2eRQozYqqbQ2yXLVKB9+xcprMF+44U1g=\""); } @@ -179,7 +179,7 @@ public class HpkpHeaderWriterTests { writer.writeHeaders(request, response); - assertThat(response.getHeaderNames().isEmpty()).isTrue(); + assertThat(response.getHeaderNames()).isEmpty(); } @Test(expected = IllegalArgumentException.class) diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java index 81536be914..3e7435e8c3 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java index 418ea1aaf2..1eff6351e2 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; import java.util.Collections; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java index f6bdd74c05..6ad535de72 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java index bee0606a36..55b102cb6b 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java index d6a3e3e699..d83aa89f20 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers.frameoptions; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java index 88fb16b1aa..5db64de276 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.header.writers.frameoptions; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import java.util.Collections; diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java index 998aebdcac..697cf56bdd 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java @@ -6,7 +6,7 @@ import org.springframework.security.web.header.writers.frameoptions.StaticAllowF import java.net.URI; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; /** * Test for the StaticAllowFromStrategy. @@ -20,6 +20,6 @@ public class StaticAllowFromStrategyTests { public void shouldReturnUri() { String uri = "http://www.test.com"; StaticAllowFromStrategy strategy = new StaticAllowFromStrategy(URI.create(uri)); - assertEquals(uri, strategy.getAllowFromValue(new MockHttpServletRequest())); + assertThat(strategy.getAllowFromValue(new MockHttpServletRequest())).isEqualTo(uri); } } diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java index d9dae40434..4d6acd0f96 100644 --- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.jaasapi; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -137,7 +137,7 @@ public class JaasApiIntegrationFilterTests { */ @Test public void currentSubjectNull() { - assertNull(Subject.getSubject(AccessController.getContext())); + assertThat(Subject.getSubject(AccessController.getContext())).isNull(); } @Test @@ -165,7 +165,7 @@ public class JaasApiIntegrationFilterTests { public void obtainSubjectNullSubject() throws Exception { LoginContext ctx = new LoginContext("obtainSubjectNullSubject", null, callbackHandler, testConfiguration); - assertNull(ctx.getSubject()); + assertThat(ctx.getSubject()).isNull(); token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx); SecurityContextHolder.getContext().setAuthentication(token); @@ -175,7 +175,7 @@ public class JaasApiIntegrationFilterTests { @Test public void obtainSubject() throws Exception { SecurityContextHolder.getContext().setAuthentication(token); - assertEquals(authenticatedSubject, filter.obtainSubject(request)); + assertThat(filter.obtainSubject(request)).isEqualTo(authenticatedSubject); } @Test @@ -211,7 +211,7 @@ public class JaasApiIntegrationFilterTests { // See if the subject was updated Subject currentSubject = Subject .getSubject(AccessController.getContext()); - assertEquals(expectedValue, currentSubject); + assertThat(currentSubject).isEqualTo(expectedValue); // run so we know the chain was executed super.doFilter(request, response); @@ -219,10 +219,10 @@ public class JaasApiIntegrationFilterTests { }; filter.doFilter(request, response, chain); // ensure that the chain was actually invoked - assertNotNull(chain.getRequest()); + assertThat(chain.getRequest()).isNotNull(); } private void assertNullSubject(Subject subject) { - assertNull("Subject is expected to be null, but is not. Got " + subject, subject); + assertThat("Subject is expected to be null, but is not. Got " + subject, subject).isNull(); } -} \ No newline at end of file +} diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java index f7152949cb..053015b829 100644 --- a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.method.annotation; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java index c01a370756..9651bf7ee3 100644 --- a/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.method.annotation; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java index 12f7251fd3..8798ab7323 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.savedrequest; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.MockPortResolver; @@ -19,7 +19,7 @@ public class DefaultSavedRequestTests { request.addHeader("USER-aGenT", "Mozilla"); DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443)); - assertEquals("Mozilla", saved.getHeaderValues("user-agent").get(0)); + assertThat(saved.getHeaderValues("user-agent").get(0)).isEqualTo("Mozilla"); } // SEC-1412 @@ -29,7 +29,7 @@ public class DefaultSavedRequestTests { request.addHeader("If-None-Match", "somehashvalue"); DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443)); - assertTrue(saved.getHeaderValues("if-none-match").isEmpty()); + assertThat(saved.getHeaderValues("if-none-match").isEmpty()).isTrue(); } // SEC-3082 @@ -40,7 +40,7 @@ public class DefaultSavedRequestTests { request.addParameter("thisisatest", "Hi mom"); DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443)); - assertEquals("Hi mom", saved.getParameterValues("thisisatest")[0]); - assertNull(saved.getParameterValues("anothertest")); + assertThat(saved.getParameterValues("thisisatest")[0]).isEqualTo("Hi mom"); + assertThat(saved.getParameterValues("anothertest")).isNull(); } } diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java index 21575e4eaa..d36747fbfa 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.savedrequest; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -33,14 +33,14 @@ public class HttpSessionRequestCacheTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/destination"); MockHttpServletResponse response = new MockHttpServletResponse(); cache.saveRequest(request, response); - assertNotNull(request.getSession().getAttribute( + assertThat(request.getSession().isNotNull().getAttribute( HttpSessionRequestCache.SAVED_REQUEST)); - assertNotNull(cache.getRequest(request, response)); + assertThat(cache.getRequest(request, response)).isNotNull(); MockHttpServletRequest newRequest = new MockHttpServletRequest("POST", "/destination"); newRequest.setSession(request.getSession()); - assertNull(cache.getMatchingRequest(newRequest, response)); + assertThat(cache.getMatchingRequest(newRequest, response)).isNull(); } @@ -57,10 +57,10 @@ public class HttpSessionRequestCacheTests { "/destination"); MockHttpServletResponse response = new MockHttpServletResponse(); cache.saveRequest(request, response); - assertNull(cache.getRequest(request, response)); - assertNull(cache.getRequest(new MockHttpServletRequest(), + assertThat(cache.getRequest(request, response)).isNull(); + assertThat(cache.getRequest(new MockHttpServletRequest().isNull(), new MockHttpServletResponse())); - assertNull(cache.getMatchingRequest(request, response)); + assertThat(cache.getMatchingRequest(request, response)).isNull(); } // SEC-2246 diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java index 102b02dd25..8923e5ebbf 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.savedrequest; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.mock.web.MockFilterChain; @@ -18,11 +18,11 @@ public class RequestCacheAwareFilterTests { "/destination"); MockHttpServletResponse response = new MockHttpServletResponse(); cache.saveRequest(request, response); - assertNotNull(request.getSession().getAttribute( + assertThat(request.getSession().isNotNull().getAttribute( HttpSessionRequestCache.SAVED_REQUEST)); filter.doFilter(request, response, new MockFilterChain()); - assertNull(request.getSession().getAttribute( + assertThat(request.getSession().isNull().getAttribute( HttpSessionRequestCache.SAVED_REQUEST)); } } diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java index 67cef16e2c..0ebc356d9a 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java @@ -25,46 +25,46 @@ public class SavedCookieTests extends TestCase { } public void testGetName() throws Exception { - assertEquals(cookie.getName(), savedCookie.getName()); + assertThat(savedCookie.getName()).isEqualTo(cookie.getName()); } public void testGetValue() throws Exception { - assertEquals(cookie.getValue(), savedCookie.getValue()); + assertThat(savedCookie.getValue()).isEqualTo(cookie.getValue()); } public void testGetComment() throws Exception { - assertEquals(cookie.getComment(), savedCookie.getComment()); + assertThat(savedCookie.getComment()).isEqualTo(cookie.getComment()); } public void testGetDomain() throws Exception { - assertEquals(cookie.getDomain(), savedCookie.getDomain()); + assertThat(savedCookie.getDomain()).isEqualTo(cookie.getDomain()); } public void testGetMaxAge() throws Exception { - assertEquals(cookie.getMaxAge(), savedCookie.getMaxAge()); + assertThat(savedCookie.getMaxAge()).isEqualTo(cookie.getMaxAge()); } public void testGetPath() throws Exception { - assertEquals(cookie.getPath(), savedCookie.getPath()); + assertThat(savedCookie.getPath()).isEqualTo(cookie.getPath()); } public void testGetVersion() throws Exception { - assertEquals(cookie.getVersion(), savedCookie.getVersion()); + assertThat(savedCookie.getVersion()).isEqualTo(cookie.getVersion()); } public void testGetCookie() throws Exception { Cookie other = savedCookie.getCookie(); - assertEquals(cookie.getComment(), other.getComment()); - assertEquals(cookie.getDomain(), other.getDomain()); - assertEquals(cookie.getMaxAge(), other.getMaxAge()); - assertEquals(cookie.getName(), other.getName()); - assertEquals(cookie.getPath(), other.getPath()); - assertEquals(cookie.getSecure(), other.getSecure()); - assertEquals(cookie.getValue(), other.getValue()); - assertEquals(cookie.getVersion(), other.getVersion()); + assertThat(other.getComment()).isEqualTo(cookie.getComment()); + assertThat(other.getDomain()).isEqualTo(cookie.getDomain()); + assertThat(other.getMaxAge()).isEqualTo(cookie.getMaxAge()); + assertThat(other.getName()).isEqualTo(cookie.getName()); + assertThat(other.getPath()).isEqualTo(cookie.getPath()); + assertThat(other.getSecure()).isEqualTo(cookie.getSecure()); + assertThat(other.getValue()).isEqualTo(cookie.getValue()); + assertThat(other.getVersion()).isEqualTo(cookie.getVersion()); } public void testSerializable() throws Exception { - assertTrue(savedCookie instanceof Serializable); + assertThat(savedCookie instanceof Serializable).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java index fd3e4d4659..34f5c28384 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.savedrequest; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import java.text.SimpleDateFormat; import java.util.Date; @@ -33,8 +33,8 @@ public class SavedRequestAwareWrapperTests { MockHttpServletRequest savedRequest = new MockHttpServletRequest(); savedRequest.setCookies(new Cookie[] { new Cookie("cookie", "fromsaved") }); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, newRequest); - assertEquals(1, wrapper.getCookies().length); - assertEquals("fromnew", wrapper.getCookies()[0].getValue()); + assertThat(wrapper.getCookies().length).isEqualTo(1); + assertThat(wrapper.getCookies()[0].getValue()).isEqualTo("fromnew"); } @Test @@ -45,17 +45,17 @@ public class SavedRequestAwareWrapperTests { SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, new MockHttpServletRequest()); - assertNull(wrapper.getHeader("nonexistent")); + assertThat(wrapper.getHeader("nonexistent")).isNull(); Enumeration headers = wrapper.getHeaders("nonexistent"); - assertFalse(headers.hasMoreElements()); + assertThat(headers.hasMoreElements()).isFalse(); - assertEquals("savedheader", wrapper.getHeader("Header")); + assertThat(wrapper.getHeader("Header")).isEqualTo("savedheader"); headers = wrapper.getHeaders("heaDer"); - assertTrue(headers.hasMoreElements()); - assertEquals("savedheader", headers.nextElement()); - assertFalse(headers.hasMoreElements()); - assertTrue(wrapper.getHeaderNames().hasMoreElements()); - assertEquals("header", wrapper.getHeaderNames().nextElement()); + assertThat(headers.hasMoreElements()).isTrue(); + assertThat(headers.nextElement()).isEqualTo("savedheader"); + assertThat(headers.hasMoreElements()).isFalse(); + assertThat(wrapper.getHeaderNames().hasMoreElements()).isTrue(); + assertThat(wrapper.getHeaderNames().nextElement()).isEqualTo("header"); } @Test @@ -69,13 +69,13 @@ public class SavedRequestAwareWrapperTests { savedRequest.setParameter("action", "foo"); MockHttpServletRequest wrappedRequest = new MockHttpServletRequest(); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest); - assertEquals("foo", wrapper.getParameter("action")); + assertThat(wrapper.getParameter("action")).isEqualTo("foo"); // The request after forward wrappedRequest.setParameter("action", "bar"); - assertEquals("bar", wrapper.getParameter("action")); + assertThat(wrapper.getParameter("action")).isEqualTo("bar"); // Both values should be set, but "bar" should be first - assertEquals(2, wrapper.getParameterValues("action").length); - assertEquals("bar", wrapper.getParameterValues("action")[0]); + assertThat(wrapper.getParameterValues("action").length).isEqualTo(2); + assertThat(wrapper.getParameterValues("action")[0]).isEqualTo("bar"); } @Test @@ -85,9 +85,9 @@ public class SavedRequestAwareWrapperTests { MockHttpServletRequest wrappedRequest = new MockHttpServletRequest(); wrappedRequest.setParameter("action", "foo"); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest); - assertEquals(1, wrapper.getParameterValues("action").length); - assertEquals(1, wrapper.getParameterMap().size()); - assertEquals(1, ((String[]) wrapper.getParameterMap().get("action")).length); + assertThat(wrapper.getParameterValues("action").length).isEqualTo(1); + assertThat(wrapper.getParameterMap()).hasSize(1); + assertThat(((String[]) wrapper.getParameterMap().get("action")).length).isEqualTo(1); } @Test @@ -97,15 +97,15 @@ public class SavedRequestAwareWrapperTests { MockHttpServletRequest wrappedRequest = new MockHttpServletRequest(); wrappedRequest.addHeader("Authorization", "bar"); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest); - assertEquals("foo", wrapper.getHeader("Authorization")); + assertThat(wrapper.getHeader("Authorization")).isEqualTo("foo"); } @Test public void getParameterValuesReturnsNullIfParameterIsntSet() { SavedRequestAwareWrapper wrapper = createWrapper(new MockHttpServletRequest(), new MockHttpServletRequest()); - assertNull(wrapper.getParameterValues("action")); - assertNull(wrapper.getParameterMap().get("action")); + assertThat(wrapper.getParameterValues("action")).isNull(); + assertThat(wrapper.getParameterMap().get("action")).isNull(); } @Test @@ -115,14 +115,14 @@ public class SavedRequestAwareWrapperTests { MockHttpServletRequest wrappedRequest = new MockHttpServletRequest(); SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest); - assertArrayEquals(new Object[] { "foo" }, wrapper.getParameterValues("action")); + assertThat(wrapper.getParameterValues("action")).isEqualTo(new Object[] { "foo" }); wrappedRequest.setParameter("action", "bar"); assertArrayEquals(new Object[] { "bar", "foo" }, wrapper.getParameterValues("action")); // Check map is consistent String[] valuesFromMap = (String[]) wrapper.getParameterMap().get("action"); - assertEquals(2, valuesFromMap.length); - assertEquals("bar", valuesFromMap[0]); + assertThat(valuesFromMap.length).isEqualTo(2); + assertThat(valuesFromMap[0]).isEqualTo("bar"); } @Test @@ -135,9 +135,9 @@ public class SavedRequestAwareWrapperTests { request.addHeader("header", nowString); SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest()); - assertEquals(now.getTime(), wrapper.getDateHeader("header")); + assertThat(wrapper.getDateHeader("header")).isEqualTo(now.getTime()); - assertEquals(-1L, wrapper.getDateHeader("nonexistent")); + assertThat(wrapper.getDateHeader("nonexistent")).isEqualTo(-1L); } @Test(expected = IllegalArgumentException.class) @@ -154,7 +154,7 @@ public class SavedRequestAwareWrapperTests { MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/notused"); SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest("GET", "/notused")); - assertEquals("PUT", wrapper.getMethod()); + assertThat(wrapper.getMethod()).isEqualTo("PUT"); } @Test @@ -165,8 +165,8 @@ public class SavedRequestAwareWrapperTests { SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest()); - assertEquals(999, wrapper.getIntHeader("header")); - assertEquals(-1, wrapper.getIntHeader("nonexistent")); + assertThat(wrapper.getIntHeader("header")).isEqualTo(999); + assertThat(wrapper.getIntHeader("nonexistent")).isEqualTo(-1); } } diff --git a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java index 4b86e200eb..62d02439cd 100644 --- a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.servlet.support.csrf; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.HashMap; 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 30c418ca00..13b30784f6 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 @@ -17,7 +17,7 @@ package org.springframework.security.web.servletapi; import static junit.framework.Assert.fail; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java index def19cb28f..d2f0a77c0c 100644 --- a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java @@ -46,10 +46,10 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, ""); - assertEquals("rod", wrapper.getRemoteUser()); - assertTrue(wrapper.isUserInRole("ROLE_FOO")); - assertFalse(wrapper.isUserInRole("ROLE_NOT_GRANTED")); - assertEquals(auth, wrapper.getUserPrincipal()); + assertThat(wrapper.getRemoteUser()).isEqualTo("rod"); + assertThat(wrapper.isUserInRole("ROLE_FOO")).isTrue(); + assertThat(wrapper.isUserInRole("ROLE_NOT_GRANTED")).isFalse(); + assertThat(wrapper.getUserPrincipal()).isEqualTo(auth); } public void testUseOfRolePrefixMeansItIsntNeededWhenCallngIsUserInRole() { @@ -62,7 +62,7 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, "ROLE_"); - assertTrue(wrapper.isUserInRole("FOO")); + assertThat(wrapper.isUserInRole("FOO")).isTrue(); } public void testCorrectOperationWithUserDetailsBasedPrincipal() throws Exception { @@ -77,12 +77,12 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, ""); - assertEquals("rodAsUserDetails", wrapper.getRemoteUser()); - assertFalse(wrapper.isUserInRole("ROLE_FOO")); - assertFalse(wrapper.isUserInRole("ROLE_NOT_GRANTED")); - assertTrue(wrapper.isUserInRole("ROLE_FOOBAR")); - assertTrue(wrapper.isUserInRole("ROLE_HELLO")); - assertEquals(auth, wrapper.getUserPrincipal()); + assertThat(wrapper.getRemoteUser()).isEqualTo("rodAsUserDetails"); + assertThat(wrapper.isUserInRole("ROLE_FOO")).isFalse(); + assertThat(wrapper.isUserInRole("ROLE_NOT_GRANTED")).isFalse(); + assertThat(wrapper.isUserInRole("ROLE_FOOBAR")).isTrue(); + assertThat(wrapper.isUserInRole("ROLE_HELLO")).isTrue(); + assertThat(wrapper.getUserPrincipal()).isEqualTo(auth); } public void testRoleIsntHeldIfAuthenticationIsNull() throws Exception { @@ -93,9 +93,9 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, ""); - assertNull(wrapper.getRemoteUser()); - assertFalse(wrapper.isUserInRole("ROLE_ANY")); - assertNull(wrapper.getUserPrincipal()); + assertThat(wrapper.getRemoteUser()).isNull(); + assertThat(wrapper.isUserInRole("ROLE_ANY")).isFalse(); + assertThat(wrapper.getUserPrincipal()).isNull(); } public void testRolesArentHeldIfAuthenticationPrincipalIsNull() throws Exception { @@ -109,10 +109,10 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, ""); - assertNull(wrapper.getRemoteUser()); - assertFalse(wrapper.isUserInRole("ROLE_HELLO")); // principal is null, so reject - assertFalse(wrapper.isUserInRole("ROLE_FOOBAR")); // principal is null, so reject - assertNull(wrapper.getUserPrincipal()); + assertThat(wrapper.getRemoteUser()).isNull(); + assertThat(wrapper.isUserInRole("ROLE_HELLO")).isFalse(); // principal is null, so reject + assertThat(wrapper.isUserInRole("ROLE_FOOBAR")).isFalse(); // principal is null, so reject + assertThat(wrapper.getUserPrincipal()).isNull(); } public void testRolePrefix() { @@ -125,8 +125,8 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, "ROLE_"); - assertTrue(wrapper.isUserInRole("HELLO")); - assertTrue(wrapper.isUserInRole("FOOBAR")); + assertThat(wrapper.isUserInRole("HELLO")).isTrue(); + assertThat(wrapper.isUserInRole("FOOBAR")).isTrue(); } // SEC-3020 @@ -140,7 +140,7 @@ public class SecurityContextHolderAwareRequestWrapperTests extends TestCase { SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper( request, "ROLE_"); - assertTrue(wrapper.isUserInRole("ROLE_HELLO")); - assertTrue(wrapper.isUserInRole("ROLE_FOOBAR")); + assertThat(wrapper.isUserInRole("ROLE_HELLO")).isTrue(); + assertThat(wrapper.isUserInRole("ROLE_FOOBAR")).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java index 07a70cd246..5ca80160c5 100644 --- a/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java @@ -16,7 +16,7 @@ package org.springframework.security.web.session; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import javax.servlet.http.HttpServletRequest; @@ -47,7 +47,7 @@ public class DefaultSessionAuthenticationStrategyTests { strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse()); - assertNull(request.getSession(false)); + assertThat(request.getSession(false)).isNull(); } @Test @@ -59,7 +59,7 @@ public class DefaultSessionAuthenticationStrategyTests { strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse()); - assertFalse(sessionId.equals(request.getSession().getId())); + assertThat(sessionId.equals(request.getSession().getId())).isFalse(); } // SEC-2002 @@ -85,18 +85,18 @@ public class DefaultSessionAuthenticationStrategyTests { .forClass(ApplicationEvent.class); verify(eventPublisher).publishEvent(eventArgumentCaptor.capture()); - assertFalse(oldSessionId.equals(request.getSession().getId())); - assertNotNull(request.getSession().getAttribute("blah")); - assertNotNull(request.getSession().getAttribute( + assertThat(oldSessionId.equals(request.getSession().getId())).isFalse(); + assertThat(request.getSession().getAttribute("blah")).isNotNull(); + assertThat(request.getSession().isNotNull().getAttribute( "SPRING_SECURITY_SAVED_REQUEST_KEY")); - assertNotNull(eventArgumentCaptor.getValue()); - assertTrue(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent); + assertThat(eventArgumentCaptor.getValue()).isNotNull(); + assertThat(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent).isTrue(); SessionFixationProtectionEvent event = (SessionFixationProtectionEvent) eventArgumentCaptor .getValue(); - assertEquals(oldSessionId, event.getOldSessionId()); - assertEquals(request.getSession().getId(), event.getNewSessionId()); - assertSame(mockAuthentication, event.getAuthentication()); + assertThat(event.getOldSessionId()).isEqualTo(oldSessionId); + assertThat(event.getNewSessionId()).isEqualTo(request.getSession().getId()); + assertThat(event.getAuthentication()).isSameAs(mockAuthentication); } // See SEC-1077 @@ -113,8 +113,8 @@ public class DefaultSessionAuthenticationStrategyTests { strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse()); - assertNull(request.getSession().getAttribute("blah")); - assertNotNull(request.getSession().getAttribute( + assertThat(request.getSession().getAttribute("blah")).isNull(); + assertThat(request.getSession().isNotNull().getAttribute( "SPRING_SECURITY_SAVED_REQUEST_KEY")); } @@ -142,17 +142,17 @@ public class DefaultSessionAuthenticationStrategyTests { .forClass(ApplicationEvent.class); verify(eventPublisher).publishEvent(eventArgumentCaptor.capture()); - assertNull(request.getSession().getAttribute("blah")); - assertNotNull(request.getSession().getAttribute( + assertThat(request.getSession().getAttribute("blah")).isNull(); + assertThat(request.getSession().isNotNull().getAttribute( "SPRING_SECURITY_SAVED_REQUEST_KEY")); - assertNotNull(eventArgumentCaptor.getValue()); - assertTrue(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent); + assertThat(eventArgumentCaptor.getValue()).isNotNull(); + assertThat(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent).isTrue(); SessionFixationProtectionEvent event = (SessionFixationProtectionEvent) eventArgumentCaptor .getValue(); - assertEquals(oldSessionId, event.getOldSessionId()); - assertEquals(request.getSession().getId(), event.getNewSessionId()); - assertSame(mockAuthentication, event.getAuthentication()); + assertThat(event.getOldSessionId()).isEqualTo(oldSessionId); + assertThat(event.getNewSessionId()).isEqualTo(request.getSession().getId()); + assertThat(event.getAuthentication()).isSameAs(mockAuthentication); } @Test @@ -162,7 +162,7 @@ public class DefaultSessionAuthenticationStrategyTests { HttpServletRequest request = new MockHttpServletRequest(); strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse()); - assertNotNull(request.getSession(false)); + assertThat(request.getSession(false)).isNotNull(); } } diff --git a/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java index 2011335e3c..2ba15998ca 100644 --- a/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java +++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.session; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertSame; import static org.mockito.Mockito.mock; @@ -34,22 +34,22 @@ public class HttpSessionDestroyedEventTests { @Test public void getSecurityContexts() { List securityContexts = destroyedEvent.getSecurityContexts(); - assertEquals(1, securityContexts.size()); - assertSame(session.getAttribute("context"), securityContexts.get(0)); + assertThat(securityContexts).hasSize(1); + assertThat(securityContexts.get(0)).isSameAs(session.getAttribute("context")); } @Test public void getSecurityContextsMulti() { session.setAttribute("another", new SecurityContextImpl()); List securityContexts = destroyedEvent.getSecurityContexts(); - assertEquals(2, securityContexts.size()); + assertThat(securityContexts).hasSize(2); } @Test public void getSecurityContextsDiffImpl() { session.setAttribute("context", mock(SecurityContext.class)); List securityContexts = destroyedEvent.getSecurityContexts(); - assertEquals(1, securityContexts.size()); - assertSame(session.getAttribute("context"), securityContexts.get(0)); + assertThat(securityContexts).hasSize(1); + assertThat(securityContexts.get(0)).isSameAs(session.getAttribute("context")); } -} \ No newline at end of file +} diff --git a/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java index 34d854ff97..d98e3e52da 100644 --- a/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java +++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java @@ -15,7 +15,7 @@ package org.springframework.security.web.session; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import javax.servlet.http.HttpSessionEvent; @@ -60,17 +60,17 @@ public class HttpSessionEventPublisherTests { publisher.sessionCreated(event); - assertNotNull(listener.getCreatedEvent()); - assertNull(listener.getDestroyedEvent()); - assertEquals(session, listener.getCreatedEvent().getSession()); + assertThat(listener.getCreatedEvent()).isNotNull(); + assertThat(listener.getDestroyedEvent()).isNull(); + assertThat(listener.getCreatedEvent().getSession()).isEqualTo(session); listener.setCreatedEvent(null); listener.setDestroyedEvent(null); publisher.sessionDestroyed(event); - assertNotNull(listener.getDestroyedEvent()); - assertNull(listener.getCreatedEvent()); - assertEquals(session, listener.getDestroyedEvent().getSession()); + assertThat(listener.getDestroyedEvent()).isNotNull(); + assertThat(listener.getCreatedEvent()).isNull(); + assertThat(listener.getDestroyedEvent().getSession()).isEqualTo(session); } @Test @@ -96,17 +96,17 @@ public class HttpSessionEventPublisherTests { publisher.sessionCreated(event); - assertNotNull(listener.getCreatedEvent()); - assertNull(listener.getDestroyedEvent()); - assertEquals(session, listener.getCreatedEvent().getSession()); + assertThat(listener.getCreatedEvent()).isNotNull(); + assertThat(listener.getDestroyedEvent()).isNull(); + assertThat(listener.getCreatedEvent().getSession()).isEqualTo(session); listener.setCreatedEvent(null); listener.setDestroyedEvent(null); publisher.sessionDestroyed(event); - assertNotNull(listener.getDestroyedEvent()); - assertNull(listener.getCreatedEvent()); - assertEquals(session, listener.getDestroyedEvent().getSession()); + assertThat(listener.getDestroyedEvent()).isNotNull(); + assertThat(listener.getCreatedEvent()).isNull(); + assertThat(listener.getDestroyedEvent().getSession()).isEqualTo(session); } // SEC-2599 diff --git a/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java b/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java index 69d909b5a5..c03f9878b6 100644 --- a/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.session; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -58,7 +58,7 @@ public class SessionManagementFilterTests { filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain()); - assertEquals(sessionId, request.getSession().getId()); + assertThat(request.getSession().getId()).isEqualTo(sessionId); } @Test @@ -144,7 +144,7 @@ public class SessionManagementFilterTests { MockHttpServletResponse response = new MockHttpServletResponse(); filter.doFilter(request, response, new MockFilterChain()); - assertNull(response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isNull(); // Now set a redirect URL request = new MockHttpServletRequest(); @@ -158,7 +158,7 @@ public class SessionManagementFilterTests { filter.doFilter(request, response, fc); verifyZeroInteractions(fc); - assertEquals("/timedOut", response.getRedirectedUrl()); + assertThat(response.getRedirectedUrl()).isEqualTo("/timedOut"); } @Test diff --git a/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java b/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java index 605659c84b..8433c9f157 100644 --- a/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java +++ b/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.util; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.security.web.util.TextEscapeUtils; @@ -18,8 +18,8 @@ public class TextEscapeUtilsTests { @Test public void nullOrEmptyStringIsHandled() throws Exception { - assertEquals("", TextEscapeUtils.escapeEntities("")); - assertNull(TextEscapeUtils.escapeEntities(null)); + assertThat(TextEscapeUtils.escapeEntities("")).isEqualTo(""); + assertThat(TextEscapeUtils.escapeEntities(null)).isNull(); } @Test(expected = IllegalArgumentException.class) @@ -42,11 +42,11 @@ public class TextEscapeUtilsTests { */ @Test public void validSurrogatePairIsAccepted() throws Exception { - assertEquals("abc𐐀a", TextEscapeUtils.escapeEntities("abc\uD801\uDC00a")); + assertThat(TextEscapeUtils.escapeEntities("abc\uD801\uDC00a")).isEqualTo("abc𐐀a"); } @Test public void undefinedSurrogatePairIsIgnored() throws Exception { - assertEquals("abca", TextEscapeUtils.escapeEntities("abc\uD888\uDC00a")); + assertThat(TextEscapeUtils.escapeEntities("abc\uD888\uDC00a")).isEqualTo("abca"); } } diff --git a/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java b/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java index 251db3474e..48c4156e80 100644 --- a/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java +++ b/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java @@ -165,8 +165,8 @@ public class ThrowableAnalyzerTests extends TestCase { Throwable t = this.testTrace[0]; Throwable[] chain = analyzer.determineCauseChain(t); // Without extractors only the root throwable is available - assertEquals("Unexpected chain size", 1, chain.length); - assertEquals("Unexpected chain entry", t, chain[0]); + assertThat(chain.length).as("Unexpected chain size").isEqualTo(1); + assertThat(chain[0]).as("Unexpected chain entry").isEqualTo(t); } public void testDetermineCauseChainWithDefaultExtractors() { @@ -179,9 +179,9 @@ public class ThrowableAnalyzerTests extends TestCase { // Element at index 2 is a NonStandardException which cannot be analyzed further // by default - assertEquals("Unexpected chain size", 3, chain.length); + assertThat(chain.length).as("Unexpected chain size").isEqualTo(3); for (int i = 0; i < 3; ++i) { - assertEquals("Unexpected chain entry: " + i, this.testTrace[i], chain[i]); + assertThat(chain[i]).isEqualTo("Unexpected chain entry: " + i, this.testTrace[i]); } } @@ -190,9 +190,9 @@ public class ThrowableAnalyzerTests extends TestCase { Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]); - assertEquals("Unexpected chain size", this.testTrace.length, chain.length); + assertThat(chain.length).as("Unexpected chain size").isEqualTo(this.testTrace.length); for (int i = 0; i < chain.length; ++i) { - assertEquals("Unexpected chain entry: " + i, this.testTrace[i], chain[i]); + assertThat(chain[i]).isEqualTo("Unexpected chain entry: " + i, this.testTrace[i]); } } @@ -203,8 +203,8 @@ public class ThrowableAnalyzerTests extends TestCase { Throwable result = analyzer.getFirstThrowableOfType(Exception.class, chain); - assertNotNull("null not expected", result); - assertEquals("Unexpected throwable found", this.testTrace[0], result); + assertThat(result).as("null not expected").isNotNull(); + assertThat(result).as("Unexpected throwable found").isEqualTo(this.testTrace[0]); } public void testGetFirstThrowableOfTypeWithSuccess2() { @@ -215,8 +215,8 @@ public class ThrowableAnalyzerTests extends TestCase { Throwable result = analyzer.getFirstThrowableOfType(NonStandardException.class, chain); - assertNotNull("null not expected", result); - assertEquals("Unexpected throwable found", this.testTrace[2], result); + assertThat(result).as("null not expected").isNotNull(); + assertThat(result).as("Unexpected throwable found").isEqualTo(this.testTrace[2]); } public void testGetFirstThrowableOfTypeWithFailure() { @@ -228,7 +228,7 @@ public class ThrowableAnalyzerTests extends TestCase { Throwable result = analyzer.getFirstThrowableOfType(IllegalStateException.class, chain); - assertNull("null expected", result); + assertThat(result).as("null expected").isNull(); } public void testVerifyThrowableHierarchyWithExactType() { diff --git a/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java b/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java index 46c921cd86..0a19db7be3 100644 --- a/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java +++ b/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.util; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; @@ -12,12 +12,12 @@ public class UrlUtilsTests { @Test public void absoluteUrlsAreMatchedAsAbsolute() throws Exception { - assertTrue(UrlUtils.isAbsoluteUrl("http://something/")); - assertTrue(UrlUtils.isAbsoluteUrl("http1://something/")); - assertTrue(UrlUtils.isAbsoluteUrl("HTTP://something/")); - assertTrue(UrlUtils.isAbsoluteUrl("https://something/")); - assertTrue(UrlUtils.isAbsoluteUrl("a://something/")); - assertTrue(UrlUtils.isAbsoluteUrl("zz+zz.zz-zz://something/")); + assertThat(UrlUtils.isAbsoluteUrl("http://something/")).isTrue(); + assertThat(UrlUtils.isAbsoluteUrl("http1://something/")).isTrue(); + assertThat(UrlUtils.isAbsoluteUrl("HTTP://something/")).isTrue(); + assertThat(UrlUtils.isAbsoluteUrl("https://something/")).isTrue(); + assertThat(UrlUtils.isAbsoluteUrl("a://something/")).isTrue(); + assertThat(UrlUtils.isAbsoluteUrl("zz+zz.zz-zz://something/")).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java index 2727b99c1f..5bbe46242f 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import java.util.Arrays; diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java index ebaf457bbf..ae71dd42ea 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java @@ -12,8 +12,8 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; @@ -40,75 +40,75 @@ public class AntPathRequestMatcherTests { @Test public void singleWildcardMatchesAnyPath() { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**"); - assertEquals("/**", matcher.getPattern()); + assertThat(matcher.getPattern()).isEqualTo("/**"); - assertTrue(matcher.matches(createRequest("/blah"))); + assertThat(matcher.matches(createRequest("/blah"))).isTrue(); matcher = new AntPathRequestMatcher("**"); - assertTrue(matcher.matches(createRequest("/blah"))); - assertTrue(matcher.matches(createRequest(""))); + assertThat(matcher.matches(createRequest("/blah"))).isTrue(); + assertThat(matcher.matches(createRequest(""))).isTrue(); } @Test public void trailingWildcardMatchesCorrectly() { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah/blAh/**"); - assertTrue(matcher.matches(createRequest("/BLAH/blah"))); - assertFalse(matcher.matches(createRequest("/blah/bleh"))); - assertTrue(matcher.matches(createRequest("/blah/blah/"))); - assertTrue(matcher.matches(createRequest("/blah/blah/xxx"))); - assertFalse(matcher.matches(createRequest("/blah/blaha"))); - assertFalse(matcher.matches(createRequest("/blah/bleh/"))); + assertThat(matcher.matches(createRequest("/BLAH/blah"))).isTrue(); + assertThat(matcher.matches(createRequest("/blah/bleh"))).isFalse(); + assertThat(matcher.matches(createRequest("/blah/blah/"))).isTrue(); + assertThat(matcher.matches(createRequest("/blah/blah/xxx"))).isTrue(); + assertThat(matcher.matches(createRequest("/blah/blaha"))).isFalse(); + assertThat(matcher.matches(createRequest("/blah/bleh/"))).isFalse(); MockHttpServletRequest request = createRequest("/blah/"); request.setPathInfo("blah/bleh"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); matcher = new AntPathRequestMatcher("/bl?h/blAh/**"); - assertTrue(matcher.matches(createRequest("/BLAH/Blah/aaa/"))); - assertTrue(matcher.matches(createRequest("/bleh/Blah"))); + assertThat(matcher.matches(createRequest("/BLAH/Blah/aaa/"))).isTrue(); + assertThat(matcher.matches(createRequest("/bleh/Blah"))).isTrue(); matcher = new AntPathRequestMatcher("/blAh/**/blah/**"); - assertTrue(matcher.matches(createRequest("/blah/blah"))); - assertFalse(matcher.matches(createRequest("/blah/bleh"))); - assertTrue(matcher.matches(createRequest("/blah/aaa/blah/bbb"))); + assertThat(matcher.matches(createRequest("/blah/blah"))).isTrue(); + assertThat(matcher.matches(createRequest("/blah/bleh"))).isFalse(); + assertThat(matcher.matches(createRequest("/blah/aaa/blah/bbb"))).isTrue(); matcher = new AntPathRequestMatcher("/{id}/blAh/**"); - assertTrue(matcher.matches(createRequest("/1234/blah"))); - assertFalse(matcher.matches(createRequest("/4567/bleh"))); - assertTrue(matcher.matches(createRequest("/paskos/blah/"))); - assertTrue(matcher.matches(createRequest("/12345/blah/xxx"))); - assertFalse(matcher.matches(createRequest("/12345/blaha"))); - assertFalse(matcher.matches(createRequest("/paskos/bleh/"))); + assertThat(matcher.matches(createRequest("/1234/blah"))).isTrue(); + assertThat(matcher.matches(createRequest("/4567/bleh"))).isFalse(); + assertThat(matcher.matches(createRequest("/paskos/blah/"))).isTrue(); + assertThat(matcher.matches(createRequest("/12345/blah/xxx"))).isTrue(); + assertThat(matcher.matches(createRequest("/12345/blaha"))).isFalse(); + assertThat(matcher.matches(createRequest("/paskos/bleh/"))).isFalse(); } @Test public void trailingWildcardWithVariableMatchesCorrectly() { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/{id}/blAh/**"); - assertTrue(matcher.matches(createRequest("/1234/blah"))); - assertFalse(matcher.matches(createRequest("/4567/bleh"))); - assertTrue(matcher.matches(createRequest("/paskos/blah/"))); - assertTrue(matcher.matches(createRequest("/12345/blah/xxx"))); - assertFalse(matcher.matches(createRequest("/12345/blaha"))); - assertFalse(matcher.matches(createRequest("/paskos/bleh/"))); + assertThat(matcher.matches(createRequest("/1234/blah"))).isTrue(); + assertThat(matcher.matches(createRequest("/4567/bleh"))).isFalse(); + assertThat(matcher.matches(createRequest("/paskos/blah/"))).isTrue(); + assertThat(matcher.matches(createRequest("/12345/blah/xxx"))).isTrue(); + assertThat(matcher.matches(createRequest("/12345/blaha"))).isFalse(); + assertThat(matcher.matches(createRequest("/paskos/bleh/"))).isFalse(); } @Test public void nontrailingWildcardWithVariableMatchesCorrectly() { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**/{id}"); - assertTrue(matcher.matches(createRequest("/blah/1234"))); - assertTrue(matcher.matches(createRequest("/bleh/4567"))); - assertTrue(matcher.matches(createRequest("/paskos/blah/"))); - assertTrue(matcher.matches(createRequest("/12345/blah/xxx"))); - assertTrue(matcher.matches(createRequest("/12345/blaha"))); - assertTrue(matcher.matches(createRequest("/paskos/bleh/"))); + assertThat(matcher.matches(createRequest("/blah/1234"))).isTrue(); + assertThat(matcher.matches(createRequest("/bleh/4567"))).isTrue(); + assertThat(matcher.matches(createRequest("/paskos/blah/"))).isTrue(); + assertThat(matcher.matches(createRequest("/12345/blah/xxx"))).isTrue(); + assertThat(matcher.matches(createRequest("/12345/blaha"))).isTrue(); + assertThat(matcher.matches(createRequest("/paskos/bleh/"))).isTrue(); } @Test public void requestHasNullMethodMatches() { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*", "GET"); HttpServletRequest request = createRequestWithNullMethod("/something/here"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); } // SEC-2084 @@ -116,7 +116,7 @@ public class AntPathRequestMatcherTests { public void requestHasNullMethodNoMatch() { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*", "GET"); HttpServletRequest request = createRequestWithNullMethod("/nomatch"); - assertFalse(matcher.matches(request)); + assertThat(matcher.matches(request)).isFalse(); } @Test @@ -124,7 +124,7 @@ public class AntPathRequestMatcherTests { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*"); MockHttpServletRequest request = createRequest("/something/here"); request.setMethod(null); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); } @Test @@ -132,15 +132,15 @@ public class AntPathRequestMatcherTests { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*"); MockHttpServletRequest request = createRequest("/nomatch"); request.setMethod(null); - assertFalse(matcher.matches(request)); + assertThat(matcher.matches(request)).isFalse(); } @Test public void exactMatchOnlyMatchesIdenticalPath() throws Exception { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/login.html"); - assertTrue(matcher.matches(createRequest("/login.html"))); - assertFalse(matcher.matches(createRequest("/login.html/"))); - assertFalse(matcher.matches(createRequest("/login.html/blah"))); + assertThat(matcher.matches(createRequest("/login.html"))).isTrue(); + assertThat(matcher.matches(createRequest("/login.html/"))).isFalse(); + assertThat(matcher.matches(createRequest("/login.html/blah"))).isFalse(); } @Test @@ -149,9 +149,9 @@ public class AntPathRequestMatcherTests { AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah", "GET"); MockHttpServletRequest request = createRequest("/blah"); request.setMethod("GET"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); request.setMethod("POST"); - assertFalse(matcher.matches(request)); + assertThat(matcher.matches(request)).isFalse(); } @Test @@ -173,16 +173,16 @@ public class AntPathRequestMatcherTests { @Test public void equalsBehavesCorrectly() throws Exception { // Both universal wildcard options should be equal - assertEquals(new AntPathRequestMatcher("/**"), new AntPathRequestMatcher("**")); - assertEquals(new AntPathRequestMatcher("/xyz"), new AntPathRequestMatcher("/xyz")); - assertEquals(new AntPathRequestMatcher("/xyz", "POST"), + assertThat(new AntPathRequestMatcher("**")).isEqualTo(new AntPathRequestMatcher("/**")); + assertThat(new AntPathRequestMatcher("/xyz")).isEqualTo(new AntPathRequestMatcher("/xyz")); + assertThat("POST").isEqualTo(new AntPathRequestMatcher("/xyz"), new AntPathRequestMatcher("/xyz", "POST")); - assertFalse(new AntPathRequestMatcher("/xyz", "POST") + assertThat(new AntPathRequestMatcher("/xyz", "POST").isFalse() .equals(new AntPathRequestMatcher("/xyz", "GET"))); - assertFalse(new AntPathRequestMatcher("/xyz").equals(new AntPathRequestMatcher( + assertThat(new AntPathRequestMatcher("/xyz").isFalse().equals(new AntPathRequestMatcher( "/xxx"))); - assertFalse(new AntPathRequestMatcher("/xyz").equals(AnyRequestMatcher.INSTANCE)); - assertFalse(new AntPathRequestMatcher("/xyz", "GET", false) + assertThat(new AntPathRequestMatcher("/xyz").equals(AnyRequestMatcher.INSTANCE)).isFalse(); + assertThat(new AntPathRequestMatcher("/xyz", "GET", false).isFalse() .equals(new AntPathRequestMatcher("/xyz", "GET", true))); } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java index 3eb354e4a6..0febd4bfb4 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; @@ -33,7 +33,7 @@ public class ELRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRemoteAddr("1.1.1.1"); - assertTrue(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isTrue(); } @Test @@ -42,7 +42,7 @@ public class ELRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setRemoteAddr("1.1.1.2"); - assertFalse(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isFalse(); } @Test @@ -52,7 +52,7 @@ public class ELRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("User-Agent", "MSIE"); - assertTrue(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isTrue(); } @Test @@ -62,12 +62,12 @@ public class ELRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("User-Agent", "MSIE"); - assertTrue(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isTrue(); request = new MockHttpServletRequest(); request.addHeader("User-Agent", "Mozilla"); - assertTrue(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isTrue(); } @@ -78,7 +78,7 @@ public class ELRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("User-Agent", "wrong"); - assertFalse(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isFalse(); } @Test @@ -87,7 +87,7 @@ public class ELRequestMatcherTests { "hasHeader('User-Agent','MSIE')"); MockHttpServletRequest request = new MockHttpServletRequest(); - assertFalse(requestMatcher.matches(request)); + assertThat(requestMatcher.matches(request)).isFalse(); } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java index df685a3b0a..b358a9fd27 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java @@ -1,6 +1,6 @@ package org.springframework.security.web.util.matcher; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; @@ -24,37 +24,37 @@ public class IpAddressMatcherTests { @Test public void ipv6MatcherMatchesIpv6Address() { - assertTrue(v6matcher.matches(ipv6Request)); + assertThat(v6matcher.matches(ipv6Request)).isTrue(); } @Test public void ipv6MatcherDoesntMatchIpv4Address() { - assertFalse(v6matcher.matches(ipv4Request)); + assertThat(v6matcher.matches(ipv4Request)).isFalse(); } @Test public void ipv4MatcherMatchesIpv4Address() { - assertTrue(v4matcher.matches(ipv4Request)); + assertThat(v4matcher.matches(ipv4Request)).isTrue(); } @Test public void ipv4SubnetMatchesCorrectly() throws Exception { IpAddressMatcher matcher = new IpAddressMatcher("192.168.1.0/24"); - assertTrue(matcher.matches(ipv4Request)); + assertThat(matcher.matches(ipv4Request)).isTrue(); matcher = new IpAddressMatcher("192.168.1.128/25"); - assertFalse(matcher.matches(ipv4Request)); + assertThat(matcher.matches(ipv4Request)).isFalse(); ipv4Request.setRemoteAddr("192.168.1.159"); // 159 = 0x9f - assertTrue(matcher.matches(ipv4Request)); + assertThat(matcher.matches(ipv4Request)).isTrue(); } @Test public void ipv6RangeMatches() throws Exception { IpAddressMatcher matcher = new IpAddressMatcher("2001:DB8::/48"); - assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:0")); - assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:1")); - assertTrue(matcher.matches("2001:DB8:0:FFFF:FFFF:FFFF:FFFF:FFFF")); - assertFalse(matcher.matches("2001:DB8:1:0:0:0:0:0")); + assertThat(matcher.matches("2001:DB8:0:0:0:0:0:0")).isTrue(); + assertThat(matcher.matches("2001:DB8:0:0:0:0:0:1")).isTrue(); + assertThat(matcher.matches("2001:DB8:0:FFFF:FFFF:FFFF:FFFF:FFFF")).isTrue(); + assertThat(matcher.matches("2001:DB8:1:0:0:0:0:0")).isFalse(); } // SEC-1733 @@ -62,11 +62,11 @@ public class IpAddressMatcherTests { public void zeroMaskMatchesAnything() throws Exception { IpAddressMatcher matcher = new IpAddressMatcher("0.0.0.0/0"); - assertTrue(matcher.matches("123.4.5.6")); - assertTrue(matcher.matches("192.168.0.159")); + assertThat(matcher.matches("123.4.5.6")).isTrue(); + assertThat(matcher.matches("192.168.0.159")).isTrue(); matcher = new IpAddressMatcher("192.168.0.159/0"); - assertTrue(matcher.matches("123.4.5.6")); - assertTrue(matcher.matches("192.168.0.159")); + assertThat(matcher.matches("123.4.5.6")).isTrue(); + assertThat(matcher.matches("192.168.0.159")).isTrue(); } } diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java index 57247f2766..c6e49550a0 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java index 0cedb78719..64c17a6b47 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java index 44cc5fd6c9..d686b82bdb 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import javax.servlet.http.HttpServletRequest; diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java index 56bd3e1295..15a58fe0f6 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import java.util.Arrays; diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java index 794d4960b7..66551b793a 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java @@ -12,7 +12,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; @@ -41,7 +41,7 @@ public class RegexRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest("POST", "/anything"); - assertFalse(matcher.matches(request)); + assertThat(matcher.matches(request)).isFalse(); } @Test @@ -51,7 +51,7 @@ public class RegexRequestMatcherTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/anything"); request.setServletPath("/anything"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); } @Test @@ -64,14 +64,14 @@ public class RegexRequestMatcherTests { request.setPathInfo("/path"); request.setQueryString("x=y"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); } @Test public void requestHasNullMethodMatches() { RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", "GET"); HttpServletRequest request = createRequestWithNullMethod("/something/here"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); } // SEC-2084 @@ -79,21 +79,21 @@ public class RegexRequestMatcherTests { public void requestHasNullMethodNoMatch() { RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", "GET"); HttpServletRequest request = createRequestWithNullMethod("/nomatch"); - assertFalse(matcher.matches(request)); + assertThat(matcher.matches(request)).isFalse(); } @Test public void requestHasNullMethodAndNullMatcherMatches() { RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", null); HttpServletRequest request = createRequestWithNullMethod("/something/here"); - assertTrue(matcher.matches(request)); + assertThat(matcher.matches(request)).isTrue(); } @Test public void requestHasNullMethodAndNullMatcherNoMatch() { RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", null); HttpServletRequest request = createRequestWithNullMethod("/nomatch"); - assertFalse(matcher.matches(request)); + assertThat(matcher.matches(request)).isFalse(); } // SEC-2831 diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java index a29a07cced..75bdba1e72 100644 --- a/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java @@ -15,7 +15,7 @@ */ package org.springframework.security.web.util.matcher; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test;