增加HttpProxy单元测试

Author: xljiulang

WebApiClient/HttpProxy.cs

@@ -9,6 +9,11 @@ namespace WebApiClient
     /// </summary>
     public class HttpProxy : IWebProxy
     {
+        /// <summary>
+        /// 授权字段
+        /// </summary>
+        private ICredentials credentials;
+
         /// <summary>
         /// 获取代理服务器域名或ip
         /// </summary>
@@ -32,7 +37,17 @@ public class HttpProxy : IWebProxy
         /// <summary>
         /// 获取或设置授权信息
         /// </summary>
-        ICredentials IWebProxy.Credentials { get; set; }
+        ICredentials IWebProxy.Credentials
+        {
+            get
+            {
+                return this.credentials;
+            }
+            set
+            {
+                this.SetCredentialsByInterface(value);
+            }
+        }
 
         /// <summary>
         /// http代理信息
@@ -69,8 +84,9 @@ public HttpProxy(Uri proxyAddress)
         /// <param name="port">代理服务器端口</param>
         /// <exception cref="ArgumentNullException"></exception>
         public HttpProxy(string host, int port)
-            : this(host, port, null, null)
         {
+            this.Host = host ?? throw new ArgumentNullException(nameof(host));
+            this.Port = port;
         }
 
         /// <summary>
@@ -82,18 +98,37 @@ public HttpProxy(string host, int port)
         /// <param name="password">代理服务器密码</param>
         /// <exception cref="ArgumentNullException"></exception>
         public HttpProxy(string host, int port, string userName, string password)
+            : this(host, port)
         {
-            this.Host = host ?? throw new ArgumentNullException(nameof(host));
-            this.Port = port;
             this.UserName = userName;
             this.Password = password;
 
             if (string.IsNullOrEmpty(userName + password) == false)
             {
-                ((IWebProxy)this).Credentials = new NetworkCredential(userName, password);
+                this.credentials = new NetworkCredential(userName, password);
             }
         }
 
+        /// <summary>
+        /// 通过接口设置授权信息
+        /// </summary>
+        /// <param name="value"></param>
+        private void SetCredentialsByInterface(ICredentials value)
+        {
+            var userName = default(string);
+            var password = default(string);
+            if (value != null)
+            {
+                var networkCredentialsd = value.GetCredential(null, null);
+                userName = networkCredentialsd?.UserName;
+                password = networkCredentialsd?.Password;
+            }
+
+            this.UserName = userName;
+            this.Password = password;
+            this.credentials = value;
+        }
+
         /// <summary>
         /// 从IWebProxy实例转换获得
         /// </summary>
@@ -115,13 +150,8 @@ public static HttpProxy FromWebProxy(IWebProxy webProxy, Uri targetAddress)
 
             var proxyAddress = webProxy.GetProxy(targetAddress);
             var httpProxy = new HttpProxy(proxyAddress);
+            httpProxy.SetCredentialsByInterface(webProxy.Credentials);
 
-            if (webProxy.Credentials != null)
-            {
-                var credentials = webProxy.Credentials.GetCredential(null, null);
-                httpProxy.UserName = credentials?.UserName;
-                httpProxy.Password = credentials?.Password;
-            }
             return httpProxy;
         }
 
@@ -159,19 +189,19 @@ public string ToTunnelRequestString(Uri targetAddress)
         /// <summary>
         /// 获取代理服务器地址
         /// </summary>
-        /// <param name="destination"></param>
+        /// <param name="destination">目标地址</param>
         /// <returns></returns>
-        Uri IWebProxy.GetProxy(Uri destination)
+        public Uri GetProxy(Uri destination)
         {
             return new Uri($"http://{this.Host}:{this.Port}/");
         }
 
         /// <summary>
         /// 是否忽略代理
         /// </summary>
-        /// <param name="host"></param>
+        /// <param name="host">目标地址</param>
         /// <returns></returns>
-        bool IWebProxy.IsBypassed(Uri host)
+        public bool IsBypassed(Uri host)
         {
             return false;
         }

WebApiClient/ProxyValidator.cs

@@ -26,8 +26,8 @@ public class ProxyValidator
         /// <param name="proxyPort">代理服务器端口</param>
         /// <exception cref="ArgumentNullException"></exception>
         public ProxyValidator(string proxyHost, int proxyPort)
+            : this(new HttpProxy(proxyHost, proxyPort))
         {
-            this.webProxy = new HttpProxy(proxyHost, proxyPort);
         }
 
         /// <summary>

WebApiClientTest/HttpProxyTest.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using WebApiClient;
+using Xunit;
+
+namespace WebApiClientTest
+{
+    public class HttpProxyTest
+    {
+        [Fact]
+        public void CtorTest()
+        {
+            var target = new Uri("https://www.baidu.com/");
+            var uri = "http://localhost:5533/";
+            var proxy = new HttpProxy(uri);
+
+            Assert.True(proxy.Host == "localhost" && proxy.Port == 5533);
+            Assert.True(proxy.GetProxy(target) == new Uri(uri));
+            Assert.True(proxy.UserName == null);
+            Assert.True(((IWebProxy)proxy).Credentials == null);
+
+
+            proxy = new HttpProxy(new Uri(uri));
+            Assert.True(proxy.Host == "localhost" && proxy.Port == 5533);
+            Assert.True(proxy.GetProxy(target) == new Uri(uri));
+            Assert.True(proxy.UserName == null);
+            Assert.True(((IWebProxy)proxy).Credentials == null);
+
+
+            proxy = new HttpProxy("localhost", 5533, "laojiu", "123456");
+            Assert.True(proxy.Host == "localhost" && proxy.Port == 5533);
+            Assert.True(proxy.GetProxy(target) == new Uri(uri));
+            Assert.True(proxy.UserName == "laojiu");
+            Assert.True(proxy.Password == "123456");
+            Assert.True(((IWebProxy)proxy).Credentials.GetCredential(null, null).UserName == "laojiu");
+            Assert.True(((IWebProxy)proxy).Credentials.GetCredential(null, null).Password == "123456");
+
+
+            var p = new WebProxy("127.0.0.1", 5000) { Credentials = new NetworkCredential("abc", "123") };
+            proxy = HttpProxy.FromWebProxy(p, target);
+            Assert.True(proxy.Host == "127.0.0.1" && proxy.Port == 5000);
+            Assert.True(proxy.GetProxy(target) == new Uri("http://127.0.0.1:5000"));
+            Assert.True(proxy.UserName == "abc");
+            Assert.True(proxy.Password == "123");
+            Assert.True(((IWebProxy)proxy).Credentials.GetCredential(null, null).UserName == "abc");
+            Assert.True(((IWebProxy)proxy).Credentials.GetCredential(null, null).Password == "123");
+
+        }
+    }
+}