From 31095f1d4e9eb270da9ec83a35733c0528e81e6c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 2 Oct 2018 12:43:17 +0200 Subject: [PATCH] Move MockCookie parsing tests to correct class Issue: SPR-17321, #1974 --- .../mock/web/MockCookieTests.java | 23 ++++++++++++++++++ .../mock/web/MockHttpServletRequestTests.java | 24 ------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java index 77c0be4b7f..a41fed503f 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java @@ -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()); + } + } diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java index 27451ab1d6..8d1c269844 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java @@ -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);