Merge branch 'getfield_ignoreblank_missingfield' of github.com:Stefan…

…Bertels/CsvHelper into StefanBertels-getfield_ignoreblank_missingfield
fcmai · Oct 5, 2022 · aa84807 · aa84807
2 parents b077c5a + d739206
commit aa84807
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/CsvHelper/CsvReader.cs b/src/CsvHelper/CsvReader.cs
@@ -343,12 +343,8 @@ public virtual string? this[string name]
 
 			if (index >= parser.Count || index < 0)
 			{
-				if (ignoreBlankLines)
-				{
 					var args = new MissingFieldFoundArgs(null, index, context);
 					missingFieldFound?.Invoke(args);
-				}
-
 				return default;
 			}
 
@@ -484,11 +480,8 @@ public virtual string? this[string name]
 			if (index >= parser.Count || index < 0)
 			{
 				currentIndex = index;
-				if (ignoreBlankLines)
-				{
 					var args = new MissingFieldFoundArgs(null, index, context);
 					missingFieldFound?.Invoke(args);
-				}
 
 				return default;
 			}

diff --git a/tests/CsvHelper.Tests/CsvReaderTests.cs b/tests/CsvHelper.Tests/CsvReaderTests.cs
@@ -222,6 +222,10 @@ public void GetMissingFieldGenericByIndexStrictTest()
 				null,
 			};
 
+			var config = new CsvConfiguration(CultureInfo.InvariantCulture)
+			{
+				IgnoreBlankLines = false,
+			};
 			var reader = new CsvReader(parserMock);
 			reader.Read();
 
@@ -881,7 +885,9 @@ public void DoNotIgnoreBlankLinesTest()
 		{
 			var config = new CsvConfiguration(CultureInfo.InvariantCulture)
 			{
+				Delimiter = ",",
 				IgnoreBlankLines = false,
+				MissingFieldFound = null,
 			};
 			using (var stream = new MemoryStream())
 			using (var reader = new StreamReader(stream))

diff --git a/tests/CsvHelper.Tests/Exceptions/ExceptionMessageTests.cs b/tests/CsvHelper.Tests/Exceptions/ExceptionMessageTests.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using CsvHelper.Configuration;
 using CsvHelper.Tests.Mocks;
 using CsvHelper.TypeConversion;
 using Xunit;
@@ -17,13 +18,16 @@ public class ExceptionMessageTests
 		[Fact]
 		public void GetMissingFieldTest()
 		{
-			var parser = new ParserMock
+			var config = new CsvConfiguration(CultureInfo.InvariantCulture)
+			{
+				IgnoreBlankLines = false,
+			};
+			var parser = new ParserMock(config)
 			{
 				{ "Id", "Name" },
 				{ "a", "b" },
 				null
 			};
-
 			var reader = new CsvReader(parser);
 			reader.Read();
 			reader.Read();

diff --git a/tests/CsvHelper.Tests/Reading/NullableValuesInEmptyColumnsInputTests.cs b/tests/CsvHelper.Tests/Reading/NullableValuesInEmptyColumnsInputTests.cs
@@ -18,6 +18,7 @@ public void SingleColumnCsvWithHeadersAndSingleNullDataRowTest()
 			var config = new CsvConfiguration(CultureInfo.InvariantCulture)
 			{
 				IgnoreBlankLines = false,
+				MissingFieldFound = null,
 			};
 			var parser = new ParserMock(config)
 			{
@@ -55,6 +56,7 @@ public void SingleColumnCsvWithHeadersAndPresentAndNullDataRowTest()
 			var config = new CsvConfiguration(CultureInfo.InvariantCulture)
 			{
 				IgnoreBlankLines = false,
+				MissingFieldFound = null,
 			};
 			var parser = new ParserMock(config)
 			{
@@ -118,6 +120,7 @@ public void TwoColumnCsvWithHeadersAndPresentAndNullDataRowTest()
 			var config = new CsvConfiguration(CultureInfo.InvariantCulture)
 			{
 				IgnoreBlankLines = false,
+				MissingFieldFound = null,
 			};
 			var parser = new ParserMock(config)
 			{