some fix for tests #130

webmagic-core/src/main/java/us/codecraft/webmagic/Site.java

@@ -49,7 +49,7 @@ public class Site {
 
     private HttpHost httpProxy;
 
-	private ProxyPool httpProxyPool=new ProxyPool();
+	private ProxyPool httpProxyPool;
 	
     private boolean useGzip = true;
 
@@ -453,6 +453,11 @@ public class Site {
 		return this;
 	}
 
+    public Site enableHttpProxyPool() {
+        this.httpProxyPool=new ProxyPool();
+        return this;
+    }
+
 	public ProxyPool getHttpProxyPool() {
 		return httpProxyPool;
 	}

webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpClientDownloader.java

@@ -141,7 +141,7 @@ public class HttpClientDownloader extends AbstractDownloader {
                 .setSocketTimeout(site.getTimeOut())
                 .setConnectTimeout(site.getTimeOut())
                 .setCookieSpec(CookieSpecs.BEST_MATCH);
-		if (site.getHttpProxyPool().isEnable()) {
+        if (site.getHttpProxyPool() != null && site.getHttpProxyPool().isEnable()) {
             HttpHost host = site.getHttpProxyFromPool();
 			requestConfigBuilder.setProxy(host);
 			request.putExtra(Request.PROXY, host);

webmagic-core/src/main/java/us/codecraft/webmagic/proxy/ProxyPool.java

@@ -1,39 +1,26 @@
 package us.codecraft.webmagic.proxy;
 
-import java.io.File;
+import org.apache.http.HttpHost;
-import java.io.FileInputStream;
+import org.slf4j.Logger;
-import java.io.FileNotFoundException;
+import org.slf4j.LoggerFactory;
-import java.io.FileOutputStream;
+import us.codecraft.webmagic.utils.FilePersistentBase;
-import java.io.IOException;
+import us.codecraft.webmagic.utils.ProxyUtils;
-import java.io.ObjectInputStream;
+
-import java.io.ObjectOutputStream;
+import java.io.*;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.Map.Entry;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.DelayQueue;
 
-import org.apache.http.HttpHost;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import us.codecraft.webmagic.utils.FilePersistentBase;
-import us.codecraft.webmagic.utils.ProxyUtils;
-
 /**
  * Pooled Proxy Object
  *
  * @author yxssfxwzy@sina.com <br>
- * @since 0.5.1
  * @see Proxy
+ * @since 0.5.1
  */
 public class ProxyPool {
 
@@ -87,9 +74,9 @@ public class ProxyPool {
 
     private void setFilePath() {
         String tmpDir = System.getProperty("java.io.tmpdir");
-		String path = tmpDir + "webmagic\\lastUse.proxy";
+        String path = tmpDir + FilePersistentBase.PATH_SEPERATOR + "webmagic" + FilePersistentBase.PATH_SEPERATOR + "lastUse.proxy";
         if (tmpDir != null && new File(tmpDir).isDirectory()) {
-			fBase.setPath(tmpDir + "webmagic");
+            fBase.setPath(tmpDir + FilePersistentBase.PATH_SEPERATOR + "webmagic");
             File f = fBase.getFile(path);
             if (!f.exists()) {
                 try {

webmagic-core/src/test/java/us/codecraft/webmagic/proxy/ProxyTest.java

@@ -1,16 +1,14 @@
 package us.codecraft.webmagic.proxy;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.http.HttpHost;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.http.HttpHost;
+import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import us.codecraft.webmagic.Request;
 
 /**
  * @author yxssfxwzy@sina.com May 30, 2014
@@ -30,11 +28,6 @@ public class ProxyTest {
 		}
 	}
 
-	@Test
-	public void testAddProxy() {
-
-	}
-
 	@Test
 	public void testProxy() {
 		ProxyPool proxyPool = new ProxyPool(httpProxyList);