Index: Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs =================================================================== diff -u -r90fb33be4e1e7f3fd9f5e6c3555e569329933297 -r3b4deea4a101039bcb85e7d19b2c543d1313da4b --- Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs (.../TargetProbabilityCalculationService.cs) (revision 90fb33be4e1e7f3fd9f5e6c3555e569329933297) +++ Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs (.../TargetProbabilityCalculationService.cs) (revision 3b4deea4a101039bcb85e7d19b2c543d1313da4b) @@ -65,6 +65,17 @@ isValid = false; } + if (isValid && !HydraulicBoundaryDataHelper.IsCorrectVersion(calculationSettings.HrdFileVersion, calculationSettings.HrdFilePath)) + { + CalculationServiceHelper.LogMessagesAsError(Resources.Hydraulic_boundary_database_mismatching_version_in_file_0_, + new[] + { + calculationSettings.HrdFilePath + }); + + isValid = false; + } + CalculationServiceHelper.LogValidationEnd(); return isValid; Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r7ce3ac89b20a5668039162e2f5ecd778187e8491 -r3b4deea4a101039bcb85e7d19b2c543d1313da4b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 7ce3ac89b20a5668039162e2f5ecd778187e8491) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 3b4deea4a101039bcb85e7d19b2c543d1313da4b) @@ -44,6 +44,7 @@ { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013"; private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); [Test] @@ -168,6 +169,7 @@ assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -308,6 +310,7 @@ assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -rc23095a9a501b191b755e3b2b3e9b61472b78641 -r3b4deea4a101039bcb85e7d19b2c543d1313da4b --- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision c23095a9a501b191b755e3b2b3e9b61472b78641) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision 3b4deea4a101039bcb85e7d19b2c543d1313da4b) @@ -44,6 +44,7 @@ { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013"; private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); [Test] @@ -286,6 +287,7 @@ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, UsePreprocessorClosure = usePreprocessorClosure }; Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs =================================================================== diff -u -rc23095a9a501b191b755e3b2b3e9b61472b78641 -r3b4deea4a101039bcb85e7d19b2c543d1313da4b --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision c23095a9a501b191b755e3b2b3e9b61472b78641) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 3b4deea4a101039bcb85e7d19b2c543d1313da4b) @@ -44,6 +44,7 @@ { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); private static readonly string validHrdFilePath = Path.Combine(testDataPath, "complete.sqlite"); + private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013"; private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); [Test] @@ -138,6 +139,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, UsePreprocessorClosure = true, Locations = { Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs =================================================================== diff -u -rc23095a9a501b191b755e3b2b3e9b61472b78641 -r3b4deea4a101039bcb85e7d19b2c543d1313da4b --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision c23095a9a501b191b755e3b2b3e9b61472b78641) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 3b4deea4a101039bcb85e7d19b2c543d1313da4b) @@ -59,6 +59,7 @@ private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); private static readonly string validHrdFilePath = Path.Combine(testDataPath, "complete.sqlite"); + private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013"; private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); private Form testForm; @@ -483,6 +484,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -556,6 +558,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -701,6 +704,7 @@ { FilePath = validHrdFilePath, UsePreprocessorClosure = usePreprocessorClosure, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation