Add test for @SpyBean for generic bean definition

Add an integration test to check that @SpyBean can be used with on a
bean definition that returns a generic type.

Closes gh-7625

spring-boot-dependencies/pom.xml

@@ -2664,4 +2664,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
+</project>

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2012-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.boot.test.mock.mockito;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.example.ExampleGenericService;
+import org.springframework.boot.test.mock.mockito.example.ExampleGenericServiceCaller;
+import org.springframework.boot.test.mock.mockito.example.SimpleExampleIntegerGenericService;
+import org.springframework.boot.test.mock.mockito.example.SimpleExampleStringGenericService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Test {@link SpyBean} on a test class field can be used to replace existing beans.
+ *
+ * @author Phillip Webb
+ * @see SpyBeanOnTestFieldForExistingBeanCacheIntegrationTests
+ */
+@RunWith(SpringRunner.class)
+public class SpyBeanOnTestFieldForExistingGenericBeanIntegrationTests {
+
+	// gh-7625
+
+	@SpyBean
+	private ExampleGenericService<String> exampleService;
+
+	@Autowired
+	private ExampleGenericServiceCaller caller;
+
+	@Test
+	public void testSpying() throws Exception {
+		assertThat(this.caller.sayGreeting()).isEqualTo("I say 123 simple");
+		verify(this.exampleService).greeting();
+	}
+
+	@Configuration
+	@Import({ ExampleGenericServiceCaller.class,
+			SimpleExampleIntegerGenericService.class })
+	static class SpyBeanOnTestFieldForExistingBeanConfig {
+
+		@Bean
+		public ExampleGenericService<String> simpleExampleStringGenericService() {
+			// In order to trigger issue we need a method signature that returns the
+			// generic type not the actual implementation class
+			return new SimpleExampleStringGenericService();
+		}
+
+	}
+
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-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.boot.test.mock.mockito.example;
+
+/**
+ * Example generic service implementation for spy tests.
+ *
+ * @author Phillip Webb
+ */
+public class SimpleExampleIntegerGenericService
+		implements ExampleGenericService<Integer> {
+
+	@Override
+	public Integer greeting() {
+		return 123;
+	}
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-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.boot.test.mock.mockito.example;
+
+/**
+ * Example generic service implementation for spy tests.
+ *
+ * @author Phillip Webb
+ */
+public class SimpleExampleStringGenericService implements ExampleGenericService<String> {
+
+	@Override
+	public String greeting() {
+		return "simple";
+	}
+
+}