Spies are not reset after test execution when using @SpyBean

[mjgp2]

Spies created with @SpyBean are not added to the MockitoBeans which are then reset at the end of test execution like Mocks are, rendering them useless for invocation counts.

Compare from org.springframework.boot.test.mock.mockito.MockitoPostProcessor:

private void registerMock(ConfigurableListableBeanFactory beanFactory,
		BeanDefinitionRegistry registry, MockDefinition definition, Field field) {
	RootBeanDefinition beanDefinition = createBeanDefinition(definition);
	String beanName = getBeanName(beanFactory, registry, definition, beanDefinition);
	beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(1,
			beanName);
	if (registry.containsBeanDefinition(beanName)) {
		registry.removeBeanDefinition(beanName);
	}
	registry.registerBeanDefinition(beanName, beanDefinition);
	Object mock = createMock(definition, beanName);
	beanFactory.registerSingleton(beanName, mock);
	this.mockitoBeans.add(mock);
	this.beanNameRegistry.put(definition, beanName);
	if (field != null) {
		this.fieldRegistry.put(field, new RegisteredField(definition, beanName));
	}
}

and

private void registerSpy(SpyDefinition definition, Field field, String beanName) {
	this.spies.put(beanName, definition);
	this.beanNameRegistry.put(definition, beanName);
	if (field != null) {
		this.fieldRegistry.put(field, new RegisteredField(definition, beanName));
	}
}

You can see for @MockBean that we register the mocks (this.mockitoBeans.add(mock);) but for @SpyBean the mock is never registered, and hence is not reset when the beans contained in the MockitoBeans instance are.

[wilkinsona]

I can't reproduce the problem described here. These tests pass:

@RunWith(SpringRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class SpyBeanResetTests {

	@SpyBean
	private SomeService someService;

	@Test
	public void test001() {
		this.someService.doSomething();
	}

	@Test
	public void test002() {
		verify(this.someService, times(0)).doSomething();
	}

	@Configuration
	static class Config {

		@Bean
		SomeService someService() {
			return new SomeService();
		}

	}

	static class SomeService {

		void doSomething() {

		}

	}

}

They pass because the spied bean is part of the application context and ResetMocksTestExecutionListener finds it in the application context and resets it.

@mjgp2 Do you have an example that reproduces the behaviour you've described?

The support for @MockBean and @SpyBean has evolved in 1.4.x, and it looks to me like MockitoBeans may actually now be redundant but I'd like to be a bit more certain before removing it.

[mjgp2]

Looks like this was fixed in 1.4.2 👍

I can remove the workarounds from my tests and they now pass. Hoorah.