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

Merge branch '5.2.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2020-05-28 06:52:23 +01:00
parent 90ccabd60b a92f425529
commit d706899b7e
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
View File

@@ -63,6 +63,7 @@ public class RequestMappingInfoTests {
assertThat(info.getHeadersCondition()).isSameAs(anotherInfo.getHeadersCondition());
assertThat(info.getConsumesCondition()).isSameAs(anotherInfo.getConsumesCondition());
assertThat(info.getProducesCondition()).isSameAs(anotherInfo.getProducesCondition());
assertThat(info.getCustomCondition()).isSameAs(anotherInfo.getCustomCondition());
RequestMappingInfo result = info.combine(anotherInfo);
assertThat(info.getPatternsCondition()).isSameAs(result.getPatternsCondition());
@@ -71,6 +72,7 @@ public class RequestMappingInfoTests {
assertThat(info.getHeadersCondition()).isSameAs(result.getHeadersCondition());
assertThat(info.getConsumesCondition()).isSameAs(result.getConsumesCondition());
assertThat(info.getProducesCondition()).isSameAs(result.getProducesCondition());
assertThat(info.getCustomCondition()).isSameAs(result.getCustomCondition());
}
@Test