diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java index 21f6c213bef..201a3e2e794 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 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. @@ -36,10 +36,12 @@ import org.springframework.test.context.junit4.SpringRunner; * used as a class level annotation or on fields in either {@code @Configuration} classes, * or test classes that are {@link RunWith @RunWith} the {@link SpringRunner}. *
- * Mocks can be registered by type or by {@link #name() bean name}. Any existing single - * bean of the same type defined in the context will be replaced by the mock. If no - * existing bean is defined a new one will be added. Dependencies that are known to the - * application context but are not beans (such as those + * Mocks can be registered by type or by {@link #name() bean name}. When registered by + * type, any existing single bean of a matching type (including subclasses) in the context + * will be replaced by the mock. When registered by name, an existing bean can be + * specifically targeted for replacement by a mock. In either case, if no existing bean is + * defined a new one will be added. Dependencies that are known to the application context + * but are not beans (such as those * {@link org.springframework.beans.factory.config.ConfigurableListableBeanFactory#registerResolvableDependency(Class, Object) * registered directly}) will not be found and a mocked bean will be added to the context * alongside the existing dependency. diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java index 7715875312f..bf5146805cc 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 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. @@ -37,9 +37,9 @@ import org.springframework.test.context.junit4.SpringRunner; * {@link RunWith @RunWith} the {@link SpringRunner}. *
* Spies can be applied by type or by {@link #name() bean name}. All beans in the context - * of the same type will be wrapped with the spy. If no existing bean is defined a new one - * will be added. Dependencies that are known to the application context but are not beans - * (such as those + * of a matching type (including subclasses) will be wrapped with the spy. If no existing + * bean is defined a new one will be added. Dependencies that are known to the application + * context but are not beans (such as those * {@link org.springframework.beans.factory.config.ConfigurableListableBeanFactory#registerResolvableDependency(Class, Object) * registered directly}) will not be found and a spied bean will be added to the context * alongside the existing dependency.