Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r43ba421491b5d56fb5437b459be09ca8904ea166 -ra9da044985f4765ccb9502404575f12b382fbd98 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 43ba421491b5d56fb5437b459be09ca8904ea166) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision a9da044985f4765ccb9502404575f12b382fbd98) @@ -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] @@ -311,6 +312,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, UsePreprocessorClosure = usePreprocessorClosure, Locations = { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb5c8c561ef4d8d3362b503b736e0e00c8b576dd2 -ra9da044985f4765ccb9502404575f12b382fbd98 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision b5c8c561ef4d8d3362b503b736e0e00c8b576dd2) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision a9da044985f4765ccb9502404575f12b382fbd98) @@ -82,6 +82,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 IGui gui; @@ -1402,6 +1403,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -1531,6 +1533,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r0815b0bb8311db717a5e269d48d3ca39af3660a6 -ra9da044985f4765ccb9502404575f12b382fbd98 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 0815b0bb8311db717a5e269d48d3ca39af3660a6) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision a9da044985f4765ccb9502404575f12b382fbd98) @@ -68,6 +68,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 MockRepository mocks; @@ -834,6 +835,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -934,6 +936,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rb5c8c561ef4d8d3362b503b736e0e00c8b576dd2 -ra9da044985f4765ccb9502404575f12b382fbd98 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs) (revision b5c8c561ef4d8d3362b503b736e0e00c8b576dd2) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs) (revision a9da044985f4765ccb9502404575f12b382fbd98) @@ -65,6 +65,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 MockRepository mocksRepository; @@ -374,6 +375,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -499,6 +501,7 @@ new HydraulicBoundaryDatabase { FilePath = validHrdFilePath, + Version = validHrdFileVersion, Locations = { hydraulicBoundaryLocation @@ -571,7 +574,7 @@ } }; - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository); var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -620,7 +623,7 @@ } }; - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository); var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -678,7 +681,7 @@ var calculationObserver = mocksRepository.StrictMock(); calculationWithIllustrationPoints.Attach(calculationObserver); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository); var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -751,7 +754,7 @@ var unaffectedCalculationObserver = mocksRepository.StrictMock(); calculationWithOutput.Attach(unaffectedCalculationObserver); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository); var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder();