Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb
2019-06-28 23:27:59 -07:00
parent 4f079803d2 d91f27e11f
commit cfeb0239b7
342 changed files with 332 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@@ -73,6 +73,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
* @author Andy Wilkinson
* @author Stephane Nicoll
* @author Madhura Bhave
* @since 1.4.0
* @see SpringBootTest
*/
public class SpringBootContextLoader extends AbstractContextLoader {

1
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProvider.java
View File

@@ -43,6 +43,7 @@ import org.springframework.util.Assert;
*
* @param <C> the application context type
* @author Phillip Webb
* @since 2.0.0
* @see AssertableApplicationContext
* @see AssertableWebApplicationContext
* @see AssertableReactiveWebApplicationContext