cleanup

Author: Gurpreet Singh

src/.editorconfig

@@ -1,4 +1,5 @@
 [*.cs]
 
-# Default severity for analyzer diagnostics with category 'Style'
-dotnet_analyzer_diagnostic.category-Style.severity = none
+
+# SYSLIB1045: Convert to 'GeneratedRegexAttribute'.
+dotnet_diagnostic.SYSLIB1045.severity = none

src/TestStack.BDDfy/DefaultHumanizer.cs

@@ -1,7 +1,4 @@
-using Microsoft.VisualBasic;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using TestStack.BDDfy.Configuration;
@@ -10,65 +7,49 @@ namespace TestStack.BDDfy
 {
     internal partial class DefaultHumanizer: IHumanizer
     {
-        private static readonly TextInfo textInfo = CultureInfo.CurrentCulture.TextInfo;
+        private static readonly Regex ConsecutiveCapitalLetters = new("([A-Z]+)([A-Z][a-z])");
+        private static readonly Regex TokensPattern = new("__([a-zA-Z0-9]+)__");
+        private static readonly Regex PascalCaseRegex = new(@"(?<!^)([A-Z])");
+        private static readonly Regex TokenReplacePattern = new("#(\\S+)#");
+        private static readonly Regex SentenceWithNumerals = new(@"(?<=[a-zA-Z])(?=\d)(?![^<>]*>)");
+        private static readonly Regex UnicodeMatchPattern = new(@"[^\u0000-\u007F]");
+        private static readonly Regex LoneIReplacePattern = new(@"(?<=^|\s)i(?=\s|$)");
 
         public string Humanize(string input)
         {
             var shouldPreserveCasing = input.Replace("__", "-").Contains('_');
 
-            input = TokensPattern().Replace(input, "-#$1#-");
+            input = TokensPattern.Replace(input, "-#$1#-");
 
             var words = input.Split(['_','-']);
 
-            var finalWords = words.Select(x => TokenReplacePattern().Replace(x, "<$1>"));
+            var finalWords = words.Select(x => TokenReplacePattern.Replace(x, "<$1>"));
 
             var sentence = string.Join(" ", finalWords);
 
             if (!shouldPreserveCasing)
             {
-                sentence = ConsecutiveCapitalLetters().Replace(sentence, "$1 $2");
+                sentence = ConsecutiveCapitalLetters.Replace(sentence, "$1 $2");
                 sentence = PascalToSentence(sentence);
-                sentence = SentenceWithNumerals().Replace(sentence, " ");
-                if (UnicodeMatchPattern().IsMatch(input)) 
+                sentence = SentenceWithNumerals.Replace(sentence, " ");
+                if (UnicodeMatchPattern.IsMatch(input)) 
                     throw new ArgumentException("Non ascii characters detected");
             }
 
 
             sentence = sentence.Trim().Replace("  "," ");
-            sentence = LoneIReplacePattern().Replace(sentence, "I");
+            sentence = LoneIReplacePattern.Replace(sentence, "I");
             return sentence;
         }
 
         public static string PascalToSentence(string input)
         {
             if (string.IsNullOrEmpty(input)) return input;
 
-            var sentence = PascalCaseRegex().Replace(input, " $1");
+            var sentence = PascalCaseRegex.Replace(input, " $1");
             sentence = sentence.Replace("< ", "<").Replace(" >",">");
-            var final = char.ToUpper(sentence[0]) + sentence.Substring(1).ToLower();
+            var final = char.ToUpper(sentence[0]) + sentence[1..].ToLower();
             return final;
         }
-
-
-        [GeneratedRegex("([A-Z]+)([A-Z][a-z])")]
-        private static partial Regex ConsecutiveCapitalLetters();
-
-        [GeneratedRegex("__([a-zA-Z0-9]+)__")]
-        private static partial Regex TokensPattern();
-
-        [GeneratedRegex(@"(?<!^)([A-Z])")]
-        private static partial Regex PascalCaseRegex();
-
-        [GeneratedRegex("#(\\S+)#")]
-        private static partial Regex TokenReplacePattern();
-
-        [GeneratedRegex(@"(?<=[a-zA-Z])(?=\d)(?![^<>]*>)")]
-        private static partial Regex SentenceWithNumerals();
-
-        [GeneratedRegex(@"[^\u0000-\u007F]")]
-        private static partial Regex UnicodeMatchPattern();
-
-        [GeneratedRegex(@"(?<=^|\s)i(?=\s|$)")]
-        private static partial Regex LoneIReplacePattern();
     }
 }

src/TestStack.BDDfy/Processors/UnusedExampleException.cs

@@ -2,12 +2,13 @@
 
 namespace TestStack.BDDfy.Processors
 {
- [Serializable]
- public class UnusedExampleException : Exception
- {
- public UnusedExampleException(ExampleValue unusedValue) : base(string.Format("Example Column '{0}' is unused, all examples should be consumed by the test (have you misspelt a field or property?)\r\n\r\n"
- + "If this is not the case, raise an issue at https://github.com/TestStack/TestStack.BDDfy/issues.", unusedValue.Header))
- {
- }
- }
+    [Serializable]
+    public class UnusedExampleException : Exception
+    {
+        public UnusedExampleException(ExampleValue unusedValue) 
+            : base(string.Format("Example Column '{0}' is unused, all examples should be consumed by the test (have you misspelt a field or property?)\r\n\r\n"
+        + "If this is not the case, raise an issue at https://github.com/TestStack/TestStack.BDDfy/issues.", unusedValue.Header))
+        {
+        }
+    }
 }

src/TestStack.BDDfy/Properties/AssemblyInfo.cs

@@ -1,4 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Company>TestStack.BDDfy - http://teststack.github.com/TestStack.BDDfy/</Company>
+    <Product>TestStack.BDDfy</Product>
+    <Copyright>Copyright © 2011-2017 TestStack.BDDfy contributors</Copyright>
+  </PropertyGroup>
   <PropertyGroup>
 	  <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>TestStack.BDDfy</AssemblyName>
@@ -15,5 +20,6 @@
 
   <ItemGroup>
     <EmbeddedResource Include="**\Scripts\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+    <InternalsVisibleTo Include="$(AssemblyName).Tests"/>
   </ItemGroup>
 </Project>