Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rf6078b7cc101caa7c76675ab6496a37f6ea00937 -r04450458c9a8b3855b3890b35d123e0fb0f03b11 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision f6078b7cc101caa7c76675ab6496a37f6ea00937) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 04450458c9a8b3855b3890b35d123e0fb0f03b11) @@ -424,7 +424,7 @@ { InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(), DikeProfile = CreateDikeProfile() } }; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/CalculationsState/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rf6078b7cc101caa7c76675ab6496a37f6ea00937 -r04450458c9a8b3855b3890b35d123e0fb0f03b11 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/CalculationsState/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision f6078b7cc101caa7c76675ab6496a37f6ea00937) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/CalculationsState/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 04450458c9a8b3855b3890b35d123e0fb0f03b11) @@ -512,6 +512,7 @@ var hydraulicBoundaryData = new HydraulicBoundaryData { + FilePath = validHrdFilePath, HydraulicLocationConfigurationDatabase = { FilePath = validHlcdFilePath Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r2abd5d98ba3eebdbe25c8208a5e3b5ae306e9a71 -r04450458c9a8b3855b3890b35d123e0fb0f03b11 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 2abd5d98ba3eebdbe25c8208a5e3b5ae306e9a71) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 04450458c9a8b3855b3890b35d123e0fb0f03b11) @@ -800,6 +800,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); var hydraulicBoundaryData = new HydraulicBoundaryData { + FilePath = validHrdFilePath, HydraulicLocationConfigurationDatabase = { FilePath = validHlcdFilePath Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2abd5d98ba3eebdbe25c8208a5e3b5ae306e9a71 -r04450458c9a8b3855b3890b35d123e0fb0f03b11 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2abd5d98ba3eebdbe25c8208a5e3b5ae306e9a71) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 04450458c9a8b3855b3890b35d123e0fb0f03b11) @@ -1612,6 +1612,7 @@ var hydraulicBoundaryData = new HydraulicBoundaryData { + FilePath = validHrdFilePath, HydraulicLocationConfigurationDatabase = { FilePath = validHlcdFilePath Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -rb9df4bbd2cf0f590cf20a673af76578215888e75 -r04450458c9a8b3855b3890b35d123e0fb0f03b11 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionInwardsCalculationActivityFactoryTest.cs) (revision b9df4bbd2cf0f590cf20a673af76578215888e75) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionInwardsCalculationActivityFactoryTest.cs) (revision 04450458c9a8b3855b3890b35d123e0fb0f03b11) @@ -113,7 +113,7 @@ mocks.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = CreateValidCalculation(); + GrassCoverErosionInwardsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.GetLocations().First()); // Call CalculatableActivity activity = GrassCoverErosionInwardsCalculationActivityFactory.CreateCalculationActivity(calculation, @@ -190,9 +190,11 @@ mocks.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation(); - GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation(); + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(); + GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); + GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); + var calculations = new CalculationGroup { Children = @@ -257,9 +259,11 @@ mocks.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation(); - GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation(); + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(); + GrassCoverErosionInwardsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); + GrassCoverErosionInwardsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); + failureMechanism.CalculationsGroup.Children.AddRange(new[] { calculation1, @@ -280,13 +284,13 @@ mocks.VerifyAll(); } - private static GrassCoverErosionInwardsCalculation CreateValidCalculation() + private static GrassCoverErosionInwardsCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation) { return new GrassCoverErosionInwardsCalculation { InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), + HydraulicBoundaryLocation = hydraulicBoundaryLocation, DikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0], Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -rb9df4bbd2cf0f590cf20a673af76578215888e75 -r04450458c9a8b3855b3890b35d123e0fb0f03b11 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision b9df4bbd2cf0f590cf20a673af76578215888e75) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 04450458c9a8b3855b3890b35d123e0fb0f03b11) @@ -483,7 +483,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldDikeHeightBeCalculated = shouldDikeHeightBeCalculated, ShouldOvertoppingRateBeCalculated = shouldOvertoppingRateBeCalculated, @@ -582,7 +582,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldDikeHeightBeCalculated = true } @@ -653,7 +653,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldOvertoppingRateBeCalculated = true } @@ -715,7 +715,7 @@ { InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(), DikeProfile = DikeProfileTestFactory.CreateDikeProfile() } }; @@ -767,7 +767,7 @@ { InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(), DikeProfile = DikeProfileTestFactory.CreateDikeProfile(), ShouldDikeHeightBeCalculated = true } @@ -832,7 +832,7 @@ { InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(), DikeProfile = DikeProfileTestFactory.CreateDikeProfile(), ShouldDikeHeightBeCalculated = true, ShouldOvertoppingRateBeCalculated = true @@ -894,7 +894,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile } }; @@ -966,7 +966,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile } }; @@ -1039,7 +1039,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile } }; @@ -1117,7 +1117,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldDikeHeightBeCalculated = true } @@ -1188,7 +1188,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldDikeHeightBeCalculated = true } @@ -1260,7 +1260,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldDikeHeightBeCalculated = true } @@ -1332,7 +1332,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldOvertoppingRateBeCalculated = true } @@ -1403,7 +1403,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldOvertoppingRateBeCalculated = true } @@ -1475,7 +1475,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001), + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001), DikeProfile = dikeProfile, ShouldOvertoppingRateBeCalculated = true } @@ -1552,7 +1552,8 @@ mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -1636,7 +1637,9 @@ mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); + calculation.InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated = false; using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1720,7 +1723,8 @@ mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -1804,7 +1808,9 @@ mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); + calculation.InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated = false; using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -1888,7 +1894,8 @@ mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -1972,7 +1979,9 @@ mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); + calculation.InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated = false; using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -2054,7 +2063,8 @@ .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -2139,7 +2149,8 @@ .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -2226,7 +2237,8 @@ .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -2311,7 +2323,8 @@ .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -2398,7 +2411,8 @@ .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -2483,7 +2497,8 @@ .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); - GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings(); + GrassCoverErosionInwardsCalculation calculation = GetValidCalculationWithCalculateIllustrationPointsSettings( + assessmentSection.HydraulicBoundaryData.GetLocations().First()); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -2550,7 +2565,7 @@ validHrdFilePath, usePreprocessorClosure); - HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001); + HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001); HydraulicBoundaryCalculationSettings calculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings( assessmentSection.HydraulicBoundaryData, hydraulicBoundaryLocation); @@ -2646,13 +2661,13 @@ }; } - private static GrassCoverErosionInwardsCalculation GetValidCalculationWithCalculateIllustrationPointsSettings() + private static GrassCoverErosionInwardsCalculation GetValidCalculationWithCalculateIllustrationPointsSettings(HydraulicBoundaryLocation hydraulicBoundaryLocation) { return new GrassCoverErosionInwardsCalculation { InputParameters = { - HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), + HydraulicBoundaryLocation = hydraulicBoundaryLocation, DikeProfile = GetDikeProfile(), ShouldDikeHeightBeCalculated = true, ShouldOvertoppingRateBeCalculated = true,