Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -r560ea9f96409cc65f4666adf212a1c135c5e626f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 39e18750ccb61ad1f367279f9dac39a232d4f843) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 560ea9f96409cc65f4666adf212a1c135c5e626f) @@ -84,24 +84,6 @@ private MockRepository mocks; private ClosingStructuresPlugin plugin; - public override void Setup() - { - mocks = new MockRepository(); - gui = mocks.Stub(); - plugin = new ClosingStructuresPlugin - { - Gui = gui - }; - - info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresCalculationGroupContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - mocks.VerifyAll(); - } - [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -238,6 +220,7 @@ // Call info.ContextMenuStrip(groupContext, null, treeViewControl); } + // Assert // Assert expectancies called in TearDown() } @@ -400,6 +383,7 @@ // Call info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl); } + // Assert // Assert expectancies called in TearDown() } @@ -1623,7 +1607,7 @@ var calculation = new StructuresCalculation(); group.Children.Add(calculation); - ClosingStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First(); + StructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.First(); result.Calculation = calculation; // Call @@ -1670,6 +1654,24 @@ CollectionAssert.DoesNotContain(parentGroup.Children, group); } + public override void Setup() + { + mocks = new MockRepository(); + gui = mocks.Stub(); + plugin = new ClosingStructuresPlugin + { + Gui = gui + }; + + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ClosingStructuresCalculationGroupContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + } + private static void ChangeStructure(ClosingStructure structure) { structure.CopyProperties(new ClosingStructure(