Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs
===================================================================
diff -u -r9546415673320a98221b4da2050acd06508d9e5c -r54bd521f90ff9e421cd1320da896b611d55bf936
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 9546415673320a98221b4da2050acd06508d9e5c)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 54bd521f90ff9e421cd1320da896b611d55bf936)
@@ -53,13 +53,12 @@
///
/// Reads the hydraulic location configuration database.
///
- /// The track id to read the location configurations for.
/// A read hydraulic location configuration database.
/// Thrown when the hydraulic location configuration database
/// could not be read.
/// Thrown when the database returned incorrect values for
/// required properties.
- public ReadHydraulicLocationConfigurationDatabase Read(long trackId)
+ public ReadHydraulicLocationConfigurationDatabase Read()
{
return new ReadHydraulicLocationConfigurationDatabase(GetData(GetLocationsFromDatabase),
IsScenarioInformationTablePresent()
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs
===================================================================
diff -u -rf11ec2252cdf6a1d6919689bc8efe02d22258c32 -r54bd521f90ff9e421cd1320da896b611d55bf936
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision f11ec2252cdf6a1d6919689bc8efe02d22258c32)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 54bd521f90ff9e421cd1320da896b611d55bf936)
@@ -78,7 +78,7 @@
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(777);
+ ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read();
// Assert
Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings);
@@ -94,7 +94,7 @@
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(777);
+ ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read();
// Assert
ReadHydraulicLocationConfigurationDatabaseSettings[] readHydraulicLocationConfigurationDatabaseSettings =
@@ -160,7 +160,7 @@
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(777);
+ ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read();
// Assert
bool actualUsePreprocessorClosure = readHydraulicLocationConfigurationDatabase.ReadTracks.First(rt => rt.TrackId == trackId).UsePreprocessorClosure;
@@ -176,7 +176,7 @@
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- void Call() => hydraulicBoundaryDatabaseReader.Read(1000);
+ void Call() => hydraulicBoundaryDatabaseReader.Read();
// Assert
string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
@@ -190,13 +190,12 @@
public void Read_FileWithScenarioInformationAndMissingColumns_ThrowsCriticalFileReadException()
{
// Setup
- const int trackId = 18169;
string dbFile = Path.Combine(testDataPath, "hlcdWithScenarioInformationMissingColumn.sqlite");
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
+ void Call() => hydraulicBoundaryDatabaseReader.Read();
// Assert
string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt.");
@@ -210,13 +209,12 @@
public void Read_FileWithScenarioInformationAndInvalidData_ThrowsLineParseException()
{
// Setup
- const int trackId = 18169;
string dbFile = Path.Combine(testDataPath, "hlcdWithScenarioInformationInvalidData.sqlite");
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
+ void Call() => hydraulicBoundaryDatabaseReader.Read();
// Assert
string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
@@ -231,12 +229,11 @@
{
// Setup
string dbFile = Path.Combine(testDataPath, "corruptschema.sqlite");
- const int trackId = 1;
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
+ void Call() => hydraulicBoundaryDatabaseReader.Read();
// Assert
string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
@@ -251,12 +248,11 @@
{
// Setup
string dbFile = Path.Combine(testDataPath, "empty.sqlite");
- const int trackId = 1;
using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
{
// Call
- void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
+ void Call() => hydraulicBoundaryDatabaseReader.Read();
// Assert
string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt.");