Merge branch '2.7.x' into 3.0.x

Closes gh-34044

Author: wilkinsona

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -79,7 +79,7 @@ private void resetMocks(ConfigurableApplicationContext applicationContext, MockR
 		for (String name : names) {
 			BeanDefinition definition = beanFactory.getBeanDefinition(name);
 			if (definition.isSingleton() && instantiatedSingletons.contains(name)) {
-				Object bean = beanFactory.getSingleton(name);
+				Object bean = getBean(beanFactory, name);
 				if (reset.equals(MockReset.get(bean))) {
 					Mockito.reset(bean);
 				}
@@ -101,4 +101,13 @@ private void resetMocks(ConfigurableApplicationContext applicationContext, MockR
 		}
 	}
 
+	private Object getBean(ConfigurableListableBeanFactory beanFactory, String name) {
+		try {
+			return beanFactory.getBean(name);
+		}
+		catch (Exception ex) {
+			return beanFactory.getSingleton(name);
+		}
+	}
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -52,13 +52,15 @@ void test001() {
 		given(getMock("none").greeting()).willReturn("none");
 		given(getMock("before").greeting()).willReturn("before");
 		given(getMock("after").greeting()).willReturn("after");
+		given(getMock("fromFactoryBean").greeting()).willReturn("fromFactoryBean");
 	}
 
 	@Test
 	void test002() {
 		assertThat(getMock("none").greeting()).isEqualTo("none");
 		assertThat(getMock("before").greeting()).isNull();
 		assertThat(getMock("after").greeting()).isNull();
+		assertThat(getMock("fromFactoryBean").greeting()).isNull();
 	}
 
 	ExampleService getMock(String name) {
@@ -102,6 +104,11 @@ BrokenFactoryBean brokenFactoryBean() {
 			return new BrokenFactoryBean();
 		}
 
+		@Bean
+		WorkingFactoryBean fromFactoryBean() {
+			return new WorkingFactoryBean();
+		}
+
 	}
 
 	static class BrokenFactoryBean implements FactoryBean<String> {
@@ -123,4 +130,23 @@ public boolean isSingleton() {
 
 	}
 
+	static class WorkingFactoryBean implements FactoryBean<ExampleService> {
+
+		@Override
+		public ExampleService getObject() {
+			return mock(ExampleService.class, MockReset.before());
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return ExampleService.class;
+		}
+
+		@Override
+		public boolean isSingleton() {
+			return true;
+		}
+
+	}
+
 }