Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -22,8 +22,8 @@ using System.Linq; using Core.Gui.Plugin; using Core.Gui.PropertyBag; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects.HydraulicLoadsState; @@ -53,9 +53,7 @@ public void CreateInstance_WithContext_SetsFailureMechanismAsData() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); @@ -72,7 +70,6 @@ Assert.AreSame(failureMechanism, objectProperties.Data); } - mocks.VerifyAll(); } private static PropertyInfo GetInfo(WaveImpactAsphaltCoverPlugin plugin) Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/RegistrationState/WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/RegistrationState/WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/RegistrationState/WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertyInfoTest.cs) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -22,8 +22,8 @@ using System.Linq; using Core.Gui.Plugin; using Core.Gui.PropertyBag; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects.RegistrationState; @@ -53,9 +53,7 @@ public void CreateInstance_WithContext_SetsFailureMechanismAsData() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); @@ -72,7 +70,6 @@ Assert.AreSame(failureMechanism, objectProperties.Data); } - mocks.VerifyAll(); } private static PropertyInfo GetInfo(WaveImpactAsphaltCoverPlugin plugin) Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj =================================================================== diff -u -rd0e327ebc28f8e3ef5ffa3c4da5f299b2f305381 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj (.../Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj) (revision d0e327ebc28f8e3ef5ffa3c4da5f299b2f305381) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj (.../Riskeer.WaveImpactAsphaltCover.Plugin.Test.csproj) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -48,6 +48,12 @@ 3.8.1 + + 4.4.0 + + + 1.0.16 + 3.6.1 Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -21,8 +21,8 @@ using System.Linq; using Core.Gui.Plugin; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.WaveImpactAsphaltCover.Data; @@ -34,14 +34,12 @@ [TestFixture] public class WaveImpactAsphaltCoverFailureMechanismViewInfoTest { - private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private ViewInfo info; [SetUp] public void SetUp() { - mocks = new MockRepository(); plugin = new WaveImpactAsphaltCoverPlugin(); info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaveImpactAsphaltCoverFailureMechanismView)); } @@ -64,8 +62,7 @@ public void GetViewName_WithContext_ReturnsNameOfFailureMechanism() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/RegistrationState/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/RegistrationState/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/RegistrationState/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -21,8 +21,8 @@ using System.Linq; using Core.Gui.Plugin; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.WaveImpactAsphaltCover.Data; @@ -34,14 +34,12 @@ [TestFixture] public class WaveImpactAsphaltCoverFailureMechanismViewInfoTest { - private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private ViewInfo info; [SetUp] public void SetUp() { - mocks = new MockRepository(); plugin = new WaveImpactAsphaltCoverPlugin(); info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaveImpactAsphaltCoverFailureMechanismView)); } @@ -64,8 +62,7 @@ public void GetViewName_WithContext_ReturnsNameOfFailureMechanism() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); @@ -83,8 +80,7 @@ public void AdditionalDataCheck_Always_ReturnTrueOnlyIfFailureMechanismInAssembly(bool inAssembly) { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism { @@ -98,7 +94,6 @@ // Assert Assert.AreEqual(inAssembly, result); - mocks.VerifyAll(); } [Test] @@ -123,8 +118,7 @@ { // Setup var assessmentSection = new AssessmentSectionStub(); - var otherAssessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var otherAssessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -135,8 +129,6 @@ // Assert Assert.IsFalse(closeForData); - - mocks.VerifyAll(); } [Test] @@ -153,8 +145,6 @@ // Assert Assert.IsTrue(closeForData); - - mocks.VerifyAll(); } [Test] Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -24,8 +24,8 @@ using Core.Common.Base; using Core.Common.Controls.Views; using Core.Gui.Plugin; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; @@ -39,14 +39,12 @@ [TestFixture] public class WaveImpactAsphaltCoverFailureMechanismResultViewInfoTest { - private MockRepository mocks; private WaveImpactAsphaltCoverPlugin plugin; private ViewInfo info; [SetUp] public void SetUp() { - mocks = new MockRepository(); plugin = new WaveImpactAsphaltCoverPlugin(); info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(NonAdoptableFailureMechanismResultView)); } @@ -69,8 +67,7 @@ public void GetViewData_WithContext_ReturnsWrappedFailureMechanismResult() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismSectionResultContext( @@ -83,7 +80,6 @@ // Assert Assert.AreSame(failureMechanism.SectionResults, viewData); - mocks.VerifyAll(); } [Test] @@ -100,9 +96,8 @@ public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Array.Empty()); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); + assessmentSection.GetFailureMechanisms().Returns(Array.Empty()); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -117,20 +112,18 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var otherFailureMechanism = mocks.Stub(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[] + var otherFailureMechanism = Substitute.For(); + var assessmentSection = Substitute.For(); + assessmentSection.GetFailureMechanisms().Returns(new[] { otherFailureMechanism }); - mocks.ReplayAll(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableFailureMechanismResultView( @@ -144,20 +137,18 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[] + var assessmentSection = Substitute.For(); + assessmentSection.GetFailureMechanisms().Returns(new IFailureMechanism[] { failureMechanism }); - mocks.ReplayAll(); using (var view = new NonAdoptableFailureMechanismResultView( failureMechanism.SectionResults, failureMechanism, assessmentSection, @@ -170,15 +161,13 @@ Assert.IsTrue(closeForData); } - mocks.VerifyAll(); } [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableFailureMechanismResultView( @@ -192,15 +181,13 @@ Assert.IsTrue(closeForData); } - mocks.VerifyAll(); } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); using (var view = new NonAdoptableFailureMechanismResultView( @@ -214,15 +201,13 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); @@ -238,15 +223,13 @@ Assert.IsTrue(closeForData); } - mocks.VerifyAll(); } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var context = new WaveImpactAsphaltCoverFailureMechanismContext( new WaveImpactAsphaltCoverFailureMechanism(), assessmentSection); @@ -263,15 +246,13 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] public void CreateInstance_WithContext_ReturnsView() { // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverFailureMechanismSectionResultContext( @@ -284,7 +265,6 @@ // Assert Assert.IsInstanceOf>(view); - mocks.VerifyAll(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -rff17ab3ba4ca3b023d39ea040af408a69b4865cb --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision ff17ab3ba4ca3b023d39ea040af408a69b4865cb) @@ -28,8 +28,8 @@ using Core.Gui.Forms.Main; using Core.Gui.Plugin; using Core.Gui.TestUtil; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.Views; @@ -102,10 +102,8 @@ const string symbol = ""; var fontFamily = new FontFamily(); - var mockRepository = new MockRepository(); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ActiveStateInfo).Return(new StateInfo(string.Empty, symbol, fontFamily, p => p)); - mockRepository.ReplayAll(); + var gui = Substitute.For(); + gui.ActiveStateInfo.Returns(new StateInfo(string.Empty, symbol, fontFamily, p => p)); using (var plugin = new WaveImpactAsphaltCoverPlugin { @@ -147,7 +145,6 @@ }); } - mockRepository.VerifyAll(); } [Test] @@ -176,11 +173,9 @@ public void GetExportInfos_ReturnsSupportedExportInfos() { // Setup - var mocks = new MockRepository(); - var mainWindow = mocks.Stub(); - var gui = mocks.Stub(); - gui.Stub(g => g.MainWindow).Return(mainWindow); - mocks.ReplayAll(); + var mainWindow = Substitute.For(); + var gui = Substitute.For(); + gui.MainWindow.Returns(mainWindow); using (var plugin = new WaveImpactAsphaltCoverPlugin { @@ -196,7 +191,6 @@ Assert.AreEqual(2, exportInfos.Count(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext))); } - mocks.VerifyAll(); } [Test]