Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r4ca4b2260f66713349c9aae32f5f4b82373c312b -rc9396d0af18873fda14c7e486decbfca7d4e8b21 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 4ca4b2260f66713349c9aae32f5f4b82373c312b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision c9396d0af18873fda14c7e486decbfca7d4e8b21) @@ -49,9 +49,19 @@ info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismSectionResultContext)); } + [TearDown] + public void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + [Test] public void Initialized_Always_ExpectedPropertiesSet() { + // Setup + mocks.ReplayAll(); + // Assert Assert.AreEqual(typeof(FailureMechanismSectionResultContext), info.TagType); @@ -85,12 +95,14 @@ // Assert Assert.AreEqual("Resultaat", text); - mocks.VerifyAll(); } [Test] public void Image_Always_ReturnsGenericInputOutputIcon() { + // Setup + mocks.ReplayAll(); + // Call var image = info.Image(null); @@ -102,17 +114,17 @@ public void ContextMenuStrip_Always_CallsBuilder() { // Setup - var gui = mocks.StrictMultiMock(); var menuBuilderMock = mocks.StrictMock(); - + menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + using (var treeViewControl = new TreeViewControl()) { + var gui = mocks.StrictMultiMock(); gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); gui.Expect(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Expect(g => g.ProjectOpened -= null).IgnoreArguments(); - menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); - mocks.ReplayAll(); plugin.Gui = gui; @@ -121,7 +133,7 @@ info.ContextMenuStrip(null, null, treeViewControl); } // Assert - mocks.VerifyAll(); + // Assert expectancies are called in TearDown() } } } \ No newline at end of file