Polish

Fixes gh-3892

core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.security.access.expression;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.assertj.core.api.Assertions.*;

core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java

@@ -16,8 +16,6 @@
 package org.springframework.security.access.expression.method;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 import org.junit.Before;
@@ -30,8 +28,6 @@ import org.springframework.security.access.expression.ExpressionUtils;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.core.Authentication;
 
-import java.util.*;
-
 /**
  * Tests for {@link MethodSecurityExpressionRoot}
  *

core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.access.intercept.aopalliance;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.aopalliance.intercept.MethodInvocation;

core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.access.intercept.aspectj;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.aopalliance.intercept.MethodInvocation;

core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java

@@ -18,7 +18,6 @@ package org.springframework.security.access.vote;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;

core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.security.authentication;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.*;

core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.authentication;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;

core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.authentication.rcp;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;

core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java

@@ -21,11 +21,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.SmartApplicationListener;
-import org.springframework.security.core.session.SessionDestroyedEvent;
 
-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;

core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java

@@ -34,7 +34,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 import org.springframework.core.SpringVersion;
-import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * Checks that the embedded version information is up to date.

core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java

@@ -21,13 +21,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.SpringVersion;
 import org.springframework.security.access.method.P;
 import org.springframework.test.util.ReflectionTestUtils;
 

core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java

@@ -17,7 +17,6 @@ package org.springframework.security.provisioning;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
-import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
 import java.util.HashMap;