From ff2f588c4164a768488e6bae70ad71f898327822 Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Wed, 4 Dec 2013 22:11:20 +0800 Subject: [PATCH] #48 nullpointer exception --- .../webmagic/downloader/HttpClientDownloader.java | 3 +-- .../webmagic/downloader/HttpClientDownloaderTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java index da34c2d..7fd2d09 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java @@ -47,8 +47,7 @@ public class HttpClientDownloader implements Downloader { * @return html */ public Html download(String url) { - Page page = download(new Request(url), null); - return (Html) page.getHtml(); + return download(url, null); } /** diff --git a/webmagic-core/src/test/java/us/codecraft/webmagic/downloader/HttpClientDownloaderTest.java b/webmagic-core/src/test/java/us/codecraft/webmagic/downloader/HttpClientDownloaderTest.java index b5ecada..7901a55 100644 --- a/webmagic-core/src/test/java/us/codecraft/webmagic/downloader/HttpClientDownloaderTest.java +++ b/webmagic-core/src/test/java/us/codecraft/webmagic/downloader/HttpClientDownloaderTest.java @@ -6,6 +6,7 @@ import org.junit.Test; import us.codecraft.webmagic.Page; import us.codecraft.webmagic.Request; import us.codecraft.webmagic.Site; +import us.codecraft.webmagic.selector.Html; /** * Author: code4crafer@gmail.com @@ -23,4 +24,11 @@ public class HttpClientDownloaderTest { Assert.assertTrue(download.getHtml().toString().contains("flashsword30")); } + @Test + public void testDownloader() { + HttpClientDownloader httpClientDownloader = new HttpClientDownloader(); + Html html = httpClientDownloader.download("http://www.oschina.net"); + Assert.assertTrue(!html.getText().isEmpty()); + } + }