Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs =================================================================== diff -u -r83533c155d88de10f0a8e37e3918effc0725ba77 -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision 83533c155d88de10f0a8e37e3918effc0725ba77) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -46,7 +46,9 @@ target.SimpleAssessmentResult = origin.SimpleAssessmentResult; target.DetailedAssessmentResult = origin.DetailedAssessmentResult; + target.DetailedAssessmentProbability = origin.DetailedAssessmentProbability; target.TailorMadeAssessmentResult = origin.TailorMadeAssessmentResult; + target.TailorMadeAssessmentProbability = origin.TailorMadeAssessmentProbability; target.UseManualAssemblyCategoryGroup = origin.UseManualAssemblyCategoryGroup; target.ManualAssemblyCategoryGroup = origin.ManualAssemblyCategoryGroup; } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r95605fb4015061bf2eacd284b2e4f2f9dd9596b0 -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 95605fb4015061bf2eacd284b2e4f2f9dd9596b0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -1574,62 +1574,6 @@ }; } - private static IEnumerable GetOutputs(IFailureMechanism nodeData) - { - var grassCoverSlipOffInwards = nodeData as IHasSectionResults; - var grassCoverSlipOffOutwards = nodeData as IHasSectionResults; - var microstability = nodeData as IHasSectionResults; - var technicalInnovation = nodeData as IHasSectionResults; - var strengthStabilityLengthwiseConstruction = nodeData as IHasSectionResults; - var waterPressureAsphaltCover = nodeData as IHasSectionResults; - - var failureMechanismSectionResultContexts = new object[2]; - if (grassCoverSlipOffInwards != null) - { - failureMechanismSectionResultContexts[0] = - new FailureMechanismSectionResultContext( - grassCoverSlipOffInwards.SectionResults, nodeData); - } - - if (grassCoverSlipOffOutwards != null) - { - failureMechanismSectionResultContexts[0] = - new FailureMechanismSectionResultContext( - grassCoverSlipOffOutwards.SectionResults, nodeData); - } - - if (microstability != null) - { - failureMechanismSectionResultContexts[0] = - new FailureMechanismSectionResultContext( - microstability.SectionResults, nodeData); - } - - if (technicalInnovation != null) - { - failureMechanismSectionResultContexts[0] = - new FailureMechanismSectionResultContext( - technicalInnovation.SectionResults, nodeData); - } - - if (strengthStabilityLengthwiseConstruction != null) - { - failureMechanismSectionResultContexts[0] = - new FailureMechanismSectionResultContext( - strengthStabilityLengthwiseConstruction.SectionResults, nodeData); - } - - if (waterPressureAsphaltCover != null) - { - failureMechanismSectionResultContexts[0] = - new FailureMechanismSectionResultContext( - waterPressureAsphaltCover.SectionResults, nodeData); - } - - failureMechanismSectionResultContexts[1] = nodeData.OutputComments; - return failureMechanismSectionResultContexts; - } - private ContextMenuStrip StandAloneFailureMechanismEnabledContextMenuStrip(IFailureMechanismContext nodeData, object parentData, TreeViewControl treeViewControl) { var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); @@ -1684,11 +1628,21 @@ { return new object[] { - new GrassCoverSlipOffInwardsFailureMechanismSectionsContext(nodeData, assessmentSection), + new GrassCoverSlipOffInwardsFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } + private static IEnumerable GetOutputs(GrassCoverSlipOffInwardsFailureMechanism nodeData) + { + return new object[] + { + new FailureMechanismSectionResultContext( + nodeData.SectionResults, nodeData), + nodeData.OutputComments + }; + } + #endregion #region GrassCoverSlipOffOutwardsFailureMechanismContext TreeNodeInfo @@ -1715,6 +1669,16 @@ }; } + private static IEnumerable GetOutputs(GrassCoverSlipOffOutwardsFailureMechanism nodeData) + { + return new object[] + { + new FailureMechanismSectionResultContext( + nodeData.SectionResults, nodeData), + nodeData.OutputComments + }; + } + #endregion #region MacroStabilityOutwardsFailureMechanismContext TreeNodeInfo @@ -1736,7 +1700,7 @@ { return new object[] { - new MacroStabilityOutwardsFailureMechanismSectionsContext(nodeData, assessmentSection), + new MacroStabilityOutwardsFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } @@ -1777,11 +1741,21 @@ { return new object[] { - new MicrostabilityFailureMechanismSectionsContext(nodeData, assessmentSection), + new MicrostabilityFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } + private static IEnumerable GetOutputs(MicrostabilityFailureMechanism nodeData) + { + return new object[] + { + new FailureMechanismSectionResultContext( + nodeData.SectionResults, nodeData), + nodeData.OutputComments + }; + } + #endregion #region PipingStructureFailureMechanismContext TreeNodeInfo @@ -1803,7 +1777,7 @@ { return new object[] { - new PipingStructureFailureMechanismSectionsContext(nodeData, assessmentSection), + new PipingStructureFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } @@ -1844,11 +1818,21 @@ { return new object[] { - new StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext(nodeData, assessmentSection), + new StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } + private static IEnumerable GetOutputs(StrengthStabilityLengthwiseConstructionFailureMechanism nodeData) + { + return new object[] + { + new FailureMechanismSectionResultContext( + nodeData.SectionResults, nodeData), + nodeData.OutputComments + }; + } + #endregion #region TechnicalInnovationFailureMechanismContext TreeNodeInfo @@ -1870,11 +1854,21 @@ { return new object[] { - new TechnicalInnovationFailureMechanismSectionsContext(nodeData, assessmentSection), + new TechnicalInnovationFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } + private static IEnumerable GetOutputs(TechnicalInnovationFailureMechanism nodeData) + { + return new object[] + { + new FailureMechanismSectionResultContext( + nodeData.SectionResults, nodeData), + nodeData.OutputComments + }; + } + #endregion #region WaterPressureAsphaltCoverFailureMechanismContext TreeNodeInfo @@ -1896,11 +1890,21 @@ { return new object[] { - new WaterPressureAsphaltCoverFailureMechanismSectionsContext(nodeData, assessmentSection), + new WaterPressureAsphaltCoverFailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } + private static IEnumerable GetOutputs(WaterPressureAsphaltCoverFailureMechanism nodeData) + { + return new object[] + { + new FailureMechanismSectionResultContext( + nodeData.SectionResults, nodeData), + nodeData.OutputComments + }; + } + #endregion #region CategoryTreeFolder TreeNodeInfo Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs =================================================================== diff -u -r55bc38bfa86e54bbd5ee3c9abaa1117e4d918b03 -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 55bc38bfa86e54bbd5ee3c9abaa1117e4d918b03) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs (.../BackgroundDataTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -229,6 +229,7 @@ info.ContextMenuStrip(null, null, treeViewControl); } } + // Assert mockRepository.VerifyAll(); } @@ -265,6 +266,7 @@ } } } + // Assert mockRepository.VerifyAll(); } @@ -339,6 +341,7 @@ AssertBackgroundData(newMapData, assessmentSection.BackgroundData); } } + mockRepository.VerifyAll(); } @@ -395,6 +398,7 @@ BackgroundDataTestHelper.AssertBackgroundData(oldBackgroundData, assessmentSection.BackgroundData); } } + mockRepository.VerifyAll(); } @@ -462,6 +466,7 @@ AssertBackgroundData(newMapData, assessmentSection.BackgroundData); } } + mockRepository.VerifyAll(); } @@ -529,6 +534,7 @@ AssertBackgroundData(newMapData, assessmentSection.BackgroundData); } } + mockRepository.VerifyAll(); } @@ -590,6 +596,7 @@ BackgroundDataTestHelper.AssertBackgroundData(backgroundData, assessmentSection.BackgroundData); } } + mockRepository.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs (.../CategoryTreeFolderTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs (.../CategoryTreeFolderTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -73,6 +73,7 @@ Assert.IsNull(info.CanInsert); Assert.IsNull(info.OnDrop); } + mocks.VerifyAll(); } @@ -95,6 +96,7 @@ // Assert Assert.AreEqual(testname, text); } + mocks.VerifyAll(); } @@ -116,6 +118,7 @@ // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, image); } + mocks.VerifyAll(); } @@ -137,6 +140,7 @@ // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.InputFolderIcon, image); } + mocks.VerifyAll(); } @@ -158,6 +162,7 @@ // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.OutputFolderIcon, image); } + mocks.VerifyAll(); } @@ -189,6 +194,7 @@ object2 }, objects); } + mocks.VerifyAll(); } @@ -222,6 +228,7 @@ info.ContextMenuStrip(null, null, treeViewControl); } } + // Assert mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs (.../CommentContextTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs (.../CommentContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -74,6 +74,7 @@ Assert.IsNull(info.CanInsert); Assert.IsNull(info.OnDrop); } + mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfilesContextTreeNodeInfoTest.cs =================================================================== diff -u -r0d67fae590a8c774697ae6836565dc1a03cf451b -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfilesContextTreeNodeInfoTest.cs (.../ForeshoreProfilesContextTreeNodeInfoTest.cs) (revision 0d67fae590a8c774697ae6836565dc1a03cf451b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfilesContextTreeNodeInfoTest.cs (.../ForeshoreProfilesContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -171,7 +171,7 @@ object[] children = info.ChildNodeObjects(context); // Assert - var expectedChildren = new[] + ForeshoreProfile[] expectedChildren = { profile1, profile2, Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -33,8 +33,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -145,10 +143,10 @@ public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes() { // Setup - var assessmentSection = new AssessmentSectionStub(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); - var failureMechanismContext = new GrassCoverSlipOffInwardsFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -157,6 +155,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -247,15 +246,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new GrassCoverSlipOffInwardsFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new GrassCoverSlipOffInwardsFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -399,32 +398,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -33,8 +33,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -145,10 +143,10 @@ public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes() { // Setup - var assessmentSection = new AssessmentSectionStub(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism(); - var failureMechanismContext = new GrassCoverSlipOffOutwardsFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -157,6 +155,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -247,15 +246,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup - using (var treeView = new TreeViewControl()) + var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism { - var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new GrassCoverSlipOffOutwardsFailureMechanismContext(failureMechanism, assessmentSection); + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new GrassCoverSlipOffOutwardsFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) + { var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -399,32 +398,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -36,7 +36,6 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; @@ -151,9 +150,7 @@ { // Setup var assessmentSection = new AssessmentSectionStub(); - var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); - var failureMechanismContext = new MacroStabilityOutwardsFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -162,6 +159,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -191,7 +189,7 @@ Assert.AreEqual(probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength), calculator.FailureMechanismN); } - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) + var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(1); Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); @@ -266,15 +264,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new MacroStabilityOutwardsFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new MacroStabilityOutwardsFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new MacroStabilityOutwardsFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new MacroStabilityOutwardsFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -418,32 +416,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs (.../MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs) (revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs (.../MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -33,8 +33,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -145,10 +143,10 @@ public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes() { // Setup - var assessmentSection = new AssessmentSectionStub(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); var failureMechanism = new MicrostabilityFailureMechanism(); - var failureMechanismContext = new MicrostabilityFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -157,6 +155,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -247,15 +246,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new MicrostabilityFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new MicrostabilityFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new MicrostabilityFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new MicrostabilityFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -399,32 +398,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs) (revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -36,7 +36,6 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; @@ -151,7 +150,6 @@ var assessmentSection = new AssessmentSectionStub(); var failureMechanism = new PipingStructureFailureMechanism(); - var failureMechanismContext = new PipingStructureFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -160,6 +158,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -171,6 +170,7 @@ Assert.AreSame(failureMechanism.InputComments, inputComment); var outputFolder = (CategoryTreeFolder) children[1]; + Assert.AreEqual(3, outputFolder.Contents.Count()); Assert.AreEqual("Oordeel", outputFolder.Name); Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category); @@ -187,7 +187,7 @@ Assert.AreEqual(failureMechanism.N, calculator.AssemblyCategoriesInput.N); } - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) + var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(1); Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); @@ -262,15 +262,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new PipingStructureFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new PipingStructureFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new PipingStructureFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new PipingStructureFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -414,32 +414,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs =================================================================== diff -u -rcd5e764c0cceea5f2133a0e86d7698511ca1ba4a -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs (.../ReferenceLineContextTreeNodeInfoTest.cs) (revision cd5e764c0cceea5f2133a0e86d7698511ca1ba4a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs (.../ReferenceLineContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -74,6 +74,7 @@ Assert.IsNull(info.CanInsert); Assert.IsNull(info.OnDrop); } + mocks.VerifyAll(); } @@ -96,6 +97,7 @@ // Assert Assert.AreEqual("Referentielijn", text); } + mocks.VerifyAll(); } @@ -118,6 +120,7 @@ // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ReferenceLineIcon, image); } + mocks.VerifyAll(); } @@ -150,6 +153,7 @@ info.ContextMenuStrip(null, null, treeViewControl); } } + // Assert mocks.VerifyAll(); } @@ -173,6 +177,7 @@ // Assert Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color); } + mocks.VerifyAll(); } @@ -196,6 +201,7 @@ // Assert Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color); } + mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs =================================================================== diff -u -r43ad5cd168824e7ba3b7b772e94b570d12a0597e -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision 43ad5cd168824e7ba3b7b772e94b570d12a0597e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -169,6 +169,7 @@ info.ContextMenuStrip(null, null, treeViewControl); } } + // Assert mockRepository.VerifyAll(); } @@ -202,6 +203,7 @@ } } } + // Assert mockRepository.VerifyAll(); // Expect no calls on arguments } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs) (revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -33,8 +33,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -145,10 +143,10 @@ public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes() { // Setup - var assessmentSection = new AssessmentSectionStub(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism(); - var failureMechanismContext = new StrengthStabilityLengthwiseConstructionFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -157,6 +155,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -247,15 +246,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new StrengthStabilityLengthwiseConstructionFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new StrengthStabilityLengthwiseConstructionFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -399,32 +398,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StructuresOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -r62c2ec9cb0416527762e077df380cbfb473dc9dc -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StructuresOutputContextTreeNodeInfoTest.cs (.../StructuresOutputContextTreeNodeInfoTest.cs) (revision 62c2ec9cb0416527762e077df380cbfb473dc9dc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StructuresOutputContextTreeNodeInfoTest.cs (.../StructuresOutputContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -166,14 +166,15 @@ // Call info.ContextMenuStrip(null, null, treeViewControl); } + // Assert // Assert expectancies called in TearDown() } private class SimpleStructuresOutputContext : StructuresOutputContext { public SimpleStructuresOutputContext(IStructuresCalculation wrappedData, IAssessmentSection assessmentSection) - : base(wrappedData, assessmentSection) { } + : base(wrappedData, assessmentSection) {} } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs (.../TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs) (revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs (.../TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -33,8 +33,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -145,10 +143,10 @@ public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes() { // Setup - var assessmentSection = new AssessmentSectionStub(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); var failureMechanism = new TechnicalInnovationFailureMechanism(); - var failureMechanismContext = new TechnicalInnovationFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -157,6 +155,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -247,15 +246,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new TechnicalInnovationFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new TechnicalInnovationFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new TechnicalInnovationFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new TechnicalInnovationFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -399,32 +398,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c -r409f425c74884ec6cbd5f56ceb89111dfa2394b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 409f425c74884ec6cbd5f56ceb89111dfa2394b5) @@ -33,8 +33,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -145,10 +143,10 @@ public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes() { // Setup - var assessmentSection = new AssessmentSectionStub(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); - var failureMechanismContext = new WaterPressureAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); // Call @@ -157,6 +155,7 @@ // Assert Assert.AreEqual(2, children.Length); var inputFolder = (CategoryTreeFolder) children[0]; + Assert.AreEqual(2, inputFolder.Contents.Count()); Assert.AreEqual("Invoer", inputFolder.Name); Assert.AreEqual(TreeFolderCategory.Input, inputFolder.Category); @@ -247,15 +246,15 @@ public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods() { // Setup + var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism + { + IsRelevant = false + }; + var assessmentSection = mocks.Stub(); + var context = new WaterPressureAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); + using (var treeView = new TreeViewControl()) { - var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism - { - IsRelevant = false - }; - var assessmentSection = mocks.Stub(); - var context = new WaterPressureAsphaltCoverFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = mocks.StrictMock(); using (mocks.Ordered()) { @@ -399,32 +398,5 @@ } } } - - /// - /// Used in ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type) - /// - private void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded() where T : FailureMechanismSectionResult - { - // Setup - var assessmentSection = mocks.Stub(); - var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); - failureMechanism.Expect(fm => fm.IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); - failureMechanism.Expect(fm => fm.InputComments).Return(new Comment()); - failureMechanism.Expect(fm => fm.OutputComments).Return(new Comment()); - var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); - - mocks.ReplayAll(); - - // Call - object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray(); - - // Assert - var outputFolder = (CategoryTreeFolder) children[1]; - - var failureMechanismResultsContext = (FailureMechanismSectionResultContext) outputFolder.Contents.ElementAt(0); - Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); - Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData); - } } } \ No newline at end of file