Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra8bc0ae79394d7c0d272e52f3420cbc94fca19dc -rf994b577e02b0e48e5ec7e642566dbe8eaf5881c --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision a8bc0ae79394d7c0d272e52f3420cbc94fca19dc) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision f994b577e02b0e48e5ec7e642566dbe8eaf5881c) @@ -33,7 +33,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.HydraRing.Calculation.Calculator.Factory; @@ -49,7 +48,8 @@ public class ClosingStructuresCalculationActivityIntegrationTest { 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 ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculationScenario @@ -162,7 +162,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculationScenario @@ -205,7 +205,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculationScenario @@ -261,7 +261,7 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validFilePath); + DataImportHelper.ImportHydraulicBoundaryData(assessmentSection, validHrdFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation @@ -302,11 +302,13 @@ { HydraulicBoundaryData = { - FilePath = validFilePath + FilePath = validHrdFilePath, + HydraulicLocationConfigurationSettings = + { + FilePath = validHlcdFilePath + } } }; - HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData, - usePreprocessorClosure); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock();