diff --git a/pom.xml b/pom.xml index 9f79e46..6aeaf9a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 7 us.codecraft - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0 pom @@ -108,7 +108,7 @@ com.github.dreamhead moco-core - 0.9.1 + 0.11.0 test @@ -164,8 +164,7 @@ maven-surefire-plugin 2.18 - pertest - -Xms1024m -Xmx1024m -Xss1m + 0 @@ -234,7 +233,7 @@ 2.10.4 UTF-8 - WebMagic 0.7.0-SNAPSHOT + WebMagic 0.7.0.alpha en_US diff --git a/webmagic-core/pom.xml b/webmagic-core/pom.xml index 7ca5c7b..f21b391 100644 --- a/webmagic-core/pom.xml +++ b/webmagic-core/pom.xml @@ -3,7 +3,7 @@ us.codecraft webmagic-parent - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0 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 d621c3d..685bdff 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 @@ -63,20 +63,20 @@ public class HttpClientDownloaderTest { @Test public void testGetHtmlCharset() throws Exception { - HttpServer server = httpserver(13423); + HttpServer server = httpServer(13423); server.get(by(uri("/header"))).response(header("Content-Type", "text/html; charset=gbk")); server.get(by(uri("/meta4"))).response(with(text("\n" + " \n" + " \n" + " \n" + " \n" + - "")),header("Content-Type","")); + "")),header("Content-Type","text/html; charset=gbk")); server.get(by(uri("/meta5"))).response(with(text("\n" + " \n" + " \n" + " \n" + " \n" + - "")),header("Content-Type","")); + "")),header("Content-Type","text/html")); Runner.running(server, new Runnable() { @Override public void run() { @@ -114,7 +114,8 @@ public class HttpClientDownloaderTest { @Test public void test_selectRequestMethod() throws Exception { - HttpServer server = httpserver(13423); + final int port = 13423; + HttpServer server = httpServer(port); server.get(eq(query("q"), "webmagic")).response("get"); server.post(eq(form("q"), "webmagic")).response("post"); server.put(eq(form("q"), "webmagic")).response("put"); @@ -127,11 +128,11 @@ public class HttpClientDownloaderTest { @Override public void run() throws Exception { Request request = new Request(); - request.setUrl("http://127.0.0.1:13423/search?q=webmagic"); + request.setUrl("http://127.0.0.1:" + port + "/search?q=webmagic"); request.setMethod(HttpConstant.Method.GET); Map params = new HashedMap(); params.put("q","webmagic"); - HttpUriRequest httpUriRequest = httpUriRequestConverter.convert(request,site,null).getHttpUriRequest(); + HttpUriRequest httpUriRequest = httpUriRequestConverter.convert(request,site,null).getHttpUriRequest(); assertThat(EntityUtils.toString(HttpClients.custom().build().execute(httpUriRequest).getEntity())).isEqualTo("get"); request.setMethod(HttpConstant.Method.DELETE); httpUriRequest = httpUriRequestConverter.convert(request, site, null).getHttpUriRequest(); @@ -142,7 +143,7 @@ public class HttpClientDownloaderTest { request.setMethod(HttpConstant.Method.TRACE); httpUriRequest = httpUriRequestConverter.convert(request, site, null).getHttpUriRequest(); assertThat(EntityUtils.toString(HttpClients.custom().build().execute(httpUriRequest).getEntity())).isEqualTo("trace"); - request.setUrl("http://127.0.0.1:13423/search"); + request.setUrl("http://127.0.0.1:" + port + "/search"); request.setMethod(HttpConstant.Method.POST); request.setRequestBody(HttpRequestBody.form(params, "utf-8")); httpUriRequest = httpUriRequestConverter.convert(request, site, null).getHttpUriRequest(); @@ -156,7 +157,7 @@ public class HttpClientDownloaderTest { @Test public void test_set_request_cookie() throws Exception { - HttpServer server = httpserver(13423); + HttpServer server = httpServer(13423); server.get(eq(cookie("cookie"), "cookie-webmagic")).response("ok"); Runner.running(server, new Runnable() { @Override @@ -173,7 +174,7 @@ public class HttpClientDownloaderTest { @Test public void test_set_request_header() throws Exception { - HttpServer server = httpserver(13423); + HttpServer server = httpServer(13423); server.get(eq(header("header"), "header-webmagic")).response("ok"); Runner.running(server, new Runnable() { @Override @@ -190,7 +191,7 @@ public class HttpClientDownloaderTest { @Test public void test_set_site_cookie() throws Exception { - HttpServer server = httpserver(13423); + HttpServer server = httpServer(13423); server.get(eq(cookie("cookie"), "cookie-webmagic")).response("ok"); Runner.running(server, new Runnable() { @Override @@ -207,7 +208,7 @@ public class HttpClientDownloaderTest { @Test public void test_download_when_task_is_null() throws Exception { - HttpServer server = httpserver(13423); + HttpServer server = httpServer(13423); server.response("foo"); Runner.running(server, new Runnable() { @Override diff --git a/webmagic-extension/pom.xml b/webmagic-extension/pom.xml index 0848817..bcc4a41 100644 --- a/webmagic-extension/pom.xml +++ b/webmagic-extension/pom.xml @@ -3,7 +3,7 @@ us.codecraft webmagic-parent - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0 diff --git a/webmagic-samples/pom.xml b/webmagic-samples/pom.xml index a447e39..feb5035 100644 --- a/webmagic-samples/pom.xml +++ b/webmagic-samples/pom.xml @@ -3,7 +3,7 @@ webmagic-parent us.codecraft - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0 diff --git a/webmagic-saxon/pom.xml b/webmagic-saxon/pom.xml index 1e33539..dd29c3b 100644 --- a/webmagic-saxon/pom.xml +++ b/webmagic-saxon/pom.xml @@ -3,7 +3,7 @@ webmagic-parent us.codecraft - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0 diff --git a/webmagic-scripts/pom.xml b/webmagic-scripts/pom.xml index cd1ec64..3b5c5f1 100755 --- a/webmagic-scripts/pom.xml +++ b/webmagic-scripts/pom.xml @@ -3,7 +3,7 @@ webmagic-parent us.codecraft - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0 diff --git a/webmagic-selenium/pom.xml b/webmagic-selenium/pom.xml index bdc9d8a..48f443e 100644 --- a/webmagic-selenium/pom.xml +++ b/webmagic-selenium/pom.xml @@ -3,7 +3,7 @@ webmagic-parent us.codecraft - 0.7.0-SNAPSHOT + 0.7.0.alpha-SNAPSHOT 4.0.0