android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-26 06:43:09 +03:00
Code Releases Activity

Use 'Headers' in recorded response.

Browse Source
This commit is contained in:
Jake Wharton
2015-01-05 22:16:25 -08:00
parent 5f44ca768e
commit c46b61d565
12 changed files with 130 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java
View File

@@ -484,8 +484,7 @@ public final class UrlConnectionCacheTest {
RecordedRequest conditionalRequest = assertConditionallyCached(
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Date: " + formatDate(-15, TimeUnit.SECONDS)));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void defaultExpirationDateFullyCachedForMoreThan24Hours() throws Exception {
@@ -521,8 +520,7 @@ public final class UrlConnectionCacheTest {
RecordedRequest conditionalRequest = assertConditionallyCached(
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void expirationDateInThePastWithNoLastModifiedHeader() throws Exception {
@@ -545,8 +543,7 @@ public final class UrlConnectionCacheTest {
new MockResponse().addHeader("Date: " + formatDate(-120, TimeUnit.SECONDS))
.addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Cache-Control: max-age=60"));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void maxAgeInThePastWithDateHeaderButNoLastModifiedHeader() throws Exception {
@@ -701,7 +698,7 @@ public final class UrlConnectionCacheTest {
@Test public void etag() throws Exception {
RecordedRequest conditionalRequest =
assertConditionallyCached(new MockResponse().addHeader("ETag: v1"));
assertTrue(conditionalRequest.getHeaders().contains("If-None-Match: v1"));
assertEquals("v1", conditionalRequest.getHeader("If-None-Match"));
}
@Test public void etagAndExpirationDateInThePast() throws Exception {
@@ -710,9 +707,8 @@ public final class UrlConnectionCacheTest {
new MockResponse().addHeader("ETag: v1")
.addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-None-Match: v1"));
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals("v1", conditionalRequest.getHeader("If-None-Match"));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void etagAndExpirationDateInTheFuture() throws Exception {
@@ -731,8 +727,7 @@ public final class UrlConnectionCacheTest {
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS))
.addHeader("Cache-Control: no-cache"));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void pragmaNoCache() throws Exception {
@@ -745,8 +740,7 @@ public final class UrlConnectionCacheTest {
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS))
.addHeader("Pragma: no-cache"));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void cacheControlNoStore() throws Exception {
@@ -1009,9 +1003,8 @@ public final class UrlConnectionCacheTest {
String ifModifiedSinceDate = formatDate(-24, TimeUnit.HOURS);
RecordedRequest request =
assertClientSuppliedCondition(response, "If-Modified-Since", ifModifiedSinceDate);
List<String> headers = request.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + ifModifiedSinceDate));
assertFalse(headers.contains("If-None-Match: v3"));
assertEquals(ifModifiedSinceDate, request.getHeader("If-Modified-Since"));
assertNull(request.getHeader("If-None-Match"));
}
@Test public void clientSuppliedIfNoneMatchSinceWithCachedResult() throws Exception {
@@ -1020,9 +1013,8 @@ public final class UrlConnectionCacheTest {
.addHeader("Date: " + formatDate(-2, TimeUnit.MINUTES))
.addHeader("Cache-Control: max-age=0");
RecordedRequest request = assertClientSuppliedCondition(response, "If-None-Match", "v1");
List<String> headers = request.getHeaders();
assertTrue(headers.contains("If-None-Match: v1"));
assertFalse(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals("v1", request.getHeader("If-None-Match"));
assertNull(request.getHeader("If-Modified-Since"));
}
private RecordedRequest assertClientSuppliedCondition(MockResponse seed, String conditionName,

34
okhttp-urlconnection/src/test/java/com/squareup/okhttp/internal/huc/ResponseCacheTest.java
View File

@@ -421,8 +421,7 @@ public final class ResponseCacheTest {
RecordedRequest conditionalRequest = assertConditionallyCached(
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Date: " + formatDate(-15, TimeUnit.SECONDS)));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void defaultExpirationDateFullyCachedForMoreThan24Hours() throws Exception {
@@ -458,8 +457,7 @@ public final class ResponseCacheTest {
RecordedRequest conditionalRequest = assertConditionallyCached(
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void expirationDateInThePastWithNoLastModifiedHeader() throws Exception {
@@ -482,8 +480,7 @@ public final class ResponseCacheTest {
new MockResponse().addHeader("Date: " + formatDate(-120, TimeUnit.SECONDS))
.addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Cache-Control: max-age=60"));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void maxAgeInThePastWithDateHeaderButNoLastModifiedHeader() throws Exception {
@@ -595,7 +592,7 @@ public final class ResponseCacheTest {
@Test public void etag() throws Exception {
RecordedRequest conditionalRequest =
assertConditionallyCached(new MockResponse().addHeader("ETag: v1"));
assertTrue(conditionalRequest.getHeaders().contains("If-None-Match: v1"));
assertEquals("v1", conditionalRequest.getHeader("If-None-Match"));
}
@Test public void etagAndExpirationDateInThePast() throws Exception {
@@ -604,9 +601,8 @@ public final class ResponseCacheTest {
new MockResponse().addHeader("ETag: v1")
.addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-None-Match: v1"));
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals("v1", conditionalRequest.getHeader("If-None-Match"));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void etagAndExpirationDateInTheFuture() throws Exception {
@@ -625,8 +621,7 @@ public final class ResponseCacheTest {
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS))
.addHeader("Cache-Control: no-cache"));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void pragmaNoCache() throws Exception {
@@ -639,8 +634,7 @@ public final class ResponseCacheTest {
new MockResponse().addHeader("Last-Modified: " + lastModifiedDate)
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS))
.addHeader("Pragma: no-cache"));
List<String> headers = conditionalRequest.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals(lastModifiedDate, conditionalRequest.getHeader("If-Modified-Since"));
}
@Test public void cacheControlNoStore() throws Exception {
@@ -863,9 +857,8 @@ public final class ResponseCacheTest {
String ifModifiedSinceDate = formatDate(-24, TimeUnit.HOURS);
RecordedRequest request =
assertClientSuppliedCondition(response, "If-Modified-Since", ifModifiedSinceDate);
List<String> headers = request.getHeaders();
assertTrue(headers.contains("If-Modified-Since: " + ifModifiedSinceDate));
assertFalse(headers.contains("If-None-Match: v3"));
assertEquals(ifModifiedSinceDate, request.getHeader("If-Modified-Since"));
assertNull(request.getHeader("If-None-Match"));
}
@Test public void clientSuppliedIfNoneMatchSinceWithCachedResult() throws Exception {
@@ -874,9 +867,8 @@ public final class ResponseCacheTest {
.addHeader("Date: " + formatDate(-2, TimeUnit.MINUTES))
.addHeader("Cache-Control: max-age=0");
RecordedRequest request = assertClientSuppliedCondition(response, "If-None-Match", "v1");
List<String> headers = request.getHeaders();
assertTrue(headers.contains("If-None-Match: v1"));
assertFalse(headers.contains("If-Modified-Since: " + lastModifiedDate));
assertEquals("v1", request.getHeader("If-None-Match"));
assertNull(request.getHeader("If-Modified-Since"));
}
private RecordedRequest assertClientSuppliedCondition(MockResponse seed, String conditionName,
@@ -905,7 +897,7 @@ public final class ResponseCacheTest {
connection.setIfModifiedSince(since.getTime());
assertEquals("A", readAscii(connection));
RecordedRequest request = server.takeRequest();
assertTrue(request.getHeaders().contains("If-Modified-Since: " + HttpDate.format(since)));
assertEquals(HttpDate.format(since), request.getHeader("If-Modified-Since"));
}
@Test public void clientSuppliedConditionWithoutCachedResult() throws Exception {