Browse Source

Let's not go back to static

Piotr Czajkowski 6 hours ago
parent
commit
cbc35fccc9
2 changed files with 21 additions and 4 deletions
  1. 1 3
      ProcessFiles/ProcessFiles.cs
  2. 20 1
      ProcessFilesTests/ProcessFilesTests.cs

+ 1 - 3
ProcessFiles/ProcessFiles.cs

@@ -14,7 +14,7 @@ namespace ProcessFiles
 
     public class ProcessFiles
     {
-        private List<string> errors = [];
+        private readonly List<string> errors = [];
         
         private static readonly char[] invalidCharactersForExtension =
             [.. ExtraChars(), .. Enumerable.Range(0x00, 0x20).Select(i => (char)i)];
@@ -144,8 +144,6 @@ namespace ProcessFiles
             var invalidExtensions = GetInvalidExtensions(fileExtensions);
             if (invalidExtensions.Count > 0) throw new ArgumentException($"Following extensions contain invalid characters ({string.Join(", ", invalidCharactersForExtension)}):\n{string.Join(Environment.NewLine, invalidExtensions)}");
             
-            errors = [];
-            
             foreach (var argument in arguments)
             {
                 switch (WhatIsIt(argument))

+ 20 - 1
ProcessFilesTests/ProcessFilesTests.cs

@@ -189,7 +189,7 @@ namespace ProcessFilesTests
         }
         
         [Fact]
-        public void ProcessErrorsDontAccumulate()
+        public void ProcessErrorsFromSameInstanceAccumulate()
         {
             var result = string.Empty;
             void TestAction(string value)
@@ -202,6 +202,25 @@ namespace ProcessFilesTests
             var errors2 = test.Process(["./nonExistent"], "txt", TestAction);
             Assert.NotEmpty(errors1);
             Assert.NotEmpty(errors2);
+            Assert.Contains(errors1, x => errors2.Contains(x));
+        }
+        
+        [Fact]
+        public void ProcessErrorsFromDifferemtInstancesDontAccumulate()
+        {
+            var result = string.Empty;
+            void TestAction(string value)
+            {
+                result = value;
+            }
+
+            var test = new ProcessFiles.ProcessFiles();
+            var errors1 = test.Process(["./testFiles/test.txt"], "txt", TestAction);
+            
+            var test2 = new ProcessFiles.ProcessFiles();
+            var errors2 = test2.Process(["./nonExistent"], "txt", TestAction);
+            Assert.NotEmpty(errors1);
+            Assert.NotEmpty(errors2);
             Assert.DoesNotContain(errors1, x => errors2.Contains(x));
         }
     }