Merge pull request #27 from AoshiW/modern-.NET

switch to File Scope Namespace, and more
TwitchLib · Aug 5, 2023 · 6e98a4d · 6e98a4d
2 parents d9bdf98 + 96ec32e
commit 6e98a4d
Show file tree

Hide file tree

Showing 26 changed files with 1,781 additions and 1,808 deletions.
diff --git a/src/TwitchLib.Communication.Tests/Clients/ClientTestsBase.cs b/src/TwitchLib.Communication.Tests/Clients/ClientTestsBase.cs
diff --git a/src/TwitchLib.Communication.Tests/Clients/TcpClientTests.cs b/src/TwitchLib.Communication.Tests/Clients/TcpClientTests.cs
@@ -1,10 +1,9 @@
 using TwitchLib.Communication.Clients;
 using TwitchLib.Communication.Models;
 
-namespace TwitchLib.Communication.Tests.Clients
+namespace TwitchLib.Communication.Tests.Clients;
+
+public class TcpClientTests : ClientTestsBase<TcpClient>
 {
-    public class TcpClientTests : ClientTestsBase<TcpClient>
-    {
-        public TcpClientTests() : base(new ClientOptions(useSsl: false)) { }
-    }
+    public TcpClientTests() : base(new ClientOptions(useSsl: false)) { }
 }
diff --git a/src/TwitchLib.Communication.Tests/Clients/WebSocketClientTests.cs b/src/TwitchLib.Communication.Tests/Clients/WebSocketClientTests.cs
@@ -1,8 +1,7 @@
 using TwitchLib.Communication.Clients;
 
-namespace TwitchLib.Communication.Tests.Clients
+namespace TwitchLib.Communication.Tests.Clients;
+
+public class WebSocketClientTests : ClientTestsBase<WebSocketClient>
 {
-    public class WebSocketClientTests : ClientTestsBase<WebSocketClient>
-    {
-    }
-}
+}
diff --git a/src/TwitchLib.Communication.Tests/Helpers/TestLogHelper.cs b/src/TwitchLib.Communication.Tests/Helpers/TestLogHelper.cs
@@ -5,65 +5,64 @@
 using Serilog.Events;
 using Serilog.Exceptions;
 
-namespace TwitchLib.Communication.Tests.Helpers
+namespace TwitchLib.Communication.Tests.Helpers;
+
+internal static class TestLogHelper
 {
-    internal static class TestLogHelper
-    {
-        private static readonly string OUTPUT_TEMPLATE =
-            "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}]  [{Level:u}]  {Message:lj}{NewLine}{Exception}{NewLine}";
+    private static readonly string OUTPUT_TEMPLATE =
+        "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}]  [{Level:u}]  {Message:lj}{NewLine}{Exception}{NewLine}";
 
-        private static readonly string NEW_TEST_RUN_INDICATOR;
+    private static readonly string NEW_TEST_RUN_INDICATOR;
 
-        static TestLogHelper()
-        {
-            StringBuilder builder = new StringBuilder();
-            builder.AppendLine();
-            builder.AppendLine(new string('-', 80));
-            builder.Append(new string(' ', 34));
-            builder.AppendLine("new Test-Run");
-            builder.AppendLine(new string('-', 80));
-            NEW_TEST_RUN_INDICATOR = builder.ToString();
-        }
+    static TestLogHelper()
+    {
+        var builder = new StringBuilder();
+        builder.AppendLine();
+        builder.Append('-', 80).AppendLine();
+        builder.Append(' ', 34);
+        builder.AppendLine("new Test-Run");
+        builder.Append('-', 80).AppendLine();
+        NEW_TEST_RUN_INDICATOR = builder.ToString();
+    }
 
-        internal static Microsoft.Extensions.Logging.ILogger<T> GetLogger<T>(
-            LogEventLevel logEventLevel = LogEventLevel.Verbose,
-            [CallerMemberName] string callerMemberName = "TestMethod")
-        {
-            Serilog.ILogger logger = GetSerilogLogger<T>(typeof(T).Name,
-                callerMemberName,
-                logEventLevel);
-            Microsoft.Extensions.Logging.ILoggerFactory loggerFactory =
-                new Serilog.Extensions.Logging.SerilogLoggerFactory(logger);
-            return loggerFactory.CreateLogger<T>();
-        }
+    internal static Microsoft.Extensions.Logging.ILogger<T> GetLogger<T>(
+        LogEventLevel logEventLevel = LogEventLevel.Verbose,
+        [CallerMemberName] string callerMemberName = "TestMethod")
+    {
+        Serilog.ILogger logger = GetSerilogLogger<T>(typeof(T).Name,
+            callerMemberName,
+            logEventLevel);
+        Microsoft.Extensions.Logging.ILoggerFactory loggerFactory =
+            new Serilog.Extensions.Logging.SerilogLoggerFactory(logger);
+        return loggerFactory.CreateLogger<T>();
+    }
 
-        private static Serilog.ILogger GetSerilogLogger<T>(string typeName,
-            string callerMemberName,
-            LogEventLevel logEventLevel)
-        {
-            Serilog.LoggerConfiguration loggerConfiguration = GetConfiguration(typeName,
-                callerMemberName,
-                logEventLevel);
-            Serilog.ILogger logger = loggerConfiguration.CreateLogger().ForContext<T>();
-            logger.Information(NEW_TEST_RUN_INDICATOR);
-            return logger;
-        }
+    private static Serilog.ILogger GetSerilogLogger<T>(string typeName,
+        string callerMemberName,
+        LogEventLevel logEventLevel)
+    {
+        Serilog.LoggerConfiguration loggerConfiguration = GetConfiguration(typeName,
+            callerMemberName,
+            logEventLevel);
+        Serilog.ILogger logger = loggerConfiguration.CreateLogger().ForContext<T>();
+        logger.Information(NEW_TEST_RUN_INDICATOR);
+        return logger;
+    }
 
-        private static Serilog.LoggerConfiguration GetConfiguration(string typeName,
-            string callerMemberName,
-            LogEventLevel logEventLevel)
-        {
-            Serilog.LoggerConfiguration loggerConfiguration = new Serilog.LoggerConfiguration();
-            loggerConfiguration.MinimumLevel.Verbose();
-            string path = $"../../../Logs/{typeName}/{callerMemberName}.log";
-            loggerConfiguration.WriteTo.File(
-                path: path,
-                restrictedToMinimumLevel: logEventLevel,
-                outputTemplate: OUTPUT_TEMPLATE
-            );
-            loggerConfiguration.Enrich.WithExceptionDetails();
-            loggerConfiguration.Enrich.FromLogContext();
-            return loggerConfiguration;
-        }
+    private static Serilog.LoggerConfiguration GetConfiguration(string typeName,
+        string callerMemberName,
+        LogEventLevel logEventLevel)
+    {
+        var loggerConfiguration = new Serilog.LoggerConfiguration();
+        loggerConfiguration.MinimumLevel.Verbose();
+        string path = $"../../../Logs/{typeName}/{callerMemberName}.log";
+        loggerConfiguration.WriteTo.File(
+            path: path,
+            restrictedToMinimumLevel: logEventLevel,
+            outputTemplate: OUTPUT_TEMPLATE
+        );
+        loggerConfiguration.Enrich.WithExceptionDetails();
+        loggerConfiguration.Enrich.FromLogContext();
+        return loggerConfiguration;
     }
-}
+}
diff --git a/src/TwitchLib.Communication.Tests/Models/ReconnectionPolicyTests.cs b/src/TwitchLib.Communication.Tests/Models/ReconnectionPolicyTests.cs
@@ -2,39 +2,38 @@
 using TwitchLib.Communication.Models;
 using Xunit;
 
