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

Remove PathMatchResultComparator

Browse Source 
Follow-up change to the previous commit.
This commit is contained in:
Rossen Stoyanchev
2017-07-01 17:27:54 -04:00
parent a5e54788cc
commit 145eab9c2f
6 changed files with 84 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webflux/src/test/java/org/springframework/web/reactive/handler/PathPatternRegistryTests.java
View File

@@ -24,7 +24,6 @@ import java.util.stream.Collectors;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -45,17 +44,13 @@ import static org.junit.Assert.assertThat;
*/
public class PathPatternRegistryTests {
private PathPatternRegistry<Object> registry;
private final PathPatternRegistry<Object> registry = new PathPatternRegistry();
private final PathPatternParser parser = new PathPatternParser();
@Rule
public ExpectedException thrown = ExpectedException.none();
@Before
public void setUp() throws Exception {
this.registry = new PathPatternRegistry();
}
@Test
public void shouldPrependPatternsWithSlash() {
@@ -79,7 +74,7 @@ public class PathPatternRegistryTests {
this.registry.register("/fo?", new Object());
this.registry.register("/f?o", new Object());
Set<PathMatchResult<Object>> matches = this.registry.findMatches("/foo");
assertThat(getPatternList(matches), contains(pattern("/f?o"), pattern("/fo?")));
assertThat(toPatterns(matches), contains(pattern("/f?o"), pattern("/fo?")));
}
@Test
@@ -94,15 +89,13 @@ public class PathPatternRegistryTests {
this.registry.register("/foo/bar/baz", new Object());
this.registry.register("/foo/bar/{baz}", new Object());
Set<PathMatchResult<Object>> matches = this.registry.findMatches("/foo/bar/baz");
assertThat(getPatternList(matches), contains(pattern("/foo/bar/baz"), pattern("/foo/bar/{baz}"),
assertThat(toPatterns(matches), contains(pattern("/foo/bar/baz"), pattern("/foo/bar/{baz}"),
pattern("/foo/{*baz}")));
}
private List<PathPattern> getPatternList(Collection<PathMatchResult<Object>> results) {
return results.stream()
.map(result -> result.getPattern()).collect(Collectors.toList());
private List<PathPattern> toPatterns(Collection<PathMatchResult<Object>> results) {
return results.stream().map(PathMatchResult::getPattern).collect(Collectors.toList());
}
private static PathPatternMatcher pattern(String pattern) {

13
spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java
View File

@@ -16,10 +16,14 @@
package org.springframework.web.reactive.result.condition;
import java.util.Arrays;
import java.util.Iterator;
import org.junit.Test;
import org.springframework.mock.http.server.reactive.test.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.util.pattern.PathPattern;
import org.springframework.web.util.pattern.PathPatternParser;
import static org.junit.Assert.assertEquals;
@@ -143,6 +147,15 @@ public class PatternsRequestConditionTests {
assertEquals(0, c1.compareTo(c2, get("/foo").toExchange()));
}
@Test
public void equallyMatchingPatternsAreBothPresent() throws Exception {
PatternsRequestCondition c = new PatternsRequestCondition("/a", "/b");
assertEquals(2, c.getPatterns().size());
Iterator<PathPattern> itr = c.getPatterns().iterator();
assertEquals("/a", itr.next().getPatternString());
assertEquals("/b", itr.next().getPatternString());
}
@Test
public void comparePatternSpecificity() throws Exception {
PatternsRequestCondition c1 = new PatternsRequestCondition("/fo*");