Upgrade to Mockito 2

Closes gh-7770

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito110Tests.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2012-2017 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.boot.test.mock.mockito;
+
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.junit.runner.classpath.ClassPathOverrides;
+import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for compatibility with Mockito 1.10
+ *
+ * @author Andy Wilkinson
+ * @author Stephane Nicoll
+ */
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathOverrides("org.mockito:mockito-core:1.10.19")
+public class Mockito110Tests {
+
+	@Test
+	public void spyBeanWithAopProxyTestsWithMockito1() {
+		runTests(SpyBeanWithAopProxyTests.class);
+	}
+
+	private void runTests(Class<?> testClass) {
+		Result result = new JUnitCore().run(testClass);
+		assertThat(result.getFailureCount()).isEqualTo(0);
+		assertThat(result.getRunCount()).isGreaterThan(0);
+	}
+
+}

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanOnTestFieldForMultipleExistingBeansIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,7 +49,7 @@ public class SpyBeanOnTestFieldForMultipleExistingBeansIntegrationTests {
 	@Test
 	public void testSpying() throws Exception {
 		assertThat(this.caller.sayGreeting()).isEqualTo("I say two");
-		assertThat(new MockUtil().getMockName(this.spy).toString()).isEqualTo("two");
+		assertThat(MockUtil.getMockName(this.spy).toString()).isEqualTo("two");
 		verify(this.spy).greeting();
 	}