From d9084eab67becf7767a23b1fcd64b23e83c3559c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 19 Oct 2020 11:35:53 +0100
Subject: [PATCH] Provide Mockito with a MockResolver that removes
 Spring-created proxies

---
 .../mock/mockito/SpringBootMockResolver.java  | 38 +++++++++++++++++++
 .../org.mockito.plugins.MockResolver          |  1 +
 ...pringBootMockResolverIntegrationTests.java | 36 ++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java
 create mode 100644 spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver
 create mode 100644 spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java

diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java
new file mode 100644
index 0000000000..aaf37163e3
--- /dev/null
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolver.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2012-2020 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
+ *
+ *      https://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.mockito.plugins.MockResolver;
+
+import org.springframework.test.util.AopTestUtils;
+
+/**
+ * A {@link MockResolver} for testing Spring Boot applications with Mockito. Resolves
+ * mocks by returning the {@link AopTestUtils#getUltimateTargetObject(Object) ultimate
+ * target object} of the instance.
+ *
+ * @author Andy Wilkinson
+ * @since 2.4.0
+ */
+public class SpringBootMockResolver implements MockResolver {
+
+	@Override
+	public Object resolve(Object instance) {
+		return AopTestUtils.getUltimateTargetObject(instance);
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver b/spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver
new file mode 100644
index 0000000000..3646a4b775
--- /dev/null
+++ b/spring-boot-project/spring-boot-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockResolver
@@ -0,0 +1 @@
+org.springframework.boot.test.mock.mockito.SpringBootMockResolver
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java
new file mode 100644
index 0000000000..0a1ce91cbc
--- /dev/null
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverIntegrationTests.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012-2020 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
+ *
+ *      https://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.jupiter.api.Test;
+import org.mockito.internal.configuration.plugins.Plugins;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link SpringBootMockResolver}.
+ *
+ * @author Andy Wilkinson
+ */
+class SpringBootMockResolverIntegrationTests {
+
+	@Test
+	void customMockResolverIsRegisteredWithMockito() {
+		assertThat(Plugins.getMockResolvers()).hasOnlyElementsOfType(SpringBootMockResolver.class);
+	}
+
+}