Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r77c905218e8c214fd59e3f38576f62ef9296aff0 -rc35a4308c9093dde0e6847d7c89aa08b73c71d60 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 77c905218e8c214fd59e3f38576f62ef9296aff0) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision c35a4308c9093dde0e6847d7c89aa08b73c71d60) @@ -139,9 +139,9 @@ Assert.AreSame(failureMechanism.InputComments, inputComment); var calculationsFolder = (ClosingStructuresCalculationGroupContext) children[1]; - Assert.AreEqual(failureMechanism.CalculationsGroup, calculationsFolder.WrappedData); + Assert.AreSame(failureMechanism.CalculationsGroup, calculationsFolder.WrappedData); Assert.IsNull(calculationsFolder.Parent); - Assert.AreEqual(failureMechanism, calculationsFolder.FailureMechanism); + Assert.AreSame(failureMechanism, calculationsFolder.FailureMechanism); var outputsFolder = (CategoryTreeFolder) children[2]; Assert.AreEqual("Oordeel", outputsFolder.Name); @@ -582,7 +582,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestClosingStructuresFailureMechanism(); + var failureMechanism = new ClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "A", @@ -676,7 +676,7 @@ public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations() { // Setup - var failureMechanism = new TestClosingStructuresFailureMechanism(); + var failureMechanism = new ClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "A", Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rea1f2528796aea2946f3f8a7bbc28b2c528576d9 -rc35a4308c9093dde0e6847d7c89aa08b73c71d60 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision ea1f2528796aea2946f3f8a7bbc28b2c528576d9) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision c35a4308c9093dde0e6847d7c89aa08b73c71d60) @@ -148,6 +148,7 @@ Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category); Assert.AreEqual(4, outputsFolder.Contents.Count()); + var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0); Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData); Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection); @@ -162,8 +163,8 @@ } var scenariosContext = (HeightStructuresScenariosContext) outputsFolder.Contents.ElementAt(1); - Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism); Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData); + Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism); var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2); Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism); @@ -239,7 +240,7 @@ } // Assert - // Assert expectancies are called in TearDown() + // Assert is done in TearDown } [Test] @@ -269,7 +270,6 @@ { var gui = mocksRepository.Stub(); gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - mocksRepository.ReplayAll(); plugin.Gui = gui; @@ -279,7 +279,7 @@ } // Assert - // Assert expectancies are called in TearDown() + // Assert is done in TearDown } [Test] @@ -357,7 +357,6 @@ gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - mocksRepository.ReplayAll(); plugin.Gui = gui; @@ -429,7 +428,6 @@ var gui = mocksRepository.Stub(); gui.Stub(g => g.ViewCommands).Return(viewCommands); gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - mocksRepository.ReplayAll(); plugin.Gui = gui; @@ -446,13 +444,14 @@ } [Test] - public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllDisabledAndTooltipSet() + public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); + var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -475,116 +474,7 @@ "Er is geen hydraulische belastingendatabase geïmporteerd.", RiskeerCommonFormsResources.CalculateAllIcon, false); - } - } - } - [Test] - public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemCalculateAllDisabledAndTooltipSet() - { - // Setup - var failureMechanism = new HeightStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); - - var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - - using (var treeViewControl = new TreeViewControl()) - { - var gui = mocksRepository.Stub(); - gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.MainWindow).Return(mocksRepository.Stub()); - gui.Stub(g => g.ViewCommands).Return(mocksRepository.Stub()); - mocksRepository.ReplayAll(); - - plugin.Gui = gui; - - // Call - using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex]; - - Assert.AreEqual("Alles be&rekenen", contextMenuItem.Text); - StringAssert.Contains("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt.", contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.CalculateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); - } - } - } - - [Test] - public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() - { - // Setup - var failureMechanism = new HeightStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }; - HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); - - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - - var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - - using (var treeViewControl = new TreeViewControl()) - { - var gui = mocksRepository.Stub(); - gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.MainWindow).Return(mocksRepository.Stub()); - gui.Stub(g => g.ViewCommands).Return(mocksRepository.Stub()); - mocksRepository.ReplayAll(); - - plugin.Gui = gui; - - // Call - using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - "Alles be&rekenen", - "Voer alle berekeningen binnen dit toetsspoor uit.", - RiskeerCommonFormsResources.CalculateAllIcon); - } - } - } - - [Test] - public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemValidateAllDisabledAndTooltipSet() - { - // Setup - var failureMechanism = new HeightStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); - - var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - - using (var treeViewControl = new TreeViewControl()) - { - var gui = mocksRepository.Stub(); - gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.MainWindow).Return(mocksRepository.Stub()); - gui.Stub(g => g.ViewCommands).Return(mocksRepository.Stub()); - mocksRepository.ReplayAll(); - - plugin.Gui = gui; - - // Call - using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex, "Alles &valideren", "Er is geen hydraulische belastingendatabase geïmporteerd.", @@ -595,7 +485,7 @@ } [Test] - public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemValidateAllDisabledAndTooltipSet() + public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); @@ -620,18 +510,25 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex]; + ToolStripItem calculateAllContextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex]; - Assert.AreEqual("Alles &valideren", contextMenuItem.Text); - StringAssert.Contains("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt.", contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ValidateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual("Alles be&rekenen", calculateAllContextMenuItem.Text); + StringAssert.Contains("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. ", calculateAllContextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.CalculateAllIcon, calculateAllContextMenuItem.Image); + Assert.IsFalse(calculateAllContextMenuItem.Enabled); + + ToolStripItem validateAllContextMenuItem = contextMenu.Items[contextMenuValidateAllIndex]; + + Assert.AreEqual("Alles &valideren", validateAllContextMenuItem.Text); + StringAssert.Contains("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. ", validateAllContextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ValidateAllIcon, validateAllContextMenuItem.Image); + Assert.IsFalse(validateAllContextMenuItem.Enabled); } } } [Test] - public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemValidateAllEnabled() + public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllAndValidateAllEnabled() { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); @@ -666,6 +563,11 @@ using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, + "Alles be&rekenen", + "Voer alle berekeningen binnen dit toetsspoor uit.", + RiskeerCommonFormsResources.CalculateAllIcon); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, "Alles &valideren", "Valideer alle berekeningen binnen dit toetsspoor.", @@ -725,7 +627,7 @@ .WhenCalled(invocation => { HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase), + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase), (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestStructuresCalculator()) @@ -1304,9 +1206,8 @@ public override void TearDown() { plugin.Dispose(); - mocksRepository.VerifyAll(); - base.TearDown(); + mocksRepository.VerifyAll(); } } } \ No newline at end of file