From 7052af97a65b1b8b17de90758293aec653905b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Basl=C3=A9?= Date: Wed, 7 Aug 2024 14:57:15 +0200 Subject: [PATCH] Polish test to focus on the FactoryBean results being mocked --- ...itoBeanForBeanFactoryIntegrationTests.java | 26 ++--- ...SpyBeanForBeanFactoryIntegrationTests.java | 94 +++++++++++++++++++ 2 files changed, 109 insertions(+), 11 deletions(-) create mode 100644 spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java index 7932248128a..c7e6a3ca71d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java @@ -16,6 +16,8 @@ package org.springframework.test.context.bean.override.mockito; +import java.util.concurrent.atomic.AtomicBoolean; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.FactoryBean; @@ -26,32 +28,31 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; +import static org.mockito.BDDMockito.when; /** - * Test {@link MockitoBean @MockitoBean} for a factory bean. + * Test {@link MockitoBean @MockitoBean} for a factory bean configuration. * - * @author Phillip Webb + * @author Simon Baslé */ @SpringJUnitConfig class MockitoBeanForBeanFactoryIntegrationTests { @MockitoBean - private TestFactoryBean testFactoryBean; + private TestBean testBean; @Autowired private ApplicationContext applicationContext; @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) - void testName() { - TestBean testBean = mock(TestBean.class); - given(testBean.hello()).willReturn("amock"); - given(this.testFactoryBean.getObjectType()).willReturn((Class) TestBean.class); - given(this.testFactoryBean.getObject()).willReturn(testBean); + void beanReturnedByFactoryIsMocked() { TestBean bean = this.applicationContext.getBean(TestBean.class); + assertThat(bean).isSameAs(this.testBean); + + when(testBean.hello()).thenReturn("amock"); assertThat(bean.hello()).isEqualTo("amock"); + + assertThat(TestFactoryBean.USED).isFalse(); } @Configuration(proxyBeanMethods = false) @@ -66,8 +67,11 @@ class MockitoBeanForBeanFactoryIntegrationTests { static class TestFactoryBean implements FactoryBean { + static final AtomicBoolean USED = new AtomicBoolean(false); + @Override public TestBean getObject() { + USED.set(true); return () -> "normal"; } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java new file mode 100644 index 00000000000..6459c6fb978 --- /dev/null +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java @@ -0,0 +1,94 @@ +/* + * Copyright 2002-2024 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.test.context.bean.override.mockito; + +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.bean.override.mockito.MockitoBeanForBeanFactoryIntegrationTests.TestBean; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Test {@link MockitoSpyBean @MockitoSpyBean} for a factory bean configuration. + * + * @author Simon Baslé + */ +@SpringJUnitConfig +class MockitoSpyBeanForBeanFactoryIntegrationTests { + + @MockitoSpyBean + private TestBean testBean; + + @Autowired + private TestFactoryBean testFactoryBean; + + @Autowired + private ApplicationContext applicationContext; + + @Test + void beanReturnedByFactoryIsSpied() { + TestBean bean = this.applicationContext.getBean(TestBean.class); + assertThat(this.testBean).as("injected same").isSameAs(bean); + assertThat(bean.hello()).isEqualTo("hi"); + + Mockito.verify(bean).hello(); + } + + @Test + void factoryItselfIsNotSpied() { + assertThat(this.testFactoryBean.getObject()).isNotSameAs(this.testBean); + } + + @Configuration(proxyBeanMethods = false) + static class Config { + + @Bean + TestFactoryBean testFactoryBean() { + return new TestFactoryBean(); + } + + } + + static class TestBeanImpl implements TestBean { + @Override + public String hello() { + return "hi"; + } + } + + static class TestFactoryBean implements FactoryBean { + + @Override + public TestBean getObject() { + return new TestBeanImpl(); + } + + @Override + public Class getObjectType() { + return TestBean.class; + } + + } + +}