lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-26 23:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

A little cleanup of FetchHTTPTest refactoring

Browse Source
This commit is contained in:
Noah Levitt
2012-12-04 18:43:15 -08:00
parent 5354960f00
commit e44cf9ca9b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
+4
View File
@@ -337,4 +337,8 @@ public class FetchHTTPTest extends ProcessorTestBase {
}
};
}
public static Request getLastRequest() {
return lastRequest;
}
}
modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTests.java
+2 -6
View File
@@ -27,8 +27,6 @@ import static org.archive.modules.fetcher.FetchHTTPTest.DIGEST_AUTH_LOGIN;
import static org.archive.modules.fetcher.FetchHTTPTest.DIGEST_AUTH_PASSWORD;
import static org.archive.modules.fetcher.FetchHTTPTest.DIGEST_AUTH_REALM;
import static org.archive.modules.fetcher.FetchHTTPTest.ETAG_TEST_VALUE;
import static org.archive.modules.fetcher.FetchHTTPTest.ensureHttpServers;
import static org.archive.modules.fetcher.FetchHTTPTest.lastRequest;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -157,7 +155,7 @@ public class FetchHTTPTests extends ProcessorTestBase {
assertEquals(DEFAULT_PAYLOAD_STRING, curi.getRecorder().getContentReplayCharSequence().toString());
if (!exclusions.contains("httpBindAddress")) {
assertEquals("127.0.0.1", lastRequest.getRemoteAddr());
assertEquals("127.0.0.1", FetchHTTPTest.getLastRequest().getRemoteAddr());
}
assertTrue(curi.getNonFatalFailures().isEmpty());
@@ -385,7 +383,7 @@ public class FetchHTTPTests extends ProcessorTestBase {
// the client bind address isn't recorded anywhere in heritrix as
// far as i can tell, so we get it this way...
assertEquals(addr, lastRequest.getRemoteAddr());
assertEquals(addr, FetchHTTPTest.getLastRequest().getRemoteAddr());
runDefaultChecks(curi, "httpBindAddress");
}
@@ -628,8 +626,6 @@ public class FetchHTTPTests extends ProcessorTestBase {
}
public void testChunked() throws Exception {
ensureHttpServers();
/* XXX Server expects us to close the connection apparently. But we
* don't detect end of chunked transfer. With these small timeouts we
* can finish quickly. A couple of SocketTimeoutExceptions will happen