Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) @@ -42,7 +42,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, ""); // Assert Assert.IsNull(result); @@ -56,7 +56,7 @@ string filePath = Path.Combine(testDataPath, nonexistingSqlite); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath, ""); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); @@ -70,7 +70,7 @@ invalidPath = invalidPath.Replace('c', Path.GetInvalidPathChars()[0]); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidPath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidPath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{invalidPath}':", result); @@ -83,7 +83,7 @@ string filePath = Path.Combine(testDataPath, "/"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); @@ -96,7 +96,7 @@ string validFilePath = Path.Combine(testDataPath, "withoutHLCD", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); @@ -109,7 +109,7 @@ string validFilePath = Path.Combine(testDataPath, "withoutSettings", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); @@ -122,7 +122,7 @@ string validFilePath = Path.Combine(testDataPath, "invalidSettingsSchema", "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); // Assert Assert.AreEqual("De rekeninstellingen database heeft niet het juiste schema.", result); @@ -138,7 +138,7 @@ "\\followedbythefile"; // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidFilePath); + string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidFilePath, testDataPath); // Assert Assert.AreEqual($"Het opgegeven bestandspad ({invalidFilePath}) is niet geldig.", result);