Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra8bc0ae79394d7c0d272e52f3420cbc94fca19dc -r954d49324cd794c4fcb69bb602cf9d8461217fc1 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision a8bc0ae79394d7c0d272e52f3420cbc94fca19dc) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 954d49324cd794c4fcb69bb602cf9d8461217fc1) @@ -30,7 +30,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.Structures; -using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Service; using Riskeer.Common.Service.TestUtil; using Riskeer.HeightStructures.Data; @@ -49,7 +48,8 @@ public class HeightStructuresCalculationActivityIntegrationTest { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); - private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); [Test] public void Run_CalculationInvalidInput_LogValidationStartAndEndWithError() @@ -100,7 +100,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculationScenario @@ -161,7 +161,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculationScenario @@ -203,7 +203,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new TestHeightStructuresCalculationScenario @@ -257,7 +257,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new StructuresCalculation @@ -297,15 +297,18 @@ { HydraulicBoundaryData = { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath, + UsePreprocessorClosure = usePreprocessorClosure + }, Locations = { new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0) } } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData, - usePreprocessorClosure); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/CalculationsState/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r954d49324cd794c4fcb69bb602cf9d8461217fc1 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/CalculationsState/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/CalculationsState/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 954d49324cd794c4fcb69bb602cf9d8461217fc1) @@ -63,7 +63,9 @@ private const int contextMenuClearAllIndex = 5; private const int contextMenuClearIllustrationPointsIndex = 6; - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); + private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); + private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); private MockRepository mocksRepository; private HeightStructuresPlugin plugin; @@ -333,14 +335,15 @@ var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "1.0" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocksRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -445,14 +448,15 @@ var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "1.0" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocksRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -507,9 +511,12 @@ var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = Path.Combine(testDataPath, "complete.sqlite") + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocksRepository.Stub(); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -600,13 +607,14 @@ } }); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocksRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r954d49324cd794c4fcb69bb602cf9d8461217fc1 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 954d49324cd794c4fcb69bb602cf9d8461217fc1) @@ -79,7 +79,10 @@ private const int contextMenuCalculateAllIndexNestedGroup = 13; private const int contextMenuClearAllIndexNestedGroup = 15; private const int contextMenuClearIllustrationPointsIndexNestedGroup = 16; - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); + + private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); + private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); private IGui gui; private TreeNodeInfo info; @@ -578,17 +581,18 @@ } }; - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "1.0" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -720,17 +724,18 @@ } }; - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "1.0" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -1113,9 +1118,12 @@ var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = Path.Combine(testDataPath, "complete.sqlite") + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -1208,13 +1216,14 @@ } }); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r954d49324cd794c4fcb69bb602cf9d8461217fc1 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 954d49324cd794c4fcb69bb602cf9d8461217fc1) @@ -65,7 +65,10 @@ private const int contextMenuCalculateIndex = 9; private const int contextMenuClearIndex = 11; private const int contextMenuClearIllustrationPointsIndex = 12; - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); + + private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData)); + private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); private MockRepository mocks; private HeightStructuresPlugin plugin; @@ -202,14 +205,15 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "random" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -641,14 +645,15 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemPerformCalculationEnabled() { // Setup - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "1.0" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -748,14 +753,15 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemValidateCalculationEnabled() { // Setup - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "1.0" }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData); @@ -1062,14 +1068,17 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = Path.Combine(testDataPath, "complete.sqlite"), + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "random", Locations = { hydraulicBoundaryLocation } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -1146,18 +1155,20 @@ // Given var observer = mocks.StrictMock(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); var hydraulicBoundaryData = new HydraulicBoundaryData { - FilePath = validFilePath, + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + }, Version = "random", Locations = { hydraulicBoundaryLocation } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryData).Return(hydraulicBoundaryData);