Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs =================================================================== diff -u -r569f34a9b159c4a721e24f5a08235bfc2f9bf791 -r62e646635c42d3a25b9c0155e35df36eebb12cbf --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs) (revision 569f34a9b159c4a721e24f5a08235bfc2f9bf791) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs) (revision 62e646635c42d3a25b9c0155e35df36eebb12cbf) @@ -68,8 +68,8 @@ mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); - var input = new GrassCoverErosionInwardsInput(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); + var input = new GrassCoverErosionInwardsInput(); var properties = new GrassCoverErosionInwardsInputContextDikeGeometryProperties(); // Call @@ -95,7 +95,7 @@ new RoughnessPoint(new Point2D(3.3, 4.4), 0.7) }); - var calculation = new GrassCoverErosionInwardsCalculation(0.1) + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { @@ -132,8 +132,8 @@ mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); - var input = new GrassCoverErosionInwardsInput(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); + var input = new GrassCoverErosionInwardsInput(); // Call var properties = new GrassCoverErosionInwardsInputContextDikeGeometryProperties Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r2c538a8ef1f2ea58ee05ca47589b039a094b69b5 -r62e646635c42d3a25b9c0155e35df36eebb12cbf --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 2c538a8ef1f2ea58ee05ca47589b039a094b69b5) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 62e646635c42d3a25b9c0155e35df36eebb12cbf) @@ -99,10 +99,10 @@ // Setup mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var inputParameters = new GrassCoverErosionInwardsInput(0.1); + var inputParameters = new GrassCoverErosionInwardsInput(); var context = new GrassCoverErosionInwardsInputContext(inputParameters, calculation, @@ -124,10 +124,10 @@ // Setup mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var inputParameters = new GrassCoverErosionInwardsInput(0.1); + var inputParameters = new GrassCoverErosionInwardsInput(); var context = new GrassCoverErosionInwardsInputContext(inputParameters, calculation, @@ -155,8 +155,8 @@ mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); - var input = new GrassCoverErosionInwardsInput(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); + var input = new GrassCoverErosionInwardsInput(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); // Call @@ -193,8 +193,8 @@ mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); - var input = new GrassCoverErosionInwardsInput(0.1) + var calculation = new GrassCoverErosionInwardsCalculation(); + var input = new GrassCoverErosionInwardsInput { DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(12.34, 56.78)), HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0) @@ -318,8 +318,8 @@ mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); - var input = new GrassCoverErosionInwardsInput(0.1) + var calculation = new GrassCoverErosionInwardsCalculation(); + var input = new GrassCoverErosionInwardsInput { DikeHeightCalculationType = DikeHeightCalculationType.CalculateByAssessmentSectionNorm, OvertoppingRateCalculationType = OvertoppingRateCalculationType.CalculateByAssessmentSectionNorm @@ -347,8 +347,8 @@ // Setup mockRepository.ReplayAll(); - var calculationInput = new GrassCoverErosionInwardsInput(0.1); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculationInput = new GrassCoverErosionInwardsInput(); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(calculationInput, calculation, @@ -383,11 +383,11 @@ mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(200620.173572981, 503401.652985217)) }; - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, handler); @@ -419,12 +419,12 @@ mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { HydraulicBoundaryLocation = hydraulicBoundaryLocation, DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(200620.173572981, 503401.652985217)) }; - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, handler); @@ -462,12 +462,12 @@ mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { HydraulicBoundaryLocation = hydraulicBoundaryLocation, DikeProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(200620.173572981, 503401.652985217)) }; - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, handler); @@ -502,8 +502,8 @@ mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var input = new GrassCoverErosionInwardsInput(); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, handler); @@ -541,11 +541,11 @@ mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { DikeProfile = DikeProfileTestFactory.CreateDikeProfile() }; - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); var properties = new GrassCoverErosionInwardsInputContextProperties(inputContext, handler); @@ -585,13 +585,13 @@ mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { DikeProfile = DikeProfileTestFactory.CreateDikeProfile() }; DikeProfile otherProfile = DikeProfileTestFactory.CreateDikeProfile(new Point2D(0.0, 190.0)); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var inputContext = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection); @@ -626,8 +626,8 @@ // Setup mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(0.1); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var input = new GrassCoverErosionInwardsInput(); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.DikeProfiles.AddRange(new[] @@ -656,8 +656,8 @@ mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); - var input = new GrassCoverErosionInwardsInput(0.1) + var calculation = new GrassCoverErosionInwardsCalculation(); + var input = new GrassCoverErosionInwardsInput { DikeProfile = withDikeProfile ? DikeProfileTestFactory.CreateDikeProfile() @@ -795,9 +795,9 @@ var changeHandler = mockRepository.Stub(); mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { ShouldDikeHeightBeCalculated = shouldDikeHeightBeCalculated }; @@ -826,9 +826,9 @@ var changeHandler = mockRepository.Stub(); mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { ShouldOvertoppingRateBeCalculated = shouldOvertoppingRateBeCalculated }; @@ -857,9 +857,9 @@ var changeHandler = mockRepository.Stub(); mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { DikeProfile = hasDikeProfile ? DikeProfileTestFactory.CreateDikeProfile() @@ -888,9 +888,9 @@ var changeHandler = mockRepository.Stub(); mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var input = new GrassCoverErosionInwardsInput(0.1) + var input = new GrassCoverErosionInwardsInput { DikeProfile = hasDikeProfile ? DikeProfileTestFactory.CreateDikeProfile() @@ -918,7 +918,7 @@ observable.Expect(o => o.NotifyObservers()); mockRepository.ReplayAll(); - var calculation = new GrassCoverErosionInwardsCalculation(0.1); + var calculation = new GrassCoverErosionInwardsCalculation(); GrassCoverErosionInwardsInput input = calculation.InputParameters; input.DikeProfile = DikeProfileTestFactory.CreateDikeProfile(); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextDikeProfileEditorTest.cs =================================================================== diff -u -r569f34a9b159c4a721e24f5a08235bfc2f9bf791 -r62e646635c42d3a25b9c0155e35df36eebb12cbf --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextDikeProfileEditorTest.cs (.../GrassCoverErosionInwardsInputContextDikeProfileEditorTest.cs) (revision 569f34a9b159c4a721e24f5a08235bfc2f9bf791) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextDikeProfileEditorTest.cs (.../GrassCoverErosionInwardsInputContextDikeProfileEditorTest.cs) (revision 62e646635c42d3a25b9c0155e35df36eebb12cbf) @@ -56,8 +56,8 @@ { DikeProfileTestFactory.CreateDikeProfile() }, "path"); - var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput(0.1); - var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(0.1); + var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput(); + var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(); var assessmentSection = mockRepository.Stub(); var inputContext = new GrassCoverErosionInwardsInputContext(grassCoverErosionInwardsInput, @@ -100,11 +100,11 @@ dikeProfile }, "path"); - var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput(0.1) + var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput { DikeProfile = dikeProfile }; - var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(0.1); + var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation(); var assessmentSection = mockRepository.Stub(); var inputContext = new GrassCoverErosionInwardsInputContext(grassCoverErosionInwardsInput,