Index: Core/Common/src/Core.Common.IO/Readers/IDataReaderExtensions.cs =================================================================== diff -u -r0615f3f2d1a71890c749543b2ac54372be10d259 -r1ac796985b56d9e81af2e78e9f7a1e4b259a91ba --- Core/Common/src/Core.Common.IO/Readers/IDataReaderExtensions.cs (.../IDataReaderExtensions.cs) (revision 0615f3f2d1a71890c749543b2ac54372be10d259) +++ Core/Common/src/Core.Common.IO/Readers/IDataReaderExtensions.cs (.../IDataReaderExtensions.cs) (revision 1ac796985b56d9e81af2e78e9f7a1e4b259a91ba) @@ -39,7 +39,8 @@ /// data row. /// Thrown when or /// is null. - /// Thrown when the value in the column was not of type . + /// Thrown when the value in the column could not be converted + /// to type . public static T Read(this IDataReader dataReader, string columnName) { if (dataReader == null) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReader.cs =================================================================== diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -r1ac796985b56d9e81af2e78e9f7a1e4b259a91ba --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReader.cs (.../HydraulicBoundarySqLiteDatabaseReader.cs) (revision d73c509c93f18a87da76086c871eca2a2c903e12) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReader.cs (.../HydraulicBoundarySqLiteDatabaseReader.cs) (revision 1ac796985b56d9e81af2e78e9f7a1e4b259a91ba) @@ -85,7 +85,7 @@ { return ReadHrdLocation(); } - catch (InvalidCastException e) + catch (ConversionException e) { var message = new FileReaderErrorMessageBuilder(Path). Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); @@ -197,19 +197,6 @@ } /// - /// Reads a value at column from the database. - /// - /// The expected type of value in the column with name . - /// The name of the column to read from. - /// The read value from the column with name . - /// Thrown when the value in the column was not of type - /// . - private T Read(string columnName) - { - return (T) sqliteDataReader[columnName]; - } - - /// /// Reads the current row into a new instance of . /// /// A new instance of , based upon the current row. @@ -219,10 +206,10 @@ { try { - var id = Read(HrdLocationsTableDefinitions.HrdLocationId); - var name = Read(HrdLocationsTableDefinitions.Name); - var x = Read(HrdLocationsTableDefinitions.XCoordinate); - var y = Read(HrdLocationsTableDefinitions.YCoordinate); + var id = sqliteDataReader.Read(HrdLocationsTableDefinitions.HrdLocationId); + var name = sqliteDataReader.Read(HrdLocationsTableDefinitions.Name); + var x = sqliteDataReader.Read(HrdLocationsTableDefinitions.XCoordinate); + var y = sqliteDataReader.Read(HrdLocationsTableDefinitions.YCoordinate); MoveNext(); return new HrdLocation(id, name, x, y); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs =================================================================== diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -r1ac796985b56d9e81af2e78e9f7a1e4b259a91ba --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs (.../HydraulicBoundarySqLiteDatabaseReaderTest.cs) (revision 64eede81657b51fb755944fd3939ceefb839e591) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs (.../HydraulicBoundarySqLiteDatabaseReaderTest.cs) (revision 1ac796985b56d9e81af2e78e9f7a1e4b259a91ba) @@ -272,7 +272,7 @@ // Assert var exception = Assert.Throws(test); Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); + Assert.IsInstanceOf(exception.InnerException); } Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); }