Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs
===================================================================
diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs (.../DataCollectionSerializer.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs (.../DataCollectionSerializer.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -88,10 +88,10 @@
streamWriter.Flush();
stream.Seek(0, SeekOrigin.Begin);
- using (var writer = XmlDictionaryReader.CreateTextReader(stream, XmlDictionaryReaderQuotas.Max))
+ using (var reader = XmlDictionaryReader.CreateTextReader(stream, XmlDictionaryReaderQuotas.Max))
{
var serializer = new DataContractSerializer(serializationRootType);
- return FromSerializableData((TSerializedData[]) serializer.ReadObject(writer));
+ return FromSerializableData((TSerializedData[]) serializer.ReadObject(reader));
}
}
}
Index: Application/Ringtoets/test/Application.Ringtoets.Integration.Test/UnusedResourceSearcher/UnusedResourceSearcher.exe
===================================================================
diff -u -rf04fffaf83626ea7f332ca363b83ff3f7f17369f -rf64dceaa32788bad28dcf09f4a1c3150595f1327
Binary files differ
Index: Core/Common/src/Core.Common.Base/Geometry/Math2D.cs
===================================================================
diff -u -re2719484be4a10aecf59be5a999943bb01688ec0 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision e2719484be4a10aecf59be5a999943bb01688ec0)
+++ Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -159,6 +159,8 @@
/// The first point.
/// The second point.
/// True when the points are equal. False otherwise.
+ /// Thrown when or
+ /// is null.
public static bool AreEqualPoints(Point2D point1, Point2D point2)
{
if (point1 == null)
@@ -181,6 +183,7 @@
/// The X-coordinate of the vertical line.
/// A of with all intersection points of the
/// with the vertical line at x=.
+ /// Thrown when is null.
/// Segments which have length=0 or which are vertical, will not return an intersection point.
public static IEnumerable SegmentsIntersectionWithVerticalLine(IEnumerable segments, double verticalLineX)
{
@@ -209,6 +212,7 @@
///
/// The points that make up a 2D line.
/// The sum of the distances between consecutive points.
+ /// Thrown when is null.
public static double Length(IEnumerable points)
{
if (points == null)
@@ -237,6 +241,8 @@
/// The first 2D segment.
/// The second 2D segment.
/// The intersection calculation result.
+ /// Thrown when or
+ /// is null.
/// Implementation from http://geomalgorithms.com/a05-_intersect-1.html
/// based on method intersect2D_2Segments.
public static Segment2DIntersectSegment2DResult GetIntersectionBetweenSegments(Segment2D segment1, Segment2D segment2)
@@ -301,6 +307,7 @@
/// The segment to interpolate over.
/// The fraction of the length of the segment where to obtain a new point.
/// A new at the interpolated point.
+ /// Thrown when is null.
public static Point2D GetInterpolatedPointAtFraction(Segment2D lineSegment, double fraction)
{
if (lineSegment == null)
Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs
===================================================================
diff -u -r99f3b343f5ac4aed453d9f6d291217de76ef5314 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314)
+++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -60,6 +60,7 @@
// Assert
StringAssert.EndsWith("target", message);
+ mocks.VerifyAll();
}
[Test]
@@ -78,6 +79,7 @@
// Assert
StringAssert.EndsWith("filePath", message);
+ mocks.VerifyAll();
}
[Test]
@@ -96,6 +98,7 @@
// Assert
Assert.AreEqual(fileImporter.Name, fileImportActivity.Name);
+ mocks.VerifyAll();
}
[Test]
Index: Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs (.../DialogBaseTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs (.../DialogBaseTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -139,6 +139,8 @@
Assert.IsFalse(dialog.MinimizeBox);
Assert.IsNull(dialog.CancelButton); // Set during load
}
+
+ mocks.VerifyAll();
}
[Test]
@@ -147,13 +149,10 @@
// Setup
var mocks = new MockRepository();
var window = mocks.Stub();
- var icon = mocks.Stub();
-
- icon.Stub(i => i.Handle).Return(new IntPtr());
- icon.Stub(i => i.Size).Return(new Size(16, 16));
-
mocks.ReplayAll();
+ Icon icon = IconStub();
+
DialogBoxHandler = (name, wnd) =>
{
var openedDialog = new FormTester(name);
@@ -170,6 +169,8 @@
Assert.AreEqual(1, dialog.MinimumSize.Width);
Assert.AreEqual(2, dialog.MinimumSize.Height);
}
+
+ mocks.VerifyAll();
}
[Test]
@@ -178,13 +179,10 @@
// Setup
var mocks = new MockRepository();
var window = mocks.Stub();
- var icon = mocks.Stub();
-
- icon.Stub(i => i.Handle).Return(new IntPtr());
- icon.Stub(i => i.Size).Return(new Size(16, 16));
-
mocks.ReplayAll();
+ Icon icon = IconStub();
+
DialogBoxHandler = (name, wnd) =>
{
var openedDialog = new FormTester(name);
@@ -201,8 +199,16 @@
Assert.IsNotNull(dialog.CancelButton);
Assert.AreSame("Test button", ((Button) dialog.CancelButton).Name);
}
+
+ mocks.VerifyAll();
}
+ private static Icon IconStub()
+ {
+ var canvas = new Bitmap(16, 16);
+ return Icon.FromHandle(canvas.GetHicon());
+ }
+
private class TestDialog : DialogBase
{
public TestDialog(IWin32Window dialogParent, Bitmap icon, int minWidth, int minHeight)
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs
===================================================================
diff -u -r151bab16a7ebc1bffc0621ab56c6dc219db1e90f -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision 151bab16a7ebc1bffc0621ab56c6dc219db1e90f)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeInfoTest.cs (.../TreeNodeInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -23,7 +23,6 @@
using System.Drawing;
using System.Windows.Forms;
using NUnit.Framework;
-using Rhino.Mocks;
namespace Core.Common.Controls.TreeView.Test
{
@@ -248,10 +247,6 @@
public void ImplicitOperator_WithAllMethodsSet_InfoFullyConverted()
{
// Setup
- var mocks = new MockRepository();
-
- mocks.ReplayAll();
-
var onDropCounter = 0;
var onNodeRenamedCounter = 0;
var onNodeRemovedCounter = 0;
Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs
===================================================================
diff -u -r2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision 2e73db6bbdd25adf8d0e26a2db9f862e2ed3c191)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -206,7 +206,7 @@
ModalFormHandler = (name, wnd, form) =>
{
var messageBox = new SaveFileDialogTester(wnd);
- messageBox.SaveFile("exportFile.txt");
+ messageBox.SaveFile(Path.GetFullPath("exportFile.txt"));
};
var exportHandler = new GuiExportHandler(mainWindow, new List
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -60,6 +60,8 @@
var message = Assert.Throws(test).Message;
StringAssert.StartsWith(Resources.GuiContextMenuItemFactory_Can_not_create_gui_context_menu_items_without_gui, message);
StringAssert.EndsWith("applicationFeatureCommandHandler", message);
+
+ mocks.VerifyAll();
}
[Test]
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -r151bab16a7ebc1bffc0621ab56c6dc219db1e90f -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs (.../TreeViewContextMenuItemFactoryTest.cs) (revision 151bab16a7ebc1bffc0621ab56c6dc219db1e90f)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs (.../TreeViewContextMenuItemFactoryTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -75,15 +75,13 @@
// Setup
using (var treeViewControl = new TreeViewControl())
{
- mocks.ReplayAll();
// Call
TestDelegate test = () => new TreeViewContextMenuItemFactory(new object(), treeViewControl);
// Assert
Assert.DoesNotThrow(test);
}
- mocks.VerifyAll();
}
[Test]
@@ -210,8 +208,6 @@
Assert.AreEqual(Resources.Expand_all_ToolTip, item.ToolTipText);
TestHelper.AssertImagesAreEqual(Resources.ExpandAllIcon, item.Image);
Assert.AreEqual(hasChildren, item.Enabled);
-
- mocks.VerifyAll();
}
[Test]
@@ -248,8 +244,6 @@
Assert.AreEqual(Resources.Collapse_all_ToolTip, item.ToolTipText);
TestHelper.AssertImagesAreEqual(Resources.CollapseAllIcon, item.Image);
Assert.AreEqual(hasChildren, item.Enabled);
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs
===================================================================
diff -u -r77c945bdf8a9d69da89a86c7b943250e51f0cc39 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs (.../SelectItemDialogTest.cs) (revision 77c945bdf8a9d69da89a86c7b943250e51f0cc39)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs (.../SelectItemDialogTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -57,6 +57,8 @@
Assert.IsNull(dialog.SelectedItemTag);
Assert.IsNull(dialog.SelectedItemTypeName);
}
+
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/SelectViewDialogTest.cs
===================================================================
diff -u -r8c97c3995795d80d531bf9415291d9734f6de054 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/Forms/SelectViewDialogTest.cs (.../SelectViewDialogTest.cs) (revision 8c97c3995795d80d531bf9415291d9734f6de054)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/SelectViewDialogTest.cs (.../SelectViewDialogTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -57,6 +57,8 @@
Assert.IsNull(dialog.SelectedItem);
Assert.IsNull(dialog.Items);
}
+
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs
===================================================================
diff -u -r46f5fa30ac0467eb02a8dd37eae190a6d778b472 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 46f5fa30ac0467eb02a8dd37eae190a6d778b472)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -76,6 +76,7 @@
// Assert
Assert.IsFalse(result);
+ mocks.VerifyAll();
}
[Test]
@@ -137,6 +138,7 @@
Assert.AreEqual(viewData, view.Data);
Assert.AreEqual(viewName, view.Text);
Assert.IsTrue(afterCreateCalled);
+ mocks.VerifyAll();
}
[Test]
@@ -159,6 +161,7 @@
// Assert
Assert.IsFalse(result);
+ mocks.VerifyAll();
}
[Test]
@@ -214,6 +217,7 @@
Assert.AreEqual(data, view.Data);
Assert.AreEqual(viewName, view.Text);
Assert.IsTrue(afterCreateCalled);
+ mocks.VerifyAll();
}
[Test]
@@ -251,6 +255,7 @@
Assert.IsTrue(result);
Assert.AreEqual(data, view.Data);
Assert.AreEqual(string.Empty, view.Text);
+ mocks.VerifyAll();
}
[Test]
@@ -287,6 +292,7 @@
Assert.IsTrue(result);
Assert.AreEqual(data, view.Data);
Assert.AreEqual(string.Empty, view.Text);
+ mocks.VerifyAll();
}
[Test]
@@ -330,6 +336,7 @@
Assert.IsTrue(result);
Assert.AreEqual(data, view.Data);
Assert.AreEqual(string.Empty, view.Text);
+ mocks.VerifyAll();
}
[Test]
@@ -553,6 +560,7 @@
Assert.IsTrue(result);
Assert.AreEqual(data, view.Data);
Assert.AreEqual(string.Empty, view.Text);
+ mocks.VerifyAll();
}
[Test]
Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -871,6 +871,8 @@
// Assert
CollectionAssert.IsEmpty(result);
}
+
+ mocks.VerifyAll();
}
[Test]
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerViewController.cs
===================================================================
diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerViewController.cs (.../ProjectExplorerViewController.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerViewController.cs (.../ProjectExplorerViewController.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -132,6 +132,10 @@
{
if (projectExplorer != null)
{
+ if (IsProjectExplorerOpen)
+ {
+ CloseProjectExplorer();
+ }
projectExplorer.Dispose();
}
}
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs
===================================================================
diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs (.../ToggleProjectExplorerCommandTest.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs (.../ToggleProjectExplorerCommandTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -98,6 +98,7 @@
Arg.Matches(vl => vl == ToolViewLocation.Left)))
.WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
viewHost.Expect(tvc => tvc.SetImage(null, null)).IgnoreArguments();
+ viewHost.Expect(vm => vm.Remove(Arg.Is.TypeOf));
}
var viewController = mocks.StrictMock();
@@ -142,11 +143,9 @@
Arg.Matches(vl => vl == ToolViewLocation.Left)))
.WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
viewHost.Stub(vm => vm.SetImage(null, null)).IgnoreArguments();
- if (isViewOpen)
- {
- viewHost.Expect(tvc => tvc.Remove(Arg.Is.TypeOf));
- }
+ viewHost.Expect(tvc => tvc.Remove(Arg.Is.TypeOf));
+
var viewController = mocks.StrictMock();
viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs
===================================================================
diff -u -ra32bbe3919b6babd74ae4867e8337662aed0dad2 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs (.../ProjectExplorerPluginTest.cs) (revision a32bbe3919b6babd74ae4867e8337662aed0dad2)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs (.../ProjectExplorerPluginTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -274,6 +274,7 @@
// Assert
Assert.AreSame(newProjectMock, toolViews[0].Data);
}
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs
===================================================================
diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs (.../ProjectExplorerViewControllerTest.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs (.../ProjectExplorerViewControllerTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -147,6 +147,7 @@
Arg.Matches(vl => vl == ToolViewLocation.Left)))
.WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
+ viewHost.Expect(vm => vm.Remove(Arg.Is.TypeOf));
}
mocks.ReplayAll();
@@ -184,6 +185,7 @@
Arg.Matches(vl => vl == ToolViewLocation.Left)))
.WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); });
viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments();
+ viewHost.Expect(vm => vm.Remove(Arg.Is.TypeOf));
IViewController viewController = mocks.Stub();
viewController.Stub(tvc => tvc.ViewHost).Return(viewHost);
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx
===================================================================
diff -u -r6427aea965f542a803081d1152bfd6c4dd88060d -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision 6427aea965f542a803081d1152bfd6c4dd88060d)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -129,7 +129,6 @@
Kaart
-
..\Resources\map.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs
===================================================================
diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -34,7 +34,7 @@
public interface IAssessmentSection : ICommentable, IObservable, IStorable
{
///
- /// Gets or sets the identifier of the assessment section.
+ /// Gets the identifier of the assessment section.
///
string Id { get; }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupExtensionsTest.cs
===================================================================
diff -u -rde6ffafc792b3f154436127cca3ccd922776df09 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupExtensionsTest.cs (.../CalculationGroupExtensionsTest.cs) (revision de6ffafc792b3f154436127cca3ccd922776df09)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupExtensionsTest.cs (.../CalculationGroupExtensionsTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -96,6 +96,7 @@
calculation4
};
CollectionAssert.AreEquivalent(itemsThatShouldBeFound, result);
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionItemTest.cs
===================================================================
diff -u -r14de3deecd2cff7f6abe41ed6dc5dc016c4c81e0 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionItemTest.cs (.../FailureMechanismContributionItemTest.cs) (revision 14de3deecd2cff7f6abe41ed6dc5dc016c4c81e0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionItemTest.cs (.../FailureMechanismContributionItemTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -179,6 +179,7 @@
// Assert
Assert.IsTrue(contributionItem.IsRelevant);
+ mockRepository.VerifyAll();
}
[Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -319,6 +319,7 @@
// Assert
Assert.AreEqual(Enumerable.Repeat(newNorm, 2), failureMechanismContribution.Distribution.Select(d => d.Norm));
+ mockRepository.VerifyAll();
}
private void AssertFailureProbabilitySpace(double newOtherContribution, int norm, double probabilitySpace)
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs
===================================================================
diff -u -r14de3deecd2cff7f6abe41ed6dc5dc016c4c81e0 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs (.../DesignVariableTest.cs) (revision 14de3deecd2cff7f6abe41ed6dc5dc016c4c81e0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs (.../DesignVariableTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -130,6 +130,7 @@
Environment.NewLine
}, StringSplitOptions.None)[0];
Assert.AreEqual("Een kansverdeling moet opgegeven zijn om op basis van die data een rekenwaarde te bepalen.", customMessagePart);
+ mocks.VerifyAll(); // Expect no calls on mocks
}
private class SimpleDesignVariable : DesignVariable
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs
===================================================================
diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs (.../RingtoetsContextMenuItemFactoryTest.cs) (revision 2857b234df4622cdaf80bbc75abc58af36667347)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs (.../RingtoetsContextMenuItemFactoryTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -1194,6 +1194,7 @@
Assert.AreEqual(RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip, toolStripItem.ToolTipText);
TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, toolStripItem.Image);
Assert.IsTrue(toolStripItem.Enabled);
+ mocks.VerifyAll();
}
[Test]
@@ -1215,6 +1216,7 @@
Assert.AreEqual(RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, toolStripItem.ToolTipText);
TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, toolStripItem.Image);
Assert.IsFalse(toolStripItem.Enabled);
+ mocks.VerifyAll();
}
[Test]
@@ -1246,6 +1248,7 @@
Assert.AreEqual(errorMessage, toolStripItem.ToolTipText);
TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, toolStripItem.Image);
Assert.IsFalse(toolStripItem.Enabled);
+ mocks.VerifyAll();
}
[Test]
@@ -1272,6 +1275,7 @@
Assert.AreEqual(RingtoetsFormsResources.ValidateAll_No_calculations_to_validate, toolStripItem.ToolTipText);
TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, toolStripItem.Image);
Assert.IsFalse(toolStripItem.Enabled);
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision 2857b234df4622cdaf80bbc75abc58af36667347)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -769,11 +769,11 @@
var failureMechanismMock = mocks.StrictMock();
mocks.ReplayAll();
- var nodeMock = new TestCalculationContext(new TestCalculation(), failureMechanismMock);
+ var calculationContext = new TestCalculationContext(new TestCalculation(), failureMechanismMock);
var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null, null);
// Call
- bool removalAllowed = treeNodeInfo.CanRemove(nodeMock, dataMock);
+ bool removalAllowed = treeNodeInfo.CanRemove(calculationContext, dataMock);
// Assert
Assert.IsFalse(removalAllowed);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r780026d643daa908175ea55cf553a33ae1d8f634 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision 780026d643daa908175ea55cf553a33ae1d8f634)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -185,6 +185,8 @@
Assert.AreEqual("Modelfactoren", fshallowProperty.Category);
Assert.AreEqual("Modelfactor Fondiep [-]", fshallowProperty.DisplayName);
Assert.AreEqual("De parameter 'Fondiep' die gebruikt wordt in de berekening.", fshallowProperty.Description);
+
+ mockRepository.VerifyAll();
}
private const int namePropertyIndex = 0;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -35,14 +35,6 @@
[TestFixture]
public class GrassCoverErosionInwardsOutputPropertiesTest
{
- private MockRepository mockRepository;
-
- [SetUp]
- public void SetUp()
- {
- mockRepository = new MockRepository();
- }
-
[Test]
public void Constructor_ExpectedValues()
{
@@ -94,8 +86,6 @@
Assert.AreEqual(2, properties.DikeHeight.NumberOfDecimalPlaces);
Assert.AreEqual(dikeHeight, properties.DikeHeight, properties.DikeHeight.GetAccuracy());
-
- mockRepository.VerifyAll();
}
[Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs (.../DikeProfilesContextTreeNodeInfoTest.cs) (revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/DikeProfilesContextTreeNodeInfoTest.cs (.../DikeProfilesContextTreeNodeInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -98,7 +98,7 @@
// Assert
const string expectedText = "Dijkprofielen";
Assert.AreEqual(expectedText, text);
- mocks.ReplayAll();
+ mocks.VerifyAll();
}
[Test]
@@ -118,7 +118,7 @@
// Assert
TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, image);
- mocks.ReplayAll();
+ mocks.VerifyAll();
}
[Test]
@@ -195,7 +195,7 @@
Assert.AreEqual(2, children.Length);
Assert.AreSame(dikeProfile1, children.ElementAt(0));
Assert.AreSame(dikeProfile2, children.ElementAt(1));
- mocks.ReplayAll();
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs
===================================================================
diff -u -r1e83b807b29726b374bf006d0a664827a6572a99 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision 1e83b807b29726b374bf006d0a664827a6572a99)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -36,13 +36,11 @@
public class GrassCoverErosionInwardsScenariosViewTest
{
private Form testForm;
- private MockRepository mocks;
[SetUp]
public void Setup()
{
testForm = new Form();
- mocks = new MockRepository();
}
[TearDown]
@@ -95,15 +93,13 @@
// Setup
using (var view = ShowScenariosView())
{
- var calculationsGroupMock = new CalculationGroup();
+ var calculationGroup = new CalculationGroup();
// Call
- view.Data = calculationsGroupMock;
+ view.Data = calculationGroup;
- mocks.ReplayAll();
-
// Assert
- Assert.AreSame(calculationsGroupMock, view.Data);
+ Assert.AreSame(calculationGroup, view.Data);
}
}
@@ -113,15 +109,13 @@
// Setup
using (var view = ShowScenariosView())
{
- var calculationsGroupMock = mocks.StrictMock();
+ var calculationGroup = new CalculationGroup();
// Call
- view.Data = calculationsGroupMock;
+ view.Data = calculationGroup;
- mocks.ReplayAll();
-
// Assert
- Assert.AreSame(calculationsGroupMock, view.Data);
+ Assert.AreSame(calculationGroup, view.Data);
}
}
@@ -131,15 +125,13 @@
// Setup
using (var view = ShowScenariosView())
{
- var failureMechanismMock = mocks.StrictMock();
+ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
// Call
- view.FailureMechanism = failureMechanismMock;
+ view.FailureMechanism = failureMechanism;
- mocks.ReplayAll();
-
// Assert
- Assert.AreSame(failureMechanismMock, view.FailureMechanism);
+ Assert.AreSame(failureMechanism, view.FailureMechanism);
}
}
@@ -149,15 +141,13 @@
// Setup
using (var view = ShowScenariosView())
{
- var failureMechanismMock = mocks.StrictMock();
+ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
// Call
- view.FailureMechanism = failureMechanismMock;
+ view.FailureMechanism = failureMechanism;
- mocks.ReplayAll();
-
// Assert
- Assert.AreSame(failureMechanismMock, view.FailureMechanism);
+ Assert.AreSame(failureMechanism, view.FailureMechanism);
}
}
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -57,9 +57,6 @@
using (var plugin = new GrassCoverErosionInwardsPlugin())
{
// call
- var mocks = new MockRepository();
- mocks.ReplayAll();
-
PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
// assert
@@ -88,8 +85,6 @@
Assert.IsNull(outputProperties.AdditionalDataCheck);
Assert.IsNull(outputProperties.GetObjectPropertiesData);
Assert.IsNull(outputProperties.AfterCreate);
-
- mocks.VerifyAll();
}
}
@@ -152,6 +147,7 @@
Assert.IsTrue(viewInfos.Any(vi => vi.ViewType == typeof(GrassCoverErosionInwardsInputView)));
Assert.IsTrue(viewInfos.Any(vi => vi.ViewType == typeof(GrassCoverErosionInwardsScenariosView)));
}
+ mocks.VerifyAll();
}
[Test]
@@ -175,6 +171,7 @@
Assert.AreEqual(1, importers.Length);
Assert.IsInstanceOf(importers[0]);
}
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs (.../GrassCoverErosionInwardsScenariosViewInfoTest.cs) (revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs (.../GrassCoverErosionInwardsScenariosViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -226,58 +226,63 @@
public void CloseForData_AssessmentSectionRemovedWithoutGrassCoverErosionInwardsFailureMechanism_ReturnsFalse()
{
// Setup
- var viewMock = mocks.StrictMock();
var assessmentSectionMock = mocks.StrictMock();
- var calculationsGroupMock = mocks.StrictMock();
-
- viewMock.Expect(vm => vm.Data).Return(calculationsGroupMock);
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
-
mocks.ReplayAll();
+ var view = new GrassCoverErosionInwardsScenariosView
+ {
+ Data = new CalculationGroup()
+ };
+
// Call & Assert
- Assert.IsFalse(info.CloseForData(viewMock, assessmentSectionMock));
+ Assert.IsFalse(info.CloseForData(view, assessmentSectionMock));
+ mocks.VerifyAll();
}
[Test]
public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse()
{
// Setup
- var viewMock = mocks.StrictMock();
var assessmentSectionMock = mocks.StrictMock();
- var failureMechanismMock = mocks.Stub();
- var calculationsGroupMock = mocks.StrictMock();
-
- viewMock.Expect(vm => vm.Data).Return(calculationsGroupMock);
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[]
{
- failureMechanismMock
+ new GrassCoverErosionInwardsFailureMechanism()
});
mocks.ReplayAll();
+ var view = new GrassCoverErosionInwardsScenariosView
+ {
+ Data = new CalculationGroup()
+ };
+
// Call & Assert
- Assert.IsFalse(info.CloseForData(viewMock, assessmentSectionMock));
+ Assert.IsFalse(info.CloseForData(view, assessmentSectionMock));
+ mocks.VerifyAll();
}
[Test]
public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue()
{
// Setup
- var viewMock = mocks.StrictMock();
var assessmentSectionMock = mocks.StrictMock();
- var failureMechanismMock = mocks.Stub();
-
- viewMock.Expect(vm => vm.Data).Return(failureMechanismMock.CalculationsGroup);
+ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[]
{
- failureMechanismMock
+ failureMechanism
});
mocks.ReplayAll();
+ var view = new GrassCoverErosionInwardsScenariosView
+ {
+ Data = failureMechanism.CalculationsGroup
+ };
+
// Call & Assert
- Assert.IsTrue(info.CloseForData(viewMock, assessmentSectionMock));
+ Assert.IsTrue(info.CloseForData(view, assessmentSectionMock));
+ mocks.VerifyAll();
}
[Test]
@@ -289,8 +294,6 @@
view.Data = new CalculationGroup();
- mocks.ReplayAll();
-
// Call & Assert
Assert.IsFalse(info.CloseForData(view, failureMechanism));
}
@@ -304,8 +307,6 @@
view.Data = failureMechanism.CalculationsGroup;
- mocks.ReplayAll();
-
// Call & Assert
Assert.IsTrue(info.CloseForData(view, failureMechanism));
}
@@ -316,16 +317,17 @@
// Setup
var assessmentSectionMock = mocks.StrictMock();
+ mocks.ReplayAll();
+
var view = new GrassCoverErosionInwardsScenariosView();
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSectionMock);
view.Data = failureMechanism.CalculationsGroup;
- mocks.ReplayAll();
-
// Call & Assert
Assert.IsFalse(info.CloseForData(view, failureMechanismContext));
+ mocks.VerifyAll();
}
[Test]
@@ -334,16 +336,17 @@
// Setup
var assessmentSectionMock = mocks.StrictMock();
+ mocks.ReplayAll();
+
var view = new GrassCoverErosionInwardsScenariosView();
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock);
view.Data = failureMechanism.CalculationsGroup;
- mocks.ReplayAll();
-
// Call & Assert
Assert.IsTrue(info.CloseForData(view, failureMechanismContext));
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r780026d643daa908175ea55cf553a33ae1d8f634 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs (.../HeightStructuresFailureMechanismContextPropertiesTest.cs) (revision 780026d643daa908175ea55cf553a33ae1d8f634)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs (.../HeightStructuresFailureMechanismContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -172,6 +172,8 @@
Assert.AreEqual("Modelfactoren", modelFactorForStorageVolumeProperty.Category);
Assert.AreEqual("Modelfactor kombergingsvolume [-]", modelFactorForStorageVolumeProperty.DisplayName);
Assert.AreEqual("Het modelfactor kombergingsvolume.", modelFactorForStorageVolumeProperty.Description);
+
+ mockRepository.VerifyAll();
}
private const int namePropertyIndex = 0;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -200,6 +200,8 @@
// Assert
var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Value_too_large;
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
+
+ mockRepository.VerifyAll();
}
[Test]
@@ -227,6 +229,8 @@
// Assert
var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Could_not_parse_string_to_double_value;
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
+
+ mockRepository.VerifyAll();
}
[Test]
@@ -252,6 +256,8 @@
// Assert
var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Value_cannot_be_null;
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
+
+ mockRepository.VerifyAll();
}
[Test]
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -56,9 +56,6 @@
using (var plugin = new HeightStructuresPlugin())
{
// call
- var mocks = new MockRepository();
- mocks.ReplayAll();
-
PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
// assert
@@ -74,8 +71,6 @@
Assert.IsNull(heightStructuresInputContextProperties.AdditionalDataCheck);
Assert.IsNull(heightStructuresInputContextProperties.GetObjectPropertiesData);
Assert.IsNull(heightStructuresInputContextProperties.AfterCreate);
-
- mocks.VerifyAll();
}
}
@@ -132,6 +127,7 @@
Assert.IsTrue(viewInfos.Any(vi => vi.ViewType == typeof(HeightStructuresFailureMechanismResultView)));
}
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs
===================================================================
diff -u -r1051f838aebbd5977351542027ce6330583b0d43 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs (.../CalculationContextPropertiesTest.cs) (revision 1051f838aebbd5977351542027ce6330583b0d43)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs (.../CalculationContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -65,6 +65,7 @@
// Call & Assert
Assert.AreEqual(name, properties.Name);
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs
===================================================================
diff -u -r4a3b8ce5bac7931fefdcb0185f30e65dfb1fd464 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs (.../CalculationGroupContextPropertiesTest.cs) (revision 4a3b8ce5bac7931fefdcb0185f30e65dfb1fd464)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs (.../CalculationGroupContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -65,6 +65,7 @@
// Call & Assert
Assert.AreEqual(calculationGroup.Name, properties.Name);
+ mocks.VerifyAll();
}
[Test]
@@ -120,6 +121,7 @@
// Assert
Assert.AreEqual(1, namePropertyAttributes.OfType().Count());
Assert.AreEqual(!nameIsEditable, DynamicReadOnlyAttribute.IsReadOnly(properties, propertyName));
+ mocks.VerifyAll();
}
private class TestCalculationGroupContext : Observable, ICalculationContext
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -rc703acd9b4aa18825e6938815ba975c34949cc6f -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision c703acd9b4aa18825e6938815ba975c34949cc6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -72,6 +72,7 @@
// Assert
Assert.AreEqual(filePath, properties.FilePath);
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r26bfb24de212c4f4224b773a0cb8fb87a2d7a0f0 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 26bfb24de212c4f4224b773a0cb8fb87a2d7a0f0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -253,11 +253,11 @@
Version = "random"
};
- var assessmentSectionMock = new AssessmentSection(AssessmentSectionComposition.Dike)
+ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
{
HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
};
- var context = new DesignWaterLevelLocationsContext(assessmentSectionMock);
+ var context = new DesignWaterLevelLocationsContext(assessmentSection);
using (var treeViewControl = new TreeViewControl())
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r26bfb24de212c4f4224b773a0cb8fb87a2d7a0f0 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 26bfb24de212c4f4224b773a0cb8fb87a2d7a0f0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -303,11 +303,11 @@
Version = "random"
};
- var assessmentSectionMock = new AssessmentSection(AssessmentSectionComposition.Dike)
+ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
{
HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
};
- var context = new WaveHeightLocationsContext(assessmentSectionMock);
+ var context = new WaveHeightLocationsContext(assessmentSection);
using (var treeViewControl = new TreeViewControl())
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r26bfb24de212c4f4224b773a0cb8fb87a2d7a0f0 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 26bfb24de212c4f4224b773a0cb8fb87a2d7a0f0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -100,6 +100,7 @@
}
}
+ mocks.VerifyAll();
Dispatcher.CurrentDispatcher.InvokeShutdown();
}
@@ -140,6 +141,7 @@
}
}
+ mocks.VerifyAll();
Dispatcher.CurrentDispatcher.InvokeShutdown();
}
@@ -183,6 +185,7 @@
}
}
+ mocks.VerifyAll();
Dispatcher.CurrentDispatcher.InvokeShutdown();
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/AssessmentSectionViewInfoTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/AssessmentSectionViewInfoTest.cs (.../AssessmentSectionViewInfoTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/AssessmentSectionViewInfoTest.cs (.../AssessmentSectionViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -72,6 +72,8 @@
// Assert
Assert.AreEqual("Trajectkaart", viewName);
+
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructureResultViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructureResultViewInfoTest.cs (.../ClosingStructureResultViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructureResultViewInfoTest.cs (.../ClosingStructureResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,7 +71,6 @@
// Setup
var failureMechanism = new ClosingStructureFailureMechanism();
var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
- mocks.ReplayAll();
// Call
var viewData = info.GetViewData(context);
@@ -94,6 +93,7 @@
// Assert
Assert.AreEqual("Resultaat", viewName);
+ mocks.VerifyAll();
}
[Test]
@@ -154,8 +154,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -183,6 +183,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -209,8 +210,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -266,8 +267,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -289,8 +290,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -76,6 +76,7 @@
// Assert
Assert.AreEqual("Opmerkingen", viewName);
+ mocks.VerifyAll();
}
[Test]
@@ -91,6 +92,7 @@
// Assert
Assert.AreSame(commentMock, viewData);
+ mocks.VerifyAll();
}
[Test]
@@ -289,9 +291,8 @@
// Assert
Assert.IsTrue(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -325,9 +326,8 @@
// Assert
Assert.IsFalse(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -356,9 +356,8 @@
// Assert
Assert.IsTrue(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -389,9 +388,8 @@
// Assert
Assert.IsFalse(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -418,9 +416,8 @@
// Assert
Assert.IsTrue(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -449,9 +446,8 @@
// Assert
Assert.IsFalse(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -535,9 +531,8 @@
// Assert
Assert.IsTrue(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -569,9 +564,8 @@
// Assert
Assert.IsFalse(closeForData);
-
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityInwardsResultViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityInwardsResultViewInfoTest.cs (.../MacrostabilityInwardsResultViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityInwardsResultViewInfoTest.cs (.../MacrostabilityInwardsResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,7 +71,6 @@
// Setup
var failureMechanism = new MacrostabilityInwardsFailureMechanism();
var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
- mocks.ReplayAll();
// Call
var viewData = info.GetViewData(context);
@@ -94,6 +93,7 @@
// Assert
Assert.AreEqual("Resultaat", viewName);
+ mocks.VerifyAll();
}
[Test]
@@ -154,8 +154,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -183,6 +183,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -209,8 +210,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -266,8 +267,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -289,8 +290,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityOutwardsResultViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityOutwardsResultViewInfoTest.cs (.../MacrostabilityOutwardsResultViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityOutwardsResultViewInfoTest.cs (.../MacrostabilityOutwardsResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,7 +71,6 @@
// Setup
var failureMechanism = new MacrostabilityOutwardsFailureMechanism();
var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
- mocks.ReplayAll();
// Call
var viewData = info.GetViewData(context);
@@ -94,6 +93,7 @@
// Assert
Assert.AreEqual("Resultaat", viewName);
+ mocks.VerifyAll();
}
[Test]
@@ -154,8 +154,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -183,6 +183,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -209,8 +210,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -266,8 +267,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -289,8 +290,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,7 +71,6 @@
// Setup
var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism();
var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
- mocks.ReplayAll();
// Call
var viewData = info.GetViewData(context);
@@ -155,6 +154,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -181,6 +181,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -207,8 +208,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -264,8 +265,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -287,8 +288,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityPointConstructionResultViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityPointConstructionResultViewInfoTest.cs (.../StrengthStabilityPointConstructionResultViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityPointConstructionResultViewInfoTest.cs (.../StrengthStabilityPointConstructionResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,7 +71,6 @@
// Setup
var failureMechanism = new StrengthStabilityPointConstructionFailureMechanism();
var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
- mocks.ReplayAll();
// Call
var viewData = info.GetViewData(context);
@@ -85,12 +84,10 @@
{
// Setup
var failureMechanism = new StrengthStabilityPointConstructionFailureMechanism();
- var viewMock = mocks.StrictMock();
+ var constructionResultView = new StrengthStabilityPointConstructionResultView();
- mocks.ReplayAll();
-
// Call
- var viewName = info.GetViewName(viewMock, failureMechanism.SectionResults);
+ var viewName = info.GetViewName(constructionResultView, failureMechanism.SectionResults);
// Assert
Assert.AreEqual("Resultaat", viewName);
@@ -154,8 +151,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -183,6 +180,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -209,8 +207,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -266,8 +264,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -289,8 +287,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -299,12 +297,12 @@
// Setup
var failureMechanism = new StrengthStabilityPointConstructionFailureMechanism();
var view = mocks.StrictMock();
- var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
-
view.Expect(v => v.FailureMechanism = failureMechanism);
mocks.ReplayAll();
+ var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
+
// Call
info.AfterCreate(view, context);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,7 +71,6 @@
// Setup
var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism);
- mocks.ReplayAll();
// Call
var viewData = info.GetViewData(context);
@@ -155,6 +154,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -181,6 +181,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -207,8 +208,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -264,8 +265,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -287,8 +288,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs (.../WaveImpactAsphaltCoverResultViewInfoTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs (.../WaveImpactAsphaltCoverResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -78,6 +78,7 @@
// Assert
Assert.AreSame(failureMechanism.SectionResults, viewData);
+ mocks.VerifyAll();
}
[Test]
@@ -155,6 +156,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -181,6 +183,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -207,8 +210,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -264,8 +267,8 @@
// Assert
Assert.IsTrue(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
@@ -287,8 +290,8 @@
// Assert
Assert.IsFalse(closeForData);
- mocks.VerifyAll();
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -86,6 +86,7 @@
// Call & Assert
calculation.NotifyObservers();
+ mockRepository.VerifyAll();
}
[Test]
@@ -103,6 +104,7 @@
// Call & Assert
calculation.NotifyObservers();
+ mockRepository.VerifyAll();
}
[Test]
@@ -124,6 +126,7 @@
// Call & Assert
calculation.NotifyObservers();
+ mockRepository.VerifyAll();
}
[Test]
@@ -146,6 +149,7 @@
// Call & Assert
calculation.NotifyObservers();
+ mockRepository.VerifyAll();
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -r99f3b343f5ac4aed453d9f6d291217de76ef5314 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -210,6 +210,8 @@
Assert.AreEqual(schematizationCategory, saturatedVolumicWeightOfCoverageLayerProperty.Category);
Assert.AreEqual("Verzadigd gewicht deklaag [kN/m³]", saturatedVolumicWeightOfCoverageLayerProperty.DisplayName);
Assert.AreEqual("Verzadigd gewicht deklaag.", saturatedVolumicWeightOfCoverageLayerProperty.Description);
+
+ mocks.VerifyAll();
}
[Test]
@@ -293,7 +295,7 @@
Assert.AreSame(stochasticSoilModel, properties.StochasticSoilModel);
Assert.AreSame(testHydraulicBoundaryLocation, properties.HydraulicBoundaryLocation);
- mocks.ReplayAll();
+ mocks.VerifyAll();
}
[Test]
@@ -788,6 +790,7 @@
// Assert
Assert.IsNull(inputParameters.StochasticSoilModel);
Assert.IsNull(inputParameters.StochasticSoilProfile);
+ mocks.VerifyAll();
}
[Test]
@@ -834,6 +837,7 @@
// Assert
Assert.AreSame(stochasticSoilModel, inputParameters.StochasticSoilModel);
Assert.AreSame(stochasticSoilProfile, inputParameters.StochasticSoilProfile);
+ mocks.VerifyAll();
}
[Test]
@@ -882,6 +886,7 @@
// Assert
Assert.IsNull(inputParameters.StochasticSoilModel);
Assert.IsNull(inputParameters.StochasticSoilProfile);
+ mocks.VerifyAll();
}
[Test]
@@ -931,6 +936,7 @@
// Assert
Assert.IsNull(inputParameters.StochasticSoilProfile);
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs
===================================================================
diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -19,6 +19,8 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
+using System.ComponentModel;
using Core.Common.Base.Geometry;
using Core.Common.Gui.PropertyBag;
using NUnit.Framework;
@@ -80,5 +82,77 @@
Assert.AreEqual(point2, properties.BottomDitchPolderSide);
Assert.AreEqual(point2, properties.DitchPolderSide);
}
+
+ [Test]
+ public void PropertyAttributes_ReturnExpectedValues()
+ {
+ // Setup
+ var surfaceLine = new RingtoetsPipingSurfaceLine();
+
+ // Call
+ var properties = new RingtoetsPipingSurfaceLineProperties
+ {
+ Data = surfaceLine
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
+ {
+ new BrowsableAttribute(true)
+ });
+ Assert.AreEqual(8, dynamicProperties.Count);
+
+ var generalCategory = "Algemeen";
+ var charactersticPointsCategory = "Karakteristieke punten";
+
+ PropertyDescriptor nameProperty = dynamicProperties[0];
+ Assert.IsTrue(nameProperty.IsReadOnly);
+ Assert.AreEqual(generalCategory, nameProperty.Category);
+ Assert.AreEqual("Naam", nameProperty.DisplayName);
+ Assert.AreEqual("Naam van de profielschematisatie.", nameProperty.Description);
+
+ PropertyDescriptor dikeToeAtRiverProperty = dynamicProperties[1];
+ Assert.IsTrue(dikeToeAtRiverProperty.IsReadOnly);
+ Assert.AreEqual(charactersticPointsCategory, dikeToeAtRiverProperty.Category);
+ Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverProperty.DisplayName);
+ Assert.AreEqual("De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd.", dikeToeAtRiverProperty.Description);
+
+ PropertyDescriptor dikeToeAtPolderProperty = dynamicProperties[2];
+ Assert.IsTrue(dikeToeAtPolderProperty.IsReadOnly);
+ Assert.AreEqual(charactersticPointsCategory, dikeToeAtPolderProperty.Category);
+ Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderProperty.DisplayName);
+ Assert.AreEqual("De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.", dikeToeAtPolderProperty.Description);
+
+ PropertyDescriptor ditchDikeSideProperty = dynamicProperties[3];
+ Assert.IsTrue(ditchDikeSideProperty.IsReadOnly);
+ Assert.AreEqual(charactersticPointsCategory, ditchDikeSideProperty.Category);
+ Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideProperty.DisplayName);
+ Assert.AreEqual("De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.", ditchDikeSideProperty.Description);
+
+ PropertyDescriptor bottomDitchDikeSideProperty = dynamicProperties[4];
+ Assert.IsTrue(bottomDitchDikeSideProperty.IsReadOnly);
+ Assert.AreEqual(charactersticPointsCategory, bottomDitchDikeSideProperty.Category);
+ Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideProperty.DisplayName);
+ Assert.AreEqual("De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.", bottomDitchDikeSideProperty.Description);
+
+ PropertyDescriptor bottomDitchPolderSideProperty = dynamicProperties[5];
+ Assert.IsTrue(bottomDitchPolderSideProperty.IsReadOnly);
+ Assert.AreEqual(charactersticPointsCategory, bottomDitchPolderSideProperty.Category);
+ Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideProperty.DisplayName);
+ Assert.AreEqual("De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.", bottomDitchPolderSideProperty.Description);
+
+ PropertyDescriptor ditchPolderSideProperty = dynamicProperties[6];
+ Assert.IsTrue(ditchPolderSideProperty.IsReadOnly);
+ Assert.AreEqual(charactersticPointsCategory, ditchPolderSideProperty.Category);
+ Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideProperty.DisplayName);
+ Assert.AreEqual("De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.", ditchPolderSideProperty.Description);
+
+ PropertyDescriptor pointsProperty = dynamicProperties[7];
+ Assert.IsTrue(pointsProperty.IsReadOnly);
+ Assert.AreEqual(generalCategory, pointsProperty.Category);
+ Assert.AreEqual("Geometriepunten", pointsProperty.DisplayName);
+ Assert.AreEqual("De punten die de geometrie van de profielschematisatie definiëren.", pointsProperty.Description);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -140,10 +140,10 @@
// Setup
var mocks = new MockRepository();
var assessmentSection = mocks.Stub();
- var pipingCalculationsView = ShowPipingCalculationsView();
-
mocks.ReplayAll();
+ var pipingCalculationsView = ShowPipingCalculationsView();
+
// Call
pipingCalculationsView.AssessmentSection = assessmentSection;
@@ -153,6 +153,7 @@
var hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items;
Assert.AreEqual(1, hydraulicBoundaryLocationComboboxItems.Count);
Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString());
+ mocks.VerifyAll();
}
[Test]
@@ -182,6 +183,7 @@
Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString());
Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString());
Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString());
+ mocks.VerifyAll();
}
[Test]
@@ -226,8 +228,13 @@
public void PipingCalculationsView_CalculationsWithCorrespondingStochasticSoilModel_StochasticSoilModelsComboboxCorrectlyInitialized()
{
// Setup & Call
- ShowFullyConfiguredPipingCalculationsView();
+ MockRepository mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+ mocks.ReplayAll();
+
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
// Assert
@@ -240,16 +247,23 @@
Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString());
Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[1].ToString());
Assert.AreEqual("Model E", stochasticSoilModelsComboboxItems[2].ToString());
+
+ mocks.VerifyAll();
}
[Test]
public void PipingCalculationsView_CalculationsWithCorrespondingSoilProfiles_SoilProfilesComboboxCorrectlyInitialized()
{
// Setup & Call
- ShowFullyConfiguredPipingCalculationsView();
+ MockRepository mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
- var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+ mocks.ReplayAll();
+ var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject;
+
// Assert
var soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items;
Assert.AreEqual(3, soilProfilesComboboxItems.Count);
@@ -260,14 +274,21 @@
soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilProfilesColumnIndex]).Items;
Assert.AreEqual(1, soilProfilesComboboxItems.Count);
Assert.AreEqual("Profile 5", soilProfilesComboboxItems[0].ToString());
+
+ mocks.VerifyAll();
}
[Test]
public void PipingCalculationsView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized()
{
// Setup & Call
- ShowFullyConfiguredPipingCalculationsView();
+ MockRepository mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+ mocks.ReplayAll();
+
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
// Assert
@@ -297,17 +318,22 @@
Assert.AreEqual(6.667.ToString(CultureInfo.CurrentCulture), cells[phreaticLevelExitMeanColumnIndex].FormattedValue);
Assert.AreEqual(7.78.ToString(CultureInfo.CurrentCulture), cells[entryPointLColumnIndex].FormattedValue);
Assert.AreEqual(8.89.ToString(CultureInfo.CurrentCulture), cells[exitPointLColumnIndex].FormattedValue);
+
+ mocks.VerifyAll();
}
[Test]
public void PipingCalculationsView_SelectingCellInRow_ApplicationSelectionCorrectlySynced()
{
// Setup
- var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView();
+ MockRepository mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+
+ var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
var secondPipingCalculationItem = ((PipingCalculationScenario) ((CalculationGroup) pipingCalculationsView.Data).Children[1]);
var secondPipingInputItem = secondPipingCalculationItem.InputParameters;
- var mocks = new MockRepository();
var applicationSelectionMock = mocks.StrictMock();
applicationSelectionMock.Stub(asm => asm.Selection).Return(null);
applicationSelectionMock.Expect(asm => asm.Selection = new PipingInputContext(secondPipingInputItem,
@@ -336,7 +362,10 @@
// Setup
var mocks = new MockRepository();
var applicationSelectionMock = mocks.StrictMock();
- var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+
+ var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
var secondPipingCalculationItem = ((PipingCalculationScenario) ((CalculationGroup) pipingCalculationsView.Data).Children[1]);
var secondPipingInputItem = secondPipingCalculationItem.InputParameters;
@@ -367,7 +396,10 @@
{
// Setup
var mocks = new MockRepository();
- var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+
+ var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
var applicationSelectionMock = mocks.StrictMock();
applicationSelectionMock.Expect(asm => asm.Selection).Return(null);
@@ -405,15 +437,21 @@
public void PipingCalculationsView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex)
{
// Setup
- ShowFullyConfiguredPipingCalculationsView();
+ MockRepository mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+ mocks.ReplayAll();
+
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
// Call
dataGridView.Rows[0].Cells[cellIndex].Value = newValue;
// Assert
Assert.AreEqual("De tekst moet een getal zijn.", dataGridView.Rows[0].ErrorText);
+ mocks.VerifyAll();
}
[Test]
@@ -434,15 +472,21 @@
public void FailureMechanismResultView_EditValueValid_DoNotShowErrorToolTipAndEditValue(double newValue, int cellIndex)
{
// Setup
- ShowFullyConfiguredPipingCalculationsView();
+ MockRepository mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+ mocks.ReplayAll();
+
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
// Call
dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble) newValue;
// Assert
Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
+ mocks.VerifyAll();
}
[Test]
@@ -851,10 +895,12 @@
var mocks = new MockRepository();
var pipingCalculationObserver = mocks.StrictMock();
var pipingCalculationInputObserver = mocks.StrictMock();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+
mocks.ReplayAll();
- var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
-
var data = (CalculationGroup) pipingCalculationView.Data;
var pipingCalculation = (PipingCalculationScenario) data.Children.First();
@@ -882,10 +928,12 @@
var mocks = new MockRepository();
var pipingCalculationObserver = mocks.StrictMock();
var pipingCalculationInputObserver = mocks.StrictMock();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+
mocks.ReplayAll();
- var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
-
var data = (CalculationGroup) pipingCalculationView.Data;
var pipingCalculation = (PipingCalculationScenario) data.Children.First();
@@ -909,8 +957,13 @@
public void Selection_Always_ReturnsTheSelectedRowObject(int selectedRow)
{
// Setup
- var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
+ mocks.ReplayAll();
+
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
dataGridView.CurrentCell = dataGridView.Rows[selectedRow].Cells[0];
@@ -921,7 +974,8 @@
// Assert
Assert.IsInstanceOf(selection);
var dataRow = (PipingCalculationRow) dataGridView.Rows[selectedRow].DataBoundItem;
- Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext) selection).PipingCalculation);
+ Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext)selection).PipingCalculation);
+ mocks.VerifyAll();
}
[TestCase(nameColumnIndex, "New name", true, false)]
@@ -947,11 +1001,13 @@
{
pipingCalculationInputObserver.Expect(o => o.UpdateObserver());
}
+
+ var assessmentSection = mocks.Stub();
+ var hydraulicBoundaryDatabase = mocks.StrictMock();
+ var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase);
mocks.ReplayAll();
- var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView();
-
var data = (CalculationGroup) pipingCalculationView.Data;
var pipingCalculation = (PipingCalculationScenario) data.Children.First();
@@ -977,16 +1033,11 @@
private const int entryPointLColumnIndex = 7;
private const int exitPointLColumnIndex = 8;
- private PipingCalculationsView ShowFullyConfiguredPipingCalculationsView()
+ private PipingCalculationsView ShowFullyConfiguredPipingCalculationsView(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
{
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- var hydraulicBoundaryDatabase = mocks.StrictMock();
var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(1, "Location 1", 1.1, 2.2);
var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(2, "Location 2", 3.3, 4.4);
- mocks.ReplayAll();
-
assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation1);
hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation2);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -385,16 +385,12 @@
// Setup
string validFilePath = Path.Combine(testDataPath, "complete.soil");
- var observer = mockRepository.StrictMock();
- observer.Expect(o => o.UpdateObserver());
-
var assessmentSection = mockRepository.Stub();
assessmentSection.ReferenceLine = new ReferenceLine();
var failureMechanism = new PipingFailureMechanism();
mockRepository.ReplayAll();
var context = new StochasticSoilModelContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection);
- context.Attach(observer);
var importer = new PipingSoilProfilesImporter
{
@@ -416,6 +412,7 @@
// Assert
Assert.IsTrue(importResult);
Assert.AreEqual(36, progress);
+ mockRepository.VerifyAll();
}
[Test]
@@ -717,16 +714,12 @@
// Setup
string validFilePath = Path.Combine(testDataPath, "SingleSoilProfile2D_noLayerProperties.soil");
- var observer = mockRepository.StrictMock();
- observer.Expect(o => o.UpdateObserver());
-
var assessmentSection = mockRepository.Stub();
assessmentSection.ReferenceLine = new ReferenceLine();
var failureMechanism = new PipingFailureMechanism();
mockRepository.ReplayAll();
var context = new StochasticSoilModelContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection);
- context.Attach(observer);
var importer = new PipingSoilProfilesImporter
{
@@ -775,6 +768,7 @@
profile.Layers.Select(l => l.BelowPhreaticLevelMean));
Assert.AreEqual(6, progress);
+ mockRepository.VerifyAll();
}
[Test]
@@ -783,16 +777,12 @@
// Setup
string validFilePath = Path.Combine(testDataPath, "SingleSoilProfile2D_withLayerProperties.soil");
- var observer = mockRepository.StrictMock();
- observer.Expect(o => o.UpdateObserver());
-
var assessmentSection = mockRepository.Stub();
assessmentSection.ReferenceLine = new ReferenceLine();
var failureMechanism = new PipingFailureMechanism();
mockRepository.ReplayAll();
var context = new StochasticSoilModelContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection);
- context.Attach(observer);
var importer = new PipingSoilProfilesImporter
{
@@ -865,6 +855,7 @@
profile.Layers.Select(l => l.BelowPhreaticLevelMean));
Assert.AreEqual(6, progress);
+ mockRepository.VerifyAll();
}
private void IncrementProgress(string a, int b, int c)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -172,6 +172,7 @@
Assert.IsTrue(viewInfos.Any(vi => vi.ViewType == typeof(PipingInputView)));
Assert.IsTrue(viewInfos.Any(vi => vi.ViewType == typeof(PipingScenariosView)));
}
+ mocks.VerifyAll();
}
[Test]
@@ -196,6 +197,7 @@
Assert.IsInstanceOf(importers[0]);
Assert.IsInstanceOf(importers[1]);
}
+ mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -71,116 +71,123 @@
{
// Setup
var assessmentSectionMock = mocks.StrictMock();
- var pipingFailureMechanismMock = mocks.StrictMock();
- var pipingCalculationsGroupMock = mocks.StrictMock();
- var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, assessmentSectionMock);
mocks.ReplayAll();
+ var failureMechanism = new PipingFailureMechanism();
+ var calculationGroup = new CalculationGroup();
+ var calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, assessmentSectionMock);
+
+
// Call & Assert
- Assert.AreEqual(pipingCalculationsGroupMock, info.GetViewData(pipingCalculationGroupContext));
+ Assert.AreEqual(calculationGroup, info.GetViewData(calculationGroupContext));
+ mocks.VerifyAll();
}
[Test]
public void GetViewName_Always_ReturnsCalculationGroupName()
{
// Setup
- var viewMock = mocks.StrictMock();
- var pipingCalculationsGroupMock = mocks.StrictMock();
+ var calculationsView = new PipingCalculationsView();
+ var calculationGroup = new CalculationGroup
+ {
+ Name = "Test"
+ };
- mocks.ReplayAll();
-
- pipingCalculationsGroupMock.Name = "Test";
-
// Call & Assert
- Assert.AreEqual("Test", info.GetViewName(viewMock, pipingCalculationsGroupMock));
+ Assert.AreEqual("Test", info.GetViewName(calculationsView, calculationGroup));
}
[Test]
public void AdditionalDataCheck_PipingCalculationGroupContextWithPipingFailureMechanismParent_ReturnsTrue()
{
// Setup
var assessmentSectionMock = mocks.StrictMock();
- var pipingFailureMechanismMock = mocks.StrictMock();
- var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingFailureMechanismMock.CalculationsGroup, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, assessmentSectionMock);
-
mocks.ReplayAll();
+ var pipingFailureMechanism = new PipingFailureMechanism();
+ var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingFailureMechanism.CalculationsGroup, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanism, assessmentSectionMock);
+
// Call & Assert
Assert.IsTrue(info.AdditionalDataCheck(pipingCalculationGroupContext));
+ mocks.VerifyAll();
}
[Test]
public void AdditionalDataCheck_PipingCalculationGroupContextWithoutPipingFailureMechanismParent_ReturnsFalse()
{
// Setup
var assessmentSectionMock = mocks.StrictMock();
- var pipingFailureMechanismMock = mocks.Stub();
- var pipingCalculationsGroupMock = mocks.StrictMock();
- var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, assessmentSectionMock);
-
mocks.ReplayAll();
+ var failureMechanism = new PipingFailureMechanism();
+ var calculationGroup = new CalculationGroup();
+ var pipingCalculationGroupContext = new PipingCalculationGroupContext(calculationGroup, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, assessmentSectionMock);
+
// Call & Assert
Assert.IsFalse(info.AdditionalDataCheck(pipingCalculationGroupContext));
+ mocks.VerifyAll();
}
[Test]
public void CloseForData_AssessmentSectionRemovedWithoutPipingFailureMechanism_ReturnsFalse()
{
// Setup
- var viewMock = mocks.StrictMock();
var assessmentSectionMock = mocks.StrictMock();
- var pipingCalculationsGroupMock = mocks.StrictMock();
-
- viewMock.Expect(vm => vm.Data).Return(pipingCalculationsGroupMock);
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
-
mocks.ReplayAll();
+ var view = new PipingCalculationsView
+ {
+ Data = new CalculationGroup()
+ };
+
// Call & Assert
- Assert.IsFalse(info.CloseForData(viewMock, assessmentSectionMock));
+ Assert.IsFalse(info.CloseForData(view, assessmentSectionMock));
+ mocks.VerifyAll();
}
[Test]
public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse()
{
// Setup
- var viewMock = mocks.StrictMock();
var assessmentSectionMock = mocks.StrictMock();
- var pipingFailureMechanismMock = mocks.Stub();
- var pipingCalculationsGroupMock = mocks.StrictMock();
-
- viewMock.Expect(vm => vm.Data).Return(pipingCalculationsGroupMock);
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[]
{
- pipingFailureMechanismMock
+ new PipingFailureMechanism()
});
-
mocks.ReplayAll();
+ var view = new PipingCalculationsView
+ {
+ Data = new CalculationGroup()
+ };
+
// Call & Assert
- Assert.IsFalse(info.CloseForData(viewMock, assessmentSectionMock));
+ Assert.IsFalse(info.CloseForData(view, assessmentSectionMock));
+ mocks.VerifyAll();
}
[Test]
public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue()
{
// Setup
- var viewMock = mocks.StrictMock();
var assessmentSectionMock = mocks.StrictMock();
- var pipingFailureMechanismMock = mocks.StrictMock();
-
- viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismMock.CalculationsGroup);
+ var failureMechanism = new PipingFailureMechanism();
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[]
{
- pipingFailureMechanismMock
+ failureMechanism
});
-
mocks.ReplayAll();
+ var view = new PipingCalculationsView
+ {
+ Data = failureMechanism.CalculationsGroup
+ };
+
// Call & Assert
- Assert.IsTrue(info.CloseForData(viewMock, assessmentSectionMock));
+ Assert.IsTrue(info.CloseForData(view, assessmentSectionMock));
+ mocks.VerifyAll();
}
[Test]
@@ -192,8 +199,6 @@
view.Data = new CalculationGroup();
- mocks.ReplayAll();
-
// Call
var closeForData = info.CloseForData(view, failureMechanism);
@@ -210,8 +215,6 @@
view.Data = failureMechanism.CalculationsGroup;
- mocks.ReplayAll();
-
// Call
var closeForData = info.CloseForData(view, failureMechanism);
@@ -224,41 +227,41 @@
{
// Setup
var assessmentSectionMock = mocks.StrictMock();
+ mocks.ReplayAll();
var view = new PipingCalculationsView();
var failureMechanism = new PipingFailureMechanism();
var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSectionMock);
view.Data = failureMechanism.CalculationsGroup;
- mocks.ReplayAll();
-
// Call
var closeForData = info.CloseForData(view, failureMechanismContext);
// Assert
Assert.IsFalse(closeForData);
+ mocks.VerifyAll();
}
[Test]
public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue()
{
// Setup
var assessmentSectionMock = mocks.StrictMock();
+ mocks.ReplayAll();
var view = new PipingCalculationsView();
var failureMechanism = new PipingFailureMechanism();
var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSectionMock);
view.Data = failureMechanism.CalculationsGroup;
- mocks.ReplayAll();
-
// Call
var closeForData = info.CloseForData(view, failureMechanismContext);
// Assert
Assert.IsTrue(closeForData);
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rc09079988a542708a8cee7c6640c67335ea3c760 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -157,6 +157,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -186,6 +187,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -214,6 +216,7 @@
// Assert
Assert.IsTrue(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -273,6 +276,7 @@
// Assert
Assert.IsTrue(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -298,6 +302,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rad11d25e651c47162ecf08d11a05d40bba0bebca -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs (.../PipingFailureMechanismViewInfoTest.cs) (revision ad11d25e651c47162ecf08d11a05d40bba0bebca)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs (.../PipingFailureMechanismViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -99,6 +99,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -122,6 +123,7 @@
// Assert
Assert.IsTrue(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -147,6 +149,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -170,6 +173,7 @@
// Assert
Assert.IsTrue(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs
===================================================================
diff -u -rc09079988a542708a8cee7c6640c67335ea3c760 -rf64dceaa32788bad28dcf09f4a1c3150595f1327
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327)
@@ -149,6 +149,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -177,6 +178,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -204,6 +206,7 @@
// Assert
Assert.IsTrue(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -265,6 +268,7 @@
// Assert
Assert.IsFalse(closeForData);
}
+ mocks.VerifyAll();
}
[Test]
@@ -288,6 +292,7 @@
// Assert
Assert.IsTrue(closeForData);
}
+ mocks.VerifyAll();
}
[Test]