Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs =================================================================== diff -u -r2ff2a985fe9015df6da49fe43006e5c7631434c3 -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision 2ff2a985fe9015df6da49fe43006e5c7631434c3) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -369,7 +369,7 @@ private static void SetStateWithEnableFunction(T context, Func enableFunction, StrictContextMenuItem menuItem) { - var validationText = enableFunction != null ? enableFunction(context) : null; + string validationText = enableFunction != null ? enableFunction(context) : null; if (!string.IsNullOrEmpty(validationText)) { menuItem.Enabled = false; Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CalculatableView.Designer.cs =================================================================== diff -u -r40e486ad3df2752a22f69fcaf5f3d023c1e186fd -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CalculatableView.Designer.cs (.../CalculatableView.Designer.cs) (revision 40e486ad3df2752a22f69fcaf5f3d023c1e186fd) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CalculatableView.Designer.cs (.../CalculatableView.Designer.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -104,6 +104,7 @@ this.CalculateForSelectedButtonErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink; this.CalculateForSelectedButtonErrorProvider.ContainerControl = this; this.CalculateForSelectedButtonErrorProvider.Icon = Properties.Resources.warning; + this.CalculateForSelectedButtonErrorProvider.SetIconPadding(CalculateForSelectedButton, 2); // // CalculatableView // Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CalculatableView.cs =================================================================== diff -u -r40e486ad3df2752a22f69fcaf5f3d023c1e186fd -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CalculatableView.cs (.../CalculatableView.cs) (revision 40e486ad3df2752a22f69fcaf5f3d023c1e186fd) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CalculatableView.cs (.../CalculatableView.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -151,17 +151,16 @@ /// protected void UpdateCalculateForSelectedButton() { - var validationText = ValidateCalculatableObjects(); + string validationText = ValidateCalculatableObjects(); if (!string.IsNullOrEmpty(validationText)) { CalculateForSelectedButton.Enabled = false; CalculateForSelectedButtonErrorProvider.SetError(CalculateForSelectedButton, validationText); - CalculateForSelectedButtonErrorProvider.SetIconPadding(CalculateForSelectedButton, 2); } else { CalculateForSelectedButton.Enabled = true; - CalculateForSelectedButtonErrorProvider.Clear(); + CalculateForSelectedButtonErrorProvider.SetError(CalculateForSelectedButton, ""); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CalculatableViewTest.cs =================================================================== diff -u -r70c6d25383da91912edb6e26dfcb748b1fe361ae -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CalculatableViewTest.cs (.../CalculatableViewTest.cs) (revision 70c6d25383da91912edb6e26dfcb748b1fe361ae) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CalculatableViewTest.cs (.../CalculatableViewTest.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -194,13 +194,12 @@ [Test] public void GivenFullyConfiguredView_WhenRowsSelected_ThenCalculateForSelectedButtonEnabledAndNoErrorMessageProvided() { - // Given & When + // Given TestCalculatableView view = ShowFullyConfiguredTestCalculatableView(); - var dataGridView = (DataGridView) view.Controls.Find("dataGridView", true)[0]; - DataGridViewRowCollection rows = dataGridView.Rows; - rows[0].Cells[calculateColumnIndex].Value = true; + // When + dataGridView.Rows[0].Cells[calculateColumnIndex].Value = true; // Then var button = (Button) view.Controls.Find("CalculateForSelectedButton", true)[0]; Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rf6159b772668c5564d585d15a86bd8c3632f711c -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision f6159b772668c5564d585d15a86bd8c3632f711c) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -240,14 +240,14 @@ private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, DuneErosionFailureMechanism failureMechanism) { - if (!failureMechanism.DuneLocations.Any()) + if (failureMechanism.Contribution <= 0.0) { - return Resources.DuneErosionPlugin_DuneLocationsContextMenuStrip_Calculate_all_ToolTip_no_locations; + return RingtoetsCommonFormsResources.Contribution_of_failure_mechanism_zero; } - if (failureMechanism.Contribution <= 0.0) + if (!failureMechanism.DuneLocations.Any()) { - return RingtoetsCommonFormsResources.Contribution_of_failure_mechanism_zero; + return Resources.DuneErosionPlugin_DuneLocationsContextMenuStrip_Calculate_all_ToolTip_no_locations; } return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase); @@ -274,7 +274,7 @@ context.NotifyObservers(); }); - var validationText = ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); + string validationText = ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); if (!string.IsNullOrEmpty(validationText)) { calculateAllItem.Enabled = false; Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Ringtoets.DuneErosion.Plugin.csproj =================================================================== diff -u -rf6159b772668c5564d585d15a86bd8c3632f711c -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Ringtoets.DuneErosion.Plugin.csproj (.../Ringtoets.DuneErosion.Plugin.csproj) (revision f6159b772668c5564d585d15a86bd8c3632f711c) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Ringtoets.DuneErosion.Plugin.csproj (.../Ringtoets.DuneErosion.Plugin.csproj) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -95,6 +95,7 @@ {D951D6DA-FE83-4920-9FDB-63BF96480B54} Ringtoets.Common.Service + False {D1068432-C172-4AA6-847B-D9DEB4C6DE26} Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rbd216dc28f22e55bd7e8347861352bc1aca90030 -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision bd216dc28f22e55bd7e8347861352bc1aca90030) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -519,7 +519,7 @@ } }); - var validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism); + string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism); if (!string.IsNullOrEmpty(validationText)) { designWaterLevelItem.Enabled = false; @@ -576,7 +576,7 @@ } }); - var validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism); + string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism); if (!string.IsNullOrEmpty(validationText)) { waveHeightItem.Enabled = false; Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r604d0e202fa546642f20240c80aac5d98447e4fc -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 604d0e202fa546642f20240c80aac5d98447e4fc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -1376,7 +1376,7 @@ private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection, StrictContextMenuItem menuItem) { - var validationText = HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase); + string validationText = HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase); if (!string.IsNullOrEmpty(validationText)) { menuItem.Enabled = false; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Segment2DLoopCollectionHelperTest.cs =================================================================== diff -u -r99f3b343f5ac4aed453d9f6d291217de76ef5314 -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Segment2DLoopCollectionHelperTest.cs (.../Segment2DLoopCollectionHelperTest.cs) (revision 99f3b343f5ac4aed453d9f6d291217de76ef5314) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Segment2DLoopCollectionHelperTest.cs (.../Segment2DLoopCollectionHelperTest.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -36,7 +36,7 @@ "..1..", ".....", "....." - )).ToArray(); + )).ToArray(); // Assert Assert.AreEqual(1, result.Length); @@ -53,7 +53,7 @@ "..1..", ".....", "....2" - )).ToArray(); + )).ToArray(); // Assert Assert.AreEqual(2, result.Length); @@ -72,7 +72,7 @@ "..2..", ".....", "....1" - )).ToArray(); + )).ToArray(); // Assert Assert.AreEqual(2, result.Length); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/TestPipingFailureMechanismTest.cs =================================================================== diff -u -r3239ee53997bb2ab3ca97266f6a5f83868049535 -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/TestPipingFailureMechanismTest.cs (.../TestPipingFailureMechanismTest.cs) (revision 3239ee53997bb2ab3ca97266f6a5f83868049535) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/TestPipingFailureMechanismTest.cs (.../TestPipingFailureMechanismTest.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -39,6 +39,7 @@ var failureMechanism = new TestPipingFailureMechanism(); // Assert + Assert.IsInstanceOf(failureMechanism); Assert.AreEqual(24, failureMechanism.Contribution); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/TestStochasticSoilModelTest.cs =================================================================== diff -u -r5e70f173b3839314912e086b6c1c784b975ee646 -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/TestStochasticSoilModelTest.cs (.../TestStochasticSoilModelTest.cs) (revision 5e70f173b3839314912e086b6c1c784b975ee646) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/TestStochasticSoilModelTest.cs (.../TestStochasticSoilModelTest.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -34,6 +34,7 @@ var model = new TestStochasticSoilModel(); // Assert + Assert.IsInstanceOf(model); Assert.IsEmpty(model.Name); Assert.IsEmpty(model.SegmentName); Assert.AreEqual(2, model.StochasticSoilProfiles.Count); @@ -51,6 +52,7 @@ var model = new TestStochasticSoilModel(name); // Assert + Assert.IsInstanceOf(model); Assert.AreEqual(name, model.Name); Assert.IsEmpty(model.SegmentName); Assert.AreEqual(2, model.StochasticSoilProfiles.Count); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs =================================================================== diff -u -r3239ee53997bb2ab3ca97266f6a5f83868049535 -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs (.../TestPipingFailureMechanism.cs) (revision 3239ee53997bb2ab3ca97266f6a5f83868049535) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestPipingFailureMechanism.cs (.../TestPipingFailureMechanism.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -27,7 +27,7 @@ namespace Ringtoets.Piping.Data.TestUtil { /// - /// Simple piping failure mechanism that can be used for testing + /// Simple piping failure mechanism that can be used for testing. /// public class TestPipingFailureMechanism : PipingFailureMechanism { @@ -76,4 +76,4 @@ return failureMechanism; } } -} +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestStochasticSoilModel.cs =================================================================== diff -u -ra9ab2d906323a908ed5e7a245b5813380776961a -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision a9ab2d906323a908ed5e7a245b5813380776961a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) @@ -24,8 +24,15 @@ namespace Ringtoets.Piping.Data.TestUtil { + /// + /// for testing purposes. + /// public class TestStochasticSoilModel : StochasticSoilModel { + /// + /// Creates a new instance of . + /// + /// The name of the stochastic soil model. public TestStochasticSoilModel(string name) : base(0, name, string.Empty) { StochasticSoilProfiles.AddRange(new[] @@ -41,7 +48,9 @@ }); } - public TestStochasticSoilModel() : this(string.Empty) - { } + /// + /// Creates a new instance of . + /// + public TestStochasticSoilModel() : this(string.Empty) {} } } \ No newline at end of file