Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HrdFileReader.cs =================================================================== diff -u -r0cbe91b9dac19e488c365a6fedeba38cbf536e10 -re3aa7cd0005aa4891cea37a9c9c1100a1b61d80d --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HrdFileReader.cs (.../HrdFileReader.cs) (revision 0cbe91b9dac19e488c365a6fedeba38cbf536e10) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HrdFileReader.cs (.../HrdFileReader.cs) (revision e3aa7cd0005aa4891cea37a9c9c1100a1b61d80d) @@ -60,7 +60,7 @@ { using (IDataReader reader = CreateDataReader("SELECT HRDLocationId, Name, XCoordinate, YCoordinate " + "FROM HRDLocations " + - "WHERE L.LocationTypeId > 1;")) + "WHERE LocationTypeId > 1;")) { while (MoveNext(reader)) { Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HrdFileReaderTest.cs =================================================================== diff -u -ra2b6192f2f421360e2171c628d32d3f74cba657f -re3aa7cd0005aa4891cea37a9c9c1100a1b61d80d --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HrdFileReaderTest.cs (.../HrdFileReaderTest.cs) (revision a2b6192f2f421360e2171c628d32d3f74cba657f) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HrdFileReaderTest.cs (.../HrdFileReaderTest.cs) (revision e3aa7cd0005aa4891cea37a9c9c1100a1b61d80d) @@ -90,7 +90,7 @@ public void ReadHrdLocations_FileWithInvalidDatabaseStructure_ThrowsCriticalFileReadException() { // Setup - string hrdFilePath = Path.Combine(testDataPath, "missingSegmentColumn.sqlite"); + string hrdFilePath = Path.Combine(testDataPath, "missingNameColumn.sqlite"); using (var reader = new HrdFileReader(hrdFilePath)) { @@ -140,15 +140,15 @@ IEnumerable readHrdLocations = reader.ReadHrdLocations().ToArray(); // Assert - Assert.AreEqual(164, readHrdLocations.Count()); - AssertReadHrdLocation(readHrdLocations.ElementAt(0), 700001, "10-1", "07_IJsselmeer_selectie_mu2017.sqlite"); - AssertReadHrdLocation(readHrdLocations.ElementAt(41), 1000012, "40-1", "10_Waddenzee_west_selectie_mu2017.sqlite"); - AssertReadHrdLocation(readHrdLocations.ElementAt(121), 11421125, "10-1", "03_Benedenrijn_selectie_mu2017.sqlite"); + Assert.AreEqual(18, readHrdLocations.Count()); + AssertReadHrdLocation(readHrdLocations.ElementAt(0), 1, "punt_flw_ 1", 52697.5, 427567.0); + AssertReadHrdLocation(readHrdLocations.ElementAt(9), 10, "PUNT_HAR_ 10", 63092.1, 428577.0); + AssertReadHrdLocation(readHrdLocations.ElementAt(17), 18, "PUNT_KAT_ 18", 87390.5, 469797.0); } } private static void AssertReadHrdLocation(ReadHrdLocation readHrdLocation, int expectedHrdLocationId, - string expectedName, string expectedCoordinateX, string expectedCoordinateY) + string expectedName, double expectedCoordinateX, double expectedCoordinateY) { Assert.AreEqual(expectedHrdLocationId, readHrdLocation.HrdLocationId); Assert.AreEqual(expectedName, readHrdLocation.Name); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HrdFileReader/complete.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HrdFileReader/invalidHrdLocationIdValue.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HrdFileReader/missingNameColumn.sqlite =================================================================== diff -u Binary files differ