|
|
|
@ -22,8 +22,6 @@ import static org.junit.Assert.assertTrue; |
|
|
|
|
|
|
|
|
|
import org.junit.Test; |
|
|
|
|
import org.springframework.mock.web.MockHttpServletRequest; |
|
|
|
|
import org.springframework.ui.ModelMap; |
|
|
|
|
import org.springframework.web.servlet.FlashMap; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Test fixture for {@link FlashMap} tests. |
|
|
|
@ -44,14 +42,14 @@ public class FlashMapTests { |
|
|
|
|
@Test |
|
|
|
|
public void matchUrlPath() { |
|
|
|
|
FlashMap flashMap = new FlashMap(); |
|
|
|
|
flashMap.setExpectedUrl(null, "/yes"); |
|
|
|
|
flashMap.setExpectedRequestUri(null, "/yes"); |
|
|
|
|
|
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes"))); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes/"))); |
|
|
|
|
assertFalse(flashMap.matches(new MockHttpServletRequest("GET", "/yes/but"))); |
|
|
|
|
assertFalse(flashMap.matches(new MockHttpServletRequest("GET", "/no"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(null, "/thats it?"); |
|
|
|
|
flashMap.setExpectedRequestUri(null, "/thats it?"); |
|
|
|
|
|
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/thats it"))); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/thats%20it"))); |
|
|
|
@ -61,45 +59,48 @@ public class FlashMapTests { |
|
|
|
|
public void matchRelativeUrlPath() { |
|
|
|
|
FlashMap flashMap = new FlashMap(); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(new MockHttpServletRequest("GET", "/oh/no"), "yes"); |
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest("GET", "/oh/no"), "yes"); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/oh/yes"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(new MockHttpServletRequest("GET", "/oh/not/again"), "../ok"); |
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest("GET", "/oh/not/again"), "../ok"); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/oh/ok"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(new MockHttpServletRequest("GET", "/yes/it/is"), ".."); |
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest("GET", "/yes/it/is"), ".."); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(new MockHttpServletRequest("GET", "/yes/it/is"), "../"); |
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest("GET", "/yes/it/is"), "../"); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(new MockHttpServletRequest("GET", "/thats it/really"), "./"); |
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest("GET", "/thats it/really"), "./"); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/thats%20it"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest("GET", "/yes/it/is"), "..?url=http://example.com"); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes"))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void matchAbsoluteUrlPath() { |
|
|
|
|
FlashMap flashMap = new FlashMap(); |
|
|
|
|
flashMap.setExpectedUrl(new MockHttpServletRequest(), "http://example.com"); |
|
|
|
|
flashMap.setExpectedRequestUri(new MockHttpServletRequest(), "http://example.com"); |
|
|
|
|
|
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", ""))); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/"))); |
|
|
|
|
assertFalse(flashMap.matches(new MockHttpServletRequest("GET", "/no"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(null, "http://example.com/"); |
|
|
|
|
flashMap.setExpectedRequestUri(null, "http://example.com/"); |
|
|
|
|
|
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", ""))); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/"))); |
|
|
|
|
assertFalse(flashMap.matches(new MockHttpServletRequest("GET", "/no"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(null, "http://example.com/yes"); |
|
|
|
|
flashMap.setExpectedRequestUri(null, "http://example.com/yes"); |
|
|
|
|
|
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes"))); |
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes/"))); |
|
|
|
|
assertFalse(flashMap.matches(new MockHttpServletRequest("GET", "/no"))); |
|
|
|
|
assertFalse(flashMap.matches(new MockHttpServletRequest("GET", "/yes/no"))); |
|
|
|
|
|
|
|
|
|
flashMap.setExpectedUrl(null, "http://example.com/yes?a=1"); |
|
|
|
|
flashMap.setExpectedRequestUri(null, "http://example.com/yes?a=1"); |
|
|
|
|
|
|
|
|
|
assertTrue(flashMap.matches(new MockHttpServletRequest("GET", "/yes"))); |
|
|
|
|
} |
|
|
|
@ -151,11 +152,11 @@ public class FlashMapTests { |
|
|
|
|
FlashMap flashMap2 = new FlashMap(); |
|
|
|
|
assertEquals(0, flashMap1.compareTo(flashMap2)); |
|
|
|
|
|
|
|
|
|
flashMap1.setExpectedUrl(null, "/path1"); |
|
|
|
|
flashMap1.setExpectedRequestUri(null, "/path1"); |
|
|
|
|
assertEquals(-1, flashMap1.compareTo(flashMap2)); |
|
|
|
|
assertEquals(1, flashMap2.compareTo(flashMap1)); |
|
|
|
|
|
|
|
|
|
flashMap2.setExpectedUrl(null, "/path2"); |
|
|
|
|
flashMap2.setExpectedRequestUri(null, "/path2"); |
|
|
|
|
assertEquals(0, flashMap1.compareTo(flashMap2)); |
|
|
|
|
|
|
|
|
|
flashMap1.setExpectedRequestParam("id", "1"); |
|
|
|
|