refactor unit tests

doghappy · doghappy · commit 746bb6b7e2dc · 2023-01-15T18:14:30.000+08:00
diff --git a/src/SocketIOClient/SocketIO.cs b/src/SocketIOClient/SocketIO.cs
@@ -92,24 +92,16 @@ private Uri ServerUri
 
         int _attempts;
 
-        [Obsolete]
-        /// <summary>
-        /// Whether or not the socket is disconnected from the server.
-        /// </summary>
-        public bool Disconnected => !Connected;
-
         public SocketIOOptions Options { get; }
 
         public IJsonSerializer JsonSerializer { get; set; }
-
+        public ITransport Transport { get; set; }
         public Func<IHttpClient> HttpClientProvider { get; set; }
 
         public Func<IClientWebSocket> ClientWebSocketProvider { get; set; }
 
         List<IDisposable> _resources = new List<IDisposable>();
 
-        BaseTransport _transport;
-
         List<Type> _expectedExceptions;
 
         int _packetId;
@@ -177,7 +169,8 @@ private void Initialize()
                 typeof(WebSocketException),
                 typeof(HttpRequestException),
                 typeof(OperationCanceledException),
-                typeof(TaskCanceledException)
+                typeof(TaskCanceledException),
+                typeof(TransportException),
             };
         }
 
@@ -205,7 +198,7 @@ private async Task InitTransportAsync()
             if (Options.Transport == TransportProtocol.Polling)
             {
                 var handler = HttpPollingHandler.CreateHandler(transportOptions.EIO, GetHttpClient());
-                _transport = new HttpTransport(transportOptions, handler);
+                Transport = new HttpTransport(transportOptions, handler);
             }
             else
             {
@@ -215,14 +208,14 @@ private async Task InitTransportAsync()
                     throw new ArgumentNullException(nameof(ClientWebSocketProvider), $"{ClientWebSocketProvider} returns a null");
                 }
                 _resources.Add(ws);
-                _transport = new WebSocketTransport(transportOptions, ws);
+                Transport = new WebSocketTransport(transportOptions, ws);
             }
-            _resources.Add(_transport);
-            _transport.Namespace = _namespace;
+            _resources.Add(Transport);
+            Transport.Namespace = _namespace;
             SetHeaders();
-            _transport.SetProxy(Options.Proxy);
-            _transport.OnReceived = OnMessageReceived;
-            _transport.OnError = OnErrorReceived;
+            Transport.SetProxy(Options.Proxy);
+            Transport.OnReceived = OnMessageReceived;
+            Transport.OnError = OnErrorReceived;
         }
 
         private string GetAuth(object auth)
@@ -241,7 +234,7 @@ private void SetHeaders()
                 {
                     try
                     {
-                        _transport.AddHeader(item.Key, item.Value);
+                        Transport.AddHeader(item.Key, item.Value);
                     }
                     catch (Exception e)
                     {
@@ -277,7 +270,7 @@ private void ConnectInBackground(CancellationToken cancellationToken)
                     {
                         using (var cts = new CancellationTokenSource(Options.ConnectionTimeout))
                         {
-                            await _transport.ConnectAsync(serverUri, cts.Token).ConfigureAwait(false);
+                            await Transport.ConnectAsync(serverUri, cts.Token).ConfigureAwait(false);
                             break;
                         }
                     }
@@ -561,7 +554,7 @@ public async Task DisconnectAsync()
                 };
                 try
                 {
-                    await _transport.SendAsync(msg, CancellationToken.None).ConfigureAwait(false);
+                    await Transport.SendAsync(msg, CancellationToken.None).ConfigureAwait(false);
                 }
                 catch (Exception e)
                 {
@@ -660,7 +653,7 @@ internal async Task ClientAckAsync(int packetId, CancellationToken cancellationT
                     Id = packetId
                 };
             }
-            await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+            await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -688,7 +681,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
                         Event = eventName,
                         Json = result.Json
                     };
-                    await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+                    await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
                 }
                 else
                 {
@@ -698,7 +691,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
                         Event = eventName,
                         Json = result.Json
                     };
-                    await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+                    await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
                 }
             }
             else
