Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs
===================================================================
diff -u -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e -r377ab5754aaebdd884c70b39bc44f1669d01efa8
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs	(.../HydraRingDatabaseParseHelperTest.cs)	(revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs	(.../HydraRingDatabaseParseHelperTest.cs)	(revision 377ab5754aaebdd884c70b39bc44f1669d01efa8)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -45,7 +46,7 @@
         public void Parse_WorkingDirectoryNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse(null, "", 0, "", reader => { });
+            TestDelegate test = () => HydraRingDatabaseParseHelper.ReadSingleLine(null, "", 0, "");
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -56,7 +57,7 @@
         public void Parse_QueryNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse("", null, 0, "", reader => { });
+            TestDelegate test = () => HydraRingDatabaseParseHelper.ReadSingleLine("", null, 0, "");
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -67,32 +68,21 @@
         public void Parse_ExceptionMessageNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse("", "", 0, null, reader => { });
+            TestDelegate test = () => HydraRingDatabaseParseHelper.ReadSingleLine("", "", 0, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("exceptionMessage", exception.ParamName);
         }
 
         [Test]
-        public void Parse_ReadResultActionNull_ThrowArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse("", "", 0, "", null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("readResultAction", exception.ParamName);
-        }
-
-        [Test]
         public void Parse_ReaderThrowsSQLiteException_ThrowHydraRingFileParserException()
         {
             // Setup
             string directory = Path.Combine(testDirectory, emptyWorkingDirectory);
 
             // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse(directory, query, 0, "", reader => { });
+            TestDelegate test = () => HydraRingDatabaseParseHelper.ReadSingleLine(directory, query, 0, "");
 
             // Assert
             var exception = Assert.Throws<HydraRingFileParserException>(test);
@@ -107,40 +97,24 @@
             string directory = Path.Combine(testDirectory, emptyDatabase);
 
             // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse(directory, query, 0, customMessage, reader => { });
+            TestDelegate test = () => HydraRingDatabaseParseHelper.ReadSingleLine(directory, query, 0, customMessage);
 
             // Assert
             var exception = Assert.Throws<HydraRingFileParserException>(test);
             Assert.AreEqual(customMessage, exception.Message);
         }
 
         [Test]
-        public void Parse_ReadResultActionThrowsInvalidCastException_ThrowHydraRingFileParserExceptionWithCustomMessage()
+        public void Parse_ValidData_ReturnResult()
         {
             // Setup
-            const string customMessage = "Exception message";
             string directory = Path.Combine(testDirectory, validFile);
 
             // Call
-            TestDelegate test = () => HydraRingDatabaseParseHelper.Parse(directory, query, 0, customMessage, reader => { throw new InvalidCastException(); });
+            Dictionary<string, object> result = HydraRingDatabaseParseHelper.ReadSingleLine(directory, query, 0, "");
 
             // Assert
-            var exception = Assert.Throws<HydraRingFileParserException>(test);
-            Assert.AreEqual(customMessage, exception.Message);
+            Assert.AreEqual(20, result.Count);
         }
-
-        [Test]
-        public void Parse_ValidData_ReadResultActionPerformed()
-        {
-            // Setup
-            string directory = Path.Combine(testDirectory, validFile);
-            var performed = false;
-
-            // Call
-            HydraRingDatabaseParseHelper.Parse(directory, query, 0, "", reader => { performed = true; });
-
-            // Assert
-            Assert.IsTrue(performed);
-        }
     }
 }
\ No newline at end of file