root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Move MockCookie parsing tests to correct class 

Issue: SPR-17321, #1974
This commit is contained in:
Sam Brannen 2018-10-02 12:43:17 +02:00
parent 49bc746640
commit 31095f1d4e
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java
View File

@ -81,4 +81,27 @@ public class MockCookieTests {
MockCookie.parse(header); MockCookie.parse(header);
} }
@Test
public void testCookieParsing() {
MockCookie m = MockCookie.parse("foo=bar");
testCookie("foo", "bar", m);
m = MockCookie.parse("foo=bar;");
assertFalse(m.isHttpOnly());
assertFalse(m.getSecure());
testCookie("foo", "bar", m);
m = MockCookie.parse("foo=bar; HttpOnly");
testCookie("foo", "bar", m);
assertTrue(m.isHttpOnly());
assertFalse(m.getSecure());
m = MockCookie.parse("foo=bar; Secure");
testCookie("foo", "bar", m);
assertTrue(m.getSecure());
assertFalse(m.isHttpOnly());
}
private void testCookie(String name, String value, MockCookie mockCookie) {
assertEquals(name, mockCookie.getName());
assertEquals(value, mockCookie.getValue());
}
} }

24
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@ -544,30 +544,6 @@ public class MockHttpServletRequestTests {
request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE); request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE);
} }
@Test
public void testCookieParsing() {
MockCookie m = MockCookie.parse("foo=bar");
testCookie("foo", "bar", m);
m = MockCookie.parse("foo=bar;");
assertFalse(m.isHttpOnly());
assertFalse(m.getSecure());
testCookie("foo", "bar", m);
m = MockCookie.parse("foo=bar; HttpOnly");
testCookie("foo", "bar", m);
assertTrue(m.isHttpOnly());
assertFalse(m.getSecure());
m = MockCookie.parse("foo=bar; Secure");
testCookie("foo", "bar", m);
assertTrue(m.getSecure());
assertFalse(m.isHttpOnly());
}
private void testCookie(String name, String value, MockCookie mockCookie) {
assertEquals(name, mockCookie.getName());
assertEquals(value, mockCookie.getValue());
}
private void assertEqualEnumerations(Enumeration<?> enum1, Enumeration<?> enum2) { private void assertEqualEnumerations(Enumeration<?> enum1, Enumeration<?> enum2) {
assertNotNull(enum1); assertNotNull(enum1);
assertNotNull(enum2); assertNotNull(enum2);