Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs =================================================================== diff -u -r04cf5f873b69cb330aeda88b622e286b2aefa852 -r6d76d4ccdc61afb7f55947084929318483a0c110 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs) (revision 04cf5f873b69cb330aeda88b622e286b2aefa852) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs) (revision 6d76d4ccdc61afb7f55947084929318483a0c110) @@ -30,6 +30,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.GuiServices; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; @@ -92,8 +93,8 @@ public void CreateInstance_Always_SetsExpectedProperties() { // Setup + var assessmentSection = new ObservableTestAssessmentSectionStub(); var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); var gui = mockRepository.Stub(); var window = mockRepository.Stub(); gui.Stub(gs => gs.MainWindow).Return(window); @@ -118,6 +119,7 @@ // Assert Assert.AreSame(assessmentSection, view.AssessmentSection); } + mockRepository.VerifyAll(); } @@ -145,7 +147,7 @@ plugin.Gui = gui; plugin.Activate(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection)) + using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(grassCoverErosionOutwardsFailureMechanism, assessmentSection, 0.01)) { // Call info.AfterCreate(view, data); @@ -155,24 +157,27 @@ Assert.IsInstanceOf(view.CalculationGuiService); } } + mockRepository.VerifyAll(); } [Test] public void CloseViewForData_ForMatchingAssessmentSection_ReturnsTrue() { // Setup + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] { - new GrassCoverErosionOutwardsFailureMechanism() + failureMechanism }); assessmentSection.Stub(a => a.Attach(null)).IgnoreArguments(); assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments(); mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection)) + using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(failureMechanism, assessmentSection, 0.01)) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -183,13 +188,16 @@ // Assert Assert.IsTrue(closeForData); } + mocks.VerifyAll(); } [Test] public void CloseViewForData_ForNonMatchingAssessmentSection_ReturnsFalse() { // Setup + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var mocks = new MockRepository(); var assessmentSectionA = mocks.Stub(); var assessmentSectionB = mocks.Stub(); @@ -201,11 +209,11 @@ assessmentSectionA.Stub(a => a.Detach(null)).IgnoreArguments(); assessmentSectionB.Stub(a => a.GetFailureMechanisms()).Return(new[] { - new GrassCoverErosionOutwardsFailureMechanism() + failureMechanism }); mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSectionA)) + using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(failureMechanism, assessmentSectionA, 0.01)) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -216,6 +224,7 @@ // Assert Assert.IsFalse(closeForData); } + mocks.VerifyAll(); } @@ -237,7 +246,9 @@ new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection)) + using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(new GrassCoverErosionOutwardsFailureMechanism(), + assessmentSection, + 0.01)) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -248,6 +259,7 @@ // Assert Assert.IsTrue(closeForData); } + mocks.VerifyAll(); } @@ -274,7 +286,7 @@ new GrassCoverErosionOutwardsFailureMechanism(), assessmentSectionB); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSectionA)) + using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSectionA, 0.01)) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -285,6 +297,7 @@ // Assert Assert.IsFalse(closeForData); } + mocks.VerifyAll(); } @@ -302,7 +315,7 @@ assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments(); mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(assessmentSection)) + using (var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, 0.01)) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -313,6 +326,7 @@ // Assert Assert.IsFalse(closeForData); } + mocks.VerifyAll(); }