Bugfix: EOF detection with !string.IsNullOrEmpty => !streamReader.End…

…OfStream
eduherminio · Mar 1, 2018 · 3fa85c3 · 3fa85c3
1 parent 50fc416
commit 3fa85c3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/FileParserSolution/FileParser/Utils/FileReader.cs b/FileParserSolution/FileParser/Utils/FileReader.cs
@@ -28,9 +28,13 @@ static public Queue<Queue<string>> ParseFile(string path, char[] existingSeparat
 
                 using (reader)
                 {
-                    string original_line;
-                    while (!string.IsNullOrEmpty(original_line = reader.ReadLine()))
+                    while (!reader.EndOfStream)
                     {
+                        string original_line = reader.ReadLine();
+                        // TODO: Evaluate if is it worth giving the user the option of detecting these kind of lines?
+                        if (string.IsNullOrWhiteSpace(original_line) || string.IsNullOrWhiteSpace(original_line))
+                            continue;
+                        // end TODO
                         Queue<string> parsedLine = new Queue<string>(ProcessLine(original_line, existingSeparator));
                         parsedFile.Enqueue(parsedLine);
                     }

diff --git a/FileParserSolution/FileParserTest/FileParserTest.csproj b/FileParserSolution/FileParserTest/FileParserTest.csproj
@@ -18,6 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="TestFiles\FileWithEmtpyLines.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="TestFiles\Sample_commas.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/FileParserSolution/FileParserTest/ParsedFileTests.cs b/FileParserSolution/FileParserTest/ParsedFileTests.cs
@@ -129,5 +129,12 @@ public void PeekTestChangesNotAffectingOriginalFile()
                 Assert.Equal(peekedN, peekedN2);
             }
         }
+
+        [Fact]
+        public void FileWithEmptyLines()
+        {
+            IParsedFile file = new ParsedFile(_sampleFolderPath + "FileWithEmtpyLines.txt");
+            Assert.True(file.Count == 5);
+        }
     }
 }
diff --git a/FileParserSolution/FileParserTest/TestFiles/FileWithEmtpyLines.txt b/FileParserSolution/FileParserTest/TestFiles/FileWithEmtpyLines.txt
@@ -0,0 +1,6 @@
+False 1 3.14159265  Vishy   12/31/1999 11:59:59 PM
+
+False
+1
+3.14159265
+ Vishy