resolve conflicts

Author: doghappy

.gitignore

@@ -339,3 +339,6 @@ ASALocalRun/
 # BeatPulse healthcheck temp database
 healthchecksdb
 *.snk
+
+# Ignore user config file
+/src/SocketIOClient.Test/user.json

src/SocketIOClient.Sample/SocketIOClient.Sample.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SocketIOClient\SocketIOClient.csproj" />
+  </ItemGroup>
+
+</Project>

src/SocketIOClient.Test/Configuration/UserConfig.cs

@@ -0,0 +1,8 @@
+namespace SocketIOClient.Test.Configuration
+{
+    public class UserConfig
+    {
+        public bool RunServers { get; set; } = false;
+        public bool StopServersAfterRun { get; set; } = false;
+    }
+}

src/SocketIOClient.Test/Configuration/UserConfigManager.cs

@@ -0,0 +1,21 @@
+using System.IO;
+
+namespace SocketIOClient.Test.Configuration
+{
+    public class UserConfigManager
+    {
+        private const string configFileName = "user.json";
+
+        public bool Exists =>  File.Exists(configFileName);
+
+        public UserConfig Get()
+        {
+            if (!this.Exists) 
+            {
+                return null;
+            }
+
+            return System.Text.Json.JsonSerializer.Deserialize<UserConfig>(File.ReadAllText(configFileName));
+        }
+    }
+}

src/SocketIOClient.Test/Configuration/user_sample.json

@@ -0,0 +1,5 @@
+// Rename "user_sample.json" to "user.json" and copy to output directory (comment must be removed)
+{
+  "RunServers": true,
+  "StopServersAfterRun": true
+}

src/SocketIOClient.Test/Helpers/CommandHelper.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace SocketIOClient.Test.Helpers
+{
+    public static class CommandHelper
+    {
+        public static Process RunCommand(string fileName, string argument, string workingDirectory = null)
+        {
+            if (string.IsNullOrEmpty(workingDirectory))
+            {
+                workingDirectory = Directory.GetDirectoryRoot(Directory.GetCurrentDirectory());
+            }
+
+            var processStartInfo = new ProcessStartInfo()
+            {
+                FileName = fileName,
+                Arguments = argument,
+                WorkingDirectory = workingDirectory,
+                UseShellExecute = true,
+                WindowStyle = ProcessWindowStyle.Minimized,
+            };
+
+            var process = Process.Start(processStartInfo);
+
+            if (process == null)
+            {
+                throw new Exception("Process should not be null.");
+            }
+
+            return process;
+        }
+    }
+}

src/SocketIOClient.Test/SocketIOClient.Test.csproj

@@ -8,8 +8,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,6 +28,9 @@
     <None Update="Files\tianlongbabu.epub">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="user.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

src/SocketIOClient.Test/SocketIOTests/AssemblyIntegrationTest.cs

@@ -0,0 +1,52 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SocketIOClient.Test.Configuration;
+using SocketIOClient.Test.SocketIOTests.V4;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace SocketIOClient.Test.SocketIOTests
+{
+    [TestClass]
+
+    public class AssemblyIntegrationTest
+    {
+        private static readonly IEnumerable<IServerManager> Servers = new List<IServerManager>()
+        {
+            new ServerV2Manager(),
+            new ServerV3Manager(),
+            new ServerV4Manager()
+        };
+
+        private static UserConfig UserConfig => new UserConfigManager().Get() ?? new UserConfig();
+
+        private static bool IsRunningOnAzureDevOps => Environment.GetEnvironmentVariable("SYSTEM_DEFINITIONID") != null;
+
+        [AssemblyInitialize]
+        public static void Initialize(TestContext context)
+        {
+            if (!IsRunningOnAzureDevOps && UserConfig.RunServers)
+            {
+                foreach (var server in Servers)
+                {
+                    server.Create();
+                }
+
+                // Give some time to be sure that servers are running.
+                Thread.Sleep(5000);
+            }
+        }
+
+        [AssemblyCleanup]
+        public static void Cleanup()
+        {
+            if (!IsRunningOnAzureDevOps && UserConfig.RunServers && UserConfig.StopServersAfterRun)
+            {
+                foreach (var server in Servers)
+                {
+                    server.Destroy();
+                }
+            }
+        }
+    }
+}

src/SocketIOClient.Test/SocketIOTests/BaseServerManager.cs

@@ -0,0 +1,37 @@
+using SocketIOClient.Test.Helpers;
+using System.Diagnostics;
+using System.IO;
+
+namespace SocketIOClient.Test.SocketIOTests
+{
+    public class BaseServerManager
+    {
+        private readonly string directory;
+        private Process nodeProcess;
+
+        public BaseServerManager(string directory) 
+        {
+            this.directory = directory;
+        }
+
+        public void Create()
+        {
+            var workingDirectory = Path.GetFullPath(directory);
+            var npmInstallProcess = CommandHelper.RunCommand("npm", "install", workingDirectory);
+            
+            // We wait until the installation process is finished (or we get a timeout).
+            if (!npmInstallProcess.WaitForExit(60000)) 
+            {
+                throw new System.SystemException("Failed restoring packages of server");
+            }
+
+            // Time to run the node server.
+            this.nodeProcess = CommandHelper.RunCommand("node", "app.js", workingDirectory);
+        }
+
+        public void Destroy()
+        {
+            nodeProcess?.Kill();
+        }
+    }
+}

src/SocketIOClient.Test/SocketIOTests/IServerManager.cs

@@ -0,0 +1,8 @@
+namespace SocketIOClient.Test.SocketIOTests
+{
+    public interface IServerManager
+    {
+        public void Create();
+        public void Destroy();
+    }
+}