Update MockitJunitRunner import

Issue: gh-4608

web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java

@@ -28,7 +28,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.csrf.CsrfException;
 import org.springframework.security.web.csrf.InvalidCsrfTokenException;

web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java

@@ -21,7 +21,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.StaticApplicationContext;

web/src/test/java/org/springframework/security/web/access/expression/DelegatingEvaluationContextTests.java

@@ -23,7 +23,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.expression.BeanResolver;
 import org.springframework.expression.ConstructorResolver;
@@ -141,4 +141,4 @@ public class DelegatingEvaluationContextTests {
 
 		assertThat(this.context.lookupVariable(name)).isEqualTo(expected);
 	}
-}
+}

web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java

@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.AccountStatusException;
 import org.springframework.security.authentication.BadCredentialsException;

web/src/test/java/org/springframework/security/web/authentication/logout/DelegatingLogoutSuccessHandlerTests.java

@@ -1,118 +1,118 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.security.web.authentication.logout;
-
-import java.util.LinkedHashMap;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-/**
- * DelegatingLogoutSuccessHandlerTests Tests
- *
- * @author Shazin Sadakath
- * @author Rob Winch
- */
-@RunWith(MockitoJUnitRunner.class)
-public class DelegatingLogoutSuccessHandlerTests {
-
-	@Mock
-	RequestMatcher matcher;
-	@Mock
-	RequestMatcher matcher2;
-	@Mock
-	LogoutSuccessHandler handler;
-	@Mock
-	LogoutSuccessHandler handler2;
-	@Mock
-	LogoutSuccessHandler defaultHandler;
-	@Mock
-	HttpServletRequest request;
-	@Mock
-	MockHttpServletResponse response;
-	@Mock
-	Authentication authentication;
-
-	DelegatingLogoutSuccessHandler delegatingHandler;
-
-	@Before
-	public void setup() {
-		LinkedHashMap<RequestMatcher, LogoutSuccessHandler> matcherToHandler = new LinkedHashMap<RequestMatcher, LogoutSuccessHandler>();
-		matcherToHandler.put(this.matcher, this.handler);
-		matcherToHandler.put(this.matcher2, this.handler2);
-		this.delegatingHandler = new DelegatingLogoutSuccessHandler(matcherToHandler);
-	}
-
-	@Test
-	public void onLogoutSuccessFirstMatches() throws Exception {
-		this.delegatingHandler.setDefaultLogoutSuccessHandler(this.defaultHandler);
-		when(this.matcher.matches(this.request)).thenReturn(true);
-
-		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
-				this.authentication);
-
-		verify(this.handler).onLogoutSuccess(this.request, this.response,
-				this.authentication);
-		verifyZeroInteractions(this.matcher2, this.handler2, this.defaultHandler);
-	}
-
-	@Test
-	public void onLogoutSuccessSecondMatches() throws Exception {
-		this.delegatingHandler.setDefaultLogoutSuccessHandler(this.defaultHandler);
-		when(this.matcher2.matches(this.request)).thenReturn(true);
-
-		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
-				this.authentication);
-
-		verify(this.handler2).onLogoutSuccess(this.request, this.response,
-				this.authentication);
-		verifyZeroInteractions(this.handler, this.defaultHandler);
-	}
-
-	@Test
-	public void onLogoutSuccessDefault() throws Exception {
-		this.delegatingHandler.setDefaultLogoutSuccessHandler(this.defaultHandler);
-
-		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
-				this.authentication);
-
-		verify(this.defaultHandler).onLogoutSuccess(this.request, this.response,
-				this.authentication);
-		verifyZeroInteractions(this.handler, this.handler2);
-	}
-
-	@Test
-	public void onLogoutSuccessNoMatchDefaultNull() throws Exception {
-
-		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
-				this.authentication);
-
-		verifyZeroInteractions(this.handler, this.handler2, this.defaultHandler);
-	}
-}
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.security.web.authentication.logout;
+
+import java.util.LinkedHashMap;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * DelegatingLogoutSuccessHandlerTests Tests
+ *
+ * @author Shazin Sadakath
+ * @author Rob Winch
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DelegatingLogoutSuccessHandlerTests {
+
+	@Mock
+	RequestMatcher matcher;
+	@Mock
+	RequestMatcher matcher2;
+	@Mock
+	LogoutSuccessHandler handler;
+	@Mock
+	LogoutSuccessHandler handler2;
+	@Mock
+	LogoutSuccessHandler defaultHandler;
+	@Mock
+	HttpServletRequest request;
+	@Mock
+	MockHttpServletResponse response;
+	@Mock
+	Authentication authentication;
+
+	DelegatingLogoutSuccessHandler delegatingHandler;
+
+	@Before
+	public void setup() {
+		LinkedHashMap<RequestMatcher, LogoutSuccessHandler> matcherToHandler = new LinkedHashMap<RequestMatcher, LogoutSuccessHandler>();
+		matcherToHandler.put(this.matcher, this.handler);
+		matcherToHandler.put(this.matcher2, this.handler2);
+		this.delegatingHandler = new DelegatingLogoutSuccessHandler(matcherToHandler);
+	}
+
+	@Test
+	public void onLogoutSuccessFirstMatches() throws Exception {
+		this.delegatingHandler.setDefaultLogoutSuccessHandler(this.defaultHandler);
+		when(this.matcher.matches(this.request)).thenReturn(true);
+
+		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
+				this.authentication);
+
+		verify(this.handler).onLogoutSuccess(this.request, this.response,
+				this.authentication);
+		verifyZeroInteractions(this.matcher2, this.handler2, this.defaultHandler);
+	}
+
+	@Test
+	public void onLogoutSuccessSecondMatches() throws Exception {
+		this.delegatingHandler.setDefaultLogoutSuccessHandler(this.defaultHandler);
+		when(this.matcher2.matches(this.request)).thenReturn(true);
+
+		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
+				this.authentication);
+
+		verify(this.handler2).onLogoutSuccess(this.request, this.response,
+				this.authentication);
+		verifyZeroInteractions(this.handler, this.defaultHandler);
+	}
+
+	@Test
+	public void onLogoutSuccessDefault() throws Exception {
+		this.delegatingHandler.setDefaultLogoutSuccessHandler(this.defaultHandler);
+
+		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
+				this.authentication);
+
+		verify(this.defaultHandler).onLogoutSuccess(this.request, this.response,
+				this.authentication);
+		verifyZeroInteractions(this.handler, this.handler2);
+	}
+
+	@Test
+	public void onLogoutSuccessNoMatchDefaultNull() throws Exception {
+
+		this.delegatingHandler.onLogoutSuccess(this.request, this.response,
+				this.authentication);
+
+		verifyZeroInteractions(this.handler, this.handler2, this.defaultHandler);
+	}
+}

