Browse Source

Replace isEqualTo(null) with isNull()

pull/5665/head
Johnny Lim 7 years ago committed by Josh Cummings
parent
commit
68878a1675
  1. 4
      acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java
  2. 4
      cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java
  3. 2
      config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java
  4. 2
      core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
  5. 2
      core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java
  6. 2
      oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/ClaimAccessorTests.java
  7. 2
      openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java
  8. 2
      taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
  9. 2
      web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java
  10. 2
      web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java

4
acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java

@ -154,11 +154,11 @@ public class EhCacheBasedAclCacheTests { @@ -154,11 +154,11 @@ public class EhCacheBasedAclCacheTests {
Object retrieved1 = FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy",
retrieved);
assertThat(retrieved1).isEqualTo(null);
assertThat(retrieved1).isNull();
Object retrieved2 = FieldUtils.getProtectedFieldValue(
"permissionGrantingStrategy", retrieved);
assertThat(retrieved2).isEqualTo(null);
assertThat(retrieved2).isNull();
}
@Test

4
cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java

@ -353,7 +353,7 @@ public class CasAuthenticationProviderTests { @@ -353,7 +353,7 @@ public class CasAuthenticationProviderTests {
assertThat(cap.supports(TestingAuthenticationToken.class)).isFalse();
// Try it anyway
assertThat(cap.authenticate(token)).isEqualTo(null);
assertThat(cap.authenticate(token)).isNull();
}
@Test
@ -370,7 +370,7 @@ public class CasAuthenticationProviderTests { @@ -370,7 +370,7 @@ public class CasAuthenticationProviderTests {
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
"some_normal_user", "password",
AuthorityUtils.createAuthorityList("ROLE_A"));
assertThat(cap.authenticate(token)).isEqualTo(null);
assertThat(cap.authenticate(token)).isNull();
}
@Test

2
config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java

@ -108,7 +108,7 @@ public class FilterChainProxyConfigTests { @@ -108,7 +108,7 @@ public class FilterChainProxyConfigTests {
public void pathWithNoMatchHasNoFilters() throws Exception {
FilterChainProxy filterChainProxy = appCtx.getBean(
"newFilterChainProxyNoDefaultPath", FilterChainProxy.class);
assertThat(filterChainProxy.getFilters("/nomatch")).isEqualTo(null);
assertThat(filterChainProxy.getFilters("/nomatch")).isNull();
}
// SEC-1235

2
core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java

@ -52,7 +52,7 @@ public class RunAsManagerImplTests { @@ -52,7 +52,7 @@ public class RunAsManagerImplTests {
Authentication resultingToken = runAs.buildRunAs(inputToken, new Object(),
SecurityConfig.createList("SOMETHING_WE_IGNORE"));
assertThat(resultingToken).isEqualTo(null);
assertThat(resultingToken).isNull();
}
@Test

2
core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java

@ -103,7 +103,7 @@ public class SecurityContextLoginModuleTests { @@ -103,7 +103,7 @@ public class SecurityContextLoginModuleTests {
this.module.login();
assertThat(this.module.logout()).as("Should return true as it succeeds").isTrue();
assertThat(this.module.getAuthentication()).as("Authentication should be null")
.isEqualTo(null);
.isNull();
assertThat(this.subject.getPrincipals().contains(this.auth))
.withFailMessage(

2
oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/ClaimAccessorTests.java

@ -99,6 +99,6 @@ public class ClaimAccessorTests { @@ -99,6 +99,6 @@ public class ClaimAccessorTests {
String claimName = "claim-with-null-value";
this.claims.put(claimName, null);
assertThat(this.claimAccessor.getClaimAsString(claimName)).isEqualTo(null);
assertThat(this.claimAccessor.getClaimAsString(claimName)).isNull();
}
}

2
openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java

@ -216,7 +216,7 @@ public class OpenIDAuthenticationProviderTests { @@ -216,7 +216,7 @@ public class OpenIDAuthenticationProviderTests {
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
USERNAME, "password");
assertThat(provider.authenticate(token)).isEqualTo(null);
assertThat(provider.authenticate(token)).isNull();
}
/*

2
taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java

@ -101,7 +101,7 @@ public class AuthenticationTagTests { @@ -101,7 +101,7 @@ public class AuthenticationTagTests {
authenticationTag.setProperty("principal");
assertThat(authenticationTag.doStartTag()).isEqualTo(Tag.SKIP_BODY);
assertThat(authenticationTag.doEndTag()).isEqualTo(Tag.EVAL_PAGE);
assertThat(authenticationTag.getLastMessage()).isEqualTo(null);
assertThat(authenticationTag.getLastMessage()).isNull();
}
@Test

2
web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java

@ -108,7 +108,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests { @@ -108,7 +108,7 @@ public class SimpleUrlAuthenticationSuccessHandlerTests {
SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
ash.setTargetUrlParameter("targetUrl");
ash.setTargetUrlParameter(null);
assertThat(ash.getTargetUrlParameter()).isEqualTo(null);
assertThat(ash.getTargetUrlParameter()).isNull();
}
@Test

2
web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java

@ -147,7 +147,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests { @@ -147,7 +147,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests {
filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
new MockFilterChain());
assertThat(SecurityContextHolder.getContext().getAuthentication()).isEqualTo(null);
assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
}
@Test

Loading…
Cancel
Save