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

SPR-7834 - HttpHeaders.getEtag() mangles the value

Browse Source
This commit is contained in:
Arjen Poutsma
2011-01-03 15:51:23 +00:00
parent fbede64c86
commit e5d8fa0771
4 changed files with 33 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.web/src/test/java/org/springframework/http/HttpHeadersTests.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,10 +27,11 @@ import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
/** @author Arjen Poutsma */
public class HttpHeadersTests {
@@ -99,6 +100,14 @@ public class HttpHeadersTests {
@Test
public void eTag() {
String eTag = "\"v2.6\"";
headers.setETag(eTag);
assertEquals("Invalid ETag header", eTag, headers.getETag());
assertEquals("Invalid ETag header", "\"v2.6\"", headers.getFirst("ETag"));
}
@Test(expected = IllegalArgumentException.class)
public void illegalETag() {
String eTag = "v2.6";
headers.setETag(eTag);
assertEquals("Invalid ETag header", eTag, headers.getETag());
@@ -107,7 +116,7 @@ public class HttpHeadersTests {
@Test
public void ifNoneMatch() {
String ifNoneMatch = "v2.6";
String ifNoneMatch = "\"v2.6\"";
headers.setIfNoneMatch(ifNoneMatch);
assertEquals("Invalid If-None-Match header", ifNoneMatch, headers.getIfNoneMatch().get(0));
assertEquals("Invalid If-None-Match header", "\"v2.6\"", headers.getFirst("If-None-Match"));
@@ -115,8 +124,8 @@ public class HttpHeadersTests {
@Test
public void ifNoneMatchList() {
String ifNoneMatch1 = "v2.6";
String ifNoneMatch2 = "v2.7";
String ifNoneMatch1 = "\"v2.6\"";
String ifNoneMatch2 = "\"v2.7\"";
List<String> ifNoneMatchList = new ArrayList<String>(2);
ifNoneMatchList.add(ifNoneMatch1);
ifNoneMatchList.add(ifNoneMatch2);

23
org.springframework.web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
View File

@@ -1,11 +1,11 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -141,9 +141,9 @@ public class ServletWebRequestTests {
@Test
public void checkNotModifiedETag() {
String eTag = "Foo";
String eTag = "\"Foo\"";
servletRequest.setMethod("GET");
servletRequest.addHeader("If-None-Match", "\"" + eTag + "\"");
servletRequest.addHeader("If-None-Match", eTag );
request.checkNotModified(eTag);
@@ -151,20 +151,7 @@ public class ServletWebRequestTests {
}
@Test
public void checkModifiedETagNonQuoted() {
String currentETag = "Foo";
String oldEtag = "Bar";
servletRequest.setMethod("GET");
servletRequest.addHeader("If-None-Match", "\"" + oldEtag + "\"");
request.checkNotModified(currentETag);
assertEquals(200, servletResponse.getStatus());
assertEquals("\"" + currentETag + "\"", servletResponse.getHeader("ETag"));
}
@Test
public void checkModifiedETagQuoted() {
public void checkModifiedETag() {
String currentETag = "\"Foo\"";
String oldEtag = "Bar";
servletRequest.setMethod("GET");