Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision afed834b8b1a55b3ea3ea17c83927326ad1edfad) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc) @@ -50,6 +50,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] @@ -839,7 +840,8 @@ public void Calculate_HydraulicBoundaryCalculationSettingsSet_InputPropertiesCorrectlySentToCalculator(bool usePreprocessorClosure) { // Setup - var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure); + var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, + validHrdFileVersion, usePreprocessorClosure); var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -1148,7 +1150,7 @@ private static HydraulicBoundaryCalculationSettings CreateCalculationSettings() { - return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false); + return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false); } /// Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision afed834b8b1a55b3ea3ea17c83927326ad1edfad) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc) @@ -50,6 +50,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] @@ -841,7 +842,8 @@ public void Calculate_HydraulicBoundaryCalculationSettingsSet_InputPropertiesCorrectlySentToCalculator(bool usePreprocessorClosure) { // Setup - var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure); + var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, + validHrdFileVersion, usePreprocessorClosure); var failureMechanism = new HeightStructuresFailureMechanism(); @@ -883,7 +885,7 @@ private static HydraulicBoundaryCalculationSettings CreateCalculationSettings() { - return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false); + return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false); } #region Test cases Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs =================================================================== diff -u -r170e5a87e289a41df0fa4d2aea2bdb1da510d5d9 -r4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 170e5a87e289a41df0fa4d2aea2bdb1da510d5d9) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc) @@ -59,6 +59,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"); #region Validate @@ -2254,7 +2255,7 @@ private static HydraulicBoundaryCalculationSettings CreateCalculationSettings() { - return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false); + return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false); } private static void AddSoilProfile(ProbabilisticPipingCalculation calculation, bool withCoverageLayer) Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision afed834b8b1a55b3ea3ea17c83927326ad1edfad) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 4ea0fd3e876eb3faa2efffcf02bfa389bbd7d8dc) @@ -50,6 +50,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] @@ -1563,7 +1564,8 @@ public void Calculate_HydraulicBoundaryCalculationSettingsSet_InputPropertiesCorrectlySentToCalculator(bool usePreprocessorClosure) { // Setup - var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure); + var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, + validHrdFileVersion, usePreprocessorClosure); var failureMechanism = new StabilityPointStructuresFailureMechanism(); @@ -1875,7 +1877,7 @@ private static HydraulicBoundaryCalculationSettings CreateCalculationSettings() { - return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false); + return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false); } ///