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

Merge branch '2.7.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2022-04-14 14:53:40 +01:00
parent 21ccd58f67 7789a18d23
commit 9658661bd4
8 changed files with 186 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 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.
@@ -290,9 +290,13 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
// precedence
propertySourceProperties.addAll(0, Arrays.asList(properties));
}
if (getWebEnvironment(testClass) == WebEnvironment.RANDOM_PORT) {
WebEnvironment webEnvironment = getWebEnvironment(testClass);
if (webEnvironment == WebEnvironment.RANDOM_PORT) {
propertySourceProperties.add("server.port=0");
}
else if (webEnvironment == WebEnvironment.NONE) {
propertySourceProperties.add("spring.main.web-application-type=none");
}
}
/**