Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs =================================================================== diff -u -rc651311c5ef3b1c5fe904e3c40e278634fc2b982 -r0c8a4bf7e725ad5c811357e384b95b5f474a2d2e --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision c651311c5ef3b1c5fe904e3c40e278634fc2b982) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision 0c8a4bf7e725ad5c811357e384b95b5f474a2d2e) @@ -42,7 +42,7 @@ /// /// The instance to show the properties of. /// Handler responsible for handling effects of a property change. - /// Thrown when any input parameter is null. + /// Thrown when any parameter is null. public GrassCoverErosionInwardsFailurePathProperties( GrassCoverErosionInwardsFailureMechanism data, IFailureMechanismPropertyChangeHandler handler) : Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs =================================================================== diff -u -r8983e38fa9279a0b707ad2652aa0fc0b9d441924 -r0c8a4bf7e725ad5c811357e384b95b5f474a2d2e --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs (.../GrassCoverErosionInwardsCalculationsPropertiesTest.cs) (revision 8983e38fa9279a0b707ad2652aa0fc0b9d441924) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs (.../GrassCoverErosionInwardsCalculationsPropertiesTest.cs) (revision 0c8a4bf7e725ad5c811357e384b95b5f474a2d2e) @@ -19,17 +19,12 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.ComponentModel; -using Core.Common.Base; -using Core.Common.Base.Data; -using Core.Common.TestUtil; using Core.Gui.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PropertyClasses; -using Riskeer.Common.Forms.TestUtil; using Riskeer.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionInwards.Forms.PropertyClasses; @@ -54,7 +49,7 @@ { mocks = new MockRepository(); } - + [TearDown] public void TearDown() { @@ -187,79 +182,6 @@ "Modelfactor Fondiep [-]", "De parameter 'Fondiep' die gebruikt wordt in de berekening.", true); - - mocks.VerifyAll(); } - - [Test] - [SetCulture("nl-NL")] - [TestCase(0.0)] - [TestCase(-1.0)] - [TestCase(-20.0)] - public void N_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double newN) - { - // Setup - var observable = mocks.StrictMock(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionInwardsCalculationsProperties( - failureMechanism, - changeHandler); - - // Call - void Call() => properties.N = (RoundedDouble) newN; - - // Assert - 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(); - } - - [Test] - [TestCase(1.0)] - [TestCase(10.0)] - [TestCase(20.0)] - public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN) - { - // Setup - var observable = mocks.StrictMock(); - observable.Expect(o => o.NotifyObservers()); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionInwardsCalculationsProperties( - failureMechanism, - changeHandler); - - // Call - properties.N = (RoundedDouble) newN; - - // Assert - Assert.AreEqual(newN, failureMechanism.GeneralInput.N); - Assert.IsTrue(changeHandler.Called); - - mocks.VerifyAll(); - } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs =================================================================== diff -u -r8983e38fa9279a0b707ad2652aa0fc0b9d441924 -r0c8a4bf7e725ad5c811357e384b95b5f474a2d2e --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs (.../GrassCoverErosionInwardsFailurePathPropertiesTest.cs) (revision 8983e38fa9279a0b707ad2652aa0fc0b9d441924) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs (.../GrassCoverErosionInwardsFailurePathPropertiesTest.cs) (revision 0c8a4bf7e725ad5c811357e384b95b5f474a2d2e) @@ -19,17 +19,12 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.ComponentModel; -using Core.Common.Base; -using Core.Common.Base.Data; -using Core.Common.TestUtil; using Core.Gui.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PropertyClasses; -using Riskeer.Common.Forms.TestUtil; using Riskeer.GrassCoverErosionInwards.Data; using Riskeer.GrassCoverErosionInwards.Forms.PropertyClasses; @@ -89,7 +84,7 @@ // Setup var handler = mocks.Stub>(); mocks.ReplayAll(); - + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); // Call @@ -136,66 +131,5 @@ "N [-]", "De parameter 'N' die gebruikt wordt om het lengte-effect mee te nemen in de beoordeling."); } - - [Test] - [SetCulture("nl-NL")] - [TestCase(0.0)] - [TestCase(-1.0)] - [TestCase(-20.0)] - public void N_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double newN) - { - // Setup - var observable = mocks.StrictMock(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionInwardsFailurePathProperties(failureMechanism, handler); - - // Call - void Call() => properties.N = (RoundedDouble) newN; - - // Assert - const string expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - Assert.IsTrue(handler.Called); - } - - [Test] - [TestCase(1.0)] - [TestCase(10.0)] - [TestCase(20.0)] - public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN) - { - // Setup - var observable = mocks.StrictMock(); - observable.Expect(o => o.NotifyObservers()); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionInwardsFailurePathProperties(failureMechanism, handler); - - // Call - properties.N = (RoundedDouble) newN; - - // Assert - Assert.AreEqual(newN, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); - Assert.IsTrue(handler.Called); - } } } \ No newline at end of file