Polish 'Fail fast when base path and an endpoint mapping are set to '/''

See gh-45251
This commit is contained in:
Phillip Webb
2025-04-22 11:48:14 -07:00
parent 8f535b266c
commit 7dac8ca345
6 changed files with 81 additions and 48 deletions

View File

@@ -1,27 +0,0 @@
package smoketest.actuator;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.SpringApplication;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/**
* Verifies that an exception is thrown when management and server endpoint paths
* conflict.
*
* @author Yongjun Hong
*/
class ManagementEndpointConflictSmokeTest {
@Test
void shouldThrowExceptionWhenManagementAndServerPathsConflict() {
assertThatThrownBy(() -> {
SpringApplication.run(SampleActuatorApplication.class, "--management.endpoints.web.base-path=/",
"--management.endpoints.web.path-mapping.health=/");
}).isInstanceOf(BeanCreationException.class)
.hasMessageContaining("Management endpoints and endpoint path are both mapped to '/'");
}
}

View File

@@ -0,0 +1,42 @@
/*
* Copyright 2012-2025 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package smoketest.actuator;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.SpringApplication;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* Verifies that an exception is thrown when management and server endpoint paths
* conflict.
*
* @author Yongjun Hong
*/
class ManagementEndpointConflictSmokeTests {
@Test
void shouldThrowExceptionWhenManagementAndServerPathsConflict() {
assertThatExceptionOfType(BeanCreationException.class)
.isThrownBy(() -> SpringApplication.run(SampleActuatorApplication.class,
"--management.endpoints.web.base-path=/", "--management.endpoints.web.path-mapping.health=/"))
.withMessageContaining("Management base path and the 'health' actuator endpoint are both mapped to '/'");
}
}