Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs
===================================================================
diff -u -r9282750f17811e32666e3704495e6e1f772b6414 -r87c8cbe523ecd4a197993251f0cf80b521cc3c20
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 9282750f17811e32666e3704495e6e1f772b6414)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 87c8cbe523ecd4a197993251f0cf80b521cc3c20)
@@ -71,7 +71,7 @@
/// Thrown when the database query failed.
/// Thrown when the database returned incorrect values for
/// required properties.
- public IEnumerable GetLocationIdsByTrackId(long trackId)
+ private IEnumerable GetLocationIdsByTrackId(long trackId)
{
var trackParameter = new SQLiteParameter
{
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs
===================================================================
diff -u -r9282750f17811e32666e3704495e6e1f772b6414 -r87c8cbe523ecd4a197993251f0cf80b521cc3c20
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 9282750f17811e32666e3704495e6e1f772b6414)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 87c8cbe523ecd4a197993251f0cf80b521cc3c20)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
using System.Data.SQLite;
using System.IO;
using System.Linq;
@@ -74,92 +73,6 @@
[Test]
[TestCase(18169, 1000, 1801000)]
[TestCase(6, 1000, 0)]
- public void GetLocationIdsByTrackId_ValidFile_ExpectedValues(int trackId, int hrdLocationId, int expectedLocationId)
- {
- // Setup
- string dbFile = Path.Combine(testDataPath, "complete.sqlite");
-
- using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
- {
- // Call
- IEnumerable locationMappings = hydraulicBoundaryDatabaseReader.GetLocationIdsByTrackId(trackId);
-
- // Assert
- long actualLocationId = locationMappings.Where(m => m.HrdLocationId == hrdLocationId)
- .Select(m => m.HlcdLocationId)
- .SingleOrDefault();
- Assert.AreEqual(expectedLocationId, actualLocationId);
- }
- }
-
- [Test]
- public void GetLocationIdsByTrackId_AmbiguousLocations_ReturnsFirstAndLogsWarning()
- {
- // Setup
- string dbFile = Path.Combine(testDataPath, "ambigousLocation.sqlite");
- const int trackId = 18;
- const int hrdLocationId = 1;
- IEnumerable locationMappings = null;
-
- using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
- {
- // Call
- Action call = () => locationMappings = hydraulicBoundaryDatabaseReader.GetLocationIdsByTrackId(trackId);
-
- // Assert
- const int expectedLocationId = 1800001;
- const 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.";
- TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
- long actualLocationId = locationMappings.Where(m => m.HrdLocationId == hrdLocationId)
- .Select(m => m.HlcdLocationId)
- .Single();
- Assert.AreEqual(expectedLocationId, actualLocationId);
- }
- }
-
- [Test]
- public void GetLocationIdsByTrackId_InvalidColumns_ThrowsLineParseException()
- {
- // Setup
- string dbFile = Path.Combine(testDataPath, "corruptschema.sqlite");
- const int trackId = 1;
-
- using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
- {
- // Call
- TestDelegate test = () => hydraulicBoundaryDatabaseReader.GetLocationIdsByTrackId(trackId);
-
- // Assert
- string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
- var exception = Assert.Throws(test);
- Assert.AreEqual(expectedMessage, exception.Message);
- Assert.IsInstanceOf(exception.InnerException);
- }
- }
-
- [Test]
- public void GetLocationIdsByTrackId_EmptyFile_ThrowsCriticalFileReadException()
- {
- // Setup
- string dbFile = Path.Combine(testDataPath, "empty.sqlite");
- const int trackId = 1;
-
- using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
- {
- // Call
- TestDelegate test = () => hydraulicBoundaryDatabaseReader.GetLocationIdsByTrackId(trackId);
-
- // Assert
- string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt.");
- var exception = Assert.Throws(test);
- Assert.AreEqual(expectedMessage, exception.Message);
- Assert.IsInstanceOf(exception.InnerException);
- }
- }
-
- [Test]
- [TestCase(18169, 1000, 1801000)]
- [TestCase(6, 1000, 0)]
public void Read_ValidFile_ExpectedValues(int trackId, int hrdLocationId, int expectedLocationId)
{
// Setup