web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java

@@ -39,7 +39,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;

web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java

@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.core.Authentication;
 
 /**

web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java

@@ -29,7 +29,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;

web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java

@@ -21,7 +21,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.authentication.TestingAuthenticationToken;

web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java

@@ -24,7 +24,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;

web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java

@@ -23,7 +23,7 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.context.request.NativeWebRequest;

web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java

@@ -29,7 +29,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.security.core.context.SecurityContext;

web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java

@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java

@@ -29,7 +29,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java

@@ -21,7 +21,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.authentication.TestingAuthenticationToken;

web/src/test/java/org/springframework/security/web/csrf/LazyCsrfTokenRepositoryTests.java

@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -99,4 +99,4 @@ public class LazyCsrfTokenRepositoryTests {
 
 		verify(this.delegate).loadToken(this.request);
 	}
-}
+}

web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java

@@ -24,7 +24,7 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java

@@ -23,7 +23,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.web.header.HeaderWriter;

web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java

@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.web.header.writers.frameoptions.AllowFromStrategy;

web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java

@@ -23,7 +23,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.core.MethodParameter;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.web.csrf.CsrfToken;

web/src/test/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcherTests.java

@@ -24,7 +24,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -216,4 +216,4 @@ public class MvcRequestMatcherTests {
 				new HttpRequestMethodNotSupportedException(this.request.getMethod()));
 		assertThat(this.matcher.matches(this.request)).isTrue();
 	}
-}
+}

web/src/test/java/org/springframework/security/web/util/OnCommittedResponseWrapperTests.java

@@ -23,7 +23,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.security.web.util.OnCommittedResponseWrapper;
 

web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 

web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java

@@ -27,7 +27,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;

web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java

@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
 
@@ -62,4 +62,4 @@ public class NegatedRequestMatcherTests {
 
 		assertThat(matcher.matches(request)).isFalse();
 	}
-}
+}

web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
 
@@ -119,4 +119,4 @@ public class OrRequestMatcherTests {
 
 		assertThat(matcher.matches(request)).isTrue();
 	}
-}
+}

web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java

@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 /**