Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeHeightOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -r19fe78dad099e732a640666a868b42d93b599991 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeHeightOutputContextTreeNodeInfoTest.cs (.../DikeHeightOutputContextTreeNodeInfoTest.cs) (revision 19fe78dad099e732a640666a868b42d93b599991) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/DikeHeightOutputContextTreeNodeInfoTest.cs (.../DikeHeightOutputContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -100,7 +100,7 @@ public void ForeColor_HasNoOutput_ReturnGrayText() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput( new TestOvertoppingOutput(0.5), @@ -119,7 +119,7 @@ public void ForeColor_HasOutput_ReturnControlText() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput( new TestOvertoppingOutput(0.5), Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r72ecf8d28448698d9077f780cd0afc6b07101b54 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 72ecf8d28448698d9077f780cd0afc6b07101b54) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -120,7 +120,7 @@ mocks.ReplayAll(); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = hasOutput ? new TestGrassCoverErosionInwardsOutput() @@ -154,7 +154,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = mocks.StrictMock(); @@ -215,7 +215,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -278,7 +278,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -313,7 +313,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -355,7 +355,7 @@ DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -397,7 +397,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -446,7 +446,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -510,7 +510,7 @@ DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -573,7 +573,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -605,7 +605,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -649,7 +649,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -680,7 +680,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -712,7 +712,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -755,7 +755,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var calculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -811,7 +811,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -899,7 +899,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { InputParameters = { @@ -977,7 +977,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -1012,7 +1012,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1064,7 +1064,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculation = new GrassCoverErosionInwardsCalculationScenario { Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1115,7 +1115,7 @@ { // Setup var group = new CalculationGroup(); - var elementToBeRemoved = new GrassCoverErosionInwardsCalculationScenario(0.1); + var elementToBeRemoved = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); @@ -1133,7 +1133,7 @@ mocks.ReplayAll(); group.Children.Add(elementToBeRemoved); - group.Children.Add(new GrassCoverErosionInwardsCalculationScenario(0.1)); + group.Children.Add(new GrassCoverErosionInwardsCalculationScenario()); group.Attach(observer); // Precondition @@ -1184,21 +1184,21 @@ private static IEnumerable GetCalculationConfigurationsWithIllustrationPoints() { var random = new Random(21); - var calculationWithOverToppingOutputWithIllustrationPoints = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationWithOverToppingOutputWithIllustrationPoints = new GrassCoverErosionInwardsCalculationScenario { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null, null) }; - var calculationWithDikeHeightRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationWithDikeHeightRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculationScenario { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), new TestDikeHeightOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null) }; - var calculationWithOvertoppingRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculationScenario(0.1) + var calculationWithOvertoppingRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculationScenario { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), null, Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r19fe78dad099e732a640666a868b42d93b599991 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 19fe78dad099e732a640666a868b42d93b599991) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -148,7 +148,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var group = new CalculationGroup(); var childGroup = new CalculationGroup(); - var childCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var childCalculation = new GrassCoverErosionInwardsCalculationScenario(); group.Children.Add(childGroup); group.Children.Add(calculationItem); @@ -433,12 +433,12 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, @@ -555,7 +555,7 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; @@ -595,7 +595,7 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -642,7 +642,7 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -694,7 +694,7 @@ var calculation2Observer = mocks.StrictMock(); DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); - var calculation1 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation1 = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -704,7 +704,7 @@ calculation1.Attach(calculation1Observer); calculation1.InputParameters.Attach(calculation1InputObserver); - var calculation2 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation2 = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -766,7 +766,7 @@ var calculation2Observer = mocks.StrictMock(); DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); - var calculation1 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation1 = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -777,7 +777,7 @@ calculation1.Attach(calculation1Observer); calculation1.InputParameters.Attach(calculation1InputObserver); - var calculation2 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation2 = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -858,7 +858,7 @@ calculation2Observer.Expect(obs => obs.UpdateObserver()); DikeProfile dikeProfile = DikeProfileTestFactory.CreateDikeProfile(); - var calculation1 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation1 = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -869,7 +869,7 @@ calculation1.Attach(calculation1Observer); calculation1.InputParameters.Attach(calculation1InputObserver); - var calculation2 = new GrassCoverErosionInwardsCalculation(0.1) + var calculation2 = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -942,12 +942,12 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -998,14 +998,14 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { @@ -1050,12 +1050,12 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, @@ -1105,12 +1105,12 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -1162,14 +1162,14 @@ { Children = { - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { @@ -1284,7 +1284,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -1295,7 +1295,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; @@ -1326,7 +1326,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -1336,7 +1336,7 @@ Children = { calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; @@ -1364,12 +1364,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndAborted_ThenInquiryAndIllustrationPointsNotCleared() { // Given - var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -1380,7 +1380,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; @@ -1431,12 +1431,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndContinued_ThenInquiryAndIllustrationPointsCleared() { // Given - var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -1447,7 +1447,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } }; @@ -1505,7 +1505,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", InputParameters = @@ -1514,7 +1514,7 @@ DikeProfile = DikeProfileTestFactory.CreateDikeProfile() } }); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "B", InputParameters = @@ -1575,7 +1575,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", InputParameters = @@ -1584,7 +1584,7 @@ DikeProfile = DikeProfileTestFactory.CreateDikeProfile() } }); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "B", InputParameters = @@ -1730,7 +1730,7 @@ null, failureMechanism, assessmentSection); - var calculationItem = new GrassCoverErosionInwardsCalculation(0.1) + var calculationItem = new GrassCoverErosionInwardsCalculation { Name = "Nieuwe berekening" }; @@ -1776,7 +1776,7 @@ DikeProfile dikeProfile2 = DikeProfileTestFactory.CreateDikeProfile("Dike profile 2", "id2"); var existingCalculationGroup = new CalculationGroup(); - var existingCalculation = new GrassCoverErosionInwardsCalculationScenario(0.1); + var existingCalculation = new GrassCoverErosionInwardsCalculationScenario(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism { CalculationsGroup = @@ -1909,7 +1909,7 @@ { Children = { - new GrassCoverErosionInwardsCalculationScenario(0.1) + new GrassCoverErosionInwardsCalculationScenario { Name = existingCalculationName } @@ -2016,7 +2016,7 @@ null, failureMechanism, assessmentSection); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); observer.Expect(o => o.UpdateObserver()); @@ -2077,21 +2077,21 @@ private static IEnumerable GetCalculationConfigurationsWithIllustrationPoints() { var random = new Random(21); - var calculationWithOverToppingOutputWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOverToppingOutputWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null, null) }; - var calculationWithDikeHeightRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithDikeHeightRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), new TestDikeHeightOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null) }; - var calculationWithOvertoppingRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOvertoppingRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), null, Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r19fe78dad099e732a640666a868b42d93b599991 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 19fe78dad099e732a640666a868b42d93b599991) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -257,7 +257,7 @@ { // Setup var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); var nodeData = new GrassCoverErosionInwardsCalculationsContext(failureMechanism, assessmentSection); @@ -290,7 +290,7 @@ { // Setup var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -325,7 +325,7 @@ { // Setup var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -368,7 +368,7 @@ { // Setup var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); @@ -402,7 +402,7 @@ { // Setup var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -437,7 +437,7 @@ { // Setup var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1)); + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -483,7 +483,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", InputParameters = @@ -492,7 +492,7 @@ DikeProfile = DikeProfileTestFactory.CreateDikeProfile() } }); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "B", InputParameters = @@ -581,7 +581,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", InputParameters = @@ -590,7 +590,7 @@ DikeProfile = DikeProfileTestFactory.CreateDikeProfile() } }); - failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(0.1) + failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "B", InputParameters = @@ -648,7 +648,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -661,7 +661,7 @@ { calculation, calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } } }; @@ -695,7 +695,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -707,7 +707,7 @@ Children = { calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } } }; @@ -739,12 +739,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndAborted_ThenInquiryAndIllustrationPointsNotCleared() { // Given - var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -760,7 +760,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } } }; @@ -809,12 +809,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndContinued_ThenInquiryAndIllustrationPointsCleared() { // Given - var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() }; @@ -834,7 +834,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new GrassCoverErosionInwardsCalculation(0.1) + new GrassCoverErosionInwardsCalculation() } } }; @@ -896,21 +896,21 @@ private static IEnumerable GetCalculationConfigurationsWithIllustrationPoints() { var random = new Random(21); - var calculationWithOverToppingOutputWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOverToppingOutputWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null, null) }; - var calculationWithDikeHeightRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithDikeHeightRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), new TestDikeHeightOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null) }; - var calculationWithOvertoppingRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation(0.1) + var calculationWithOvertoppingRateWithIllustrationPoints = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(random.NextDouble()), null, Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r19fe78dad099e732a640666a868b42d93b599991 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision 19fe78dad099e732a640666a868b42d93b599991) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -88,8 +88,8 @@ { // Setup var grassCoverErosionInwardsInputContext = new GrassCoverErosionInwardsInputContext( - new GrassCoverErosionInwardsInput(0.1), - new GrassCoverErosionInwardsCalculation(0.1), + new GrassCoverErosionInwardsInput(), + new GrassCoverErosionInwardsCalculation(), new GrassCoverErosionInwardsFailureMechanism(), mocksRepository.Stub()); @@ -107,8 +107,8 @@ { // Setup var grassCoverErosionInwardsInputContext = new GrassCoverErosionInwardsInputContext( - new GrassCoverErosionInwardsInput(0.1), - new GrassCoverErosionInwardsCalculation(0.1), + new GrassCoverErosionInwardsInput(), + new GrassCoverErosionInwardsCalculation(), new GrassCoverErosionInwardsFailureMechanism(), mocksRepository.Stub()); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -r72ecf8d28448698d9077f780cd0afc6b07101b54 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsOutputContextTreeNodeInfoTest.cs) (revision 72ecf8d28448698d9077f780cd0afc6b07101b54) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsOutputContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -91,7 +91,9 @@ public void ForeColor_HasNoOutput_ReturnGrayText() { // Call - Color color = info.ForeColor(new GrassCoverErosionInwardsOutputContext(new GrassCoverErosionInwardsCalculation(0.1))); + Color color = info.ForeColor(new GrassCoverErosionInwardsOutputContext(new GrassCoverErosionInwardsCalculation(), + failureMechanism, + assessmentSection)); // Assert Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color); @@ -101,7 +103,7 @@ public void ForeColor_HasOutput_ReturnControlText() { // Call - Color color = info.ForeColor(new GrassCoverErosionInwardsOutputContext(new GrassCoverErosionInwardsCalculation(0.1) + Color color = info.ForeColor(new GrassCoverErosionInwardsOutputContext(new GrassCoverErosionInwardsCalculation { Output = new TestGrassCoverErosionInwardsOutput() })); @@ -126,7 +128,13 @@ public void ChildNodeObjects_Always_ReturnsCollectionWithOutputObjects(bool hasOutput) { // Setup - var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(0.1) + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + + var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = hasOutput ? new TestGrassCoverErosionInwardsOutput() : null }; Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -re9eab53fe6879727ee749dc04785e90adfb3aaf1 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingOutputContextTreeNodeInfoTest.cs (.../OvertoppingOutputContextTreeNodeInfoTest.cs) (revision e9eab53fe6879727ee749dc04785e90adfb3aaf1) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingOutputContextTreeNodeInfoTest.cs (.../OvertoppingOutputContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -100,8 +100,12 @@ public void ForeColor_HasNoOutput_ReturnGrayText() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + var calculation = new GrassCoverErosionInwardsCalculation(); + // Call Color color = info.ForeColor(new OvertoppingOutputContext(calculation)); @@ -113,7 +117,11 @@ public void ForeColor_HasOutput_ReturnControlText() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput( new TestOvertoppingOutput(0.5), Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingRateOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -r19fe78dad099e732a640666a868b42d93b599991 -r10523021ee8dbce608fc3c1fa165468e6a70eac0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingRateOutputContextTreeNodeInfoTest.cs (.../OvertoppingRateOutputContextTreeNodeInfoTest.cs) (revision 19fe78dad099e732a640666a868b42d93b599991) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/OvertoppingRateOutputContextTreeNodeInfoTest.cs (.../OvertoppingRateOutputContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) @@ -100,7 +100,7 @@ public void ForeColor_HasNoOutput_ReturnGrayText() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput( new TestOvertoppingOutput(0.5), @@ -119,7 +119,7 @@ public void ForeColor_HasOutput_ReturnControlText() { // Setup - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput( new TestOvertoppingOutput(0.5),