Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs =================================================================== diff -u -r0e9d074a8dd58198dbb156c497eb96979868b879 -r748a27c9c0b28afded29026a44953d6a467a18cc --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs (.../GrassCoverErosionInwardsFailureMechanismProperties.cs) (revision 0e9d074a8dd58198dbb156c497eb96979868b879) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs (.../GrassCoverErosionInwardsFailureMechanismProperties.cs) (revision 748a27c9c0b28afded29026a44953d6a467a18cc) @@ -89,31 +89,6 @@ }; } - #region Length effect parameters - - [DynamicPropertyOrder] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_Description))] - public virtual RoundedDouble N - { - get - { - return data.GeneralInput.N; - } - set - { - IEnumerable affectedObjects = PropertyChangeHandler.SetPropertyValueAfterConfirmation( - data, - value, - (f, v) => f.GeneralInput.N = v); - - NotifyAffectedObjects(affectedObjects); - } - } - - #endregion - [DynamicPropertyOrderEvaluationMethod] public int DynamicPropertyOrderEvaluationMethod(string propertyName) { @@ -137,15 +112,6 @@ /// public class ConstructionProperties { - # region Length effect parameters - - /// - /// Gets or sets the property index for . - /// - public int NPropertyIndex { get; set; } - - # endregion - #region General /// @@ -169,6 +135,15 @@ public int ContributionPropertyIndex { get; set; } #endregion + + # region Length effect parameters + + /// + /// Gets or sets the property index for . + /// + public int NPropertyIndex { get; set; } + + # endregion } #region General @@ -222,5 +197,30 @@ } #endregion + + #region Length effect parameters + + [DynamicPropertyOrder] + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] + [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_DisplayName))] + [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_Description))] + public virtual RoundedDouble N + { + get + { + return data.GeneralInput.N; + } + set + { + IEnumerable affectedObjects = PropertyChangeHandler.SetPropertyValueAfterConfirmation( + data, + value, + (f, v) => f.GeneralInput.N = v); + + NotifyAffectedObjects(affectedObjects); + } + } + + #endregion } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r0e9d074a8dd58198dbb156c497eb96979868b879 -r748a27c9c0b28afded29026a44953d6a467a18cc --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs) (revision 0e9d074a8dd58198dbb156c497eb96979868b879) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs) (revision 748a27c9c0b28afded29026a44953d6a467a18cc) @@ -44,12 +44,18 @@ private const int groupPropertyIndex = 2; private const int contributionPropertyIndex = 3; private const int nPropertyIndex = 4; + private MockRepository mocks; + [SetUp] + public void SetUp() + { + mocks = new MockRepository(); + } + [Test] public void Constructor_DataNull_ThrowArgumentNullException() { // Setup - var mocks = new MockRepository(); var handler = mocks.Stub>(); mocks.ReplayAll(); @@ -66,7 +72,6 @@ public void Constructor_ConstructionPropertiesNull_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); var handler = mocks.Stub>(); mocks.ReplayAll(); @@ -95,7 +100,6 @@ // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var mocks = new MockRepository(); var handler = mocks.Stub>(); mocks.ReplayAll(); @@ -123,7 +127,6 @@ // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var mocks = new MockRepository(); var handler = mocks.Stub>(); mocks.ReplayAll(); @@ -173,7 +176,7 @@ mocks.VerifyAll(); } - + [Test] [SetCulture("nl-NL")] [TestCase(0.0)] @@ -182,7 +185,6 @@ public void N_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double newN) { // Setup - var mocks = new MockRepository(); var observable = mocks.StrictMock(); mocks.ReplayAll(); @@ -206,7 +208,7 @@ const string expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); Assert.IsTrue(changeHandler.Called); - + mocks.VerifyAll(); } @@ -217,7 +219,6 @@ public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN) { // Setup - var mocks = new MockRepository(); var observable = mocks.StrictMock(); observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); @@ -241,9 +242,8 @@ // Assert Assert.AreEqual(newN, failureMechanism.GeneralInput.N); Assert.IsTrue(changeHandler.Called); - + mocks.VerifyAll(); } - } } \ No newline at end of file