android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-27 04:22:07 +03:00
Code Releases Activity

Merge pull request #69 from square/jwilson/junit4

Browse Source 
Unsuppress tests and upgrade to JUnit 4.
This commit is contained in:
Jake Wharton
2012-12-29 13:38:32 -08:00
parent 8b574cb48e dca5d83027
commit 2c6be53791
18 changed files with 647 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -42,7 +42,7 @@
<bouncycastle.version>1.47</bouncycastle.version>
<!-- Test Dependencies -->
<junit.version>3.8.2</junit.version>
<junit.version>4.10</junit.version>
</properties>
<scm>

4
src/main/java/com/squareup/okhttp/internal/net/http/HttpAuthenticator.java
View File

@@ -42,7 +42,7 @@ public final class HttpAuthenticator {
* @return true if credentials have been added to successorRequestHeaders
* and another request should be attempted.
*/
public static boolean processAuthHeader(int responseCode, RawHeaders responeHeaders,
public static boolean processAuthHeader(int responseCode, RawHeaders responseHeaders,
RawHeaders successorRequestHeaders, Proxy proxy, URL url) throws IOException {
if (responseCode != HTTP_PROXY_AUTH && responseCode != HTTP_UNAUTHORIZED) {
throw new IllegalArgumentException();
@@ -52,7 +52,7 @@ public final class HttpAuthenticator {
String challengeHeader = responseCode == HTTP_PROXY_AUTH
? "Proxy-Authenticate"
: "WWW-Authenticate";
String credentials = getCredentials(responeHeaders, challengeHeader, proxy, url);
String credentials = getCredentials(responseHeaders, challengeHeader, proxy, url);
if (credentials == null) {
return false; // Could not find credentials so end the request cycle.
}

2
src/main/java/com/squareup/okhttp/internal/net/http/HttpDate.java
View File

@@ -26,7 +26,7 @@ import java.util.TimeZone;
/**
* Best-effort parser for HTTP dates.
*/
public final class HttpDate {
final class HttpDate {
/**
* Most websites serve cookies in the blessed format. Eagerly create the parser to ensure such

2
src/main/java/com/squareup/okhttp/internal/net/http/HttpEngine.java
View File

@@ -596,7 +596,7 @@ public class HttpEngine {
return null;
}
public static final String getDefaultUserAgent() {
public static String getDefaultUserAgent() {
String agent = System.getProperty("http.agent");
return agent != null ? agent : ("Java" + System.getProperty("java.version"));
}

4
src/main/java/com/squareup/okhttp/internal/net/http/HttpsURLConnectionImpl.java
View File

@@ -261,8 +261,8 @@ public final class HttpsURLConnectionImpl extends HttpsURLConnection {
}
@Override
public String getHeaderFieldKey(int posn) {
return delegate.getHeaderFieldKey(posn);
public String getHeaderFieldKey(int position) {
return delegate.getHeaderFieldKey(position);
}
@Override

2
src/main/java/com/squareup/okhttp/internal/net/http/RequestHeaders.java
View File

@@ -24,7 +24,7 @@ import java.util.Map;
/**
* Parsed HTTP request headers.
*/
public final class RequestHeaders {
final class RequestHeaders {
private final URI uri;
private final RawHeaders headers;

2
src/main/java/com/squareup/okhttp/internal/net/http/ResponseHeaders.java
View File

@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
/**
* Parsed HTTP response headers.
*/
public final class ResponseHeaders {
final class ResponseHeaders {
/** HTTP header name for the local time when the request was sent. */
private static final String SENT_MILLIS = "X-Android-Sent-Millis";

2
src/main/java/com/squareup/okhttp/internal/net/http/RouteSelector.java
View File

@@ -37,7 +37,7 @@ import java.util.NoSuchElementException;
* choice of proxy server, IP address, and TLS mode. Connections may also be
* recycled.
*/
public final class RouteSelector {
final class RouteSelector {
/**
* A TLS connection with useful extensions enabled. This mode supports more
* features, but is less likely to be compatible with older HTTP servers.

146
src/test/java/com/squareup/okhttp/internal/io/DiskLruCacheTest.java
View File

@@ -30,18 +30,24 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import junit.framework.TestCase;
import org.junit.After;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
public final class DiskLruCacheTest extends TestCase {
public final class DiskLruCacheTest {
private final int appVersion = 100;
private String javaTmpDir;
private File cacheDir;
private File journalFile;
private DiskLruCache cache;
// private final MockOs mockOs = new MockOs();
@Override public void setUp() throws Exception {
super.setUp();
@Before public void setUp() throws Exception {
javaTmpDir = System.getProperty("java.io.tmpdir");
cacheDir = new File(javaTmpDir, "DiskLruCacheTest");
cacheDir.mkdir();
@@ -50,21 +56,18 @@ public final class DiskLruCacheTest extends TestCase {
file.delete();
}
cache = DiskLruCache.open(cacheDir, appVersion, 2, Integer.MAX_VALUE);
// mockOs.install();
}
@Override protected void tearDown() throws Exception {
// mockOs.uninstall();
@After public void tearDown() throws Exception {
cache.close();
super.tearDown();
}
public void testEmptyCache() throws Exception {
@Test public void emptyCache() throws Exception {
cache.close();
assertJournalEquals();
}
public void testWriteAndReadEntry() throws Exception {
@Test public void writeAndReadEntry() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
creator.set(0, "ABC");
creator.set(1, "DE");
@@ -79,7 +82,7 @@ public final class DiskLruCacheTest extends TestCase {
assertEquals("DE", snapshot.getString(1));
}
public void testReadAndWriteEntryAcrossCacheOpenAndClose() throws Exception {
@Test public void readAndWriteEntryAcrossCacheOpenAndClose() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
creator.set(0, "A");
creator.set(1, "B");
@@ -93,7 +96,7 @@ public final class DiskLruCacheTest extends TestCase {
snapshot.close();
}
public void testJournalWithEditAndPublish() throws Exception {
@Test public void journalWithEditAndPublish() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
assertJournalEquals("DIRTY k1"); // DIRTY must always be flushed
creator.set(0, "AB");
@@ -103,7 +106,7 @@ public final class DiskLruCacheTest extends TestCase {
assertJournalEquals("DIRTY k1", "CLEAN k1 2 1");
}
public void testRevertedNewFileIsRemoveInJournal() throws Exception {
@Test public void revertedNewFileIsRemoveInJournal() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
assertJournalEquals("DIRTY k1"); // DIRTY must always be flushed
creator.set(0, "AB");
@@ -113,13 +116,13 @@ public final class DiskLruCacheTest extends TestCase {
assertJournalEquals("DIRTY k1", "REMOVE k1");
}
public void testUnterminatedEditIsRevertedOnClose() throws Exception {
@Test public void unterminatedEditIsRevertedOnClose() throws Exception {
cache.edit("k1");
cache.close();
assertJournalEquals("DIRTY k1", "REMOVE k1");
}
public void testJournalDoesNotIncludeReadOfYetUnpublishedValue() throws Exception {
@Test public void journalDoesNotIncludeReadOfYetUnpublishedValue() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
assertNull(cache.get("k1"));
creator.set(0, "A");
@@ -129,7 +132,7 @@ public final class DiskLruCacheTest extends TestCase {
assertJournalEquals("DIRTY k1", "CLEAN k1 1 2");
}
public void testJournalWithEditAndPublishAndRead() throws Exception {
@Test public void journalWithEditAndPublishAndRead() throws Exception {
DiskLruCache.Editor k1Creator = cache.edit("k1");
k1Creator.set(0, "AB");
k1Creator.set(1, "C");
@@ -146,7 +149,7 @@ public final class DiskLruCacheTest extends TestCase {
"READ k1");
}
public void testCannotOperateOnEditAfterPublish() throws Exception {
@Test public void cannotOperateOnEditAfterPublish() throws Exception {
DiskLruCache.Editor editor = cache.edit("k1");
editor.set(0, "A");
editor.set(1, "B");
@@ -154,7 +157,7 @@ public final class DiskLruCacheTest extends TestCase {
assertInoperable(editor);
}
public void testCannotOperateOnEditAfterRevert() throws Exception {
@Test public void cannotOperateOnEditAfterRevert() throws Exception {
DiskLruCache.Editor editor = cache.edit("k1");
editor.set(0, "A");
editor.set(1, "B");
@@ -162,7 +165,7 @@ public final class DiskLruCacheTest extends TestCase {
assertInoperable(editor);
}
public void testExplicitRemoveAppliedToDiskImmediately() throws Exception {
@Test public void explicitRemoveAppliedToDiskImmediately() throws Exception {
DiskLruCache.Editor editor = cache.edit("k1");
editor.set(0, "ABC");
editor.set(1, "B");
@@ -177,7 +180,7 @@ public final class DiskLruCacheTest extends TestCase {
* Each read sees a snapshot of the file at the time read was called.
* This means that two reads of the same key can see different data.
*/
public void testReadAndWriteOverlapsMaintainConsistency() throws Exception {
@Test public void readAndWriteOverlapsMaintainConsistency() throws Exception {
DiskLruCache.Editor v1Creator = cache.edit("k1");
v1Creator.set(0, "AAaa");
v1Creator.set(1, "BBbb");
@@ -204,7 +207,7 @@ public final class DiskLruCacheTest extends TestCase {
snapshot1.close();
}
public void testOpenWithDirtyKeyDeletesAllFilesForThatKey() throws Exception {
@Test public void openWithDirtyKeyDeletesAllFilesForThatKey() throws Exception {
cache.close();
File cleanFile0 = getCleanFile("k1", 0);
File cleanFile1 = getCleanFile("k1", 1);
@@ -223,7 +226,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(cache.get("k1"));
}
public void testOpenWithInvalidVersionClearsDirectory() throws Exception {
@Test public void openWithInvalidVersionClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournalWithHeader(MAGIC, "0", "100", "2", "");
@@ -231,7 +234,7 @@ public final class DiskLruCacheTest extends TestCase {
assertGarbageFilesAllDeleted();
}
public void testOpenWithInvalidAppVersionClearsDirectory() throws Exception {
@Test public void openWithInvalidAppVersionClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournalWithHeader(MAGIC, "1", "101", "2", "");
@@ -239,7 +242,7 @@ public final class DiskLruCacheTest extends TestCase {
assertGarbageFilesAllDeleted();
}
public void testOpenWithInvalidValueCountClearsDirectory() throws Exception {
@Test public void openWithInvalidValueCountClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournalWithHeader(MAGIC, "1", "100", "1", "");
@@ -247,7 +250,7 @@ public final class DiskLruCacheTest extends TestCase {
assertGarbageFilesAllDeleted();
}
public void testOpenWithInvalidBlankLineClearsDirectory() throws Exception {
@Test public void openWithInvalidBlankLineClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournalWithHeader(MAGIC, "1", "100", "2", "x");
@@ -255,7 +258,7 @@ public final class DiskLruCacheTest extends TestCase {
assertGarbageFilesAllDeleted();
}
public void testOpenWithInvalidJournalLineClearsDirectory() throws Exception {
@Test public void openWithInvalidJournalLineClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournal("CLEAN k1 1 1", "BOGUS");
@@ -264,7 +267,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(cache.get("k1"));
}
public void testOpenWithInvalidFileSizeClearsDirectory() throws Exception {
@Test public void openWithInvalidFileSizeClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournal("CLEAN k1 0000x001 1");
@@ -273,7 +276,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(cache.get("k1"));
}
public void testOpenWithTruncatedLineDiscardsThatLine() throws Exception {
@Test public void openWithTruncatedLineDiscardsThatLine() throws Exception {
cache.close();
writeFile(getCleanFile("k1", 0), "A");
writeFile(getCleanFile("k1", 1), "B");
@@ -284,7 +287,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(cache.get("k1"));
}
public void testOpenWithTooManyFileSizesClearsDirectory() throws Exception {
@Test public void openWithTooManyFileSizesClearsDirectory() throws Exception {
cache.close();
generateSomeGarbageFiles();
createJournal("CLEAN k1 1 1 1");
@@ -293,7 +296,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(cache.get("k1"));
}
public void testKeyWithSpaceNotPermitted() throws Exception {
@Test public void keyWithSpaceNotPermitted() throws Exception {
try {
cache.edit("my key");
fail();
@@ -301,7 +304,7 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testKeyWithNewlineNotPermitted() throws Exception {
@Test public void keyWithNewlineNotPermitted() throws Exception {
try {
cache.edit("my\nkey");
fail();
@@ -309,7 +312,7 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testKeyWithCarriageReturnNotPermitted() throws Exception {
@Test public void keyWithCarriageReturnNotPermitted() throws Exception {
try {
cache.edit("my\rkey");
fail();
@@ -317,7 +320,7 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testNullKeyThrows() throws Exception {
@Test public void nullKeyThrows() throws Exception {
try {
cache.edit(null);
fail();
@@ -325,7 +328,7 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testCreateNewEntryWithTooFewValuesFails() throws Exception {
@Test public void createNewEntryWithTooFewValuesFails() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
creator.set(1, "A");
try {
@@ -346,7 +349,7 @@ public final class DiskLruCacheTest extends TestCase {
creator2.commit();
}
public void testCreateNewEntryWithMissingFileAborts() throws Exception {
@Test public void createNewEntryWithMissingFileAborts() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
creator.set(0, "A");
creator.set(1, "A");
@@ -368,7 +371,7 @@ public final class DiskLruCacheTest extends TestCase {
creator2.commit();
}
public void testRevertWithTooFewValues() throws Exception {
@Test public void revertWithTooFewValues() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
creator.set(1, "A");
creator.abort();
@@ -379,7 +382,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(cache.get("k1"));
}
public void testUpdateExistingEntryWithTooFewValuesReusesPreviousValues() throws Exception {
@Test public void updateExistingEntryWithTooFewValuesReusesPreviousValues() throws Exception {
DiskLruCache.Editor creator = cache.edit("k1");
creator.set(0, "A");
creator.set(1, "B");
@@ -395,7 +398,7 @@ public final class DiskLruCacheTest extends TestCase {
snapshot.close();
}
public void testEvictOnInsert() throws Exception {
@Test public void evictOnInsert() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
@@ -431,7 +434,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("E", "eeee", "eeee");
}
public void testEvictOnUpdate() throws Exception {
@Test public void evictOnUpdate() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
@@ -449,7 +452,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("C", "c", "cc");
}
public void testEvictionHonorsLruFromCurrentSession() throws Exception {
@Test public void evictionHonorsLruFromCurrentSession() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
set("A", "a", "a");
@@ -473,7 +476,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("F", "f", "f");
}
public void testEvictionHonorsLruFromPreviousSession() throws Exception {
@Test public void evictionHonorsLruFromPreviousSession() throws Exception {
set("A", "a", "a");
set("B", "b", "b");
set("C", "c", "c");
@@ -497,7 +500,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("G", "g", "g");
}
public void testCacheSingleEntryOfSizeGreaterThanMaxSize() throws Exception {
@Test public void cacheSingleEntryOfSizeGreaterThanMaxSize() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
set("A", "aaaaa", "aaaaaa"); // size=11
@@ -505,7 +508,7 @@ public final class DiskLruCacheTest extends TestCase {
assertAbsent("A");
}
public void testCacheSingleValueOfSizeGreaterThanMaxSize() throws Exception {
@Test public void cacheSingleValueOfSizeGreaterThanMaxSize() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
set("A", "aaaaaaaaaaa", "a"); // size=12
@@ -513,7 +516,7 @@ public final class DiskLruCacheTest extends TestCase {
assertAbsent("A");
}
public void testConstructorDoesNotAllowZeroCacheSize() throws Exception {
@Test public void constructorDoesNotAllowZeroCacheSize() throws Exception {
try {
DiskLruCache.open(cacheDir, appVersion, 2, 0);
fail();
@@ -521,7 +524,7 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testConstructorDoesNotAllowZeroValuesPerEntry() throws Exception {
@Test public void constructorDoesNotAllowZeroValuesPerEntry() throws Exception {
try {
DiskLruCache.open(cacheDir, appVersion, 0, 10);
fail();
@@ -529,18 +532,18 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testRemoveAbsentElement() throws Exception {
@Test public void removeAbsentElement() throws Exception {
cache.remove("A");
}
public void testReadingTheSameStreamMultipleTimes() throws Exception {
@Test public void readingTheSameStreamMultipleTimes() throws Exception {
set("A", "a", "b");
DiskLruCache.Snapshot snapshot = cache.get("A");
assertSame(snapshot.getInputStream(0), snapshot.getInputStream(0));
snapshot.close();
}
public void testRebuildJournalOnRepeatedReads() throws Exception {
@Test public void rebuildJournalOnRepeatedReads() throws Exception {
set("A", "a", "a");
set("B", "b", "b");
long lastJournalLength = 0;
@@ -557,7 +560,7 @@ public final class DiskLruCacheTest extends TestCase {
}
}
public void testRebuildJournalOnRepeatedEdits() throws Exception {
@Test public void rebuildJournalOnRepeatedEdits() throws Exception {
long lastJournalLength = 0;
while (true) {
long journalLength = journalFile.length();
@@ -576,7 +579,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("B", "b", "b");
}
public void testOpenCreatesDirectoryIfNecessary() throws Exception {
@Test public void openCreatesDirectoryIfNecessary() throws Exception {
cache.close();
File dir = new File(javaTmpDir, "testOpenCreatesDirectoryIfNecessary");
cache = DiskLruCache.open(dir, appVersion, 2, Integer.MAX_VALUE);
@@ -586,42 +589,13 @@ public final class DiskLruCacheTest extends TestCase {
assertTrue(new File(dir, "journal").exists());
}
public void testFileDeletedExternally() throws Exception {
@Test public void fileDeletedExternally() throws Exception {
set("A", "a", "a");
getCleanFile("A", 1).delete();
assertNull(cache.get("A"));
}
// public void testFileBecomesInaccessibleDuringReadResultsInIoException() throws Exception {
// set("A", "aaaaa", "a");
// DiskLruCache.Snapshot snapshot = cache.get("A");
// InputStream in = snapshot.getInputStream(0);
// assertEquals('a', in.read());
// mockOs.enqueueFault("read");
// try {
// in.read();
// fail();
// } catch (IOException expected) {
// }
// snapshot.close();
// }
// public void testFileBecomesInaccessibleDuringWriteIsSilentlyDiscarded() throws Exception {
// set("A", "a", "a");
// DiskLruCache.Editor editor = cache.edit("A");
// OutputStream out0 = editor.newOutputStream(0);
// out0.write('b');
// out0.close();
// OutputStream out1 = editor.newOutputStream(1);
// out1.write('c');
// mockOs.enqueueFault("write");
// out1.write('c'); // this doesn't throw...
// out1.close();
// editor.commit(); // ... but this will abort
// assertAbsent("A");
// }
public void testEditSameVersion() throws Exception {
@Test public void editSameVersion() throws Exception {
set("A", "a", "a");
DiskLruCache.Snapshot snapshot = cache.get("A");
DiskLruCache.Editor editor = snapshot.edit();
@@ -630,7 +604,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("A", "a", "a2");
}
public void testEditSnapshotAfterChangeAborted() throws Exception {
@Test public void editSnapshotAfterChangeAborted() throws Exception {
set("A", "a", "a");
DiskLruCache.Snapshot snapshot = cache.get("A");
DiskLruCache.Editor toAbort = snapshot.edit();
@@ -642,7 +616,7 @@ public final class DiskLruCacheTest extends TestCase {
assertValue("A", "a", "a2");
}
public void testEditSnapshotAfterChangeCommitted() throws Exception {
@Test public void editSnapshotAfterChangeCommitted() throws Exception {
set("A", "a", "a");
DiskLruCache.Snapshot snapshot = cache.get("A");
DiskLruCache.Editor toAbort = snapshot.edit();
@@ -651,7 +625,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(snapshot.edit());
}
public void testEditSinceEvicted() throws Exception {
@Test public void editSinceEvicted() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
set("A", "aa", "aaa"); // size 5
@@ -662,7 +636,7 @@ public final class DiskLruCacheTest extends TestCase {
assertNull(snapshot.edit());
}
public void testEditSinceEvictedAndRecreated() throws Exception {
@Test public void editSinceEvictedAndRecreated() throws Exception {
cache.close();
cache = DiskLruCache.open(cacheDir, appVersion, 2, 10);
set("A", "aa", "aaa"); // size 5

57
src/test/java/com/squareup/okhttp/internal/io/StrictLineReaderTest.java
View File

@@ -19,44 +19,38 @@ package com.squareup.okhttp.internal.io;
import static com.squareup.okhttp.internal.Util.US_ASCII;
import java.io.ByteArrayInputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import junit.framework.TestCase;
import static org.junit.Assert.fail;
import org.junit.Test;
public class StrictLineReaderTest extends TestCase {
public void testLineReaderConsistencyWithReadAsciiLine () {
try {
// Testing with LineReader buffer capacity 32 to check some corner cases.
StrictLineReader lineReader = new StrictLineReader(createTestInputStream(), 32,
US_ASCII);
InputStream refStream = createTestInputStream();
while (true) {
public final class StrictLineReaderTest {
@Test public void lineReaderConsistencyWithReadAsciiLine() throws Exception {
// Testing with LineReader buffer capacity 32 to check some corner cases.
StrictLineReader lineReader = new StrictLineReader(createTestInputStream(), 32, US_ASCII);
InputStream refStream = createTestInputStream();
while (true) {
try {
String refLine = Streams.readAsciiLine(refStream);
try {
String refLine = Streams.readAsciiLine(refStream);
try {
String line = lineReader.readLine();
if (!refLine.equals(line)) {
fail("line (\""+line+"\") differs from expected (\""+refLine+"\").");
}
} catch (EOFException eof) {
fail("line reader threw EOFException too early.");
}
} catch (EOFException refEof) {
try {
lineReader.readLine();
fail("line reader didn't throw the expected EOFException.");
} catch (EOFException eof) {
// OK
break;
String line = lineReader.readLine();
if (!refLine.equals(line)) {
fail("line (\""+line+"\") differs from expected (\""+refLine+"\").");
}
} catch (EOFException eof) {
fail("line reader threw EOFException too early.");
}
} catch (EOFException refEof) {
try {
lineReader.readLine();
fail("line reader didn't throw the expected EOFException.");
} catch (EOFException eof) {
// OK
break;
}
}
refStream.close();
lineReader.close();
} catch (IOException ioe) {
fail("Unexpected IOException " + ioe.toString());
}
refStream.close();
lineReader.close();
}
private InputStream createTestInputStream() {
@@ -79,4 +73,3 @@ public class StrictLineReaderTest extends TestCase {
).getBytes());
}
}

281
src/test/java/com/squareup/okhttp/internal/net/http/HttpResponseCacheTest.java
View File

@@ -67,12 +67,20 @@ import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import junit.framework.TestCase;
import org.junit.After;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
/**
* Android's HttpResponseCacheTest.
*/
public final class HttpResponseCacheTest extends TestCase {
public final class HttpResponseCacheTest {
private static final HostnameVerifier NULL_HOSTNAME_VERIFIER = new HostnameVerifier() {
@Override public boolean verify(String s, SSLSession sslSession) {
return true;
@@ -94,8 +102,7 @@ public final class HttpResponseCacheTest extends TestCase {
}
}
@Override protected void setUp() throws Exception {
super.setUp();
@Before public void setUp() throws Exception {
String tmp = System.getProperty("java.io.tmpdir");
File cacheDir = new File(tmp, "HttpCache-" + UUID.randomUUID());
cache = new HttpResponseCache(cacheDir, Integer.MAX_VALUE);
@@ -103,12 +110,11 @@ public final class HttpResponseCacheTest extends TestCase {
CookieHandler.setDefault(cookieManager);
}
@Override protected void tearDown() throws Exception {
@After public void tearDown() throws Exception {
server.shutdown();
ResponseCache.setDefault(null);
cache.getCache().delete();
CookieHandler.setDefault(null);
super.tearDown();
}
private HttpURLConnection openConnection(URL url) {
@@ -119,7 +125,7 @@ public final class HttpResponseCacheTest extends TestCase {
* Test that response caching is consistent with the RI and the spec.
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.4
*/
public void testResponseCachingByResponseCode() throws Exception {
@Test public void responseCachingByResponseCode() throws Exception {
// Test each documented HTTP/1.1 code, plus the first unused value in each range.
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
@@ -159,7 +165,7 @@ public final class HttpResponseCacheTest extends TestCase {
* Response code 407 should only come from proxy servers. Android's client
* throws if it is sent by an origin server.
*/
public void testOriginServerSends407() throws Exception {
@Test public void originServerSends407() throws Exception {
server.enqueue(new MockResponse().setResponseCode(407));
server.play();
@@ -172,7 +178,7 @@ public final class HttpResponseCacheTest extends TestCase {
}
}
public void test_responseCaching_410() throws Exception {
@Test public void responseCaching_410() throws Exception {
// the HTTP spec permits caching 410s, but the RI doesn't.
assertCached(true, 410);
}
@@ -215,7 +221,7 @@ public final class HttpResponseCacheTest extends TestCase {
* Test that we can interrogate the response when the cache is being
* populated. http://code.google.com/p/android/issues/detail?id=7787
*/
public void testResponseCacheCallbackApis() throws Exception {
@Test public void responseCacheCallbackApis() throws Exception {
final String body = "ABCDE";
final AtomicInteger cacheCount = new AtomicInteger();
@@ -266,15 +272,15 @@ public final class HttpResponseCacheTest extends TestCase {
}
public void testResponseCachingAndInputStreamSkipWithFixedLength() throws IOException {
@Test public void responseCachingAndInputStreamSkipWithFixedLength() throws IOException {
testResponseCaching(TransferKind.FIXED_LENGTH);
}
public void testResponseCachingAndInputStreamSkipWithChunkedEncoding() throws IOException {
@Test public void responseCachingAndInputStreamSkipWithChunkedEncoding() throws IOException {
testResponseCaching(TransferKind.CHUNKED);
}
public void testResponseCachingAndInputStreamSkipWithNoLengthHeaders() throws IOException {
@Test public void responseCachingAndInputStreamSkipWithNoLengthHeaders() throws IOException {
testResponseCaching(TransferKind.END_OF_STREAM);
}
@@ -317,7 +323,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(1, cache.getHitCount());
}
public void testSecureResponseCaching() throws IOException {
@Test public void secureResponseCaching() throws IOException {
server.useHttps(sslContext.getSocketFactory(), false);
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -353,7 +359,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(localPrincipal, connection.getLocalPrincipal());
}
public void testCacheReturnsInsecureResponseForSecureRequest() throws IOException {
@Test public void cacheReturnsInsecureResponseForSecureRequest() throws IOException {
server.useHttps(sslContext.getSocketFactory(), false);
server.enqueue(new MockResponse().setBody("ABC"));
server.enqueue(new MockResponse().setBody("DEF"));
@@ -373,7 +379,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("DEF", readAscii(connection2));
}
public void testResponseCachingAndRedirects() throws Exception {
@Test public void responseCachingAndRedirects() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS))
@@ -397,7 +403,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(2, cache.getHitCount());
}
public void testRedirectToCachedResult() throws Exception {
@Test public void redirectToCachedResult() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.setBody("ABC"));
@@ -424,7 +430,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(2, request3.getSequenceNumber());
}
public void testSecureResponseCachingAndRedirects() throws IOException {
@Test public void secureResponseCachingAndRedirects() throws IOException {
server.useHttps(sslContext.getSocketFactory(), false);
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -453,7 +459,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(2, cache.getHitCount());
}
public void testResponseCacheRequestHeaders() throws IOException, URISyntaxException {
@Test public void responseCacheRequestHeaders() throws IOException, URISyntaxException {
server.enqueue(new MockResponse().setBody("ABC"));
server.play();
@@ -478,15 +484,15 @@ public final class HttpResponseCacheTest extends TestCase {
}
public void testServerDisconnectsPrematurelyWithContentLengthHeader() throws IOException {
@Test public void serverDisconnectsPrematurelyWithContentLengthHeader() throws IOException {
testServerPrematureDisconnect(TransferKind.FIXED_LENGTH);
}
public void testServerDisconnectsPrematurelyWithChunkedEncoding() throws IOException {
@Test public void serverDisconnectsPrematurelyWithChunkedEncoding() throws IOException {
testServerPrematureDisconnect(TransferKind.CHUNKED);
}
public void testServerDisconnectsPrematurelyWithNoLengthHeaders() throws IOException {
@Test public void serverDisconnectsPrematurelyWithNoLengthHeaders() throws IOException {
/*
* Intentionally empty. This case doesn't make sense because there's no
* such thing as a premature disconnect when the disconnect itself
@@ -520,15 +526,15 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(1, cache.getWriteSuccessCount());
}
public void testClientPrematureDisconnectWithContentLengthHeader() throws IOException {
@Test public void clientPrematureDisconnectWithContentLengthHeader() throws IOException {
testClientPrematureDisconnect(TransferKind.FIXED_LENGTH);
}
public void testClientPrematureDisconnectWithChunkedEncoding() throws IOException {
@Test public void clientPrematureDisconnectWithChunkedEncoding() throws IOException {
testClientPrematureDisconnect(TransferKind.CHUNKED);
}
public void testClientPrematureDisconnectWithNoLengthHeaders() throws IOException {
@Test public void clientPrematureDisconnectWithNoLengthHeaders() throws IOException {
testClientPrematureDisconnect(TransferKind.END_OF_STREAM);
}
@@ -558,7 +564,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(1, cache.getWriteSuccessCount());
}
public void testDefaultExpirationDateFullyCachedForLessThan24Hours() throws Exception {
@Test public void defaultExpirationDateFullyCachedForLessThan24Hours() throws Exception {
// last modified: 105 seconds ago
// served: 5 seconds ago
// default lifetime: (105 - 5) / 10 = 10 seconds
@@ -576,7 +582,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertNull(connection.getHeaderField("Warning"));
}
public void testDefaultExpirationDateConditionallyCached() throws Exception {
@Test public void defaultExpirationDateConditionallyCached() throws Exception {
// last modified: 115 seconds ago
// served: 15 seconds ago
// default lifetime: (115 - 15) / 10 = 10 seconds
@@ -589,7 +595,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
}
public void testDefaultExpirationDateFullyCachedForMoreThan24Hours() throws Exception {
@Test public void defaultExpirationDateFullyCachedForMoreThan24Hours() throws Exception {
// last modified: 105 days ago
// served: 5 days ago
// default lifetime: (105 - 5) / 10 = 10 days
@@ -607,7 +613,7 @@ public final class HttpResponseCacheTest extends TestCase {
connection.getHeaderField("Warning"));
}
public void testNoDefaultExpirationForUrlsWithQueryString() throws Exception {
@Test public void noDefaultExpirationForUrlsWithQueryString() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-105, TimeUnit.SECONDS))
.addHeader("Date: " + formatDate(-5, TimeUnit.SECONDS))
@@ -620,7 +626,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(url)));
}
public void testExpirationDateInThePastWithLastModifiedHeader() throws Exception {
@Test public void expirationDateInThePastWithLastModifiedHeader() throws Exception {
String lastModifiedDate = formatDate(-2, TimeUnit.HOURS);
RecordedRequest conditionalRequest = assertConditionallyCached(new MockResponse()
.addHeader("Last-Modified: " + lastModifiedDate)
@@ -629,24 +635,24 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
}
public void testExpirationDateInThePastWithNoLastModifiedHeader() throws Exception {
@Test public void expirationDateInThePastWithNoLastModifiedHeader() throws Exception {
assertNotCached(new MockResponse()
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
}
public void testExpirationDateInTheFuture() throws Exception {
@Test public void expirationDateInTheFuture() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS)));
}
public void testMaxAgePreferredWithMaxAgeAndExpires() throws Exception {
@Test public void maxAgePreferredWithMaxAgeAndExpires() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Date: " + formatDate(0, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS))
.addHeader("Cache-Control: max-age=60"));
}
public void testMaxAgeInThePastWithDateAndLastModifiedHeaders() throws Exception {
@Test public void maxAgeInThePastWithDateAndLastModifiedHeaders() throws Exception {
String lastModifiedDate = formatDate(-2, TimeUnit.HOURS);
RecordedRequest conditionalRequest = assertConditionallyCached(new MockResponse()
.addHeader("Date: " + formatDate(-120, TimeUnit.SECONDS))
@@ -656,7 +662,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
}
public void testMaxAgeInThePastWithDateHeaderButNoLastModifiedHeader() throws Exception {
@Test public void maxAgeInThePastWithDateHeaderButNoLastModifiedHeader() throws Exception {
/*
* Chrome interprets max-age relative to the local clock. Both our cache
* and Firefox both use the earlier of the local and server's clock.
@@ -666,71 +672,71 @@ public final class HttpResponseCacheTest extends TestCase {
.addHeader("Cache-Control: max-age=60"));
}
public void testMaxAgeInTheFutureWithDateHeader() throws Exception {
@Test public void maxAgeInTheFutureWithDateHeader() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Date: " + formatDate(0, TimeUnit.HOURS))
.addHeader("Cache-Control: max-age=60"));
}
public void testMaxAgeInTheFutureWithNoDateHeader() throws Exception {
@Test public void maxAgeInTheFutureWithNoDateHeader() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Cache-Control: max-age=60"));
}
public void testMaxAgeWithLastModifiedButNoServedDate() throws Exception {
@Test public void maxAgeWithLastModifiedButNoServedDate() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-120, TimeUnit.SECONDS))
.addHeader("Cache-Control: max-age=60"));
}
public void testMaxAgeInTheFutureWithDateAndLastModifiedHeaders() throws Exception {
@Test public void maxAgeInTheFutureWithDateAndLastModifiedHeaders() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-120, TimeUnit.SECONDS))
.addHeader("Date: " + formatDate(0, TimeUnit.SECONDS))
.addHeader("Cache-Control: max-age=60"));
}
public void testMaxAgePreferredOverLowerSharedMaxAge() throws Exception {
@Test public void maxAgePreferredOverLowerSharedMaxAge() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("Date: " + formatDate(-2, TimeUnit.MINUTES))
.addHeader("Cache-Control: s-maxage=60")
.addHeader("Cache-Control: max-age=180"));
}
public void testMaxAgePreferredOverHigherMaxAge() throws Exception {
@Test public void maxAgePreferredOverHigherMaxAge() throws Exception {
assertNotCached(new MockResponse()
.addHeader("Date: " + formatDate(-2, TimeUnit.MINUTES))
.addHeader("Cache-Control: s-maxage=180")
.addHeader("Cache-Control: max-age=60"));
}
public void testRequestMethodOptionsIsNotCached() throws Exception {
@Test public void requestMethodOptionsIsNotCached() throws Exception {
testRequestMethod("OPTIONS", false);
}
public void testRequestMethodGetIsCached() throws Exception {
@Test public void requestMethodGetIsCached() throws Exception {
testRequestMethod("GET", true);
}
public void testRequestMethodHeadIsNotCached() throws Exception {
@Test public void requestMethodHeadIsNotCached() throws Exception {
// We could support this but choose not to for implementation simplicity
testRequestMethod("HEAD", false);
}
public void testRequestMethodPostIsNotCached() throws Exception {
@Test public void requestMethodPostIsNotCached() throws Exception {
// We could support this but choose not to for implementation simplicity
testRequestMethod("POST", false);
}
public void testRequestMethodPutIsNotCached() throws Exception {
@Test public void requestMethodPutIsNotCached() throws Exception {
testRequestMethod("PUT", false);
}
public void testRequestMethodDeleteIsNotCached() throws Exception {
@Test public void requestMethodDeleteIsNotCached() throws Exception {
testRequestMethod("DELETE", false);
}
public void testRequestMethodTraceIsNotCached() throws Exception {
@Test public void requestMethodTraceIsNotCached() throws Exception {
testRequestMethod("TRACE", false);
}
@@ -748,7 +754,7 @@ public final class HttpResponseCacheTest extends TestCase {
URL url = server.getUrl("/");
HttpURLConnection request1 = (HttpURLConnection) openConnection(url);
HttpURLConnection request1 = openConnection(url);
request1.setRequestMethod(requestMethod);
addRequestBodyIfNecessary(requestMethod, request1);
assertEquals("1", request1.getHeaderField("X-Response-ID"));
@@ -761,15 +767,15 @@ public final class HttpResponseCacheTest extends TestCase {
}
}
public void testPostInvalidatesCache() throws Exception {
@Test public void postInvalidatesCache() throws Exception {
testMethodInvalidates("POST");
}
public void testPutInvalidatesCache() throws Exception {
@Test public void putInvalidatesCache() throws Exception {
testMethodInvalidates("PUT");
}
public void testDeleteMethodInvalidatesCache() throws Exception {
@Test public void deleteMethodInvalidatesCache() throws Exception {
testMethodInvalidates("DELETE");
}
@@ -797,13 +803,13 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("C", readAscii(openConnection(url)));
}
public void testEtag() throws Exception {
@Test public void etag() throws Exception {
RecordedRequest conditionalRequest = assertConditionallyCached(new MockResponse()
.addHeader("ETag: v1"));
assertTrue(conditionalRequest.getHeaders().contains("If-None-Match: v1"));
}
public void testEtagAndExpirationDateInThePast() throws Exception {
@Test public void etagAndExpirationDateInThePast() throws Exception {
String lastModifiedDate = formatDate(-2, TimeUnit.HOURS);
RecordedRequest conditionalRequest = assertConditionallyCached(new MockResponse()
.addHeader("ETag: v1")
@@ -814,18 +820,18 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
}
public void testEtagAndExpirationDateInTheFuture() throws Exception {
@Test public void etagAndExpirationDateInTheFuture() throws Exception {
assertFullyCached(new MockResponse()
.addHeader("ETag: v1")
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS)));
}
public void testCacheControlNoCache() throws Exception {
@Test public void cacheControlNoCache() throws Exception {
assertNotCached(new MockResponse().addHeader("Cache-Control: no-cache"));
}
public void testCacheControlNoCacheAndExpirationDateInTheFuture() throws Exception {
@Test public void cacheControlNoCacheAndExpirationDateInTheFuture() throws Exception {
String lastModifiedDate = formatDate(-2, TimeUnit.HOURS);
RecordedRequest conditionalRequest = assertConditionallyCached(new MockResponse()
.addHeader("Last-Modified: " + lastModifiedDate)
@@ -835,11 +841,11 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
}
public void testPragmaNoCache() throws Exception {
@Test public void pragmaNoCache() throws Exception {
assertNotCached(new MockResponse().addHeader("Pragma: no-cache"));
}
public void testPragmaNoCacheAndExpirationDateInTheFuture() throws Exception {
@Test public void pragmaNoCacheAndExpirationDateInTheFuture() throws Exception {
String lastModifiedDate = formatDate(-2, TimeUnit.HOURS);
RecordedRequest conditionalRequest = assertConditionallyCached(new MockResponse()
.addHeader("Last-Modified: " + lastModifiedDate)
@@ -849,18 +855,18 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(headers.contains("If-Modified-Since: " + lastModifiedDate));
}
public void testCacheControlNoStore() throws Exception {
@Test public void cacheControlNoStore() throws Exception {
assertNotCached(new MockResponse().addHeader("Cache-Control: no-store"));
}
public void testCacheControlNoStoreAndExpirationDateInTheFuture() throws Exception {
@Test public void cacheControlNoStoreAndExpirationDateInTheFuture() throws Exception {
assertNotCached(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS))
.addHeader("Cache-Control: no-store"));
}
public void testPartialRangeResponsesDoNotCorruptCache() throws Exception {
@Test public void partialRangeResponsesDoNotCorruptCache() throws Exception {
/*
* 1. request a range
* 2. request a full document, expecting a cache miss
@@ -881,7 +887,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("BB", readAscii(openConnection(url)));
}
public void testServerReturnsDocumentOlderThanCache() throws Exception {
@Test public void serverReturnsDocumentOlderThanCache() throws Exception {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
@@ -895,13 +901,13 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(openConnection(url)));
}
public void testNonIdentityEncodingAndConditionalCache() throws Exception {
@Test public void nonIdentityEncodingAndConditionalCache() throws Exception {
assertNonIdentityEncodingCached(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(-1, TimeUnit.HOURS)));
}
public void testNonIdentityEncodingAndFullCache() throws Exception {
@Test public void nonIdentityEncodingAndFullCache() throws Exception {
assertNonIdentityEncodingCached(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(1, TimeUnit.HOURS)));
@@ -918,13 +924,13 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("ABCABCABC", readAscii(openConnection(server.getUrl("/"))));
}
public void testExpiresDateBeforeModifiedDate() throws Exception {
@Test public void expiresDateBeforeModifiedDate() throws Exception {
assertConditionallyCached(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
.addHeader("Expires: " + formatDate(-2, TimeUnit.HOURS)));
}
public void testRequestMaxAge() throws IOException {
@Test public void requestMaxAge() throws IOException {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.HOURS))
.addHeader("Date: " + formatDate(-1, TimeUnit.MINUTES))
@@ -939,7 +945,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection));
}
public void testRequestMinFresh() throws IOException {
@Test public void requestMinFresh() throws IOException {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Cache-Control: max-age=60")
.addHeader("Date: " + formatDate(0, TimeUnit.MINUTES)));
@@ -953,7 +959,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection));
}
public void testRequestMaxStale() throws IOException {
@Test public void requestMaxStale() throws IOException {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Cache-Control: max-age=120")
.addHeader("Date: " + formatDate(-4, TimeUnit.MINUTES)));
@@ -969,7 +975,7 @@ public final class HttpResponseCacheTest extends TestCase {
connection.getHeaderField("Warning"));
}
public void testRequestMaxStaleNotHonoredWithMustRevalidate() throws IOException {
@Test public void requestMaxStaleNotHonoredWithMustRevalidate() throws IOException {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Cache-Control: max-age=120, must-revalidate")
.addHeader("Date: " + formatDate(-4, TimeUnit.MINUTES)));
@@ -983,7 +989,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection));
}
public void testRequestOnlyIfCachedWithNoResponseCached() throws IOException {
@Test public void requestOnlyIfCachedWithNoResponseCached() throws IOException {
// (no responses enqueued)
server.play();
@@ -992,7 +998,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertGatewayTimeout(connection);
}
public void testRequestOnlyIfCachedWithFullResponseCached() throws IOException {
@Test public void requestOnlyIfCachedWithFullResponseCached() throws IOException {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Cache-Control: max-age=30")
.addHeader("Date: " + formatDate(0, TimeUnit.MINUTES)));
@@ -1004,7 +1010,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(openConnection(server.getUrl("/"))));
}
public void testRequestOnlyIfCachedWithConditionalResponseCached() throws IOException {
@Test public void requestOnlyIfCachedWithConditionalResponseCached() throws IOException {
server.enqueue(new MockResponse().setBody("A")
.addHeader("Cache-Control: max-age=30")
.addHeader("Date: " + formatDate(-1, TimeUnit.MINUTES)));
@@ -1016,7 +1022,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertGatewayTimeout(connection);
}
public void testRequestOnlyIfCachedWithUnhelpfulResponseCached() throws IOException {
@Test public void requestOnlyIfCachedWithUnhelpfulResponseCached() throws IOException {
server.enqueue(new MockResponse().setBody("A"));
server.play();
@@ -1026,7 +1032,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertGatewayTimeout(connection);
}
public void testRequestCacheControlNoCache() throws Exception {
@Test public void requestCacheControlNoCache() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-120, TimeUnit.SECONDS))
.addHeader("Date: " + formatDate(0, TimeUnit.SECONDS))
@@ -1042,7 +1048,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection));
}
public void testRequestPragmaNoCache() throws Exception {
@Test public void requestPragmaNoCache() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-120, TimeUnit.SECONDS))
.addHeader("Date: " + formatDate(0, TimeUnit.SECONDS))
@@ -1058,7 +1064,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection));
}
public void testClientSuppliedIfModifiedSinceWithCachedResult() throws Exception {
@Test public void clientSuppliedIfModifiedSinceWithCachedResult() throws Exception {
MockResponse response = new MockResponse()
.addHeader("ETag: v3")
.addHeader("Cache-Control: max-age=0");
@@ -1070,7 +1076,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertFalse(headers.contains("If-None-Match: v3"));
}
public void testClientSuppliedIfNoneMatchSinceWithCachedResult() throws Exception {
@Test public void clientSuppliedIfNoneMatchSinceWithCachedResult() throws Exception {
String lastModifiedDate = formatDate(-3, TimeUnit.MINUTES);
MockResponse response = new MockResponse()
.addHeader("Last-Modified: " + lastModifiedDate)
@@ -1101,7 +1107,7 @@ public final class HttpResponseCacheTest extends TestCase {
return server.takeRequest();
}
public void testSetIfModifiedSince() throws Exception {
@Test public void setIfModifiedSince() throws Exception {
Date since = new Date();
server.enqueue(new MockResponse().setBody("A"));
server.play();
@@ -1114,7 +1120,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertTrue(request.getHeaders().contains("If-Modified-Since: " + formatDate(since)));
}
public void testClientSuppliedConditionWithoutCachedResult() throws Exception {
@Test public void clientSuppliedConditionWithoutCachedResult() throws Exception {
server.enqueue(new MockResponse()
.setResponseCode(HttpURLConnection.HTTP_NOT_MODIFIED));
server.play();
@@ -1126,7 +1132,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("", readAscii(connection));
}
public void testAuthorizationRequestHeaderPreventsCaching() throws Exception {
@Test public void authorizationRequestHeaderPreventsCaching() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-2, TimeUnit.MINUTES))
.addHeader("Cache-Control: max-age=60")
@@ -1141,17 +1147,17 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(url)));
}
public void testAuthorizationResponseCachedWithSMaxAge() throws Exception {
@Test public void authorizationResponseCachedWithSMaxAge() throws Exception {
assertAuthorizationRequestFullyCached(new MockResponse()
.addHeader("Cache-Control: s-maxage=60"));
}
public void testAuthorizationResponseCachedWithPublic() throws Exception {
@Test public void authorizationResponseCachedWithPublic() throws Exception {
assertAuthorizationRequestFullyCached(new MockResponse()
.addHeader("Cache-Control: public"));
}
public void testAuthorizationResponseCachedWithMustRevalidate() throws Exception {
@Test public void authorizationResponseCachedWithMustRevalidate() throws Exception {
assertAuthorizationRequestFullyCached(new MockResponse()
.addHeader("Cache-Control: must-revalidate"));
}
@@ -1170,7 +1176,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(openConnection(url)));
}
public void testContentLocationDoesNotPopulateCache() throws Exception {
@Test public void contentLocationDoesNotPopulateCache() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Content-Location: /bar")
@@ -1182,7 +1188,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(server.getUrl("/bar"))));
}
public void testUseCachesFalseDoesNotWriteToCache() throws Exception {
@Test public void useCachesFalseDoesNotWriteToCache() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.setBody("A").setBody("A"));
@@ -1195,7 +1201,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(server.getUrl("/"))));
}
public void testUseCachesFalseDoesNotReadFromCache() throws Exception {
@Test public void useCachesFalseDoesNotReadFromCache() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.setBody("A").setBody("A"));
@@ -1208,7 +1214,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection));
}
public void testDefaultUseCachesSetsInitialValueOnly() throws Exception {
@Test public void defaultUseCachesSetsInitialValueOnly() throws Exception {
URL url = new URL("http://localhost/");
URLConnection c1 = openConnection(url);
URLConnection c2 = openConnection(url);
@@ -1224,7 +1230,7 @@ public final class HttpResponseCacheTest extends TestCase {
}
}
public void testConnectionIsReturnedToPoolAfterConditionalSuccess() throws Exception {
@Test public void connectionIsReturnedToPoolAfterConditionalSuccess() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
.addHeader("Cache-Control: max-age=0")
@@ -1242,7 +1248,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(2, server.takeRequest().getSequenceNumber());
}
public void testStatisticsConditionalCacheMiss() throws Exception {
@Test public void statisticsConditionalCacheMiss() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
.addHeader("Cache-Control: max-age=0")
@@ -1262,7 +1268,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(0, cache.getHitCount());
}
public void testStatisticsConditionalCacheHit() throws Exception {
@Test public void statisticsConditionalCacheHit() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
.addHeader("Cache-Control: max-age=0")
@@ -1282,7 +1288,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(2, cache.getHitCount());
}
public void testStatisticsFullCacheHit() throws Exception {
@Test public void statisticsFullCacheHit() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.setBody("A"));
@@ -1299,7 +1305,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(2, cache.getHitCount());
}
public void testVaryMatchesChangedRequestHeaderField() throws Exception {
@Test public void varyMatchesChangedRequestHeaderField() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Accept-Language")
@@ -1317,7 +1323,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(enConnection));
}
public void testVaryMatchesUnchangedRequestHeaderField() throws Exception {
@Test public void varyMatchesUnchangedRequestHeaderField() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Accept-Language")
@@ -1334,7 +1340,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(connection2));
}
public void testVaryMatchesAbsentRequestHeaderField() throws Exception {
@Test public void varyMatchesAbsentRequestHeaderField() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Foo")
@@ -1346,7 +1352,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(openConnection(server.getUrl("/"))));
}
public void testVaryMatchesAddedRequestHeaderField() throws Exception {
@Test public void varyMatchesAddedRequestHeaderField() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Foo")
@@ -1360,7 +1366,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(fooConnection));
}
public void testVaryMatchesRemovedRequestHeaderField() throws Exception {
@Test public void varyMatchesRemovedRequestHeaderField() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Foo")
@@ -1374,7 +1380,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(server.getUrl("/"))));
}
public void testVaryFieldsAreCaseInsensitive() throws Exception {
@Test public void varyFieldsAreCaseInsensitive() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: ACCEPT-LANGUAGE")
@@ -1391,7 +1397,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(connection2));
}
public void testVaryMultipleFieldsWithMatch() throws Exception {
@Test public void varyMultipleFieldsWithMatch() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Accept-Language, Accept-Charset")
@@ -1413,7 +1419,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(connection2));
}
public void testVaryMultipleFieldsWithNoMatch() throws Exception {
@Test public void varyMultipleFieldsWithNoMatch() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Accept-Language, Accept-Charset")
@@ -1435,7 +1441,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(enConnection));
}
public void testVaryMultipleFieldValuesWithMatch() throws Exception {
@Test public void varyMultipleFieldValuesWithMatch() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Accept-Language")
@@ -1455,7 +1461,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(connection2));
}
public void testVaryMultipleFieldValuesWithNoMatch() throws Exception {
@Test public void varyMultipleFieldValuesWithNoMatch() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: Accept-Language")
@@ -1475,7 +1481,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(connection2));
}
public void testVaryAsterisk() throws Exception {
@Test public void varyAsterisk() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.addHeader("Vary: *")
@@ -1487,7 +1493,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(server.getUrl("/"))));
}
public void testVaryAndHttps() throws Exception {
@Test public void varyAndHttps() throws Exception {
server.useHttps(sslContext.getSocketFactory(), false);
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
@@ -1510,35 +1516,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("A", readAscii(connection2));
}
// public void testDiskWriteFailureCacheDegradation() throws Exception {
// Deque<InvocationHandler> writeHandlers = mockOs.getHandlers("write");
// int i = 0;
// boolean hasMoreScenarios = true;
// while (hasMoreScenarios) {
// mockOs.enqueueNormal("write", i++);
// mockOs.enqueueFault("write");
// exercisePossiblyFaultyCache(false);
// hasMoreScenarios = writeHandlers.isEmpty();
// writeHandlers.clear();
// }
// System.out.println("Exercising the cache performs " + (i - 1) + " writes.");
// }
//
// public void testDiskReadFailureCacheDegradation() throws Exception {
// Deque<InvocationHandler> readHandlers = mockOs.getHandlers("read");
// int i = 0;
// boolean hasMoreScenarios = true;
// while (hasMoreScenarios) {
// mockOs.enqueueNormal("read", i++);
// mockOs.enqueueFault("read");
// exercisePossiblyFaultyCache(true);
// hasMoreScenarios = readHandlers.isEmpty();
// readHandlers.clear();
// }
// System.out.println("Exercising the cache performs " + (i - 1) + " reads.");
// }
public void testCachePlusCookies() throws Exception {
@Test public void cachePlusCookies() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Set-Cookie: a=FIRST; domain=" + server.getCookieDomain() + ";")
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -1556,7 +1534,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertCookies(url, "a=SECOND");
}
public void testGetHeadersReturnsNetworkEndToEndHeaders() throws Exception {
@Test public void getHeadersReturnsNetworkEndToEndHeaders() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Allow: GET, HEAD")
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -1576,7 +1554,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("GET, HEAD, PUT", connection2.getHeaderField("Allow"));
}
public void testGetHeadersReturnsCachedHopByHopHeaders() throws Exception {
@Test public void getHeadersReturnsCachedHopByHopHeaders() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Transfer-Encoding: identity")
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -1596,7 +1574,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("identity", connection2.getHeaderField("Transfer-Encoding"));
}
public void testGetHeadersDeletesCached100LevelWarnings() throws Exception {
@Test public void getHeadersDeletesCached100LevelWarnings() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Warning: 199 test danger")
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -1615,7 +1593,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(null, connection2.getHeaderField("Warning"));
}
public void testGetHeadersRetainsCached200LevelWarnings() throws Exception {
@Test public void getHeadersRetainsCached200LevelWarnings() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Warning: 299 test danger")
.addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS))
@@ -1642,7 +1620,7 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals(Arrays.asList(expectedCookies), actualCookies);
}
public void testCachePlusRange() throws Exception {
@Test public void cachePlusRange() throws Exception {
assertNotCached(new MockResponse()
.setResponseCode(HttpURLConnection.HTTP_PARTIAL)
.addHeader("Date: " + formatDate(0, TimeUnit.HOURS))
@@ -1650,7 +1628,7 @@ public final class HttpResponseCacheTest extends TestCase {
.addHeader("Cache-Control: max-age=60"));
}
public void testConditionalHitUpdatesCache() throws Exception {
@Test public void conditionalHitUpdatesCache() throws Exception {
server.enqueue(new MockResponse()
.addHeader("Last-Modified: " + formatDate(0, TimeUnit.SECONDS))
.addHeader("Cache-Control: max-age=0")
@@ -1716,31 +1694,6 @@ public final class HttpResponseCacheTest extends TestCase {
assertEquals("B", readAscii(openConnection(url)));
}
private void exercisePossiblyFaultyCache(boolean permitReadBodyFailures) throws Exception {
server.shutdown();
server = new MockWebServer();
server.enqueue(new MockResponse()
.addHeader("Cache-Control: max-age=60")
.setBody("A"));
server.enqueue(new MockResponse().setBody("B"));
server.play();
URL url = server.getUrl("/" + UUID.randomUUID());
assertEquals("A", readAscii(openConnection(url)));
URLConnection connection = openConnection(url);
InputStream in = connection.getInputStream();
try {
int bodyChar = in.read();
assertTrue(bodyChar == 'A' || bodyChar == 'B');
assertEquals(-1, in.read());
} catch (IOException e) {
if (!permitReadBodyFailures) {
throw e;
}
}
}
/**
* @return the request with the conditional get headers.
*/

40
src/test/java/com/squareup/okhttp/internal/net/http/NewURLConnectionTest.java
View File

@@ -1,40 +0,0 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* 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
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.squareup.okhttp.internal.net.http;
import junit.framework.TestCase;
public final class NewURLConnectionTest extends TestCase {
public void testUrlConnection() {
}
// TODO: write a test that shows pooled connections detect HTTP/1.0 (vs. HTTP/1.1)
// TODO: write a test that shows POST bodies are retained on AUTH problems (or prove it unnecessary)
// TODO: cookies + trailers. Do cookie headers get processed too many times?
// TODO: crash on header names or values containing the '\0' character
// TODO: crash on empty names and empty values
// TODO: deflate compression
// TODO: read the outgoing status line and incoming status line?
}

9
src/test/java/com/squareup/okhttp/internal/net/http/RawHeadersTest.java
View File

@@ -17,10 +17,11 @@ package com.squareup.okhttp.internal.net.http;
import java.util.Arrays;
import java.util.List;
import junit.framework.TestCase;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public final class RawHeadersTest extends TestCase {
public void testParseNameValueBlock() {
public final class RawHeadersTest {
@Test public void parseNameValueBlock() {
List<String> nameValueBlock = Arrays.asList(
"cache-control",
"no-cache, no-store",
@@ -42,7 +43,7 @@ public final class RawHeadersTest extends TestCase {
assertEquals("200 OK", rawHeaders.getValue(3));
}
public void testToNameValueBlock() {
@Test public void toNameValueBlock() {
RawHeaders rawHeaders = new RawHeaders();
rawHeaders.add("cache-control", "no-cache, no-store");
rawHeaders.add("set-cookie", "Cookie1");

28
src/test/java/com/squareup/okhttp/internal/net/http/RouteSelectorTest.java
View File

@@ -36,9 +36,13 @@ import java.util.NoSuchElementException;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import junit.framework.TestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
public final class RouteSelectorTest extends TestCase {
public final class RouteSelectorTest {
private static final int proxyAPort = 1001;
private static final String proxyAHost = "proxyA";
private static final Proxy proxyA
@@ -70,7 +74,7 @@ public final class RouteSelectorTest extends TestCase {
private final FakeDns dns = new FakeDns();
private final FakeProxySelector proxySelector = new FakeProxySelector();
public void testSingleRoute() throws Exception {
@Test public void singleRoute() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, null);
RouteSelector routeSelector = new RouteSelector(address, uri, proxySelector, pool, dns);
@@ -88,7 +92,7 @@ public final class RouteSelectorTest extends TestCase {
}
}
public void testExplicitProxyTriesThatProxiesAddressesOnly() throws Exception {
@Test public void explicitProxyTriesThatProxiesAddressesOnly() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, proxyA);
RouteSelector routeSelector = new RouteSelector(address, uri, proxySelector, pool, dns);
@@ -104,7 +108,7 @@ public final class RouteSelectorTest extends TestCase {
proxySelector.assertRequests(); // No proxy selector requests!
}
public void testExplicitDirectProxy() throws Exception {
@Test public void explicitDirectProxy() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, NO_PROXY);
RouteSelector routeSelector = new RouteSelector(address, uri, proxySelector, pool, dns);
@@ -120,7 +124,7 @@ public final class RouteSelectorTest extends TestCase {
proxySelector.assertRequests(); // No proxy selector requests!
}
public void testProxySelectorReturnsNull() throws Exception {
@Test public void proxySelectorReturnsNull() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, null);
proxySelector.proxies = null;
@@ -136,7 +140,7 @@ public final class RouteSelectorTest extends TestCase {
assertFalse(routeSelector.hasNext());
}
public void testProxySelectorReturnsNoProxies() throws Exception {
@Test public void proxySelectorReturnsNoProxies() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, null);
RouteSelector routeSelector = new RouteSelector(address, uri, proxySelector, pool, dns);
@@ -152,7 +156,7 @@ public final class RouteSelectorTest extends TestCase {
proxySelector.assertRequests(uri);
}
public void testProxySelectorReturnsMultipleProxies() throws Exception {
@Test public void proxySelectorReturnsMultipleProxies() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, null);
proxySelector.proxies.add(proxyA);
@@ -186,7 +190,7 @@ public final class RouteSelectorTest extends TestCase {
assertFalse(routeSelector.hasNext());
}
public void testProxySelectorDirectConnectionsAreSkipped() throws Exception {
@Test public void proxySelectorDirectConnectionsAreSkipped() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, null);
proxySelector.proxies.add(NO_PROXY);
@@ -203,7 +207,7 @@ public final class RouteSelectorTest extends TestCase {
assertFalse(routeSelector.hasNext());
}
public void testProxyDnsFailureContinuesToNextProxy() throws Exception {
@Test public void proxyDnsFailureContinuesToNextProxy() throws Exception {
Address address = new Address(uriHost, uriPort, null, null, null);
proxySelector.proxies.add(proxyA);
@@ -242,7 +246,7 @@ public final class RouteSelectorTest extends TestCase {
assertFalse(routeSelector.hasNext());
}
public void testMultipleTlsModes() throws Exception {
@Test public void multipleTlsModes() throws Exception {
Address address = new Address(
uriHost, uriPort, socketFactory, hostnameVerifier, Proxy.NO_PROXY);
RouteSelector routeSelector = new RouteSelector(address, uri, proxySelector, pool, dns);
@@ -261,7 +265,7 @@ public final class RouteSelectorTest extends TestCase {
assertFalse(routeSelector.hasNext());
}
public void testMultipleProxiesMultipleInetAddressesMultipleTlsModes() throws Exception {
@Test public void multipleProxiesMultipleInetAddressesMultipleTlsModes() throws Exception {
Address address = new Address(
uriHost, uriPort, socketFactory, hostnameVerifier, null);
proxySelector.proxies.add(proxyA);

512
src/test/java/com/squareup/okhttp/internal/net/http/URLConnectionTest.java
View File

File diff suppressed because it is too large Load Diff

150
src/test/java/com/squareup/okhttp/internal/net/http/URLEncodingTest.java Normal file
View File

@@ -0,0 +1,150 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* 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
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.squareup.okhttp.internal.net.http;
import com.squareup.okhttp.OkHttpClient;
import java.io.IOException;
import java.net.CacheRequest;
import java.net.CacheResponse;
import java.net.HttpURLConnection;
import java.net.ResponseCache;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import static org.junit.Assert.assertEquals;
import org.junit.Ignore;
import org.junit.Test;
/**
* Exercises HttpURLConnection to convert URL to a URI. Unlike URL#toURI,
* HttpURLConnection recovers from URLs with unescaped but unsupported URI
* characters like '{' and '|' by escaping these characters.
*/
public final class URLEncodingTest {
/**
* This test goes through the exhaustive set of interesting ASCII characters
* because most of those characters are interesting in some way according to
* RFC 2396 and RFC 2732. http://b/1158780
*/
@Test @Ignore public void lenientUrlToUri() throws Exception {
// alphanum
testUrlToUriMapping("abzABZ09", "abzABZ09", "abzABZ09", "abzABZ09", "abzABZ09");
// control characters
testUrlToUriMapping("\u0001", "%01", "%01", "%01", "%01");
testUrlToUriMapping("\u001f", "%1F", "%1F", "%1F", "%1F");
// ascii characters
testUrlToUriMapping("%20", "%20", "%20", "%20", "%20");
testUrlToUriMapping("%20", "%20", "%20", "%20", "%20");
testUrlToUriMapping(" ", "%20", "%20", "%20", "%20");
testUrlToUriMapping("!", "!", "!", "!", "!");
testUrlToUriMapping("\"", "%22", "%22", "%22", "%22");
testUrlToUriMapping("#", null, null, null, "%23");
testUrlToUriMapping("$", "$", "$", "$", "$");
testUrlToUriMapping("&", "&", "&", "&", "&");
testUrlToUriMapping("'", "'", "'", "'", "'");
testUrlToUriMapping("(", "(", "(", "(", "(");
testUrlToUriMapping(")", ")", ")", ")", ")");
testUrlToUriMapping("*", "*", "*", "*", "*");
testUrlToUriMapping("+", "+", "+", "+", "+");
testUrlToUriMapping(",", ",", ",", ",", ",");
testUrlToUriMapping("-", "-", "-", "-", "-");
testUrlToUriMapping(".", ".", ".", ".", ".");
testUrlToUriMapping("/", null, "/", "/", "/");
testUrlToUriMapping(":", null, ":", ":", ":");
testUrlToUriMapping(";", ";", ";", ";", ";");
testUrlToUriMapping("<", "%3C", "%3C", "%3C", "%3C");
testUrlToUriMapping("=", "=", "=", "=", "=");
testUrlToUriMapping(">", "%3E", "%3E", "%3E", "%3E");
testUrlToUriMapping("?", null, null, "?", "?");
testUrlToUriMapping("@", "@", "@", "@", "@");
testUrlToUriMapping("[", null, "%5B", null, "%5B");
testUrlToUriMapping("\\", "%5C", "%5C", "%5C", "%5C");
testUrlToUriMapping("]", null, "%5D", null, "%5D");
testUrlToUriMapping("^", "%5E", "%5E", "%5E", "%5E");
testUrlToUriMapping("_", "_", "_", "_", "_");
testUrlToUriMapping("`", "%60", "%60", "%60", "%60");
testUrlToUriMapping("{", "%7B", "%7B", "%7B", "%7B");
testUrlToUriMapping("|", "%7C", "%7C", "%7C", "%7C");
testUrlToUriMapping("}", "%7D", "%7D", "%7D", "%7D");
testUrlToUriMapping("~", "~", "~", "~", "~");
testUrlToUriMapping("~", "~", "~", "~", "~");
testUrlToUriMapping("\u007f", "%7F", "%7F", "%7F", "%7F");
// beyond ascii
testUrlToUriMapping("\u0080", "%C2%80", "%C2%80", "%C2%80", "%C2%80");
testUrlToUriMapping("\u20ac", "\u20ac", "\u20ac", "\u20ac", "\u20ac");
testUrlToUriMapping("\ud842\udf9f",
"\ud842\udf9f", "\ud842\udf9f", "\ud842\udf9f", "\ud842\udf9f");
}
@Test @Ignore public void lenientUrlToUriNul() throws Exception {
testUrlToUriMapping("\u0000", "%00", "%00", "%00", "%00"); // RI fails this
}
private void testUrlToUriMapping(String string, String asAuthority, String asFile,
String asQuery, String asFragment) throws Exception {
if (asAuthority != null) {
assertEquals("http://host" + asAuthority + ".tld/",
backdoorUrlToUri(new URL("http://host" + string + ".tld/")).toString());
}
if (asFile != null) {
assertEquals("http://host.tld/file" + asFile + "/",
backdoorUrlToUri(new URL("http://host.tld/file" + string + "/")).toString());
}
if (asQuery != null) {
assertEquals("http://host.tld/file?q" + asQuery + "=x",
backdoorUrlToUri(new URL("http://host.tld/file?q" + string + "=x")).toString());
}
assertEquals("http://host.tld/file#" + asFragment + "-x",
backdoorUrlToUri(new URL("http://host.tld/file#" + asFragment + "-x")).toString());
}
private URI backdoorUrlToUri(URL url) throws Exception {
final AtomicReference<URI> uriReference = new AtomicReference<URI>();
OkHttpClient client = new OkHttpClient();
client.setResponseCache(new ResponseCache() {
@Override public CacheRequest put(URI uri, URLConnection connection)
throws IOException {
return null;
}
@Override public CacheResponse get(URI uri, String requestMethod,
Map<String, List<String>> requestHeaders) throws IOException {
uriReference.set(uri);
throw new UnsupportedOperationException();
}
});
try {
HttpURLConnection connection = client.open(url);
connection.getResponseCode();
} catch (Exception expected) {
if (expected.getCause() instanceof URISyntaxException) {
expected.printStackTrace();
}
}
return uriReference.get();
}
}

17
src/test/java/com/squareup/okhttp/internal/net/spdy/SettingsTest.java
View File

@@ -21,15 +21,18 @@ import static com.squareup.okhttp.internal.net.spdy.Settings.MAX_CONCURRENT_STRE
import static com.squareup.okhttp.internal.net.spdy.Settings.PERSISTED;
import static com.squareup.okhttp.internal.net.spdy.Settings.PERSIST_VALUE;
import static com.squareup.okhttp.internal.net.spdy.Settings.UPLOAD_BANDWIDTH;
import junit.framework.TestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
public final class SettingsTest extends TestCase {
public void testUnsetField() {
public final class SettingsTest {
@Test public void unsetField() {
Settings settings = new Settings();
assertEquals(-3, settings.getUploadBandwidth(-3));
}
public void testSetFields() {
@Test public void setFields() {
Settings settings = new Settings();
assertEquals(-3, settings.getUploadBandwidth(-3));
@@ -61,7 +64,7 @@ public final class SettingsTest extends TestCase {
assertEquals(108, settings.getInitialWindowSize(-3));
}
public void testIsPersisted() {
@Test public void isPersisted() {
Settings settings = new Settings();
// Initially false.
@@ -92,7 +95,7 @@ public final class SettingsTest extends TestCase {
assertFalse(settings.isPersisted(Settings.ROUND_TRIP_TIME));
}
public void testPersistValue() {
@Test public void persistValue() {
Settings settings = new Settings();
// Initially false.
@@ -123,7 +126,7 @@ public final class SettingsTest extends TestCase {
assertFalse(settings.persistValue(Settings.ROUND_TRIP_TIME));
}
public void testMerge() {
@Test public void merge() {
Settings a = new Settings();
a.set(UPLOAD_BANDWIDTH, PERSIST_VALUE, 100);
a.set(DOWNLOAD_BANDWIDTH, PERSIST_VALUE, 200);

47
src/test/java/com/squareup/okhttp/internal/net/spdy/SpdyConnectionTest.java
View File

@@ -33,9 +33,12 @@ import java.io.OutputStream;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
public final class SpdyConnectionTest extends TestCase {
public final class SpdyConnectionTest {
private static final IncomingStreamHandler REJECT_INCOMING_STREAMS
= new IncomingStreamHandler() {
@Override public void receive(SpdyStream stream) throws IOException {
@@ -44,7 +47,7 @@ public final class SpdyConnectionTest extends TestCase {
};
private final MockSpdyPeer peer = new MockSpdyPeer();
public void testClientCreatesStreamAndServerReplies() throws Exception {
@Test public void clientCreatesStreamAndServerReplies() throws Exception {
// write the mocking script
peer.acceptFrame();
peer.sendFrame().synReply(0, 1, Arrays.asList("a", "android"));
@@ -70,7 +73,7 @@ public final class SpdyConnectionTest extends TestCase {
assertTrue(Arrays.equals("c3po".getBytes("UTF-8"), requestData.data));
}
public void testServerCreatesStreamAndClientReplies() throws Exception {
@Test public void serverCreatesStreamAndClientReplies() throws Exception {
// write the mocking script
peer.sendFrame().synStream(0, 2, 0, 0, Arrays.asList("a", "android"));
peer.acceptFrame();
@@ -100,7 +103,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(1, receiveCount.get());
}
public void testReplyWithNoData() throws Exception {
@Test public void replyWithNoData() throws Exception {
// write the mocking script
peer.sendFrame().synStream(0, 2, 0, 0, Arrays.asList("a", "android"));
peer.acceptFrame();
@@ -126,7 +129,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(1, receiveCount.get());
}
public void testNoop() throws Exception {
@Test public void noop() throws Exception {
// write the mocking script
peer.acceptFrame();
peer.play();
@@ -143,7 +146,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(0, ping.flags);
}
public void testServerPingsClient() throws Exception {
@Test public void serverPingsClient() throws Exception {
// write the mocking script
peer.sendFrame().ping(0, 2);
peer.acceptFrame();
@@ -161,7 +164,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(2, ping.streamId);
}
public void testClientPingsServer() throws Exception {
@Test public void clientPingsServer() throws Exception {
// write the mocking script
peer.acceptFrame();
peer.sendFrame().ping(0, 1);
@@ -182,7 +185,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(1, pingFrame.streamId);
}
public void testUnexpectedPingIsNotReturned() throws Exception {
@Test public void unexpectedPingIsNotReturned() throws Exception {
// write the mocking script
peer.sendFrame().ping(0, 2);
peer.acceptFrame();
@@ -203,7 +206,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(4, ping4.streamId);
}
public void testServerSendsSettingsToClient() throws Exception {
@Test public void serverSendsSettingsToClient() throws Exception {
// write the mocking script
Settings settings = new Settings();
settings.set(Settings.MAX_CONCURRENT_STREAMS, PERSIST_VALUE, 10);
@@ -223,7 +226,7 @@ public final class SpdyConnectionTest extends TestCase {
}
}
public void testMultipleSettingsFramesAreMerged() throws Exception {
@Test public void multipleSettingsFramesAreMerged() throws Exception {
// write the mocking script
Settings settings1 = new Settings();
settings1.set(Settings.UPLOAD_BANDWIDTH, PERSIST_VALUE, 100);
@@ -257,7 +260,7 @@ public final class SpdyConnectionTest extends TestCase {
}
}
public void testBogusDataFrameDoesNotDisruptConnection() throws Exception {
@Test public void bogusDataFrameDoesNotDisruptConnection() throws Exception {
// write the mocking script
peer.sendFrame().data(SpdyConnection.FLAG_FIN, 42, "bogus".getBytes("UTF-8"));
peer.acceptFrame(); // RST_STREAM
@@ -280,7 +283,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(2, ping.streamId);
}
public void testBogusReplyFrameDoesNotDisruptConnection() throws Exception {
@Test public void bogusReplyFrameDoesNotDisruptConnection() throws Exception {
// write the mocking script
peer.sendFrame().synReply(0, 42, Arrays.asList("a", "android"));
peer.acceptFrame(); // RST_STREAM
@@ -303,7 +306,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(2, ping.streamId);
}
public void testClientClosesClientOutputStream() throws Exception {
@Test public void clientClosesClientOutputStream() throws Exception {
// write the mocking script
peer.acceptFrame(); // SYN_STREAM
peer.acceptFrame(); // TYPE_DATA
@@ -343,7 +346,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(2, ping.streamId);
}
public void testServerClosesClientOutputStream() throws Exception {
@Test public void serverClosesClientOutputStream() throws Exception {
// write the mocking script
peer.acceptFrame(); // SYN_STREAM
peer.sendFrame().synReset(1, SpdyStream.RST_CANCEL);
@@ -378,7 +381,7 @@ public final class SpdyConnectionTest extends TestCase {
* Test that the client sends a RST_STREAM if doing so won't disrupt the
* output stream.
*/
public void testClientClosesClientInputStream() throws Exception {
@Test public void clientClosesClientInputStream() throws Exception {
// write the mocking script
peer.acceptFrame(); // SYN_STREAM
peer.acceptFrame(); // RST_STREAM
@@ -417,7 +420,7 @@ public final class SpdyConnectionTest extends TestCase {
* Test that the client doesn't send a RST_STREAM if doing so will disrupt
* the output stream.
*/
public void testClientClosesClientInputStreamIfOutputStreamIsClosed() throws Exception {
@Test public void clientClosesClientInputStreamIfOutputStreamIsClosed() throws Exception {
// write the mocking script
peer.acceptFrame(); // SYN_STREAM
peer.acceptFrame(); // DATA
@@ -460,7 +463,7 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(SpdyStream.RST_CANCEL, rstStream.statusCode);
}
public void testServerClosesClientInputStream() throws Exception {
@Test public void serverClosesClientInputStream() throws Exception {
// write the mocking script
peer.acceptFrame(); // SYN_STREAM
peer.sendFrame().data(FLAG_FIN, 1, "square".getBytes(UTF_8));
@@ -480,22 +483,22 @@ public final class SpdyConnectionTest extends TestCase {
assertEquals(SpdyConnection.FLAG_FIN, synStream.flags);
}
public void testRemoteDoubleReply() {
@Test public void remoteDoubleReply() {
// We should get a PROTOCOL ERROR
// TODO
}
public void testRemoteSendsDataAfterInFinished() {
@Test public void remoteSendsDataAfterInFinished() {
// We have a bug where we don't fastfoward the stream
// TODO
}
public void testRemoteSendsTooMuchData() {
@Test public void remoteSendsTooMuchData() {
// We should send RST_FLOW_CONTROL_ERROR (and fastforward the stream)
// TODO
}
public void testRemoteSendsRefusedStreamBeforeReplyHeaders() {
@Test public void remoteSendsRefusedStreamBeforeReplyHeaders() {
// Calling getResponseHeaders() should throw an IOException if the stream is refused.
// TODO
}