Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r44472a4abdebe721072cb648140d9254bc25bd1a -ra8ba3036ac70c46d48b53edcdfa813c06538b3d2 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 44472a4abdebe721072cb648140d9254bc25bd1a) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision a8ba3036ac70c46d48b53edcdfa813c06538b3d2) @@ -894,6 +894,7 @@ builder.AddRenameItem(); } + ProbabilisticPipingCalculationScenario[] probabilisticCalculations = calculations.OfType().ToArray(); builder.AddCustomItem(updateEntryAndExitPointsItem) .AddSeparator() .AddValidateAllCalculationsInGroupItem( @@ -904,8 +905,9 @@ CalculateAllInCalculationGroup) .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group) - .AddClearIllustrationPointsOfCalculationsInGroupItem(() => ProbabilisticPipingIllustrationPointsHelper.HasIllustrationPoints(calculations.OfType()), - CreateChangeHandler(inquiryHelper, calculations.OfType())); + .AddClearIllustrationPointsOfCalculationsInGroupItem( + () => ProbabilisticPipingIllustrationPointsHelper.HasIllustrationPoints(probabilisticCalculations), + CreateChangeHandler(inquiryHelper, probabilisticCalculations)); if (isNestedGroup) { @@ -1201,8 +1203,9 @@ CalculateProbabilistic) .AddSeparator() .AddClearCalculationOutputItem(calculation) - .AddClearIllustrationPointsOfCalculationItem(() => ProbabilisticPipingIllustrationPointsHelper.HasIllustrationPoints(calculation), - changeHandler) + .AddClearIllustrationPointsOfCalculationItem( + () => ProbabilisticPipingIllustrationPointsHelper.HasIllustrationPoints(calculation), + changeHandler) .AddDeleteItem() .AddSeparator() .AddCollapseAllItem() Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs =================================================================== diff -u -r397e2a00a6da3e3bee9b96820c83e92d117d0162 -ra8ba3036ac70c46d48b53edcdfa813c06538b3d2 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs (.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs) (revision 397e2a00a6da3e3bee9b96820c83e92d117d0162) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs (.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs) (revision a8ba3036ac70c46d48b53edcdfa813c06538b3d2) @@ -50,15 +50,58 @@ } [Test] - public void ClearIllustrationPoints_WithCalculationWithIllustrationPoints_ClearsIllustrationPointsAndReturnsExpectedResult() + public void ClearIllustrationPoints_CalculationWithoutOutputWithoutIllustrationPoints_ReturnsFalse() { // Setup var mocks = new MockRepository(); var inquiryHelper = mocks.StrictMock(); mocks.ReplayAll(); + var calculation = new ProbabilisticPipingCalculationScenario(); + + var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(inquiryHelper, calculation); + + // Call + bool result = handler.ClearIllustrationPoints(); + + // Assert + Assert.IsFalse(result); + mocks.VerifyAll(); + } + + [Test] + public void ClearIllustrationPoints_CalculationWithOutputWithoutIllustrationPoints_ReturnsFalse() + { + // Setup + var mocks = new MockRepository(); + var inquiryHelper = mocks.StrictMock(); + mocks.ReplayAll(); + var calculation = new ProbabilisticPipingCalculationScenario { + Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithoutIllustrationPoints() + }; + + var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(inquiryHelper, calculation); + + // Call + bool result = handler.ClearIllustrationPoints(); + + // Assert + Assert.IsFalse(result); + mocks.VerifyAll(); + } + + [Test] + public void ClearIllustrationPoints_CalculationWithOutputWithIllustrationPoints_ClearsIllustrationPointsAndReturnsTrue() + { + // Setup + var mocks = new MockRepository(); + var inquiryHelper = mocks.StrictMock(); + mocks.ReplayAll(); + + var calculation = new ProbabilisticPipingCalculationScenario + { Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() }; @@ -70,8 +113,8 @@ // Assert Assert.IsTrue(result); - Assert.IsNull(calculation.Output?.ProfileSpecificOutput.GeneralResult); - Assert.IsNull(calculation.Output?.SectionSpecificOutput.GeneralResult); + Assert.IsNull(calculation.Output.ProfileSpecificOutput.GeneralResult); + Assert.IsNull(calculation.Output.SectionSpecificOutput.GeneralResult); mocks.VerifyAll(); } } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationCollectionChangeHandlerTest.cs =================================================================== diff -u -r397e2a00a6da3e3bee9b96820c83e92d117d0162 -ra8ba3036ac70c46d48b53edcdfa813c06538b3d2 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationCollectionChangeHandlerTest.cs (.../ClearIllustrationPointsOfProbabilisticPipingCalculationCollectionChangeHandlerTest.cs) (revision 397e2a00a6da3e3bee9b96820c83e92d117d0162) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationCollectionChangeHandlerTest.cs (.../ClearIllustrationPointsOfProbabilisticPipingCalculationCollectionChangeHandlerTest.cs) (revision a8ba3036ac70c46d48b53edcdfa813c06538b3d2) @@ -79,7 +79,8 @@ var mocks = new MockRepository(); var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(h => h.InquireContinuation("Weet u zeker dat u alle illustratiepunten wilt wissen?")).Return(expectedConfirmation); + inquiryHelper.Expect(h => h.InquireContinuation("Weet u zeker dat u alle illustratiepunten wilt wissen?")) + .Return(expectedConfirmation); mocks.ReplayAll(); var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationCollectionChangeHandler( @@ -97,16 +98,14 @@ public void ClearIllustrationPoints_Always_ReturnsAffectedCalculations() { // Setup - var outputWithNoIllustrationPoints = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithoutIllustrationPoints(); var calculationWitNoIllustrationPoints = new ProbabilisticPipingCalculationScenario { - Output = outputWithNoIllustrationPoints + Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithoutIllustrationPoints() }; - var outputWithIllustrationPoints = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints(); var calculationWithIllustrationPoints = new ProbabilisticPipingCalculationScenario { - Output = outputWithIllustrationPoints + Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() }; ProbabilisticPipingCalculationScenario[] calculations = @@ -144,7 +143,7 @@ ProbabilisticPipingOutput output = calc.Output; return !output.ProfileSpecificOutput.HasGeneralResult - && output.SectionSpecificOutput?.GeneralResult == null; + && !output.SectionSpecificOutput.HasGeneralResult; })); mocks.VerifyAll(); } Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r657d08b18a32bdb1f74e37665a95fa9b08e37a55 -ra8ba3036ac70c46d48b53edcdfa813c06538b3d2 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 657d08b18a32bdb1f74e37665a95fa9b08e37a55) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision a8ba3036ac70c46d48b53edcdfa813c06538b3d2) @@ -218,7 +218,7 @@ group.Children.Add(new TestPipingCalculationScenario(true)); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new PipingCalculationGroupContext(group, parentGroup, @@ -358,7 +358,7 @@ group.Children.Add(new TestPipingCalculationScenario(true)); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new PipingCalculationGroupContext(group, null, @@ -617,7 +617,7 @@ using (var treeViewControl = new TreeViewControl()) { var assessmentSection = new AssessmentSectionStub(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var group = new CalculationGroup { Children = @@ -665,7 +665,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var group = new CalculationGroup(); @@ -698,50 +698,12 @@ } [Test] - public void ContextMenuStrip_CalculationGroupHasNoCalculations_ContextMenuItemClearIllustrationPointsDisabledAndToolTipSet() - { - // Setup - using (var treeViewControl = new TreeViewControl()) - { - var pipingFailureMechanism = new TestPipingFailureMechanism(); - - var assessmentSection = mocks.Stub(); - var group = new CalculationGroup(); - - var nodeData = new PipingCalculationGroupContext(group, - null, - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); - var gui = mocks.Stub(); - gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); - mocks.ReplayAll(); - - plugin.Gui = gui; - - // Call - using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, - contextMenuClearIllustrationPointsIndexRootGroup, - "Wis alle illustratiepunten...", - "Er zijn geen berekeningen met illustratiepunten om te wissen.", - RiskeerCommonFormsResources.ClearIllustrationPointsIcon, - false); - } - } - } - - [Test] public void ContextMenuStrip_CalculationGroupWithCalculationsWithoutSurfaceLine_ContextMenuItemUpdateEntryAndExitPointsDisabledAndToolTipSet() { // Setup using (var treeViewControl = new TreeViewControl()) { - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var group = new CalculationGroup { @@ -887,14 +849,44 @@ } [Test] - public void ContextMenuStrip_CalculationGroupCalculationsWithIllustrationPoints_ContextMenuClearIllustrationPointsEnabledAndToolTipSet() + public void ContextMenuStrip_CalculationGroupWithoutCalculations_ContextMenuItemClearIllustrationPointsDisabledAndToolTipSet() { // Setup using (var treeViewControl = new TreeViewControl()) { - var assessmentSection = mocks.Stub(); - TestPipingFailureMechanism pipingFailureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); + var nodeData = new PipingCalculationGroupContext(new CalculationGroup(), + null, + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + mocks.Stub()); + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); + mocks.ReplayAll(); + plugin.Gui = gui; + + // Call + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, + contextMenuClearIllustrationPointsIndexRootGroup, + "Wis alle illustratiepunten...", + "Er zijn geen berekeningen met illustratiepunten om te wissen.", + RiskeerCommonFormsResources.ClearIllustrationPointsIcon, + false); + } + } + } + + [Test] + public void ContextMenuStrip_CalculationGroupCalculationsWithIllustrationPoints_ContextMenuClearIllustrationPointsEnabledAndToolTipSet() + { + // Setup + using (var treeViewControl = new TreeViewControl()) + { IPipingCalculationScenario probabilisticCalculation = new ProbabilisticPipingCalculationScenario { Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() @@ -915,8 +907,8 @@ null, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); + new TestPipingFailureMechanism(), + mocks.Stub()); var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -939,14 +931,11 @@ } [Test] - public void ContextMenuStrip_CalculationGroupCalculationsWithoutIllustrationPoints_ContextMenuClearIllustrationPointsEnabledAndToolTipSet() + public void ContextMenuStrip_CalculationGroupCalculationsWithoutIllustrationPoints_ContextMenuClearIllustrationPointsDisabledAndToolTipSet() { // Setup using (var treeViewControl = new TreeViewControl()) { - var assessmentSection = mocks.Stub(); - TestPipingFailureMechanism pipingFailureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); - IPipingCalculationScenario probabilisticCalculation = new ProbabilisticPipingCalculationScenario { Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithoutIllustrationPoints() @@ -967,8 +956,8 @@ null, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); + new PipingFailureMechanism(), + mocks.Stub()); var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -1380,7 +1369,7 @@ using (var treeViewControl = new TreeViewControl()) { var assessmentSection = new AssessmentSectionStub(); - var failureMechanism = new TestPipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var calculationGroup = new CalculationGroup { Children = @@ -1552,7 +1541,7 @@ using (var treeViewControl = new TreeViewControl()) { var assessmentSection = new AssessmentSectionStub(); - var failureMechanism = new TestPipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var calculationGroup = new CalculationGroup { Children = @@ -1596,57 +1585,51 @@ public void ContextMenuStrip_ClickOnClearOutputItem_ClearOutputAllChildCalculationsAndNotifyCalculationObservers(bool confirm) { // Setup - using (var treeViewControl = new TreeViewControl()) + var calculation1Observer = mocks.StrictMock(); + var calculation2Observer = mocks.StrictMock(); + if (confirm) { - var calculation1Observer = mocks.StrictMock(); - var calculation2Observer = mocks.StrictMock(); - if (confirm) - { - calculation1Observer.Expect(o => o.UpdateObserver()); - calculation2Observer.Expect(o => o.UpdateObserver()); - } + calculation1Observer.Expect(o => o.UpdateObserver()); + calculation2Observer.Expect(o => o.UpdateObserver()); + } - var pipingFailureMechanism = new TestPipingFailureMechanism(); - var assessmentSection = new AssessmentSectionStub(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + var pipingFailureMechanism = new PipingFailureMechanism(); + var assessmentSection = mocks.Stub(); - assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] - { - hydraulicBoundaryLocation - }, true); + var calculation1 = new TestPipingCalculationScenario(true); + calculation1.Attach(calculation1Observer); - var calculation1 = new TestPipingCalculationScenario(true); - calculation1.Attach(calculation1Observer); + var calculation2 = new TestPipingCalculationScenario(true); + calculation2.Attach(calculation2Observer); - var calculation2 = new TestPipingCalculationScenario(true); - calculation2.Attach(calculation2Observer); + var childGroup = new CalculationGroup(); + childGroup.Children.Add(calculation1); - var childGroup = new CalculationGroup(); - childGroup.Children.Add(calculation1); + var emptyChildGroup = new CalculationGroup(); + var group = new CalculationGroup(); + var parentGroup = new CalculationGroup(); - var emptyChildGroup = new CalculationGroup(); - var group = new CalculationGroup(); - var parentGroup = new CalculationGroup(); + group.Children.Add(childGroup); + group.Children.Add(emptyChildGroup); + group.Children.Add(calculation2); - group.Children.Add(childGroup); - group.Children.Add(emptyChildGroup); - group.Children.Add(calculation2); + var nodeData = new PipingCalculationGroupContext(group, + parentGroup, + Enumerable.Empty(), + Enumerable.Empty(), + pipingFailureMechanism, + assessmentSection); + var parentNodeData = new PipingCalculationGroupContext(parentGroup, + null, + Enumerable.Empty(), + Enumerable.Empty(), + pipingFailureMechanism, + assessmentSection); - var nodeData = new PipingCalculationGroupContext(group, - parentGroup, - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); - var parentNodeData = new PipingCalculationGroupContext(parentGroup, - null, - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); + var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - + using (var treeViewControl = new TreeViewControl()) + { var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); @@ -1693,63 +1676,57 @@ public void ContextMenuStrip_ClickOnIllustrationPointsItem_ClearIllustrationPointsChildCalculationsAndNotifyCalculationObservers(bool confirm) { // Setup - using (var treeViewControl = new TreeViewControl()) + var calculation1Observer = mocks.StrictMock(); + var calculation2Observer = mocks.StrictMock(); + if (confirm) { - var calculation1Observer = mocks.StrictMock(); - var calculation2Observer = mocks.StrictMock(); - if (confirm) - { - calculation1Observer.Expect(o => o.UpdateObserver()); - calculation2Observer.Expect(o => o.UpdateObserver()); - } + calculation1Observer.Expect(o => o.UpdateObserver()); + calculation2Observer.Expect(o => o.UpdateObserver()); + } - var pipingFailureMechanism = new TestPipingFailureMechanism(); - var assessmentSection = new AssessmentSectionStub(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + var pipingFailureMechanism = new PipingFailureMechanism(); + var assessmentSection = mocks.Stub(); - assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] - { - hydraulicBoundaryLocation - }, true); + var calculation1 = new ProbabilisticPipingCalculationScenario + { + Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() + }; + calculation1.Attach(calculation1Observer); - var calculation1 = new ProbabilisticPipingCalculationScenario - { - Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() - }; - calculation1.Attach(calculation1Observer); + var calculation2 = new ProbabilisticPipingCalculationScenario + { + Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() + }; + calculation2.Attach(calculation2Observer); - var calculation2 = new ProbabilisticPipingCalculationScenario - { - Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() - }; - calculation2.Attach(calculation2Observer); + var childGroup = new CalculationGroup(); + childGroup.Children.Add(calculation1); - var childGroup = new CalculationGroup(); - childGroup.Children.Add(calculation1); + var emptyChildGroup = new CalculationGroup(); + var group = new CalculationGroup(); + var parentGroup = new CalculationGroup(); - var emptyChildGroup = new CalculationGroup(); - var group = new CalculationGroup(); - var parentGroup = new CalculationGroup(); + group.Children.Add(childGroup); + group.Children.Add(emptyChildGroup); + group.Children.Add(calculation2); - group.Children.Add(childGroup); - group.Children.Add(emptyChildGroup); - group.Children.Add(calculation2); + var nodeData = new PipingCalculationGroupContext(group, + parentGroup, + Enumerable.Empty(), + Enumerable.Empty(), + pipingFailureMechanism, + assessmentSection); + var parentNodeData = new PipingCalculationGroupContext(parentGroup, + null, + Enumerable.Empty(), + Enumerable.Empty(), + pipingFailureMechanism, + assessmentSection); - var nodeData = new PipingCalculationGroupContext(group, - parentGroup, - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); - var parentNodeData = new PipingCalculationGroupContext(parentGroup, - null, - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); + var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - + using (var treeViewControl = new TreeViewControl()) + { var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rc6dea2e16271a5e6b32146ccc65563e75ca0cb9f -ra8ba3036ac70c46d48b53edcdfa813c06538b3d2 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision c6dea2e16271a5e6b32146ccc65563e75ca0cb9f) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision a8ba3036ac70c46d48b53edcdfa813c06538b3d2) @@ -161,79 +161,6 @@ } [Test] - public void ContextMenuStrip_CalculationWithoutOutput_ContextMenuItemClearOutputDisabledAndTooltipSet() - { - // Setup - using (var treeViewControl = new TreeViewControl()) - { - var calculation = new ProbabilisticPipingCalculationScenario(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); - var assessmentSection = mocks.Stub(); - var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, - new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); - - var gui = mocks.Stub(); - gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); - mocks.ReplayAll(); - - plugin.Gui = gui; - - // Call - using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, - contextMenuClearIndex, - "&Wis uitvoer...", - "Deze berekening heeft geen uitvoer om te wissen.", - RiskeerCommonFormsResources.ClearIcon, - false); - } - } - } - - [Test] - public void ContextMenuStrip_CalculationWithoutOutput_ContextMenuItemClearIllustrationPointsDisabledAndToolTipSet() - { - // Setup - using (var treeViewControl = new TreeViewControl()) - { - var calculation = new ProbabilisticPipingCalculationScenario(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); - var assessmentSection = mocks.Stub(); - var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, - new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - pipingFailureMechanism, - assessmentSection); - - var gui = mocks.Stub(); - gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); - mocks.ReplayAll(); - - plugin.Gui = gui; - - // Call - using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearIllustrationPointsIndex, - "Wis illustratiepunten...", - "Deze berekening heeft geen illustratiepunten om te wissen.", - RiskeerCommonFormsResources.ClearIllustrationPointsIcon, - false); - } - } - } - - [Test] public void ContextMenuStrip_CalculationWithOutput_ContextMenuItemClearOutputEnabled() { // Setup @@ -243,7 +170,7 @@ { Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() }; - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -279,7 +206,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new ProbabilisticPipingCalculationScenario(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -320,7 +247,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(new ProbabilisticPipingCalculationScenario(), new CalculationGroup(), @@ -445,7 +372,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new ProbabilisticPipingCalculationScenario(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -494,7 +421,7 @@ SurfaceLine = surfaceLine } }; - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -543,7 +470,7 @@ SurfaceLine = surfaceLine } }; - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -584,7 +511,7 @@ { Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithoutIllustrationPoints() }; - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -614,6 +541,79 @@ } [Test] + public void ContextMenuStrip_CalculationWithoutOutput_ContextMenuItemClearOutputDisabledAndTooltipSet() + { + // Setup + using (var treeViewControl = new TreeViewControl()) + { + var calculation = new ProbabilisticPipingCalculationScenario(); + var pipingFailureMechanism = new PipingFailureMechanism(); + var assessmentSection = mocks.Stub(); + var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, + new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + pipingFailureMechanism, + assessmentSection); + + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); + mocks.ReplayAll(); + + plugin.Gui = gui; + + // Call + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, + contextMenuClearIndex, + "&Wis uitvoer...", + "Deze berekening heeft geen uitvoer om te wissen.", + RiskeerCommonFormsResources.ClearIcon, + false); + } + } + } + + [Test] + public void ContextMenuStrip_CalculationWithoutOutput_ContextMenuItemClearIllustrationPointsDisabledAndToolTipSet() + { + // Setup + using (var treeViewControl = new TreeViewControl()) + { + var calculation = new ProbabilisticPipingCalculationScenario(); + var pipingFailureMechanism = new PipingFailureMechanism(); + var assessmentSection = mocks.Stub(); + var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, + new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + pipingFailureMechanism, + assessmentSection); + + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); + mocks.ReplayAll(); + + plugin.Gui = gui; + + // Call + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) + { + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearIllustrationPointsIndex, + "Wis illustratiepunten...", + "Deze berekening heeft geen illustratiepunten om te wissen.", + RiskeerCommonFormsResources.ClearIllustrationPointsIcon, + false); + } + } + } + + [Test] public void ContextMenuStrip_CalculationWithOutputAndIllustrationPoints_ContextMenuItemClearIllustrationPointsEnabledAndToolTipSet() { // Setup @@ -623,7 +623,7 @@ { Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints() }; - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -659,7 +659,7 @@ // Given CreateCalculationWithSurfaceLine(out ProbabilisticPipingCalculationScenario calculation, out PipingSurfaceLine surfaceLine); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -708,7 +708,7 @@ CreateCalculationWithSurfaceLine(out ProbabilisticPipingCalculationScenario calculation, out PipingSurfaceLine surfaceLine); calculation.Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -768,7 +768,7 @@ CreateCalculationWithSurfaceLine(out ProbabilisticPipingCalculationScenario calculation, out PipingSurfaceLine surfaceLine); calculation.Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -871,7 +871,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new ProbabilisticPipingCalculationScenario(); - var failureMechanism = new TestPipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var pipingCalculationScenarioContext = new ProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), @@ -930,7 +930,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new ProbabilisticPipingCalculationScenario(); - var pipingFailureMechanism = new TestPipingFailureMechanism(); + var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var pipingCalculationScenarioContext = new ProbabilisticPipingCalculationScenarioContext(calculation, @@ -980,7 +980,7 @@ { var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); + PipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); assessmentSection.HydraulicBoundaryDatabase.FilePath = validHydraulicBoundaryDatabaseFilePath; HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);