fix test

doghappy · doghappy · commit dc8b582f6c07 · 2021-09-22T19:07:52.000+08:00
diff --git a/src/SocketIOClient.Sample/Program.cs b/src/SocketIOClient.Sample/Program.cs
@@ -21,7 +21,8 @@ static async Task Main(string[] args)
                 Query = new Dictionary<string, string>
                 {
                     {"token", "V2" }
-                }
+                },
+                AutoUpgrade = false
             });
 
             socket.OnConnected += Socket_OnConnected;
@@ -36,7 +37,7 @@ static async Task Main(string[] args)
             });
             socket.On("hi", response =>
             {
-               // Console.WriteLine(response.ToString());
+                // Console.WriteLine(response.ToString());
                 Console.WriteLine(response.GetValue<string>());
             });
 
@@ -67,7 +68,8 @@ private static async void Socket_OnConnected(object sender, EventArgs e)
             //while (true)
             //{
             //    await Task.Delay(1000);
-                await socket.EmitAsync("hi", DateTime.Now.ToShortDateString());
+            //await socket.EmitAsync("hi", DateTime.Now.ToShortDateString());
+            await socket.EmitAsync("welcome");
             //}
             //byte[] bytes = Encoding.UTF8.GetBytes("ClientCallsServerCallback_1Params_0");
             //await socket.EmitAsync("client calls the server's callback 1", bytes);
diff --git a/src/SocketIOClient.Test/SocketIOClient.Test.csproj b/src/SocketIOClient.Test/SocketIOClient.Test.csproj
@@ -5,46 +5,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="SocketIOTests\V2\DisconnectionV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\DisconnectionV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\EmitV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\EmitV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\OffAnyV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\OffAnyV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\OffV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\OffV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\OnAnyV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\OnAnyV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\OnErrorV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\OnErrorV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\ReconnectionV2NspTest.cs" />
-    <Compile Remove="SocketIOTests\V2\ReconnectionV2Test.cs" />
-    <Compile Remove="SocketIOTests\V2\ServerV2Manager.cs" />
-    <Compile Remove="SocketIOTests\V2\SocketIOV2Creator.cs" />
-    <Compile Remove="SocketIOTests\V2\SocketIOV2NspCreator.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="SocketIOTests\V2\DisconnectionV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\DisconnectionV2Test.cs" />
-    <None Include="SocketIOTests\V2\EmitV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\EmitV2Test.cs" />
-    <None Include="SocketIOTests\V2\OffAnyV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\OffAnyV2Test.cs" />
-    <None Include="SocketIOTests\V2\OffV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\OffV2Test.cs" />
-    <None Include="SocketIOTests\V2\OnAnyV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\OnAnyV2Test.cs" />
-    <None Include="SocketIOTests\V2\OnErrorV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\OnErrorV2Test.cs" />
-    <None Include="SocketIOTests\V2\ReconnectionV2NspTest.cs" />
-    <None Include="SocketIOTests\V2\ReconnectionV2Test.cs" />
-    <None Include="SocketIOTests\V2\ServerV2Manager.cs" />
-    <None Include="SocketIOTests\V2\SocketIOV2Creator.cs" />
-    <None Include="SocketIOTests\V2\SocketIOV2NspCreator.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/src/SocketIOClient.Test/SocketIOTests/AssemblyIntegrationTest.cs b/src/SocketIOClient.Test/SocketIOTests/AssemblyIntegrationTest.cs
@@ -1,5 +1,7 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SocketIOClient.Test.Configuration;
+using SocketIOClient.Test.SocketIOTests.V2;
+using SocketIOClient.Test.SocketIOTests.V3;
 using SocketIOClient.Test.SocketIOTests.V4;
 using System;
 using System.Collections.Generic;
