Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -19,8 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.Data; @@ -35,9 +35,7 @@ public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/RegistrationState/WaveImpactAsphaltCoverFailureMechanismContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/RegistrationState/WaveImpactAsphaltCoverFailureMechanismContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/RegistrationState/WaveImpactAsphaltCoverFailureMechanismContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -19,8 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.Data; @@ -35,9 +35,7 @@ public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationContextTest.cs (.../WaveImpactAsphaltCoverCalculationContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationContextTest.cs (.../WaveImpactAsphaltCoverCalculationContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -22,8 +22,8 @@ using System; using System.Collections.Generic; using Core.Common.TestUtil; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Forms.PresentationObjects; @@ -39,9 +39,7 @@ public void ConstructorWithData_Always_ExpectedPropertiesSet() { // Setup - var mocksRepository = new MockRepository(); - var assessmentSection = mocksRepository.Stub(); - mocksRepository.ReplayAll(); + var assessmentSection = Substitute.For(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -57,16 +55,13 @@ Assert.AreSame(parent, context.Parent); Assert.AreSame(failureMechanism, context.FailureMechanism); Assert.AreSame(assessmentSection, context.AssessmentSection); - mocksRepository.VerifyAll(); } [Test] public void ParameteredConstructor_ParentNull_ThrowsArgumentNullException() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - mockRepository.ReplayAll(); + var assessmentSection = Substitute.For(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -77,33 +72,19 @@ // Assert var exception = Assert.Throws(call); Assert.AreEqual("parent", exception.ParamName); - mockRepository.VerifyAll(); } [TestFixture] private class WaveImpactAsphaltCoverWaveConditionsCalculationContextEqualsTest : EqualsTestFixture { - private static readonly MockRepository mocks = new MockRepository(); - - private static readonly IAssessmentSection assessmentSection = mocks.Stub(); + private static readonly IAssessmentSection assessmentSection = Substitute.For(); private static readonly WaveImpactAsphaltCoverWaveConditionsCalculation calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); private static readonly WaveImpactAsphaltCoverFailureMechanism failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); private static readonly CalculationGroup parent = new CalculationGroup(); - [SetUp] - public void SetUp() - { - mocks.ReplayAll(); - } - [TearDown] - public void TearDown() - { - mocks.VerifyAll(); - } - protected override WaveImpactAsphaltCoverWaveConditionsCalculationContext CreateObject() { return new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation, parent, failureMechanism, assessmentSection); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContextTest.cs (.../WaveImpactAsphaltCoverCalculationGroupContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContextTest.cs (.../WaveImpactAsphaltCoverCalculationGroupContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -21,8 +21,8 @@ using System.Collections.Generic; using Core.Common.TestUtil; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Forms.PresentationObjects; @@ -40,9 +40,7 @@ public void ParameteredConstructor_ExpectedValues(bool hasParent) { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - mockRepository.ReplayAll(); + var assessmentSection = Substitute.For(); var calculationGroup = new CalculationGroup(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -60,7 +58,6 @@ Assert.AreSame(failureMechanism, groupContext.FailureMechanism); Assert.AreSame(assessmentSection, groupContext.AssessmentSection); Assert.AreSame(failureMechanism.ForeshoreProfiles, groupContext.ForeshoreProfiles); - mockRepository.VerifyAll(); } [TestFixture(true)] @@ -69,26 +66,13 @@ : EqualsTestFixture { - private static readonly MockRepository mocks = new MockRepository(); - - private static readonly IAssessmentSection assessmentSection = mocks.Stub(); + private static readonly IAssessmentSection assessmentSection = Substitute.For(); private static readonly WaveImpactAsphaltCoverFailureMechanism failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); private static readonly CalculationGroup calculationGroup = new CalculationGroup(); private static CalculationGroup parent; - [SetUp] - public void SetUp() - { - mocks.ReplayAll(); - } - [TearDown] - public void TearDown() - { - mocks.VerifyAll(); - } - public WaveImpactAsphaltCoverCalculationGroupContextEqualsTest(bool hasParent) { parent = hasParent ? new CalculationGroup() : null; Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs (.../WaveImpactAsphaltCoverContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs (.../WaveImpactAsphaltCoverContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -22,8 +22,8 @@ using System; using Core.Common.Base; using Core.Common.Controls.PresentationObjects; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; @@ -33,21 +33,12 @@ [TestFixture] public class WaveImpactAsphaltCoverContextTest { - private MockRepository mockRepository; - - [SetUp] - public void SetUp() - { - mockRepository = new MockRepository(); - } - [Test] public void ParameteredConstructor_ExpectedValues() { // Setup - var assessmentSection = mockRepository.Stub(); - var target = mockRepository.StrictMock(); - mockRepository.ReplayAll(); + var assessmentSection = Substitute.For(); + var target = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -60,32 +51,28 @@ Assert.AreSame(assessmentSection, context.AssessmentSection); Assert.AreSame(failureMechanism, context.FailureMechanism); Assert.AreSame(failureMechanism.ForeshoreProfiles, context.ForeshoreProfiles); - mockRepository.VerifyAll(); } [Test] public void ParameteredConstructor_FailureMechanismIsNull_ThrowsArgumentNullException() { // Setup - var assessmentSection = mockRepository.Stub(); - var observableObject = mockRepository.StrictMock(); - mockRepository.ReplayAll(); + var assessmentSection = Substitute.For(); + var observableObject = Substitute.For(); // Call TestDelegate call = () => new SimpleWaveImpactAsphaltCoverContext(observableObject, null, assessmentSection); // Assert var exception = Assert.Throws(call); Assert.AreEqual("failureMechanism", exception.ParamName); - mockRepository.VerifyAll(); } [Test] public void ParameteredConstructor_AssessmentSectionIsNull_ThrowsArgumentNullException() { // Setup - var observableObject = mockRepository.StrictMock(); - mockRepository.ReplayAll(); + var observableObject = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); // Call @@ -94,7 +81,6 @@ // Assert var exception = Assert.Throws(call); Assert.AreEqual("assessmentSection", exception.ParamName); - mockRepository.VerifyAll(); } private class SimpleWaveImpactAsphaltCoverContext : WaveImpactAsphaltCoverContext where T : class, IObservable Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -19,8 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.PresentationObjects; @@ -36,9 +36,7 @@ public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -48,7 +46,6 @@ // Assert Assert.IsInstanceOf>(context); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionsContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContextTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionsContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -19,8 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.Data; @@ -35,9 +35,7 @@ public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -48,7 +46,6 @@ Assert.IsInstanceOf(context); Assert.AreSame(failureMechanism, context.WrappedData); Assert.AreSame(assessmentSection, context.AssessmentSection); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -20,8 +20,8 @@ // All rights reserved. using System; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.Revetment.Data; @@ -65,11 +65,8 @@ { // Setup var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); + var assessmentSection = Substitute.For(); - var mocks = new MockRepository(); - var assessmentSection = mocks.StrictMock(); - mocks.ReplayAll(); - // Call TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContext(calculation.InputParameters, calculation, @@ -79,7 +76,6 @@ // Assert var exception = Assert.Throws(test); Assert.AreEqual("foreshoreProfiles", exception.ParamName); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -21,8 +21,8 @@ using System; using System.Linq; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.TestUtil; @@ -42,10 +42,8 @@ public void Constructor_ExpectedValues() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - var handler = mockRepository.Stub(); - mockRepository.ReplayAll(); + var assessmentSection = Substitute.For(); + var handler = Substitute.For(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); var context = new WaveImpactAsphaltCoverWaveConditionsInputContext( @@ -63,17 +61,14 @@ WaveConditionsInput, string>>(properties); Assert.AreSame(context, properties.Data); Assert.AreEqual("Asfalt", properties.RevetmentType); - mockRepository.VerifyAll(); } [Test] public void RevetmentType_SetNewValue_ThrowsInvalidOperationException() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - var handler = mockRepository.Stub(); - mockRepository.ReplayAll(); + var assessmentSection = Substitute.For(); + var handler = Substitute.For(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); var context = new WaveImpactAsphaltCoverWaveConditionsInputContext( @@ -90,7 +85,6 @@ // Assert Assert.Throws(test); - mockRepository.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj =================================================================== diff -u -r230175547114c14da3d5516ace295d9d30cb4b04 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj (.../Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj) (revision 230175547114c14da3d5516ace295d9d30cb4b04) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj (.../Riskeer.WaveImpactAsphaltCover.Forms.Test.csproj) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -37,8 +37,11 @@ 3.8.1 - - 3.6.1 + + 4.4.0 + + 1.0.16 + \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismViewTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -30,8 +30,8 @@ using Core.Components.Gis.Features; using Core.Components.Gis.Forms; using Core.Components.Gis.Geometries; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; @@ -73,17 +73,14 @@ public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); // Call void Call() => new WaveImpactAsphaltCoverFailureMechanismView(null, assessmentSection); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("failureMechanism", exception.ParamName); - mocks.VerifyAll(); } [Test] @@ -248,10 +245,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex); @@ -264,7 +258,9 @@ // Then MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features); - mocks.VerifyAll(); + observers[referenceLineIndex].Received(1).UpdateObserver(); + observers[foreshoreProfileObserverIndex].DidNotReceive().UpdateObserver(); + observers[calculationObserverIndex].DidNotReceive().UpdateObserver(); } [Test] @@ -287,10 +283,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); @@ -307,7 +300,9 @@ // Then MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData); - mocks.VerifyAll(); + observers[referenceLineIndex].Received(1).UpdateObserver(); + observers[foreshoreProfileObserverIndex].DidNotReceive().UpdateObserver(); + observers[calculationObserverIndex].DidNotReceive().UpdateObserver(); } [Test] @@ -331,10 +326,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[foreshoreProfileObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); @@ -352,7 +344,9 @@ // Then MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, foreshoreProfileData); - mocks.VerifyAll(); + observers[referenceLineIndex].DidNotReceive().UpdateObserver(); + observers[foreshoreProfileObserverIndex].Received(1).UpdateObserver(); + observers[calculationObserverIndex].DidNotReceive().UpdateObserver(); } [Test] @@ -374,10 +368,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[foreshoreProfileObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); @@ -397,7 +388,9 @@ // Then MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, foreshoreProfileData); - mocks.VerifyAll(); + observers[referenceLineIndex].DidNotReceive().UpdateObserver(); + observers[foreshoreProfileObserverIndex].Received(1).UpdateObserver(); + observers[calculationObserverIndex].DidNotReceive().UpdateObserver(); } [Test] @@ -420,10 +413,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[calculationObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); @@ -445,7 +435,9 @@ // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast(), calculationMapData); - mocks.VerifyAll(); + observers[referenceLineIndex].DidNotReceive().UpdateObserver(); + observers[foreshoreProfileObserverIndex].DidNotReceive().UpdateObserver(); + observers[calculationObserverIndex].Received(1).UpdateObserver(); } [Test] @@ -468,10 +460,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[calculationObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); @@ -485,7 +474,9 @@ // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast(), calculationMapData); - mocks.VerifyAll(); + observers[referenceLineIndex].DidNotReceive().UpdateObserver(); + observers[foreshoreProfileObserverIndex].DidNotReceive().UpdateObserver(); + observers[calculationObserverIndex].Received(1).UpdateObserver(); } [Test] @@ -508,10 +499,7 @@ IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[calculationObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); @@ -525,7 +513,9 @@ // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast(), calculationMapData); - mocks.VerifyAll(); + observers[referenceLineIndex].DidNotReceive().UpdateObserver(); + observers[foreshoreProfileObserverIndex].DidNotReceive().UpdateObserver(); + observers[calculationObserverIndex].Received(1).UpdateObserver(); } [Test] @@ -651,23 +641,22 @@ } /// - /// Attaches mocked observers to all map data components. + /// Attaches substituted observers to all map data components. /// - /// The . /// The map data collection containing the /// elements. /// An array of mocked observers attached to the data in . - private static IObserver[] AttachMapDataObservers(MockRepository mocks, IEnumerable mapData) + private static IObserver[] AttachMapDataObservers(IEnumerable mapData) { MapData[] mapDataArray = mapData.ToArray(); - var referenceLineMapDataObserver = mocks.StrictMock(); + var referenceLineMapDataObserver = Substitute.For(); mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver); - var foreshoreProfilesMapDataObserver = mocks.StrictMock(); + var foreshoreProfilesMapDataObserver = Substitute.For(); mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver); - var calculationsMapDataObserver = mocks.StrictMock(); + var calculationsMapDataObserver = Substitute.For(); mapDataArray[calculationsIndex].Attach(calculationsMapDataObserver); return new[] Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/RegistrationState/WaveImpactAsphaltCoverFailureMechanismViewTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r24828c2872a58ae3935536447a9d3df84407456e --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/RegistrationState/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/Views/RegistrationState/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 24828c2872a58ae3935536447a9d3df84407456e) @@ -29,8 +29,8 @@ using Core.Components.Gis.Features; using Core.Components.Gis.Forms; using Core.Components.Gis.Geometries; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.AssemblyTool.KernelWrapper.Calculators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; @@ -215,12 +215,7 @@ var sectionStartsMapData = (MapPointData) sectionsCollection.ElementAt(sectionsStartPointIndex); var sectionsEndsMapData = (MapPointData) sectionsCollection.ElementAt(sectionsEndPointIndex); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[sectionsObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsStartPointObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsEndPointObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); + IObserver[] observers = AttachMapDataObservers(map.Data.Collection); // When FailureMechanismTestHelper.SetSections(failureMechanism, new[] @@ -237,7 +232,9 @@ MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, sectionMapData); MapDataTestHelper.AssertFailureMechanismSectionsStartPointMapData(failureMechanism.Sections, sectionStartsMapData); MapDataTestHelper.AssertFailureMechanismSectionsEndPointMapData(failureMechanism.Sections, sectionsEndsMapData); - mocks.VerifyAll(); + observers[sectionsObserverIndex].Received(1).UpdateObserver(); + observers[sectionsStartPointObserverIndex].Received(1).UpdateObserver(); + observers[sectionsEndPointObserverIndex].Received(1).UpdateObserver(); } [Test] @@ -397,24 +394,23 @@ } /// - /// Attaches mocked observers to all map data components. + /// Attaches substituted observers to all map data components. /// - /// The . /// The map data collection containing the /// elements. /// An array of mocked observers attached to the data in . - private static IObserver[] AttachMapDataObservers(MockRepository mocks, IEnumerable mapData) + private static IObserver[] AttachMapDataObservers(IEnumerable mapData) { MapData[] mapDataArray = mapData.ToArray(); MapData[] sectionsCollection = ((MapDataCollection) mapDataArray[sectionsCollectionIndex]).Collection.ToArray(); - var sectionsMapDataObserver = mocks.StrictMock(); + var sectionsMapDataObserver = Substitute.For(); sectionsCollection[sectionsIndex].Attach(sectionsMapDataObserver); - var sectionsStartPointMapDataObserver = mocks.StrictMock(); + var sectionsStartPointMapDataObserver = Substitute.For(); sectionsCollection[sectionsStartPointIndex].Attach(sectionsStartPointMapDataObserver); - var sectionsEndPointMapDataObserver = mocks.StrictMock(); + var sectionsEndPointMapDataObserver = Substitute.For(); sectionsCollection[sectionsEndPointIndex].Attach(sectionsEndPointMapDataObserver); return new[]