-namespace TwitchLib.Communication.Tests.Models
+namespace TwitchLib.Communication.Tests.Models;
+
+public class ReconnectionPolicyTests
 {
-    public class ReconnectionPolicyTests
+    /// <summary>
+    ///     Checks <see cref="ClientOptions.ReconnectionPolicy"/>
+    ///     <br></br>
+    ///     <see cref="ReconnectionPolicy.AreAttemptsComplete"/>
+    ///     <br></br>
+    ///     <see cref="ReconnectionPolicy.Reset(Boolean)"/>
+    /// </summary>
+    [Fact]
+    public void ReconnectionPolicy_OmitReconnect()
     {
-        /// <summary>
-        ///     Checks <see cref="ClientOptions.ReconnectionPolicy"/>
-        ///     <br></br>
-        ///     <see cref="ReconnectionPolicy.AreAttemptsComplete"/>
-        ///     <br></br>
-        ///     <see cref="ReconnectionPolicy.Reset(Boolean)"/>
-        /// </summary>
-        [Fact]
-        public void ReconnectionPolicy_OmitReconnect()
+        try
+        {
+            ReconnectionPolicy reconnectionPolicy = new NoReconnectionPolicy();
+            Assert.False(reconnectionPolicy.AreAttemptsComplete());
+            reconnectionPolicy.ProcessValues();
+            Assert.True(reconnectionPolicy.AreAttemptsComplete());
+            // in case of a normal connect, we expect the ReconnectionPolicy to be reset
+            reconnectionPolicy.Reset(false);
+            Assert.False(reconnectionPolicy.AreAttemptsComplete());
+            reconnectionPolicy.ProcessValues();
+            Assert.True(reconnectionPolicy.AreAttemptsComplete());
+            // in case of a reconnect, we expect the ReconnectionPolicy not to be reset
+            reconnectionPolicy.Reset(true);
+            Assert.True(reconnectionPolicy.AreAttemptsComplete());
+        }
+        catch (Exception e)
         {
-            try
-            {
-                ReconnectionPolicy reconnectionPolicy = new NoReconnectionPolicy();
-                Assert.False(reconnectionPolicy.AreAttemptsComplete());
-                reconnectionPolicy.ProcessValues();
-                Assert.True(reconnectionPolicy.AreAttemptsComplete());
-                // in case of a normal connect, we expect the ReconnectionPolicy to be reset
-                reconnectionPolicy.Reset(false);
-                Assert.False(reconnectionPolicy.AreAttemptsComplete());
-                reconnectionPolicy.ProcessValues();
-                Assert.True(reconnectionPolicy.AreAttemptsComplete());
-                // in case of a reconnect, we expect the ReconnectionPolicy not to be reset
-                reconnectionPolicy.Reset(true);
-                Assert.True(reconnectionPolicy.AreAttemptsComplete());
-            }
-            catch (Exception e)
-            {
-                Assert.Fail(e.ToString());
-            }
+            Assert.Fail(e.ToString());
         }
     }
-}
+}
diff --git a/src/TwitchLib.Communication.Tests/TwitchLib.Communication.Tests.csproj b/src/TwitchLib.Communication.Tests/TwitchLib.Communication.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>