Skip to content

Commit

Permalink
Clarify type matching performed by MockBean and SpyBean
Browse files Browse the repository at this point in the history
Closes gh-28656
  • Loading branch information
wilkinsona committed Mar 23, 2022
1 parent 1d15e8c commit e927cd7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
@@ -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.
Expand Down Expand Up @@ -36,10 +36,12 @@
* 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}.
* <p>
* 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.
Expand Down
@@ -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.
Expand Down Expand Up @@ -37,9 +37,9 @@
* {@link RunWith @RunWith} the {@link SpringRunner}.
* <p>
* 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.
Expand Down

0 comments on commit e927cd7

Please sign in to comment.