Test server port shouldn't affect management port when random
Closes gh-16108
This commit is contained in:
parent
07d95ce086
commit
2f3e5d65be
|
@ -52,7 +52,8 @@ class SpringBootTestRandomPortEnvironmentPostProcessor
|
||||||
}
|
}
|
||||||
Integer managementPort = getPropertyAsInteger(environment,
|
Integer managementPort = getPropertyAsInteger(environment,
|
||||||
MANAGEMENT_PORT_PROPERTY, null);
|
MANAGEMENT_PORT_PROPERTY, null);
|
||||||
if (managementPort == null || managementPort.equals(-1)) {
|
if (managementPort == null || managementPort.equals(-1)
|
||||||
|
|| managementPort.equals(0)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Integer serverPort = getPropertyAsInteger(environment, SERVER_PORT_PROPERTY,
|
Integer serverPort = getPropertyAsInteger(environment, SERVER_PORT_PROPERTY,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 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.
|
||||||
|
@ -58,6 +58,17 @@ public class SpringBootTestRandomPortEnvironmentPostProcessorTests {
|
||||||
assertThat(this.environment.getProperty("management.server.port")).isEqualTo("0");
|
assertThat(this.environment.getProperty("management.server.port")).isEqualTo("0");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void postProcessWhenServerPortAndManagementPortIsZeroInDifferentPropertySources() {
|
||||||
|
addTestPropertySource("0", null);
|
||||||
|
Map<String, Object> source = new HashMap<>();
|
||||||
|
source.put("management.server.port", "0");
|
||||||
|
this.propertySources.addLast(new MapPropertySource("other", source));
|
||||||
|
this.postProcessor.postProcessEnvironment(this.environment, null);
|
||||||
|
assertThat(this.environment.getProperty("server.port")).isEqualTo("0");
|
||||||
|
assertThat(this.environment.getProperty("management.server.port")).isEqualTo("0");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void postProcessWhenTestServerAndTestManagementPortAreNonZero() {
|
public void postProcessWhenTestServerAndTestManagementPortAreNonZero() {
|
||||||
addTestPropertySource("8080", "8081");
|
addTestPropertySource("8080", "8081");
|
||||||
|
|
Loading…
Reference in New Issue