@@ -13,7 +15,7 @@ public class AssemblyIntegrationTest
     {
         private static readonly IEnumerable<IServerManager> Servers = new List<IServerManager>()
         {
-            //new ServerV2Manager(),
+            new ServerV2Manager(),
             new ServerV3Manager(),
             new ServerV4Manager()
         };
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/HeadersV2Test.cs b/src/SocketIOClient.Test/SocketIOTests/V2/HeadersV2Test.cs
@@ -0,0 +1,22 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading.Tasks;
+
+namespace SocketIOClient.Test.SocketIOTests.V2
+{
+    [TestClass]
+    public class HeadersV2Test : HeadersTest
+    {
+        public HeadersV2Test()
+        {
+            SocketIOCreator = new SocketIOV2Creator();
+        }
+
+        protected override ISocketIOCreateable SocketIOCreator { get; }
+
+        [TestMethod]
+        public override async Task CustomHeader()
+        {
+            await base.CustomHeader();
+        }
+    }
+}
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/OffAnyV2NspTest.cs b/src/SocketIOClient.Test/SocketIOTests/V2/OffAnyV2NspTest.cs
@@ -4,7 +4,7 @@
 namespace SocketIOClient.Test.SocketIOTests.V2
 {
     [TestClass]
-    public class OffAnyV2NspTest : OnAnyTest
+    public class OffAnyV2NspTest : OffTest
     {
         public OffAnyV2NspTest()
         {
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/OnErrorV2NspTest.cs b/src/SocketIOClient.Test/SocketIOTests/V2/OnErrorV2NspTest.cs
@@ -13,6 +13,7 @@ public OnErrorV2NspTest()
 
         protected override ISocketIOCreateable SocketIOCreator { get; }
 
+
         [TestMethod]
         public override async Task Test()
         {
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/ReconnectionV2Test.cs b/src/SocketIOClient.Test/SocketIOTests/V2/ReconnectionV2Test.cs
@@ -20,6 +20,13 @@ public ReconnectionV2Test()
         //    await base.ReconnectionTrueTest();
         //}
 
+        // NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
+        //[TestMethod]
+        //public override async Task ReconnectionAttemptsExceededTest()
+        //{
+        //    await base.ReconnectionAttemptsExceededTest();
+        //}
+
         [TestMethod]
         public override async Task ReconnectionFalseTest()
         {
@@ -33,13 +40,6 @@ public override async Task ReconnectionFalseTest()
         //    await base.ReconnectingTest();
         //}
 
-        // NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
-        //[TestMethod]
-        //public override async Task ReconnectionAttemptsExceededTest()
-        //{
-        //    await base.ReconnectionAttemptsExceededTest();
-        //}
-
         [TestMethod]
         public override async Task ManuallyReconnectionTest()
         {
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/ServerV2Manager.cs b/src/SocketIOClient.Test/SocketIOTests/V2/ServerV2Manager.cs
@@ -1,4 +1,4 @@
-﻿namespace SocketIOClient.Test.SocketIOTests.V4
+﻿namespace SocketIOClient.Test.SocketIOTests.V2
 {
     public class ServerV2Manager : BaseServerManager, IServerManager
     {
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/SocketIOV2Creator.cs b/src/SocketIOClient.Test/SocketIOTests/V2/SocketIOV2Creator.cs
@@ -17,7 +17,7 @@ public SocketIO Create(bool reconnection = false)
         }
 
         public string Prefix => "V2: ";
-        public string Url => "http://localhost:11002";
         public string Token => "V2";
+        public string Url => "http://localhost:11002";
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V2/SocketIOV2NspCreator.cs b/src/SocketIOClient.Test/SocketIOTests/V2/SocketIOV2NspCreator.cs
@@ -19,6 +19,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "/nsp,V2: ";
         public string Url => "http://localhost:11002/nsp";
         public string Token => "V2";
-        public int EIO => 3;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V3/ServerV3Manager.cs b/src/SocketIOClient.Test/SocketIOTests/V3/ServerV3Manager.cs
@@ -1,4 +1,4 @@
-﻿namespace SocketIOClient.Test.SocketIOTests.V4
+﻿namespace SocketIOClient.Test.SocketIOTests.V3
 {
     public class ServerV3Manager : BaseServerManager, IServerManager
     {
diff --git a/src/SocketIOClient.Test/SocketIOTests/V3/SocketIOV3Creator.cs b/src/SocketIOClient.Test/SocketIOTests/V3/SocketIOV3Creator.cs
@@ -19,6 +19,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "V3: ";
         public string Token => "V3";
         public string Url => "http://localhost:11003";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V3/SocketIOV3NspCreator.cs b/src/SocketIOClient.Test/SocketIOTests/V3/SocketIOV3NspCreator.cs
@@ -19,6 +19,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "/nsp,V3: ";
         public string Url => "http://localhost:11003/nsp";
         public string Token => "V3NSP";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V3Http/SocketIOV3Creator.cs b/src/SocketIOClient.Test/SocketIOTests/V3Http/SocketIOV3Creator.cs
@@ -20,6 +20,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "V3: ";
         public string Token => "V3";
         public string Url => "http://localhost:11003";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V3Http/SocketIOV3NspCreator.cs b/src/SocketIOClient.Test/SocketIOTests/V3Http/SocketIOV3NspCreator.cs
@@ -20,6 +20,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "/nsp,V3: ";
         public string Url => "http://localhost:11003/nsp";
         public string Token => "V3NSP";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V4/SocketIOV4Creator.cs b/src/SocketIOClient.Test/SocketIOTests/V4/SocketIOV4Creator.cs
@@ -19,6 +19,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "V4: ";
         public string Url => "http://localhost:11004";
         public string Token => "V4";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V4/SocketIOV4NspCreator.cs b/src/SocketIOClient.Test/SocketIOTests/V4/SocketIOV4NspCreator.cs
@@ -19,6 +19,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "/nsp,V4: ";
         public string Url => "http://localhost:11004/nsp";
         public string Token => "V4NSP";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V4Http/SocketIOV4Creator.cs b/src/SocketIOClient.Test/SocketIOTests/V4Http/SocketIOV4Creator.cs
@@ -20,6 +20,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "V4: ";
         public string Token => "V4";
         public string Url => "http://localhost:11004";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.Test/SocketIOTests/V4Http/SocketIOV4NspCreator.cs b/src/SocketIOClient.Test/SocketIOTests/V4Http/SocketIOV4NspCreator.cs
@@ -20,6 +20,5 @@ public SocketIO Create(bool reconnection = false)
         public string Prefix => "/nsp,V4: ";
         public string Url => "http://localhost:11004/nsp";
         public string Token => "V4NSP";
-        public int EIO => 4;
     }
 }
diff --git a/src/SocketIOClient.UnitTest/MessageTests/MessageReadTest.cs b/src/SocketIOClient.UnitTest/MessageTests/MessageReadTest.cs
@@ -7,19 +7,6 @@ namespace SocketIOClient.UnitTest.MessageTests
     [TestClass]
     public class MessageReadTest
     {
-        [TestMethod]
-        public void Opened()
-        {
-            var msg = MessageFactory.CreateMessage(4, "0{\"sid\":\"6lV4Ef7YOyGF-5dCBvKy\",\"upgrades\":[],\"pingInterval\":10000,\"pingTimeout\":5000}");
-            Assert.AreEqual(MessageType.Opened, msg.Type);
-
-            var openedMsg = msg as OpenedMessage;
-
-            Assert.AreEqual("6lV4Ef7YOyGF-5dCBvKy", openedMsg.Sid);
-            Assert.AreEqual(10000, openedMsg.PingInterval);
-            Assert.AreEqual(5000, openedMsg.PingTimeout);
-        }
-
         [TestMethod]
         public void Ping()
         {
@@ -66,7 +53,7 @@ public void Eio3Connected()
 
             var connectedMsg = msg as ConnectedMessage;
 
-            Assert.AreEqual(string.Empty, connectedMsg.Namespace);
+            Assert.IsTrue(string.IsNullOrEmpty(connectedMsg.Namespace));
             Assert.IsNull(connectedMsg.Sid);
         }
 
diff --git a/src/SocketIOClient/Messages/MessageFactory.cs b/src/SocketIOClient/Messages/MessageFactory.cs
@@ -10,8 +10,6 @@ private static IMessage CreateMessage(MessageType type)
         {
             switch (type)
             {
-                //case MessageType.Opened:
-                //    return new OpenedMessage();
                 case MessageType.Ping:
                     return new PingMessage();
                 case MessageType.Pong:
diff --git a/src/SocketIOClient/SocketIO.cs b/src/SocketIOClient/SocketIO.cs
@@ -660,7 +660,7 @@ private async void InvokeDisconnect(string reason)
             {
                 Connected = false;
                 OnDisconnected?.Invoke(this, reason);
-                _pingTokenSource.Cancel();
+                _pingTokenSource?.Cancel();
                 try
                 {
                     await Router.DisconnectAsync();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace SocketIOClient.Test.SocketIOTests.V2`
`5`	`5`	`{`
`6`	`6`	`[TestClass]`
`7`		`- public class OffAnyV2NspTest : OnAnyTest`
	`7`	`+ public class OffAnyV2NspTest : OffTest`
`8`	`8`	`{`
`9`	`9`	`public OffAnyV2NspTest()`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public OnErrorV2NspTest()`
`13`	`13`
`14`	`14`	`protected override ISocketIOCreateable SocketIOCreator { get; }`
`15`	`15`
	`16`	`+`
`16`	`17`	`[TestMethod]`
`17`	`18`	`public override async Task Test()`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace SocketIOClient.Test.SocketIOTests.V4`
	`1`	`+namespace SocketIOClient.Test.SocketIOTests.V2`
`2`	`2`	`{`
`3`	`3`	`public class ServerV2Manager : BaseServerManager, IServerManager`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public SocketIO Create(bool reconnection = false)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public string Prefix => "V2: ";`
`20`		`- public string Url => "http://localhost:11002";`
`21`	`20`	`public string Token => "V2";`
	`21`	`+ public string Url => "http://localhost:11002";`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,5 @@ public SocketIO Create(bool reconnection = false)`
`19`	`19`	`public string Prefix => "/nsp,V2: ";`
`20`	`20`	`public string Url => "http://localhost:11002/nsp";`
`21`	`21`	`public string Token => "V2";`
`22`		`- public int EIO => 3;`
`23`	`22`	`}`
`24`	`23`	`}`