Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReaderTest.cs =================================================================== diff -u -ra77cd7f471b813c6a7218b42844d017fc10fb4ec -rfef3460a27a37aaa34948649aae3dd9ae143041c --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReaderTest.cs (.../HydraulicLocationConfigurationSqLiteDatabaseReaderTest.cs) (revision a77cd7f471b813c6a7218b42844d017fc10fb4ec) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabaseContext/HydraulicLocationConfigurationSqLiteDatabaseReaderTest.cs (.../HydraulicLocationConfigurationSqLiteDatabaseReaderTest.cs) (revision fef3460a27a37aaa34948649aae3dd9ae143041c) @@ -73,15 +73,15 @@ [TestCase(1, 1, 100001)] [TestCase(18, 1000, 1801000)] [TestCase(6, 1000, 0)] - public void GetLocationsIdByRegionId_ValidFile_ExpectedValues(int regionId, int hrdLocationId, int expectedLocationId) + public void GetLocationsIdByTrackId_ValidFile_ExpectedValues(int trackId, int hrdLocationId, int expectedLocationId) { // Setup var dbFile = Path.Combine(testDataPath, "complete.sqlite"); using (HydraulicLocationConfigurationSqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = new HydraulicLocationConfigurationSqLiteDatabaseReader(dbFile)) { // Call - Dictionary locationIdDictionary = hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByRegionId(regionId); + Dictionary locationIdDictionary = hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByTrackId(trackId); // Assert long locationId; @@ -92,11 +92,11 @@ } [Test] - public void GetLocationsIdByRegionId_AmbigousLocations_ReturnsFirstAndLogsWarning() + public void GetLocationsIdByTrackId_AmbigousLocations_ReturnsFirstAndLogsWarning() { // Setup var dbFile = Path.Combine(testDataPath, "ambigousLocation.sqlite"); - int regionId = 18; + int trackId = 18; int hrdLocationId = 1; int expectedLocationId = 1800001; string expectedMessage = "Er zijn meerdere resultaten gevonden, wat niet voor zou mogen komen. Neem contact op met de leverancier. Het eerste resultaat zal worden gebruikt."; @@ -105,7 +105,7 @@ using (HydraulicLocationConfigurationSqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = new HydraulicLocationConfigurationSqLiteDatabaseReader(dbFile)) { // Call - Action call = () => locationIdDictionary = hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByRegionId(regionId); + Action call = () => locationIdDictionary = hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByTrackId(trackId); // Assert TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); @@ -117,20 +117,20 @@ } [Test] - public void GetLocationsIdByRegionId_InvalidColumns_ThrowsLineParseException() + public void GetLocationsIdByTrackId_InvalidColumns_ThrowsLineParseException() { // Setup var dbFile = Path.Combine(testDataPath, "corruptschema.sqlite"); var expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); - int regionId = 1; + int trackId = 1; // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); using (HydraulicLocationConfigurationSqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = new HydraulicLocationConfigurationSqLiteDatabaseReader(dbFile)) { // Call - TestDelegate test = () => hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByRegionId(regionId); + TestDelegate test = () => hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByTrackId(trackId); // Assert var exception = Assert.Throws(test); @@ -141,20 +141,20 @@ } [Test] - public void GetLocationsIdByRegionId_EmptyFile_ThrowsCriticalFileReadException() + public void GetLocationsIdByTrackId_EmptyFile_ThrowsCriticalFileReadException() { // Setup var dbFile = Path.Combine(testDataPath, "empty.sqlite"); var expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build(Resources.HydraulicLocationConfigurationSqLiteDatabaseReader_Critical_Unexpected_Exception); - int regionId = 1; + int trackId = 1; // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); using (HydraulicLocationConfigurationSqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = new HydraulicLocationConfigurationSqLiteDatabaseReader(dbFile)) { // Call - TestDelegate test = () => hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByRegionId(regionId); + TestDelegate test = () => hydraulicBoundarySqLiteDatabaseReader.GetLocationsIdByTrackId(trackId); // Assert var exception = Assert.Throws(test);