Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs =================================================================== diff -u -rca8e07a3746fa9ad645528108777b0d4e485a587 -redf2d39c8546169a313ad234c52ebfb660a427b8 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs (.../GrassCoverErosionInwardsOutputProperties.cs) (revision ca8e07a3746fa9ad645528108777b0d4e485a587) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs (.../GrassCoverErosionInwardsOutputProperties.cs) (revision edf2d39c8546169a313ad234c52ebfb660a427b8) @@ -26,7 +26,6 @@ using Core.Common.Util.Attributes; using Core.Gui.Attributes; using Core.Gui.PropertyBag; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.Helpers; using Riskeer.Common.Forms.TypeConverters; @@ -45,28 +44,14 @@ /// Creates a new instance of . /// /// The grass cover erosion inwards output to create the object properties for. - /// The failure mechanism the output belongs to. - /// The assessment section the output belongs to. - /// Thrown when any parameter is null. - public GrassCoverErosionInwardsOutputProperties(GrassCoverErosionInwardsOutput grassCoverErosionInwardsOutput, - GrassCoverErosionInwardsFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + /// Thrown when is null. + public GrassCoverErosionInwardsOutputProperties(GrassCoverErosionInwardsOutput grassCoverErosionInwardsOutput) { if (grassCoverErosionInwardsOutput == null) { throw new ArgumentNullException(nameof(grassCoverErosionInwardsOutput)); } - if (failureMechanism == null) - { - throw new ArgumentNullException(nameof(failureMechanism)); - } - - if (assessmentSection == null) - { - throw new ArgumentNullException(nameof(assessmentSection)); - } - Data = grassCoverErosionInwardsOutput; } Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r00503965d6ec2d597d596bfc9bbdea9819a578f4 -redf2d39c8546169a313ad234c52ebfb660a427b8 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 00503965d6ec2d597d596bfc9bbdea9819a578f4) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision edf2d39c8546169a313ad234c52ebfb660a427b8) @@ -94,9 +94,7 @@ }; yield return new PropertyInfo { - CreateInstance = context => new GrassCoverErosionInwardsOutputProperties(context.WrappedData.Output, - context.FailureMechanism, - context.AssessmentSection) + CreateInstance = context => new GrassCoverErosionInwardsOutputProperties(context.WrappedData.Output) }; yield return new PropertyInfo { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs =================================================================== diff -u -r7562693478876abe4b0d6ca27741fd452b831d12 -redf2d39c8546169a313ad234c52ebfb660a427b8 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 7562693478876abe4b0d6ca27741fd452b831d12) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision edf2d39c8546169a313ad234c52ebfb660a427b8) @@ -26,8 +26,6 @@ using Core.Gui.PropertyBag; using Core.Gui.TestUtil; using NUnit.Framework; -using Rhino.Mocks; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Helpers; @@ -50,81 +48,34 @@ private const int secondHydraulicLoadsOutputIndex = 10; [Test] - public void Constructor_ExpectedValues() - { - // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var grassCoverErosionInwardsOutput = new TestGrassCoverErosionInwardsOutput(); - - // Call - var properties = new GrassCoverErosionInwardsOutputProperties(grassCoverErosionInwardsOutput, failureMechanism, assessmentSection); - - // Assert - Assert.IsInstanceOf>(properties); - Assert.AreSame(grassCoverErosionInwardsOutput, properties.Data); - mocks.VerifyAll(); - } - - [Test] public void Constructor_GrassCoverErosionInwardsOutputNull_ThrowsArgumentNullException() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call - void Call() => new GrassCoverErosionInwardsOutputProperties(null, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); + void Call() => new GrassCoverErosionInwardsOutputProperties(null); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("grassCoverErosionInwardsOutput", exception.ParamName); - mocks.VerifyAll(); } [Test] - public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() + public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var grassCoverErosionInwardsOutput = new TestGrassCoverErosionInwardsOutput(); // Call - void Call() => new GrassCoverErosionInwardsOutputProperties(new TestGrassCoverErosionInwardsOutput(), null, assessmentSection); + var properties = new GrassCoverErosionInwardsOutputProperties(grassCoverErosionInwardsOutput); // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("failureMechanism", exception.ParamName); - mocks.VerifyAll(); + Assert.IsInstanceOf>(properties); + Assert.AreSame(grassCoverErosionInwardsOutput, properties.Data); } [Test] - public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() - { - // Call - void Call() => new GrassCoverErosionInwardsOutputProperties(new TestGrassCoverErosionInwardsOutput(), new GrassCoverErosionInwardsFailureMechanism(), null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("assessmentSection", exception.ParamName); - } - - [Test] public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - var random = new Random(39); double waveHeight = random.NextDouble(); bool isOvertoppingDominant = Convert.ToBoolean(random.Next(0, 2)); @@ -164,7 +115,7 @@ var output = new GrassCoverErosionInwardsOutput(resultOutput, dikeHeightOutput, overtoppingRateOutput); // Call - var properties = new GrassCoverErosionInwardsOutputProperties(output, failureMechanism, assessmentSection); + var properties = new GrassCoverErosionInwardsOutputProperties(output); // Assert Assert.AreEqual(2, properties.WaveHeight.NumberOfDecimalPlaces); @@ -210,19 +161,12 @@ string overtoppingRateConvergenceValue = new EnumDisplayWrapper(overtoppingRateConvergence).DisplayName; Assert.AreEqual(overtoppingRateConvergenceValue, properties.OvertoppingRateConvergence); - mocks.VerifyAll(); } [Test] public void PropertyAttributes_WithDikeHeightAndOvertoppingRateCalculated_ReturnExpectedValues() { // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - var resultOutput = new OvertoppingOutput(10, true, 0, @@ -235,7 +179,7 @@ overtoppingRateOutput); // Call - var properties = new GrassCoverErosionInwardsOutputProperties(output, failureMechanism, assessmentSection); + var properties = new GrassCoverErosionInwardsOutputProperties(output); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -244,7 +188,6 @@ AssertResultOutputProperties(dynamicProperties); AssertDikeHeightOutputProperties(dynamicProperties, firstHydraulicLoadsOutputIndex); AssertOvertoppingRateOutputProperties(dynamicProperties, secondHydraulicLoadsOutputIndex); - mocks.VerifyAll(); } [Test] @@ -254,12 +197,6 @@ bool overtoppingRateCalculated) { // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - DikeHeightOutput dikeHeightOutput = null; OvertoppingRateOutput overtoppingRateOutput = null; @@ -283,7 +220,7 @@ overtoppingRateOutput); // Call - var properties = new GrassCoverErosionInwardsOutputProperties(output, failureMechanism, assessmentSection); + var properties = new GrassCoverErosionInwardsOutputProperties(output); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -300,8 +237,6 @@ { AssertOvertoppingRateOutputProperties(dynamicProperties, firstHydraulicLoadsOutputIndex); } - - mocks.VerifyAll(); } [Test] @@ -310,12 +245,6 @@ public void PropertyAttributes_WithoutDikeHeightAndOvertoppingRateCalculated_ReturnExpectedValues(double waveHeight) { // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - var resultOutput = new OvertoppingOutput(waveHeight, true, 0, @@ -324,7 +253,7 @@ var output = new GrassCoverErosionInwardsOutput(resultOutput, null, null); // Call - var properties = new GrassCoverErosionInwardsOutputProperties(output, failureMechanism, assessmentSection); + var properties = new GrassCoverErosionInwardsOutputProperties(output); // Assert int propertiesCount = double.IsNaN(waveHeight) ? 3 : 4; @@ -333,7 +262,6 @@ Assert.AreEqual(propertiesCount, dynamicProperties.Count); AssertResultOutputProperties(dynamicProperties, !double.IsNaN(waveHeight)); - mocks.VerifyAll(); } private static void AssertResultOutputProperties(PropertyDescriptorCollection dynamicProperties, bool waveHeightCalculated = true)