Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionCalculationsPropertiesTest.cs =================================================================== diff -u -recd6b9c740158ab63e5c04861cb506e9c4026b05 -r9c25cf14c75bf4ef9d6fad341bc9a71e04d46036 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionCalculationsPropertiesTest.cs (.../DuneErosionCalculationsPropertiesTest.cs) (revision ecd6b9c740158ab63e5c04861cb506e9c4026b05) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionCalculationsPropertiesTest.cs (.../DuneErosionCalculationsPropertiesTest.cs) (revision 9c25cf14c75bf4ef9d6fad341bc9a71e04d46036) @@ -19,17 +19,11 @@ // 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.DuneErosion.Data; using Riskeer.DuneErosion.Forms.PropertyClasses; @@ -133,66 +127,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 DuneErosionFailureMechanism(); - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new DuneErosionCalculationsProperties(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); - } - - [Test] - [TestCase(1)] - [TestCase(10)] - [TestCase(20)] - public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN) - { - // Setup - var observable = mocks.StrictMock(); - observable.Expect(o => o.NotifyObservers()); - mocks.ReplayAll(); - - var failureMechanism = new DuneErosionFailureMechanism(); - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new DuneErosionCalculationsProperties(failureMechanism, changeHandler); - - // Call - properties.N = (RoundedDouble) newN; - - // Assert - Assert.AreEqual(newN, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); - Assert.IsTrue(changeHandler.Called); - } } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailurePathPropertiesTest.cs =================================================================== diff -u -recd6b9c740158ab63e5c04861cb506e9c4026b05 -r9c25cf14c75bf4ef9d6fad341bc9a71e04d46036 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailurePathPropertiesTest.cs (.../DuneErosionFailurePathPropertiesTest.cs) (revision ecd6b9c740158ab63e5c04861cb506e9c4026b05) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailurePathPropertiesTest.cs (.../DuneErosionFailurePathPropertiesTest.cs) (revision 9c25cf14c75bf4ef9d6fad341bc9a71e04d46036) @@ -19,17 +19,11 @@ // 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.DuneErosion.Data; using Riskeer.DuneErosion.Forms.PropertyClasses; @@ -133,66 +127,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 DuneErosionFailureMechanism(); - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new DuneErosionFailurePathProperties(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); - } - - [Test] - [TestCase(1)] - [TestCase(10)] - [TestCase(20)] - public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN) - { - // Setup - var observable = mocks.StrictMock(); - observable.Expect(o => o.NotifyObservers()); - mocks.ReplayAll(); - - var failureMechanism = new DuneErosionFailureMechanism(); - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new DuneErosionFailurePathProperties(failureMechanism, changeHandler); - - // Call - properties.N = (RoundedDouble) newN; - - // Assert - Assert.AreEqual(newN, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); - Assert.IsTrue(changeHandler.Called); - } } } \ No newline at end of file