Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsCalculationsPropertiesTest.cs =================================================================== diff -u -r8983e38fa9279a0b707ad2652aa0fc0b9d441924 -r9c4b1971a701c1ff62d8615f3868c5f093c97f68 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsCalculationsPropertiesTest.cs (.../GrassCoverErosionOutwardsCalculationsPropertiesTest.cs) (revision 8983e38fa9279a0b707ad2652aa0fc0b9d441924) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsCalculationsPropertiesTest.cs (.../GrassCoverErosionOutwardsCalculationsPropertiesTest.cs) (revision 9c4b1971a701c1ff62d8615f3868c5f093c97f68) @@ -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.PropertyBag; using Core.Gui.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Forms.PropertyClasses; -using Riskeer.Common.Forms.TestUtil; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.Forms.PropertyClasses; @@ -163,72 +158,5 @@ "De modelinstellingen voor het berekenen van golfcondities voor golfklap met invloed van de golfinvalshoek, voor toets op maat.", true); } - - [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 GrassCoverErosionOutwardsFailureMechanism(); - - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionOutwardsCalculationsProperties( - 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.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 GrassCoverErosionOutwardsFailureMechanism(); - - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionOutwardsCalculationsProperties( - failureMechanism, - changeHandler); - - // Call - properties.N = (RoundedDouble) newN; - - // Assert - Assert.AreEqual(newN, failureMechanism.GeneralInput.N); - Assert.IsTrue(changeHandler.Called); - } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r0e67ee742040823db603b9cbb1ac6cb9d8d0f23c -r9c4b1971a701c1ff62d8615f3868c5f093c97f68 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 0e67ee742040823db603b9cbb1ac6cb9d8d0f23c) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 9c4b1971a701c1ff62d8615f3868c5f093c97f68) @@ -199,7 +199,7 @@ mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( + var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( failureMechanism, newN, new[] @@ -209,15 +209,15 @@ var properties = new GrassCoverErosionOutwardsFailureMechanismProperties( failureMechanism, - new GrassCoverErosionOutwardsFailureMechanismProperties.ConstructionProperties(), changeHandler); + new GrassCoverErosionOutwardsFailureMechanismProperties.ConstructionProperties(), 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(changeHandler.Called); + Assert.IsTrue(handler.Called); mocks.VerifyAll(); } @@ -234,7 +234,7 @@ mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( + var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( failureMechanism, newN, new[] @@ -244,14 +244,14 @@ var properties = new GrassCoverErosionOutwardsFailureMechanismProperties( failureMechanism, - new GrassCoverErosionOutwardsFailureMechanismProperties.ConstructionProperties(), changeHandler); + new GrassCoverErosionOutwardsFailureMechanismProperties.ConstructionProperties(), handler); // Call properties.N = (RoundedDouble) newN; // Assert Assert.AreEqual(newN, failureMechanism.GeneralInput.N); - Assert.IsTrue(changeHandler.Called); + Assert.IsTrue(handler.Called); mocks.VerifyAll(); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailurePathPropertiesTest.cs =================================================================== diff -u -r8983e38fa9279a0b707ad2652aa0fc0b9d441924 -r9c4b1971a701c1ff62d8615f3868c5f093c97f68 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailurePathPropertiesTest.cs (.../GrassCoverErosionOutwardsFailurePathPropertiesTest.cs) (revision 8983e38fa9279a0b707ad2652aa0fc0b9d441924) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailurePathPropertiesTest.cs (.../GrassCoverErosionOutwardsFailurePathPropertiesTest.cs) (revision 9c4b1971a701c1ff62d8615f3868c5f093c97f68) @@ -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.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.Forms.PropertyClasses; @@ -89,7 +84,7 @@ // Setup var handler = mocks.Stub>(); mocks.ReplayAll(); - + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); // 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 GrassCoverErosionOutwardsFailureMechanism(); - var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionOutwardsFailurePathProperties(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 GrassCoverErosionOutwardsFailureMechanism(); - var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( - failureMechanism, - (RoundedDouble) newN, - new[] - { - observable - }); - - var properties = new GrassCoverErosionOutwardsFailurePathProperties(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