diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java index 6b68f0cbdf3c..22731ae3e744 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -355,9 +355,13 @@ void inject(Field field, Object target, Definition definition) { private void inject(Field field, Object target, String beanName) { try { field.setAccessible(true); - Assert.state(ReflectionUtils.getField(field, target) == null, - () -> "The field " + field + " cannot have an existing value"); + Object existingValue = ReflectionUtils.getField(field, target); Object bean = this.beanFactory.getBean(beanName, field.getType()); + if (existingValue == bean) { + return; + } + Assert.state(existingValue == null, () -> "The existing value '" + existingValue + "' of field '" + field + + "' is not the same as the new value '" + bean + "'"); ReflectionUtils.setField(field, target, bean); } catch (Throwable ex) { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java new file mode 100644 index 000000000000..0c0e04cf7b3f --- /dev/null +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests.java @@ -0,0 +1,61 @@ +/* + * Copyright 2012-2021 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.boot.test.mock.mockito; + +import org.junit.AfterClass; +import org.junit.Rule; +import org.junit.Test; + +import org.springframework.test.annotation.Repeat; +import org.springframework.test.context.junit4.rules.SpringMethodRule; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link MockBean} and {@link Repeat}. + * + * @author Andy Wilkinson + * @see gh-27693 + */ +public class MockBeanWithSpringMethodRuleRepeatJUnit4IntegrationTests { + + @Rule + public final SpringMethodRule springMethodRule = new SpringMethodRule(); + + @MockBean + private FirstService first; + + private static int invocations; + + @AfterClass + public static void afterClass() { + assertThat(invocations).isEqualTo(2); + } + + @Test + @Repeat(2) + public void repeatedTest() { + invocations++; + } + + interface FirstService { + + String greeting(); + + } + +} diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index c9553cb27b28..89eae830e3a4 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -41,6 +41,7 @@ +