root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-09-29 15:52:20 +01:00
parent bcdc6958f0 663cae1255
commit c903f87429
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,8 +37,12 @@ import org.springframework.test.context.junit4.SpringRunner;
* or test classes that are {@link RunWith @RunWith} the {@link SpringRunner}. * or test classes that are {@link RunWith @RunWith} the {@link SpringRunner}.
* <p> * <p>
* Mocks can be registered by type or by {@link #name() bean name}. Any existing single * 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 * 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. * 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.
* <p> * <p>
* When {@code @MockBean} is used on a field, as well as being registered in the * When {@code @MockBean} is used on a field, as well as being registered in the
* application context, the mock will also be injected into the field. Typical usage might * application context, the mock will also be injected into the field. Typical usage might

8
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -38,7 +38,11 @@ import org.springframework.test.context.junit4.SpringRunner;
* <p> * <p>
* Spies can be applied by type or by {@link #name() bean name}. All beans in the context * 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 * of the same type will be wrapped with the spy. If no existing bean is defined a new one
* will be added. * 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.
* <p> * <p>
* When {@code @SpyBean} is used on a field, as well as being registered in the * When {@code @SpyBean} is used on a field, as well as being registered in the
* application context, the spy will also be injected into the field. Typical usage might * application context, the spy will also be injected into the field. Typical usage might