Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r95e76a7e90e94621a5e9773c2a365fa8e3b6dd31 -rdd776cec9fe4d6fe0c3276dbb2ed371c72d43082 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 95e76a7e90e94621a5e9773c2a365fa8e3b6dd31) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision dd776cec9fe4d6fe0c3276dbb2ed371c72d43082) @@ -108,7 +108,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); @@ -138,7 +138,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput()) + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()) { Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) }; @@ -173,8 +173,7 @@ var treeViewControlMock = mocks.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); var menuBuilderMock = mocks.Stub(); @@ -213,8 +212,7 @@ var treeViewControlMock = mocks.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -261,8 +259,7 @@ var treeViewControlMock = mocks.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); var guiMock = mocks.StrictMock(); @@ -301,8 +298,7 @@ var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); @@ -341,8 +337,7 @@ var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase()); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); @@ -390,8 +385,7 @@ var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock); @@ -446,8 +440,7 @@ { HydraulicBoundaryDatabase = hydraulicBoundaryDatabase }; - var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()) + var calculation = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()) { Output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN), InputParameters = @@ -495,8 +488,7 @@ { // Setup var group = new CalculationGroup(); - var elementToBeRemoved = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput()); + var elementToBeRemoved = new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput()); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var observerMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); @@ -512,8 +504,7 @@ mocks.ReplayAll(); group.Children.Add(elementToBeRemoved); - group.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), - new ProbabilityAssessmentInput())); + group.Children.Add(new GrassCoverErosionInwardsCalculation(new ProbabilityAssessmentInput())); group.Attach(observerMock); // Precondition