From 6c1b762fe46312781de2a9e5f002dffacccc5eb4 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Tue, 28 Aug 2012 16:57:45 -0700 Subject: [PATCH] remove unnecessary finally blocks unsetting test settings, since each test gets a fresh fetcher --- .../modules/fetcher/FetchHTTPTestBase.java | 72 +++++++++---------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTestBase.java b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTestBase.java index d3669595..3b27d549 100644 --- a/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTestBase.java +++ b/modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTestBase.java @@ -573,56 +573,48 @@ public abstract class FetchHTTPTestBase extends ProcessorTestBase { } public void testAcceptCompression() throws Exception { - try { - ensureHttpServers(); - CrawlURI curi = makeCrawlURI("http://localhost:7777/"); - getFetcher().setAcceptCompression(true); - getFetcher().process(curi); - String httpRequestString = httpRequestString(curi); + ensureHttpServers(); + CrawlURI curi = makeCrawlURI("http://localhost:7777/"); + getFetcher().setAcceptCompression(true); + getFetcher().process(curi); + String httpRequestString = httpRequestString(curi); // logger.info('\n' + httpRequestString + "\n\n" + rawResponseString(curi)); // logger.info("\n----- begin contentString -----\n" + contentString(curi)); // logger.info("\n----- begin entityString -----\n" + entityString(curi)); // logger.info("\n----- begin messageBodyString -----\n" + messageBodyString(curi)); - assertTrue(httpRequestString.contains("Accept-Encoding: gzip,deflate\r\n")); - assertEquals(DEFAULT_GZIPPED_PAYLOAD.length, curi.getContentLength()); - assertEquals(curi.getContentSize(), curi.getRecordedSize()); + assertTrue(httpRequestString.contains("Accept-Encoding: gzip,deflate\r\n")); + assertEquals(DEFAULT_GZIPPED_PAYLOAD.length, curi.getContentLength()); + assertEquals(curi.getContentSize(), curi.getRecordedSize()); - // check various - assertEquals("text/plain;charset=US-ASCII", curi.getContentType()); - assertEquals(Charset.forName("US-ASCII"), curi.getRecorder().getCharset()); - assertTrue(curi.getCredentials().isEmpty()); - assertTrue(curi.getFetchDuration() >= 0); - assertTrue(curi.getFetchStatus() == 200); - assertTrue(curi.getFetchType() == FetchType.HTTP_GET); + // check various + assertEquals("text/plain;charset=US-ASCII", curi.getContentType()); + assertEquals(Charset.forName("US-ASCII"), curi.getRecorder().getCharset()); + assertTrue(curi.getCredentials().isEmpty()); + assertTrue(curi.getFetchDuration() >= 0); + assertTrue(curi.getFetchStatus() == 200); + assertTrue(curi.getFetchType() == FetchType.HTTP_GET); - // check message body, i.e. "raw, possibly chunked-transfer-encoded message contents not including the leading headers" - assertTrue(Arrays.equals(DEFAULT_GZIPPED_PAYLOAD, IOUtils.toByteArray(curi.getRecorder().getMessageBodyReplayInputStream()))); + // check message body, i.e. "raw, possibly chunked-transfer-encoded message contents not including the leading headers" + assertTrue(Arrays.equals(DEFAULT_GZIPPED_PAYLOAD, IOUtils.toByteArray(curi.getRecorder().getMessageBodyReplayInputStream()))); - // check entity, i.e. "message-body after any (usually-unnecessary) transfer-decoding but before any content-encoding (eg gzip) decoding" - assertTrue(Arrays.equals(DEFAULT_GZIPPED_PAYLOAD, IOUtils.toByteArray(curi.getRecorder().getEntityReplayInputStream()))); + // check entity, i.e. "message-body after any (usually-unnecessary) transfer-decoding but before any content-encoding (eg gzip) decoding" + assertTrue(Arrays.equals(DEFAULT_GZIPPED_PAYLOAD, IOUtils.toByteArray(curi.getRecorder().getEntityReplayInputStream()))); - // check content, i.e. message-body after possibly tranfer-decoding and after content-encoding (eg gzip) decoding - assertEquals(DEFAULT_PAYLOAD_STRING, contentString(curi)); - assertEquals("sha1:6HXUWMO6VPBHU4SIPOVJ3OPMCSN6JJW4", curi.getContentDigestSchemeString()); - } finally { - getFetcher().setAcceptCompression(false); - } + // check content, i.e. message-body after possibly tranfer-decoding and after content-encoding (eg gzip) decoding + assertEquals(DEFAULT_PAYLOAD_STRING, contentString(curi)); + assertEquals("sha1:6HXUWMO6VPBHU4SIPOVJ3OPMCSN6JJW4", curi.getContentDigestSchemeString()); } public void testHttpBindAddress() throws Exception { - try { - ensureHttpServers(); - CrawlURI curi = makeCrawlURI("http://localhost:7777/"); - getFetcher().setHttpBindAddress("127.0.0.2"); - getFetcher().process(curi); - - // the client bind address isn't recorded anywhere in heritrix as - // far as i can tell, so we get it this way... - assertEquals("127.0.0.2", lastRequest.getRemoteAddr()); - - runDefaultChecks(curi, new HashSet(Arrays.asList("httpBindAddress"))); - } finally { - getFetcher().setHttpBindAddress(""); - } + ensureHttpServers(); + CrawlURI curi = makeCrawlURI("http://localhost:7777/"); + getFetcher().setHttpBindAddress("127.0.0.2"); + getFetcher().process(curi); + + // the client bind address isn't recorded anywhere in heritrix as + // far as i can tell, so we get it this way... + assertEquals("127.0.0.2", lastRequest.getRemoteAddr()); + + runDefaultChecks(curi, new HashSet(Arrays.asList("httpBindAddress"))); } }