Merge branch '2.5.x' into main

This commit is contained in:
Madhura Bhave 2021-07-13 15:19:24 -07:00
commit 111ea31036

View File

@ -51,22 +51,22 @@ class WebOperationRequestPredicateTests {
}
@Test
void predicatesWithSinglePathVariablesInTheSamplePlaceAreEqual() {
void predicatesWithSinglePathVariablesInTheSamePlaceAreEqual() {
assertThat(predicateWithPath("/path/{foo1}")).isEqualTo(predicateWithPath("/path/{foo2}"));
}
@Test
void predicatesWithSingleWildcardPathVariablesInTheSamplePlaceAreEqual() {
void predicatesWithSingleWildcardPathVariablesInTheSamePlaceAreEqual() {
assertThat(predicateWithPath("/path/{*foo1}")).isEqualTo(predicateWithPath("/path/{*foo2}"));
}
@Test
void predicatesWithSingleWildcardPathVariableAndRegularVariableInTheSamplePlaceAreNotEqual() {
void predicatesWithSingleWildcardPathVariableAndRegularVariableInTheSamePlaceAreNotEqual() {
assertThat(predicateWithPath("/path/{*foo1}")).isNotEqualTo(predicateWithPath("/path/{foo2}"));
}
@Test
void predicatesWithMultiplePathVariablesInTheSamplePlaceAreEqual() {
void predicatesWithMultiplePathVariablesInTheSamePlaceAreEqual() {
assertThat(predicateWithPath("/path/{foo1}/more/{bar1}"))
.isEqualTo(predicateWithPath("/path/{foo2}/more/{bar2}"));
}