Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -reffe3cbc48073f4f368b6a72851444ca1a3fec61 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision effe3cbc48073f4f368b6a72851444ca1a3fec61) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -285,6 +285,17 @@ .AddPropertiesItem() .Build() }; + + yield return new TreeNodeInfo + { + Text = context => RingtoetsCommonFormsResources.Calculation_Input, + Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon, + ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) + .AddOpenItem() + .AddSeparator() + .AddPropertiesItem() + .Build() + }; } public override IEnumerable GetExportInfos() Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs =================================================================== diff -u -r4e53af4a4179994c7a7d7fa25ab2b0bf256ca543 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 4e53af4a4179994c7a7d7fa25ab2b0bf256ca543) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -26,12 +26,15 @@ using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses; using Ringtoets.GrassCoverErosionOutwards.Forms.Views; +using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.Forms.Views; namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test { @@ -59,7 +62,7 @@ ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray(); // Assert - Assert.AreEqual(4, viewInfos.Length); + Assert.AreEqual(5, viewInfos.Length); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -83,6 +86,12 @@ typeof(GrassCoverErosionOutwardsWaveHeightCalculationsContext), typeof(IObservableEnumerable), typeof(GrassCoverErosionOutwardsWaveHeightCalculationsView)); + + PluginTestHelper.AssertViewInfoDefined( + viewInfos, + typeof(GrassCoverErosionOutwardsWaveConditionsInputContext), + typeof(ICalculation), + typeof(WaveConditionsInputView)); } } @@ -96,7 +105,7 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(11, treeNodeInfos.Length); + Assert.AreEqual(12, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsFailureMechanismContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext))); @@ -108,6 +117,7 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsOutput))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsInputContext))); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -reffe3cbc48073f4f368b6a72851444ca1a3fec61 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision effe3cbc48073f4f368b6a72851444ca1a3fec61) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -896,17 +896,6 @@ } }; - yield return new TreeNodeInfo - { - Text = context => RingtoetsCommonFormsResources.Calculation_Input, - Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .AddSeparator() - .AddPropertiesItem() - .Build() - }; - yield return new TreeNodeInfo { Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName, Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -r5973ea19f0223d8e4331d1646e505032a569f0b4 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 5973ea19f0223d8e4331d1646e505032a569f0b4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -59,9 +59,6 @@ using Ringtoets.Integration.Forms.PropertyClasses.StandAlone; using Ringtoets.Integration.Forms.Views; using Ringtoets.Integration.Forms.Views.SectionResultViews; -using Ringtoets.Revetment.Data; -using Ringtoets.Revetment.Forms.PresentationObjects; -using Ringtoets.Revetment.Forms.Views; using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources; namespace Ringtoets.Integration.Plugin.Test @@ -250,7 +247,7 @@ propertyInfos, typeof(FailureMechanismContributionContext), typeof(AssessmentSectionCompositionProperties)); - + PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(NormContext), @@ -369,7 +366,7 @@ ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray(); // Assert - Assert.AreEqual(19, viewInfos.Length); + Assert.AreEqual(18, viewInfos.Length); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -460,12 +457,6 @@ PluginTestHelper.AssertViewInfoDefined( viewInfos, - typeof(WaveConditionsInputContext), - typeof(ICalculation), - typeof(WaveConditionsInputView)); - - PluginTestHelper.AssertViewInfoDefined( - viewInfos, typeof(StructuresOutputContext), typeof(IStructuresCalculation), typeof(GeneralResultFaultTreeIllustrationPointView)); @@ -494,7 +485,7 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(32, treeNodeInfos.Length); + Assert.AreEqual(31, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(BackgroundData))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(NormContext))); @@ -523,7 +514,6 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(Comment))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(RingtoetsProject))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveConditionsInputContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StructuresOutputContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultTotalContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultPerSectionContext))); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r6f9461a8dc883d8178cbff206b537f0d248eb6f0 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 6f9461a8dc883d8178cbff206b537f0d248eb6f0) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -160,6 +160,17 @@ .AddOpenItem() .Build() }; + + yield return new TreeNodeInfo + { + Text = context => RingtoetsCommonFormsResources.Calculation_Input, + Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon, + ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) + .AddOpenItem() + .AddSeparator() + .AddPropertiesItem() + .Build() + }; } public override IEnumerable GetImportInfos() Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs =================================================================== diff -u -r73bb4932d13d36d1cd3cd30d8151f2adf49646f2 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 73bb4932d13d36d1cd3cd30d8151f2adf49646f2) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -25,7 +25,10 @@ using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.Forms.Views; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; using Ringtoets.StabilityStoneCover.Forms.PropertyClasses; @@ -73,7 +76,7 @@ ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray(); // Assert - Assert.AreEqual(2, viewInfos.Length); + Assert.AreEqual(3, viewInfos.Length); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -85,6 +88,12 @@ typeof(FailureMechanismSectionResultContext), typeof(IObservableEnumerable), typeof(StabilityStoneCoverResultView)); + + PluginTestHelper.AssertViewInfoDefined( + viewInfos, + typeof(StabilityStoneCoverWaveConditionsInputContext), + typeof(ICalculation), + typeof(WaveConditionsInputView)); } } @@ -98,13 +107,14 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(6, treeNodeInfos.Length); + Assert.AreEqual(7, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverFailureMechanismContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsCalculationContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyStabilityStoneCoverOutput))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsOutput))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityStoneCoverWaveConditionsInputContext))); } } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r5cfc0d61dc4789261beb5ee660401619a35ffe6e -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 5cfc0d61dc4789261beb5ee660401619a35ffe6e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -171,6 +171,17 @@ .AddPropertiesItem() .Build() }; + + yield return new TreeNodeInfo + { + Text = context => RingtoetsCommonFormsResources.Calculation_Input, + Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon, + ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) + .AddOpenItem() + .AddSeparator() + .AddPropertiesItem() + .Build() + }; } public override IEnumerable GetExportInfos() Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -r73bb4932d13d36d1cd3cd30d8151f2adf49646f2 -r5c66b4dea20f2aa7bc89e67bb124232d060f1477 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 73bb4932d13d36d1cd3cd30d8151f2adf49646f2) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 5c66b4dea20f2aa7bc89e67bb124232d060f1477) @@ -25,7 +25,10 @@ using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; using NUnit.Framework; +using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects; using Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses; @@ -86,7 +89,7 @@ ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray(); // Assert - Assert.AreEqual(2, viewInfos.Length); + Assert.AreEqual(3, viewInfos.Length); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -98,6 +101,12 @@ typeof(FailureMechanismSectionResultContext), typeof(IObservableEnumerable), typeof(WaveImpactAsphaltCoverFailureMechanismResultView)); + + PluginTestHelper.AssertViewInfoDefined( + viewInfos, + typeof(WaveImpactAsphaltCoverWaveConditionsInputContext), + typeof(ICalculation), + typeof(WaveConditionsInputView)); } } @@ -111,13 +120,14 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(6, treeNodeInfos.Length); + Assert.AreEqual(7, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverFailureMechanismContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyWaveImpactAsphaltCoverOutput))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsOutput))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsInputContext))); } }