Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE

Closes spring-projectsgh-36659
snicoll · Aug 3, 2023 · 780dfe3 · 780dfe3
1 parent 98b5ac6
commit 780dfe3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/...t-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java b/...t-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
@@ -252,12 +252,11 @@ private Set<String> getExistingBeans(ConfigurableListableBeanFactory beanFactory
 		Set<String> beans = new LinkedHashSet<>(
 				Arrays.asList(beanFactory.getBeanNamesForType(resolvableType, true, false)));
 		Class<?> type = resolvableType.resolve(Object.class);
-		String typeName = type.getName();
 		for (String beanName : beanFactory.getBeanNamesForType(FactoryBean.class, true, false)) {
 			beanName = BeanFactoryUtils.transformedBeanName(beanName);
 			BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
 			Object attribute = beanDefinition.getAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE);
-			if (resolvableType.equals(attribute) || type.equals(attribute) || typeName.equals(attribute)) {
+			if (resolvableType.equals(attribute) || type.equals(attribute)) {
 				beans.add(beanName);
 			}
 		}

diff --git a/...t/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java b/...t/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java
@@ -73,18 +73,6 @@ void cannotMockMultipleQualifiedBeans() {
 					+ " expected a single matching bean to replace but found [example1, example3]");
 	}
 
-	@Test
-	void canMockBeanProducedByFactoryBeanWithStringObjectTypeAttribute() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		MockitoPostProcessor.register(context);
-		RootBeanDefinition factoryBeanDefinition = new RootBeanDefinition(TestFactoryBean.class);
-		factoryBeanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, SomeInterface.class.getName());
-		context.registerBeanDefinition("beanToBeMocked", factoryBeanDefinition);
-		context.register(MockedFactoryBean.class);
-		context.refresh();
-		assertThat(Mockito.mockingDetails(context.getBean("beanToBeMocked")).isMock()).isTrue();
-	}
-
 	@Test
 	void canMockBeanProducedByFactoryBeanWithClassObjectTypeAttribute() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();