Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs =================================================================== diff -u -r04012135e8adf6a03ce2928e047603435c9a186f -raba67f792ebf713b8efd82f090204253ac4ec358 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs (.../StabilityPointStructuresInputContext.cs) (revision 04012135e8adf6a03ce2928e047603435c9a186f) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs (.../StabilityPointStructuresInputContext.cs) (revision aba67f792ebf713b8efd82f090204253ac4ec358) @@ -34,7 +34,7 @@ /// /// Creates a new instance of . /// - /// The stability point structures input instance wrapped by this context object. + /// The instance wrapped by this context object. /// The calculation item which the belongs to. /// The failure mechanism which the context belongs to. /// The assessment section which the context belongs to. Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs =================================================================== diff -u -r04012135e8adf6a03ce2928e047603435c9a186f -raba67f792ebf713b8efd82f090204253ac4ec358 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs (.../StabilityPointStructuresCalculationContextTest.cs) (revision 04012135e8adf6a03ce2928e047603435c9a186f) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs (.../StabilityPointStructuresCalculationContextTest.cs) (revision aba67f792ebf713b8efd82f090204253ac4ec358) @@ -36,7 +36,7 @@ { // Setup var mocksRepository = new MockRepository(); - var assessmentSectionMock = mocksRepository.StrictMock(); + var assessmentSectionMock = mocksRepository.Stub(); mocksRepository.ReplayAll(); var calculation = new StabilityPointStructuresCalculation(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs =================================================================== diff -u -r04012135e8adf6a03ce2928e047603435c9a186f -raba67f792ebf713b8efd82f090204253ac4ec358 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs (.../StabilityPointStructuresInputContextTest.cs) (revision 04012135e8adf6a03ce2928e047603435c9a186f) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs (.../StabilityPointStructuresInputContextTest.cs) (revision aba67f792ebf713b8efd82f090204253ac4ec358) @@ -42,7 +42,7 @@ public void ConstructorWithData_Always_ExpectedPropertiesSet() { // Setup - var assessmentSectionMock = mocksRepository.StrictMock(); + var assessmentSectionMock = mocksRepository.Stub(); mocksRepository.ReplayAll(); var input = new StabilityPointStructuresInput(); @@ -65,7 +65,7 @@ public void Constructor_NullCalculation_ThrowsArgumentNullException() { // Setup - var assessmentSectionMock = mocksRepository.StrictMock(); + var assessmentSectionMock = mocksRepository.Stub(); mocksRepository.ReplayAll(); var input = new StabilityPointStructuresInput(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r1754674a3394a05cbd874b8add9a81ac2452d5a9 -raba67f792ebf713b8efd82f090204253ac4ec358 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision 1754674a3394a05cbd874b8add9a81ac2452d5a9) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision aba67f792ebf713b8efd82f090204253ac4ec358) @@ -127,9 +127,9 @@ Assert.IsNotNull(commentContext); Assert.AreSame(calculationContext.WrappedData, commentContext.WrappedData); - var grassCoverErosionInwardsInputContext = children[1] as StabilityPointStructuresInputContext; - Assert.IsNotNull(grassCoverErosionInwardsInputContext); - Assert.AreSame(calculationContext.WrappedData.InputParameters, grassCoverErosionInwardsInputContext.WrappedData); + var stabilityPointStructuresInputContext = children[1] as StabilityPointStructuresInputContext; + Assert.IsNotNull(stabilityPointStructuresInputContext); + Assert.AreSame(calculationContext.WrappedData.InputParameters, stabilityPointStructuresInputContext.WrappedData); var emptyOutput = children[2] as EmptyProbabilityAssessmentOutput; Assert.IsNotNull(emptyOutput); @@ -158,9 +158,9 @@ Assert.IsNotNull(commentContext); Assert.AreSame(calculationContext.WrappedData, commentContext.WrappedData); - var grassCoverErosionInwardsInputContext = children[1] as StabilityPointStructuresInputContext; - Assert.IsNotNull(grassCoverErosionInwardsInputContext); - Assert.AreSame(calculationContext.WrappedData.InputParameters, grassCoverErosionInwardsInputContext.WrappedData); + var stabilityPointStructuresInputContext = children[1] as StabilityPointStructuresInputContext; + Assert.IsNotNull(stabilityPointStructuresInputContext); + Assert.AreSame(calculationContext.WrappedData.InputParameters, stabilityPointStructuresInputContext.WrappedData); var output = children[2] as StabilityPointStructuresOutput; Assert.IsNotNull(output); @@ -260,52 +260,6 @@ } [Test] - public void ContextMenuStrip_SectionsAndDatabaseSet_ContextMenuItemPerformCalculationEnabled() - { - // Setup - var guiMock = mocks.StrictMock(); - - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }; - - var failureMechanism = new StabilityPointStructuresFailureMechanism(); - failureMechanism.AddSection(new FailureMechanismSection("test", new[] - { - new Point2D(0, 0) - })); - - var assessmentSectionMock = mocks.StrictMock(); - assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - - var calculation = new StabilityPointStructuresCalculation(); - var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); - - using (var treeViewControl = new TreeViewControl()) - { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - - mocks.ReplayAll(); - - plugin.Gui = guiMock; - - // Call - using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) - { - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, - RingtoetsCommonFormsResources.Calculate, - RingtoetsCommonFormsResources.Calculate_ToolTip, - RingtoetsCommonFormsResources.CalculateIcon); - } - } - } - - [Test] public void OnNodeRemoved_ParentIsCalculationGroupContext_RemoveCalculationFromGroup() { // Setup Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r1754674a3394a05cbd874b8add9a81ac2452d5a9 -raba67f792ebf713b8efd82f090204253ac4ec358 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresInputContextTreeNodeInfoTest.cs (.../StabilityPointStructuresInputContextTreeNodeInfoTest.cs) (revision 1754674a3394a05cbd874b8add9a81ac2452d5a9) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresInputContextTreeNodeInfoTest.cs (.../StabilityPointStructuresInputContextTreeNodeInfoTest.cs) (revision aba67f792ebf713b8efd82f090204253ac4ec358) @@ -88,7 +88,7 @@ { // Setup var assessmentSectionMock = mocksRepository.StrictMock(); - var grassCoverErosionInwardsInputContext = new StabilityPointStructuresInputContext( + var stabilityPointStructuresInputContext = new StabilityPointStructuresInputContext( mocksRepository.StrictMock(), mocksRepository.StrictMock(), new StabilityPointStructuresFailureMechanism(), @@ -97,7 +97,7 @@ mocksRepository.ReplayAll(); // Call - var text = info.Text(grassCoverErosionInwardsInputContext); + var text = info.Text(stabilityPointStructuresInputContext); // Assert Assert.AreEqual("Invoer", text); @@ -108,7 +108,7 @@ { // Setup var assessmentSectionMock = mocksRepository.StrictMock(); - var grassCoverErosionInwardsInputContext = new StabilityPointStructuresInputContext( + var stabilityPointStructuresInputContext = new StabilityPointStructuresInputContext( mocksRepository.StrictMock(), mocksRepository.StrictMock(), new StabilityPointStructuresFailureMechanism(), @@ -117,7 +117,7 @@ mocksRepository.ReplayAll(); // Call - var image = info.Image(grassCoverErosionInwardsInputContext); + var image = info.Image(stabilityPointStructuresInputContext); // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresOutputTreeNodeInfoTest.cs =================================================================== diff -u -r1754674a3394a05cbd874b8add9a81ac2452d5a9 -raba67f792ebf713b8efd82f090204253ac4ec358 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresOutputTreeNodeInfoTest.cs (.../StabilityPointStructuresOutputTreeNodeInfoTest.cs) (revision 1754674a3394a05cbd874b8add9a81ac2452d5a9) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresOutputTreeNodeInfoTest.cs (.../StabilityPointStructuresOutputTreeNodeInfoTest.cs) (revision aba67f792ebf713b8efd82f090204253ac4ec358) @@ -91,7 +91,7 @@ var text = info.Text(null); // Assert - Assert.AreEqual(RingtoetsCommonFormsResources.CalculationOutput_DisplayName, text); + Assert.AreEqual("Resultaat", text); } [Test]