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

INT-4017: Fix If-None-Match HTTP header tests

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4017

According RFC 7232 (https://tools.ietf.org/html/rfc7232#section-2.3) the ETag headers must be in the pattern:
```
ETag       = entity-tag

     entity-tag = [ weak ] opaque-tag
     weak       = %x57.2F ; "W/", case-sensitive
     opaque-tag = DQUOTE *etagc DQUOTE
     etagc      = %x21 / %x23-7E / obs-text
                ; VCHAR except double quotes, plus obs-text
```
Therefore the regexp like `HttpHeaders.ETAG_HEADER_VALUE_PATTERN`
This commit is contained in:
Artem Bilan
2016-04-28 20:00:06 -04:00
parent 98a7b679ec
commit 6b6a38f8cb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2016 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.
@@ -432,64 +432,64 @@ public class DefaultHttpHeaderMapperFromMessageOutboundTests {
public void validateIfNoneMatch() throws ParseException {
HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
Map<String, Object> messageHeaders = new HashMap<String, Object>();
messageHeaders.put("If-None-Match", "1234567");
messageHeaders.put("If-None-Match", "\"1234567\"");
HttpHeaders headers = new HttpHeaders();
mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
assertEquals(1, headers.getIfNoneMatch().size());
assertEquals("1234567", headers.getIfNoneMatch().get(0));
assertEquals("\"1234567\"", headers.getIfNoneMatch().get(0));
}
@Test
public void validateIfNoneMatchAsDelimitedString() throws ParseException {
HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
Map<String, Object> messageHeaders = new HashMap<String, Object>();
messageHeaders.put("If-None-Match", "1234567, 123");
messageHeaders.put("If-None-Match", "\"123,4567\", \"123\"");
HttpHeaders headers = new HttpHeaders();
mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
assertEquals(2, headers.getIfNoneMatch().size());
assertEquals("1234567", headers.getIfNoneMatch().get(0));
assertEquals("123", headers.getIfNoneMatch().get(1));
assertEquals("\"123,4567\"", headers.getIfNoneMatch().get(0));
assertEquals("\"123\"", headers.getIfNoneMatch().get(1));
}
@Test
public void validateIfNoneMatchAsStringArray() throws ParseException {
HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
Map<String, Object> messageHeaders = new HashMap<String, Object>();
messageHeaders.put("If-None-Match", new String[] {"1234567", "123"});
messageHeaders.put("If-None-Match", new String[] {"\"1234567\"", "\"123\""});
HttpHeaders headers = new HttpHeaders();
mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
assertEquals(2, headers.getIfNoneMatch().size());
assertEquals("1234567", headers.getIfNoneMatch().get(0));
assertEquals("123", headers.getIfNoneMatch().get(1));
assertEquals("\"1234567\"", headers.getIfNoneMatch().get(0));
assertEquals("\"123\"", headers.getIfNoneMatch().get(1));
}
@Test
public void validateIfNoneMatchAsCommaDelimitedString() throws ParseException {
HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
Map<String, Object> messageHeaders = new HashMap<String, Object>();
messageHeaders.put("If-None-Match", "1234567, 123");
messageHeaders.put("If-None-Match", "\"123.4567\", \"123\"");
HttpHeaders headers = new HttpHeaders();
mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
assertEquals(2, headers.getIfNoneMatch().size());
assertEquals("1234567", headers.getIfNoneMatch().get(0));
assertEquals("123", headers.getIfNoneMatch().get(1));
assertEquals("\"123.4567\"", headers.getIfNoneMatch().get(0));
assertEquals("\"123\"", headers.getIfNoneMatch().get(1));
}
@Test
public void validateIfNoneMatchAsStringCollection() throws ParseException {
HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
Map<String, Object> messageHeaders = new HashMap<String, Object>();
messageHeaders.put("If-None-Match", Arrays.asList("1234567", "123"));
messageHeaders.put("If-None-Match", Arrays.asList("\"1234567\"", "\"123\""));
HttpHeaders headers = new HttpHeaders();
mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
assertEquals(2, headers.getIfNoneMatch().size());
assertEquals("1234567", headers.getIfNoneMatch().get(0));
assertEquals("123", headers.getIfNoneMatch().get(1));
assertEquals("\"1234567\"", headers.getIfNoneMatch().get(0));
assertEquals("\"123\"", headers.getIfNoneMatch().get(1));
}
// Pragma tests