Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -red6289be7a73b350e1b2b8be173143d937f99720 -rb34ee10a5d97dc31484eb1256747ac10ead8cb31 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision ed6289be7a73b350e1b2b8be173143d937f99720) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision b34ee10a5d97dc31484eb1256747ac10ead8cb31) @@ -83,14 +83,14 @@ public void CreateCalculationActivities_WithValidDataAndAllFailureMechanismsRelevant_ExpectedActivitiesCreated() { // Setup - AssessmentSection assessmentSection = CreateAssessmentSection(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - IEnumerable hydraulicBoundaryLocations = new[] + + AssessmentSection assessmentSection = CreateAssessmentSection(hydraulicBoundaryLocation); + + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation - }; - assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); + }); AddSemiProbabilisticPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); AddProbabilisticPipingCalculationScenario(assessmentSection, hydraulicBoundaryLocation); @@ -195,14 +195,10 @@ public void CreateHydraulicLoadCalculationActivities_WithValidDataAndAllFailureMechanismsRelevant_ExpectedActivitiesCreated() { // Setup - AssessmentSection assessmentSection = CreateAssessmentSection(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - IEnumerable hydraulicBoundaryLocations = new[] - { - hydraulicBoundaryLocation - }; + AssessmentSection assessmentSection = CreateAssessmentSection(hydraulicBoundaryLocation); + assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange( new[] { @@ -217,7 +213,10 @@ new HydraulicBoundaryLocationCalculationsForTargetProbability(0.0025) }); - assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + hydraulicBoundaryLocation + }); AddStabilityStoneCoverCalculation(assessmentSection, hydraulicBoundaryLocation); AddWaveImpactAsphaltCoverCalculation(assessmentSection, hydraulicBoundaryLocation); @@ -292,7 +291,7 @@ mocks.VerifyAll(); } - private static AssessmentSection CreateAssessmentSection() + private static AssessmentSection CreateAssessmentSection(HydraulicBoundaryLocation hydraulicBoundaryLocation) { return new AssessmentSection(AssessmentSectionComposition.DikeAndDune) { @@ -302,6 +301,17 @@ HydraulicLocationConfigurationDatabase = { FilePath = Path.Combine(testDataPath, "hlcd.sqlite") + }, + HydraulicBoundaryDatabases = + { + new HydraulicBoundaryDatabase + { + FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"), + Locations = + { + hydraulicBoundaryLocation + } + } } } };