Merge branch '2.4.x' into 2.5.x

pull/27328/head
Madhura Bhave 3 years ago
commit ed22e4a897

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

Loading…
Cancel
Save