Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r79eca6536cf0c4ef59d5286fea312dc457dd51d3 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 79eca6536cf0c4ef59d5286fea312dc457dd51d3) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision eb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057) @@ -42,12 +42,14 @@ public class HydraulicBoundaryDatabaseImporterTest { private const int totalNumberOfSteps = 4; + private const string validHlcdFileName = "HLCD.sqlite"; + private const string validHrdFileName = "HRD dutch coast south.sqlite"; private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.IO, nameof(HydraulicBoundaryDatabaseImporter)); - private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); - private static readonly string validHrdFilePath = Path.Combine(testDataPath, "complete.sqlite"); + private static readonly string validHlcdFilePath = Path.Combine(testDataPath, validHlcdFileName); + private static readonly string validHrdFilePath = Path.Combine(testDataPath, validHrdFileName); [Test] public void Constructor_UpdateHandlerNull_ThrowsArgumentNullException() @@ -206,13 +208,13 @@ mocks.ReplayAll(); string directory = Path.Combine(testDataPath, "withoutHLCD"); - string path = Path.Combine(directory, "complete.sqlite"); + string path = Path.Combine(directory, validHrdFileName); var hydraulicBoundaryData = new HydraulicBoundaryData { HydraulicLocationConfigurationDatabase = { - FilePath = Path.Combine(directory, "hlcd.sqlite") + FilePath = Path.Combine(directory, validHlcdFileName) } }; @@ -236,8 +238,8 @@ var handler = mocks.StrictMock(); mocks.ReplayAll(); - string path = Path.Combine(testDataPath, "EmptyHLCDSchema", "complete.sqlite"); - string hlcdFilePath = Path.Combine(Path.GetDirectoryName(path), "hlcd.sqlite"); + string path = Path.Combine(testDataPath, "EmptyHLCDSchema", validHrdFileName); + string hlcdFilePath = Path.Combine(Path.GetDirectoryName(path), validHlcdFileName); var hydraulicBoundaryData = new HydraulicBoundaryData { @@ -267,8 +269,8 @@ var handler = mocks.StrictMock(); mocks.ReplayAll(); - string path = Path.Combine(testDataPath, "InvalidHLCDSchema", "complete.sqlite"); - string hlcdFilePath = Path.Combine(Path.GetDirectoryName(path), "hlcd.sqlite"); + string path = Path.Combine(testDataPath, "InvalidHLCDSchema", validHrdFileName); + string hlcdFilePath = Path.Combine(Path.GetDirectoryName(path), validHlcdFileName); var hydraulicBoundaryData = new HydraulicBoundaryData { @@ -299,13 +301,13 @@ mocks.ReplayAll(); string directory = Path.Combine(testDataPath, "withoutSettings"); - string path = Path.Combine(directory, "complete.sqlite"); + string path = Path.Combine(directory, validHrdFileName); var hydraulicBoundaryData = new HydraulicBoundaryData { HydraulicLocationConfigurationDatabase = { - FilePath = Path.Combine(directory, "hlcd.sqlite") + FilePath = Path.Combine(directory, validHlcdFileName) } }; @@ -331,13 +333,13 @@ mocks.ReplayAll(); string directory = Path.Combine(testDataPath, "invalidSettings"); - string path = Path.Combine(directory, "complete.sqlite"); + string path = Path.Combine(directory, validHrdFileName); var hydraulicBoundaryData = new HydraulicBoundaryData { HydraulicLocationConfigurationDatabase = { - FilePath = Path.Combine(directory, "hlcd.sqlite") + FilePath = Path.Combine(directory, validHlcdFileName) } }; @@ -413,7 +415,7 @@ string filePath, bool usePreprocessorClosure) { // Setup - string hlcdFilePath = Path.Combine(Path.GetDirectoryName(filePath), "hlcd.sqlite"); + string hlcdFilePath = Path.Combine(Path.GetDirectoryName(filePath), validHlcdFileName); var hydraulicBoundaryData = new HydraulicBoundaryData { @@ -645,7 +647,7 @@ { new TestCaseData(validHrdFilePath, true) .SetName("validFilePath"), - new TestCaseData(Path.Combine(testDataPath, "withoutPreprocessorClosure", "complete.sqlite"), false) + new TestCaseData(Path.Combine(testDataPath, "withoutPreprocessorClosure", validHrdFileName), false) .SetName("withoutPreprocessorClosure") }; } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/EmptyHLCDSchema/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/EmptyHLCDSchema/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/HRD dutch coast south.config.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/InvalidHLCDSchema/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/InvalidHLCDSchema/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/InvalidSettings/HRD dutch coast south.config.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/InvalidSettings/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/InvalidSettings/complete.config.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/InvalidSettings/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/complete.config.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/missingPreprocessorClosure/HRD dutch coast south.config.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/missingPreprocessorClosure/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/missingPreprocessorClosure/complete.config.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/missingPreprocessorClosure/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutHLCD/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutHLCD/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutPreprocessorClosure/HRD dutch coast south.config.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutPreprocessorClosure/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutPreprocessorClosure/complete.config.sqlite =================================================================== diff -u -r60dc168e3e229c2f0b18bfd9bdce275a757ac2ab -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutPreprocessorClosure/complete.sqlite =================================================================== diff -u -r60dc168e3e229c2f0b18bfd9bdce275a757ac2ab -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutSettings/HRD dutch coast south.sqlite =================================================================== diff -u Binary files differ Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/withoutSettings/complete.sqlite =================================================================== diff -u -rbe2039934e8fb442effc0150a1900f2175ec6a03 -reb09ab04cc50ea0e45404a3e2ca06b4a4d4c5057 Binary files differ