Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailureMechanismInAssemblyTreeNodeInfoTestFixtureBase.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -re97e92608b8fafa07e637a888e8ab04687e3d380 --- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailureMechanismInAssemblyTreeNodeInfoTestFixtureBase.cs (.../FailureMechanismInAssemblyTreeNodeInfoTestFixtureBase.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailureMechanismInAssemblyTreeNodeInfoTestFixtureBase.cs (.../FailureMechanismInAssemblyTreeNodeInfoTestFixtureBase.cs) (revision e97e92608b8fafa07e637a888e8ab04687e3d380) @@ -28,8 +28,8 @@ using Core.Gui.Forms.ViewHost; using Core.Gui.Plugin; using Core.Gui.TestUtil.ContextMenu; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.PresentationObjects; @@ -56,25 +56,18 @@ public void ContextMenuStrip_FailureMechanismInAssemblyTrueAndClickOnInAssemblyItem_MakeFailureMechanismInAssemblyFalseAndRemovesAllViewsForItem() { // Setup - var mocks = new MockRepository(); - var failureMechanism = new TFailureMechanism(); - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection); - var viewCommands = mocks.StrictMock(); + var viewCommands = Substitute.For(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - viewCommands.Expect(vs => vs.RemoveAllViewsForItem(context)); - using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); - gui.Stub(g => g.ViewCommands).Return(viewCommands); - gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - gui.Stub(g => g.ViewHost).Return(mocks.Stub()); - mocks.ReplayAll(); + var gui = Substitute.For(); + gui.ViewCommands.Returns(viewCommands); + gui.Get(context, treeViewControl).Returns(menuBuilder); + gui.ViewHost.Returns(Substitute.For()); using (var plugin = new TPlugin { @@ -89,39 +82,32 @@ // Assert Assert.IsFalse(failureMechanism.InAssembly); + viewCommands.Received(1).RemoveAllViewsForItem(context); } } } - - mocks.VerifyAll(); } [Test] public void ContextMenuStrip_FailureMechanismInAssemblyFalseAndClickOnInAssemblyItem_MakeFailureMechanismInAssemblyTrueAndRemovesAllViewsForItem() { // Setup - var mocks = new MockRepository(); var failureMechanism = new TFailureMechanism { InAssembly = false }; - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection); - var viewCommands = mocks.StrictMock(); + var viewCommands = Substitute.For(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - viewCommands.Expect(vs => vs.RemoveAllViewsForItem(context)); - using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); - gui.Stub(g => g.ViewCommands).Return(viewCommands); - gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - gui.Stub(g => g.ViewHost).Return(mocks.Stub()); - mocks.ReplayAll(); + var gui = Substitute.For(); + gui.ViewCommands.Returns(viewCommands); + gui.Get(context, treeViewControl).Returns(menuBuilder); + gui.ViewHost.Returns(Substitute.For()); using (var plugin = new TPlugin { @@ -136,31 +122,26 @@ // Assert Assert.IsTrue(failureMechanism.InAssembly); + viewCommands.Received(1).RemoveAllViewsForItem(context); } } } - - mocks.VerifyAll(); } [Test] public void ContextMenuStrip_FailureMechanismInAssemblyTrue_AddCustomItems() { // Setup - var mocks = new MockRepository(); using (var treeView = new TreeViewControl()) { - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); var failureMechanism = new TFailureMechanism(); TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var gui = mocks.Stub(); - gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - gui.Stub(g => g.ViewHost).Return(mocks.Stub()); - mocks.ReplayAll(); + var gui = Substitute.For(); + gui.Get(context, treeView).Returns(menuBuilder); + gui.ViewHost.Returns(Substitute.For()); using (var plugin = new TPlugin { @@ -180,18 +161,15 @@ } } } - - mocks.VerifyAll(); } [Test] public void ContextMenuStrip_FailureMechanismInAssemblyFalse_AddCustomItems() { // Setup - var mocks = new MockRepository(); using (var treeView = new TreeViewControl()) { - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); var failureMechanism = new TFailureMechanism { InAssembly = false @@ -200,12 +178,9 @@ TContext context = CreateFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var gui = mocks.Stub(); - gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - gui.Stub(g => g.ViewHost).Return(mocks.Stub()); - mocks.ReplayAll(); + var gui = Substitute.For(); + gui.Get(context, treeView).Returns(menuBuilder); + gui.ViewHost.Returns(Substitute.For()); using (var plugin = new TPlugin { @@ -225,8 +200,6 @@ } } } - - mocks.VerifyAll(); } /// Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -re97e92608b8fafa07e637a888e8ab04687e3d380 --- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs (.../ShouldCloseViewWithCalculationDataTester.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs (.../ShouldCloseViewWithCalculationDataTester.cs) (revision e97e92608b8fafa07e637a888e8ab04687e3d380) @@ -23,8 +23,8 @@ using System.Threading; using Core.Common.Base; using Core.Common.Controls.Views; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; @@ -138,17 +138,14 @@ public void ShouldCloseMethod_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); ICalculatableFailureMechanism failureMechanism = GetFailureMechanismWithCalculation(); - assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] + assessmentSection.GetFailureMechanisms().Returns(new[] { failureMechanism }); - mocks.ReplayAll(); - using (IView view = GetView(failureMechanism.Calculations.First())) { // Call @@ -158,24 +155,20 @@ Assert.IsTrue(closeForData); } - mocks.VerifyAll(); } [Test] public void ShouldCloseMethod_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); ICalculatableFailureMechanism failureMechanism = GetFailureMechanismWithCalculation(); - assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] + assessmentSection.GetFailureMechanisms().Returns(new[] { failureMechanism }); - mocks.ReplayAll(); - using (IView view = GetView(GetCalculation())) { // Call @@ -185,7 +178,6 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } /// Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -re97e92608b8fafa07e637a888e8ab04687e3d380 --- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs (.../ShouldCloseViewWithFailureMechanismTester.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailureMechanismTester.cs (.../ShouldCloseViewWithFailureMechanismTester.cs) (revision e97e92608b8fafa07e637a888e8ab04687e3d380) @@ -22,8 +22,8 @@ using System.Linq; using Core.Common.Base; using Core.Common.Controls.Views; +using NSubstitute; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.PresentationObjects; @@ -40,11 +40,9 @@ public void ShouldCloseMethod_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Enumerable.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailureMechanisms).Return(new ObservableList()); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); + assessmentSection.GetFailureMechanisms().Returns(Enumerable.Empty()); + assessmentSection.SpecificFailureMechanisms.Returns(new ObservableList()); IFailureMechanism failureMechanism = GetFailureMechanism(); using (IView view = GetView(failureMechanism)) @@ -56,7 +54,6 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] @@ -65,10 +62,8 @@ // Setup IFailureMechanism failureMechanism = GetFailureMechanism(); - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); + var assessmentSection = Substitute.For(); ConfigureAssessmentSection(assessmentSection, failureMechanism); - mocks.ReplayAll(); using (IView view = GetView(failureMechanism)) { @@ -79,7 +74,6 @@ Assert.IsTrue(closeForData); } - mocks.VerifyAll(); } [Test] @@ -88,15 +82,13 @@ // Setup IFailureMechanism otherFailureMechanism = GetFailureMechanism(); - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[] + var failureMechanism = Substitute.For(); + var assessmentSection = Substitute.For(); + assessmentSection.GetFailureMechanisms().Returns(new[] { failureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailureMechanisms).Return(new ObservableList()); - mocks.ReplayAll(); + assessmentSection.SpecificFailureMechanisms.Returns(new ObservableList()); using (IView view = GetView(otherFailureMechanism)) { @@ -107,7 +99,6 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] @@ -132,9 +123,7 @@ // Setup IFailureMechanism otherFailureMechanism = GetFailureMechanism(); - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); + var failureMechanism = Substitute.For(); using (IView view = GetView(otherFailureMechanism)) { @@ -145,17 +134,14 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] public void ShouldCloseMethod_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse() { // Setup - var mocks = new MockRepository(); - var otherFailureMechanism = mocks.Stub(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var otherFailureMechanism = Substitute.For(); + var assessmentSection = Substitute.For(); IFailureMechanism failureMechanism = GetFailureMechanism(); var failureMechanismContext = new TestFailureMechanismContext(otherFailureMechanism, assessmentSection); @@ -169,16 +155,13 @@ Assert.IsFalse(closeForData); } - mocks.VerifyAll(); } [Test] public void ShouldCloseMethod_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); + var assessmentSection = Substitute.For(); IFailureMechanism failureMechanism = GetFailureMechanism(); var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSection); @@ -192,7 +175,6 @@ Assert.IsTrue(closeForData); } - mocks.VerifyAll(); } /// @@ -220,19 +202,19 @@ { if (failureMechanism is SpecificFailureMechanism specificFailureMechanism) { - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Enumerable.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailureMechanisms).Return(new ObservableList + assessmentSection.GetFailureMechanisms().Returns(Enumerable.Empty()); + assessmentSection.SpecificFailureMechanisms.Returns(new ObservableList { specificFailureMechanism }); } else { - assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[] + assessmentSection.GetFailureMechanisms().Returns(new[] { failureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailureMechanisms).Return(new ObservableList()); + assessmentSection.SpecificFailureMechanisms.Returns(new ObservableList()); } }