From e44cf9ca9be1dc857c4bdb19ae5f64d2132c6068 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Tue, 4 Dec 2012 18:43:15 -0800
Subject: [PATCH] A little cleanup of FetchHTTPTest refactoring

---
 .../java/org/archive/modules/fetcher/FetchHTTPTest.java   | 4 ++++
 .../java/org/archive/modules/fetcher/FetchHTTPTests.java  | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
index 2821258f..791f0550 100644
--- a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
+++ b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
@@ -337,4 +337,8 @@ public class FetchHTTPTest extends ProcessorTestBase {
             }
         };
     }
+
+    public static Request getLastRequest() {
+        return lastRequest;
+    }
 }
diff --git a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTests.java b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTests.java
index 0977e1a5..fad4250a 100644
--- a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTests.java
+++ b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTests.java
@@ -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