Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -110,7 +110,7 @@ private bool RunActivities(string hydraulicBoundaryDatabasePath, string preprocessorDirectory, IList activities) where TActivity : Activity { - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabasePath, + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabasePath, preprocessorDirectory); if (string.IsNullOrEmpty(validationProblem)) { Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseValidator.cs =================================================================== diff -u -r541c77a475cddb4cbf537d737058b3571ce6d252 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseValidator.cs (.../HydraRingSettingsDatabaseValidator.cs) (revision 541c77a475cddb4cbf537d737058b3571ce6d252) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseValidator.cs (.../HydraRingSettingsDatabaseValidator.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -71,26 +71,26 @@ return ContainsRequiredTables(GetColumnDefinitions(Connection)); } - private bool ContainsRequiredTables(List> definitions) + private bool ContainsRequiredTables(IEnumerable> definitions) { return GetValidSchema().All(definitions.Contains); } - private List> GetValidSchema() + private IEnumerable> GetValidSchema() { using (var validSchemaConnection = new SQLiteConnection("Data Source=:memory:")) using (SQLiteCommand command = validSchemaConnection.CreateCommand()) { validSchemaConnection.Open(); command.CommandText = usePreprocessor - ? Resources.settings_schema_preprocessor - : Resources.settings_schema; + ? Resources.settings_schema_preprocessor + : Resources.settings_schema; command.ExecuteNonQuery(); return GetColumnDefinitions(validSchemaConnection); } } - private static List> GetColumnDefinitions(SQLiteConnection connection) + private static IEnumerable> GetColumnDefinitions(SQLiteConnection connection) { DataTable columns = connection.GetSchema("COLUMNS"); Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs =================================================================== diff -u -rc9e2962f380ccab0d9fcb743bb7df7cb95b7928e -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs (.../HydraulicBoundaryDatabaseHelper.cs) (revision c9e2962f380ccab0d9fcb743bb7df7cb95b7928e) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs (.../HydraulicBoundaryDatabaseHelper.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -42,13 +42,13 @@ /// /// Attempts to connect to the as if it is a Hydraulic Boundary Locations - /// database with a Hydraulic Location Configurations database next to it. + /// database with a Hydraulic Location Configurations database and settings next to it. /// /// The path of the Hydraulic Boundary Locations database file. /// The preprocessor directory. /// A describing the problem when trying to connect to the /// or null if a connection could be correctly made. - public static string ValidatePathForCalculation(string filePath, string preprocessorDirectory) + public static string ValidateFilesForCalculation(string filePath, string preprocessorDirectory) { try { Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -61,7 +61,7 @@ CalculationServiceHelper.LogValidationBegin(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -42,7 +42,7 @@ return Resources.HydraulicBoundaryDatabaseConnectionValidator_No_hydraulic_boundary_database_imported; } - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(database.FilePath, + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(database.FilePath, database.EffectivePreprocessorDirectory()); if (!string.IsNullOrEmpty(validationProblem)) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -340,7 +340,7 @@ var validationResults = new List(); string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -62,7 +62,7 @@ CalculationServiceHelper.LogValidationBegin(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseValidatorTest.cs =================================================================== diff -u -r541c77a475cddb4cbf537d737058b3571ce6d252 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseValidatorTest.cs (.../HydraRingSettingsDatabaseValidatorTest.cs) (revision 541c77a475cddb4cbf537d737058b3571ce6d252) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseValidatorTest.cs (.../HydraRingSettingsDatabaseValidatorTest.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -83,10 +83,14 @@ } [Test] - public void ValidateSchema_NoPreprocessorInvalidDatabase_ReturnFalse() + [TestCase("invalidSettings_MissingColumn")] + [TestCase("invalidSettings_MissingTable")] + [TestCase("invalidSettings_WrongColumnName")] + [TestCase("invalidSettings_WrongTableName")] + public void ValidateSchema_NoPreprocessorInvalidDatabase_ReturnFalse(string databaseName) { // Setup - string completeDatabasePath = Path.Combine(directoryPath, "invalid-settings-schema.config.sqlite"); + string completeDatabasePath = Path.Combine(directoryPath, $"{databaseName}.config.sqlite"); using (var validator = new HydraRingSettingsDatabaseValidator(completeDatabasePath, string.Empty)) { @@ -115,7 +119,10 @@ } [Test] - [TestCase("invalid-settings-schema")] + [TestCase("invalidSettings_MissingColumn")] + [TestCase("invalidSettings_MissingTable")] + [TestCase("invalidSettings_WrongColumnName")] + [TestCase("invalidSettings_WrongTableName")] [TestCase("withoutPreprocessor")] public void ValidateSchema_PreprocessorInvalidDatabase_ReturnFalse(string databaseName) { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -36,100 +36,100 @@ private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"); [Test] - public void ValidatePathForCalculation_ExistingFileWithHlcd_ReturnsNull() + public void ValidateFilesForCalculation_ExistingFileWithHlcd_ReturnsNull() { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, ""); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, ""); // Assert Assert.IsNull(result); } [Test] - public void ValidatePathForCalculation_NonExistingFile_ReturnsMessageWithError() + public void ValidateFilesForCalculation_NonExistingFile_ReturnsMessageWithError() { // Setup const string nonexistingSqlite = "nonexisting.sqlite"; string filePath = Path.Combine(testDataPath, nonexistingSqlite); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath, ""); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(filePath, ""); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); } [Test] - public void ValidatePathForCalculation_InvalidFile_ReturnsMessageWithError() + public void ValidateFilesForCalculation_InvalidFile_ReturnsMessageWithError() { // Setup string invalidPath = Path.Combine(testDataPath, "complete.sqlite"); invalidPath = invalidPath.Replace('c', Path.GetInvalidPathChars()[0]); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidPath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(invalidPath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{invalidPath}':", result); } [Test] - public void ValidatePathForCalculation_FileIsDirectory_ReturnsMessageWithError() + public void ValidateFilesForCalculation_FileIsDirectory_ReturnsMessageWithError() { // Setup string filePath = Path.Combine(testDataPath, "/"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(filePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(filePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); } [Test] - public void ValidatePathForCalculation_ExistingFileWithoutHlcd_ReturnsMessageWithError() + public void ValidateFilesForCalculation_ExistingFileWithoutHlcd_ReturnsMessageWithError() { // Setup string validFilePath = Path.Combine(testDataPath, "withoutHLCD", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); } [Test] - public void ValidatePathForCalculation_ExistingFileWithoutSettings_ReturnsMessageWithError() + public void ValidateFilesForCalculation_ExistingFileWithoutSettings_ReturnsMessageWithError() { // Setup string validFilePath = Path.Combine(testDataPath, "withoutSettings", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); } [Test] - public void ValidatePathForCalculation_ExistingFileWithInvalidSettingsDatabase_ReturnsMessageWithError() + public void ValidateFilesForCalculation_ExistingFileWithInvalidSettingsDatabase_ReturnsMessageWithError() { // Setup string validFilePath = Path.Combine(testDataPath, "invalidSettingsSchema", "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(validFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, testDataPath); // Assert Assert.AreEqual("De rekeninstellingen database heeft niet het juiste schema.", result); } [Test] - public void ValidatePathForCalculation_InvalidFilePath_ReturnsMessageWithError() + public void ValidateFilesForCalculation_InvalidFilePath_ReturnsMessageWithError() { // Setup const string invalidFilePath = "C:\\Thisissomeverylongpath\\toadirectorywhich\\doesntevenexist\\Nowlets\\finishwithsomelongname\\" + @@ -138,7 +138,7 @@ "\\followedbythefile"; // Call - string result = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(invalidFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(invalidFilePath, testDataPath); // Assert Assert.AreEqual($"Het opgegeven bestandspad ({invalidFilePath}) is niet geldig.", result); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/invalid-settings-schema.config.sqlite =================================================================== diff -u -rc230da5631e073c87657dd0f32aa7c3651c427df -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/invalidSettings_MissingColumn.config.sqlite =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/invalidSettings_MissingTable.config.sqlite =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/invalidSettings_WrongColumnName.config.sqlite =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/invalidSettings_WrongTableName.config.sqlite =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/withPreprocessor.config.sqlite =================================================================== diff -u -r541c77a475cddb4cbf537d737058b3571ce6d252 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraRingSettingsDatabaseValidator/withoutPreprocessor.config.sqlite =================================================================== diff -u -r7fdb9ddecbc7af4274481b403f0cf6c7fe78b868 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 Binary files differ Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -77,7 +77,7 @@ throw new ArgumentNullException(nameof(locations)); } - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(validationProblem)) { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -60,7 +60,7 @@ CalculationServiceHelper.LogValidationBegin(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -773,7 +773,7 @@ var validationResults = new List(); string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -836,7 +836,7 @@ IEnumerable sectionsWithDatabase = ringtoetsProject.AssessmentSections.Where(i => i.HydraulicBoundaryDatabase != null); foreach (AssessmentSection section in sectionsWithDatabase) { - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(section.HydraulicBoundaryDatabase.FilePath, + string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(section.HydraulicBoundaryDatabase.FilePath, section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); if (validationProblem != null) { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -r76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5 -rf4dcbc22b5e80758399c3646086b151b5b49a6c0 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 76e7f2d96ecaa823b6ef4f63bd5faef63886a0d5) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision f4dcbc22b5e80758399c3646086b151b5b49a6c0) @@ -205,7 +205,7 @@ { var validationResults = new List(); - string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath, + string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) {