@@ -708,7 +701,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
                     Namespace = _namespace,
                     Event = eventName
                 };
-                await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+                await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
             }
         }
 
@@ -740,7 +733,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
                         Id = _packetId,
                         OutgoingBytes = new List<byte[]>(result.Bytes)
                     };
-                    await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+                    await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
                 }
                 else
                 {
@@ -751,7 +744,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
                         Id = _packetId,
                         Json = result.Json
                     };
-                    await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+                    await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
                 }
             }
             else
@@ -762,7 +755,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
                     Namespace = _namespace,
                     Id = _packetId
                 };
-                await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
+                await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
             }
         }
 
@@ -775,7 +768,7 @@ private async Task InvokeDisconnect(string reason)
                 OnDisconnected.TryInvoke(this, reason);
                 try
                 {
-                    await _transport.DisconnectAsync(CancellationToken.None).ConfigureAwait(false);
+                    await Transport.DisconnectAsync(CancellationToken.None).ConfigureAwait(false);
                 }
                 catch (Exception e)
                 {
@@ -804,7 +797,7 @@ public void AddExpectedException(Type type)
 
         public void Dispose()
         {
-            _transport.TryDispose();
+            Transport.TryDispose();
             _ackHandlers.Clear();
             _onAnyHandlers.Clear();
             _eventHandlers.Clear();
diff --git a/src/SocketIOClient/Transport/BaseTransport.cs b/src/SocketIOClient/Transport/BaseTransport.cs
@@ -12,7 +12,7 @@
 
 namespace SocketIOClient.Transport
 {
-    public abstract class BaseTransport : IDisposable
+    public abstract class BaseTransport : ITransport
     {
         protected BaseTransport(TransportOptions options)
         {
diff --git a/src/SocketIOClient/Transport/ITransport.cs b/src/SocketIOClient/Transport/ITransport.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using SocketIOClient.Messages;
+
+namespace SocketIOClient.Transport
+{
+    public interface ITransport : IDisposable
+    {
+        Action<IMessage> OnReceived { get; set; }
+        Action<Exception> OnError { get; set; }
+        string Namespace { get; set; }
+        Task SendAsync(IMessage msg, CancellationToken cancellationToken);
+        Task ConnectAsync(Uri uri, CancellationToken cancellationToken);
+        Task DisconnectAsync(CancellationToken cancellationToken);
+        void AddHeader(string key, string val);
+        void SetProxy(IWebProxy proxy);
+    }
+}
diff --git a/src/SocketIOClient/Transport/WebSockets/WebSocketTransport.cs b/src/SocketIOClient/Transport/WebSockets/WebSocketTransport.cs
@@ -85,13 +85,16 @@ private void Listen(CancellationToken cancellationToken)
                         catch (Exception e)
                         {
                             OnError.TryInvoke(e);
-                            break;
+#if DEBUG
+                            Debug.WriteLine($"[{Protocol}❌] {e}");
+#endif
+                            return;
                         }
                     }
 
                     if (result == null)
                     {
-                        break;
+                        return;
                     }
 
                     try
diff --git a/tests/SocketIOClient.UnitTest/SocketIOTest.cs b/tests/SocketIOClient.UnitTest/SocketIOTest.cs
diff --git a/tests/SocketIOClient.UnitTest/Transport/WebSocket/WebSocketTransportTest.cs b/tests/SocketIOClient.UnitTest/Transport/WebSocket/WebSocketTransportTest.cs

Original file line number	Diff line number	Diff line change
`@@ -92,24 +92,16 @@ private Uri ServerUri`
`92`	`92`
`93`	`93`	`int _attempts;`
`94`	`94`
`95`		`- [Obsolete]`
`96`		`- /// <summary>`
`97`		`- /// Whether or not the socket is disconnected from the server.`
`98`		`- /// </summary>`
`99`		`- public bool Disconnected => !Connected;`
`100`		`-`
`101`	`95`	`public SocketIOOptions Options { get; }`
`102`	`96`
`103`	`97`	`public IJsonSerializer JsonSerializer { get; set; }`
`104`		`-`
	`98`	`+ public ITransport Transport { get; set; }`
`105`	`99`	`public Func<IHttpClient> HttpClientProvider { get; set; }`
`106`	`100`
`107`	`101`	`public Func<IClientWebSocket> ClientWebSocketProvider { get; set; }`
`108`	`102`
`109`	`103`	`List<IDisposable> _resources = new List<IDisposable>();`
`110`	`104`
`111`		`- BaseTransport _transport;`
`112`		`-`
`113`	`105`	`List<Type> _expectedExceptions;`
`114`	`106`
`115`	`107`	`int _packetId;`
`@@ -177,7 +169,8 @@ private void Initialize()`
`177`	`169`	`typeof(WebSocketException),`
`178`	`170`	`typeof(HttpRequestException),`
`179`	`171`	`typeof(OperationCanceledException),`
`180`		`- typeof(TaskCanceledException)`
	`172`	`+ typeof(TaskCanceledException),`
	`173`	`+ typeof(TransportException),`
`181`	`174`	`};`
`182`	`175`	`}`
`183`	`176`
`@@ -205,7 +198,7 @@ private async Task InitTransportAsync()`
`205`	`198`	`if (Options.Transport == TransportProtocol.Polling)`
`206`	`199`	`{`
`207`	`200`	`var handler = HttpPollingHandler.CreateHandler(transportOptions.EIO, GetHttpClient());`
`208`		`- _transport = new HttpTransport(transportOptions, handler);`
	`201`	`+ Transport = new HttpTransport(transportOptions, handler);`
`209`	`202`	`}`
`210`	`203`	`else`
`211`	`204`	`{`
`@@ -215,14 +208,14 @@ private async Task InitTransportAsync()`
`215`	`208`	`throw new ArgumentNullException(nameof(ClientWebSocketProvider), $"{ClientWebSocketProvider} returns a null");`
`216`	`209`	`}`
`217`	`210`	`_resources.Add(ws);`
`218`		`- _transport = new WebSocketTransport(transportOptions, ws);`
	`211`	`+ Transport = new WebSocketTransport(transportOptions, ws);`
`219`	`212`	`}`
`220`		`- _resources.Add(_transport);`
`221`		`- _transport.Namespace = _namespace;`
	`213`	`+ _resources.Add(Transport);`
	`214`	`+ Transport.Namespace = _namespace;`
`222`	`215`	`SetHeaders();`
`223`		`- _transport.SetProxy(Options.Proxy);`
`224`		`- _transport.OnReceived = OnMessageReceived;`
`225`		`- _transport.OnError = OnErrorReceived;`
	`216`	`+ Transport.SetProxy(Options.Proxy);`
	`217`	`+ Transport.OnReceived = OnMessageReceived;`
	`218`	`+ Transport.OnError = OnErrorReceived;`
`226`	`219`	`}`
`227`	`220`
`228`	`221`	`private string GetAuth(object auth)`
`@@ -241,7 +234,7 @@ private void SetHeaders()`
`241`	`234`	`{`
`242`	`235`	`try`
`243`	`236`	`{`
`244`		`- _transport.AddHeader(item.Key, item.Value);`
	`237`	`+ Transport.AddHeader(item.Key, item.Value);`
`245`	`238`	`}`
`246`	`239`	`catch (Exception e)`
`247`	`240`	`{`
`@@ -277,7 +270,7 @@ private void ConnectInBackground(CancellationToken cancellationToken)`
`277`	`270`	`{`
`278`	`271`	`using (var cts = new CancellationTokenSource(Options.ConnectionTimeout))`
`279`	`272`	`{`
`280`		`- await _transport.ConnectAsync(serverUri, cts.Token).ConfigureAwait(false);`
	`273`	`+ await Transport.ConnectAsync(serverUri, cts.Token).ConfigureAwait(false);`
`281`	`274`	`break;`
`282`	`275`	`}`
`283`	`276`	`}`
`@@ -561,7 +554,7 @@ public async Task DisconnectAsync()`
`561`	`554`	`};`
`562`	`555`	`try`
`563`	`556`	`{`
`564`		`- await _transport.SendAsync(msg, CancellationToken.None).ConfigureAwait(false);`
	`557`	`+ await Transport.SendAsync(msg, CancellationToken.None).ConfigureAwait(false);`
`565`	`558`	`}`
`566`	`559`	`catch (Exception e)`
`567`	`560`	`{`
`@@ -660,7 +653,7 @@ internal async Task ClientAckAsync(int packetId, CancellationToken cancellationT`
`660`	`653`	`Id = packetId`
`661`	`654`	`};`
`662`	`655`	`}`
`663`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`656`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`664`	`657`	`}`
`665`	`658`
`666`	`659`	`/// <summary>`
`@@ -688,7 +681,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke`
`688`	`681`	`Event = eventName,`
`689`	`682`	`Json = result.Json`
`690`	`683`	`};`
`691`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`684`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`692`	`685`	`}`
`693`	`686`	`else`
`694`	`687`	`{`
`@@ -698,7 +691,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke`
`698`	`691`	`Event = eventName,`
`699`	`692`	`Json = result.Json`
`700`	`693`	`};`
`701`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`694`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`702`	`695`	`}`
`703`	`696`	`}`
`704`	`697`	`else`
`@@ -708,7 +701,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke`
`708`	`701`	`Namespace = _namespace,`
`709`	`702`	`Event = eventName`
`710`	`703`	`};`
`711`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`704`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`712`	`705`	`}`
`713`	`706`	`}`
`714`	`707`
`@@ -740,7 +733,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke`
`740`	`733`	`Id = _packetId,`
`741`	`734`	`OutgoingBytes = new List<byte[]>(result.Bytes)`
`742`	`735`	`};`
`743`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`736`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`744`	`737`	`}`
`745`	`738`	`else`
`746`	`739`	`{`
`@@ -751,7 +744,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke`
`751`	`744`	`Id = _packetId,`
`752`	`745`	`Json = result.Json`
`753`	`746`	`};`
`754`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`747`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`755`	`748`	`}`
`756`	`749`	`}`
`757`	`750`	`else`
`@@ -762,7 +755,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke`
`762`	`755`	`Namespace = _namespace,`
`763`	`756`	`Id = _packetId`
`764`	`757`	`};`
`765`		`- await _transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
	`758`	`+ await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);`
`766`	`759`	`}`
`767`	`760`	`}`
`768`	`761`
`@@ -775,7 +768,7 @@ private async Task InvokeDisconnect(string reason)`
`775`	`768`	`OnDisconnected.TryInvoke(this, reason);`
`776`	`769`	`try`
`777`	`770`	`{`
`778`		`- await _transport.DisconnectAsync(CancellationToken.None).ConfigureAwait(false);`
	`771`	`+ await Transport.DisconnectAsync(CancellationToken.None).ConfigureAwait(false);`
`779`	`772`	`}`
`780`	`773`	`catch (Exception e)`
`781`	`774`	`{`
`@@ -804,7 +797,7 @@ public void AddExpectedException(Type type)`
`804`	`797`
`805`	`798`	`public void Dispose()`
`806`	`799`	`{`
`807`		`- _transport.TryDispose();`
	`800`	`+ Transport.TryDispose();`
`808`	`801`	`_ackHandlers.Clear();`
`809`	`802`	`_onAnyHandlers.Clear();`
`810`	`803`	`_eventHandlers.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace SocketIOClient.Transport`
`14`	`14`	`{`
`15`		`- public abstract class BaseTransport : IDisposable`
	`15`	`+ public abstract class BaseTransport : ITransport`
`16`	`16`	`{`
`17`	`17`	`protected BaseTransport(TransportOptions options)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,16 @@ private void Listen(CancellationToken cancellationToken)`
`85`	`85`	`catch (Exception e)`
`86`	`86`	`{`
`87`	`87`	`OnError.TryInvoke(e);`
`88`		`- break;`
	`88`	`+#if DEBUG`
	`89`	`+ Debug.WriteLine($"[{Protocol}❌] {e}");`
	`90`	`+#endif`
	`91`	`+ return;`
`89`	`92`	`}`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`if (result == null)`
`93`	`96`	`{`
`94`		`- break;`
	`97`	`+ return;`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`try`