Browse Source

Move MockCookie parsing tests to correct class

Issue: SPR-17321, #1974
pull/1976/merge
Sam Brannen 6 years ago
parent
commit
31095f1d4e
  1. 23
      spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java
  2. 24
      spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java

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

@ -81,4 +81,27 @@ public class MockCookieTests { @@ -81,4 +81,27 @@ public class MockCookieTests {
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

@ -544,30 +544,6 @@ public class MockHttpServletRequestTests { @@ -544,30 +544,6 @@ public class MockHttpServletRequestTests {
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) {
assertNotNull(enum1);
assertNotNull(enum2);

Loading…
Cancel
Save