Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs
===================================================================
diff -u -r5fca1638d8f9510eebe352a8a9a86551d7ce9e61 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs (.../RingtoetsCommonDataSynchronizationService.cs) (revision 5fca1638d8f9510eebe352a8a9a86551d7ce9e61)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs (.../RingtoetsCommonDataSynchronizationService.cs) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -70,7 +70,7 @@
///
/// Determines whether the calculated output is converged,
- /// based on the
+ /// based on the and the
///
/// The resultant
/// object after a calculation.
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/Ringtoets.Common.Service.TestUtil.csproj
===================================================================
diff -u -r248229db928c9e5556be704ed274226f80b4ef19 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/Ringtoets.Common.Service.TestUtil.csproj (.../Ringtoets.Common.Service.TestUtil.csproj) (revision 248229db928c9e5556be704ed274226f80b4ef19)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/Ringtoets.Common.Service.TestUtil.csproj (.../Ringtoets.Common.Service.TestUtil.csproj) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -24,7 +24,7 @@
bin\Release\
TRACE
true
- none
+ pdbonly
x86
prompt
MinimumRecommendedRules.ruleset
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -rf1d18cd382e0e192259deb5dd2a8577ad05b22c1 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision f1d18cd382e0e192259deb5dd2a8577ad05b22c1)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -37,7 +37,6 @@
using Ringtoets.Common.Forms.Helpers;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Common.Forms.TreeNodeInfos;
-using Ringtoets.Common.Service.Properties;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -53,6 +52,7 @@
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
using BaseResources = Core.Common.Base.Properties.Resources;
+using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Plugin
{
@@ -206,7 +206,7 @@
var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
if (!string.IsNullOrEmpty(validationProblem))
{
- return string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, validationProblem);
+ return string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, validationProblem);
}
return null;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r915001caffacbbee15c0e3bf449072245bc5f509 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 915001caffacbbee15c0e3bf449072245bc5f509)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -41,13 +41,13 @@
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.Probability;
using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.Service.Properties;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
using Ringtoets.GrassCoverErosionInwards.Plugin;
using Ringtoets.HydraRing.Data;
using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
{
@@ -241,27 +241,27 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl))
{
- // Assert
- Assert.AreEqual(6, menu.Items.Count);
+ // Assert
+ Assert.AreEqual(6, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
- RingtoetsCommonFormsResources.Validate,
- RingtoetsCommonFormsResources.Validate_ToolTip,
- RingtoetsCommonFormsResources.ValidateIcon);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
+ RingtoetsCommonFormsResources.Validate,
+ RingtoetsCommonFormsResources.Validate_ToolTip,
+ RingtoetsCommonFormsResources.ValidateIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
- RingtoetsCommonFormsResources.Calculate,
- RingtoetsCommonFormsResources.Calculate_ToolTip,
- RingtoetsCommonFormsResources.CalculateIcon);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
+ RingtoetsCommonFormsResources.Calculate,
+ RingtoetsCommonFormsResources.Calculate_ToolTip,
+ RingtoetsCommonFormsResources.CalculateIcon);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex,
- RingtoetsCommonFormsResources.Clear_output,
- RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear,
- RingtoetsCommonFormsResources.ClearIcon,
- false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex,
+ RingtoetsCommonFormsResources.Clear_output,
+ RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear,
+ RingtoetsCommonFormsResources.ClearIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_NomSections_ContextMenuItemPerformCalculationDisabledAndTooltipSet()
@@ -285,15 +285,15 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
- RingtoetsCommonFormsResources.Calculate,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
- RingtoetsCommonFormsResources.CalculateIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+ RingtoetsCommonFormsResources.Calculate,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+ RingtoetsCommonFormsResources.CalculateIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetNoDatabase_ContextMenuItemPerformCalculationDisabledAndTooltipSet()
@@ -322,15 +322,15 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
- RingtoetsCommonFormsResources.Calculate,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
- RingtoetsCommonFormsResources.CalculateIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+ RingtoetsCommonFormsResources.Calculate,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+ RingtoetsCommonFormsResources.CalculateIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetDatabaseNotValid_ContextMenuItemPerformCalculationDisabledAndTooltipSet()
@@ -361,16 +361,16 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
+ // Assert
+ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
- Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
- StringAssert.Contains(string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
- TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
- Assert.IsFalse(contextMenuItem.Enabled);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
+ StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+ TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
+ Assert.IsFalse(contextMenuItem.Enabled);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsAndDatabaseSet_ContextMenuItemPerformCalculationEnabled()
@@ -409,14 +409,14 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
- RingtoetsCommonFormsResources.Calculate,
- RingtoetsCommonFormsResources.Calculate_ToolTip,
- RingtoetsCommonFormsResources.CalculateIcon);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+ RingtoetsCommonFormsResources.Calculate,
+ RingtoetsCommonFormsResources.Calculate_ToolTip,
+ RingtoetsCommonFormsResources.CalculateIcon);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_NoSections_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
@@ -440,15 +440,15 @@
// Call
using (var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
- RingtoetsCommonFormsResources.Validate,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
- RingtoetsCommonFormsResources.ValidateIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+ RingtoetsCommonFormsResources.Validate,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+ RingtoetsCommonFormsResources.ValidateIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetNoDatabase_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
@@ -477,15 +477,15 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
- RingtoetsCommonFormsResources.Validate,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
- RingtoetsCommonFormsResources.ValidateIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+ RingtoetsCommonFormsResources.Validate,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+ RingtoetsCommonFormsResources.ValidateIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetDatabaseNotValid_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
@@ -516,16 +516,16 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex];
+ // Assert
+ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex];
- Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text);
- StringAssert.Contains(string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
- TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image);
- Assert.IsFalse(contextMenuItem.Enabled);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text);
+ StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+ TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image);
+ Assert.IsFalse(contextMenuItem.Enabled);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsAndDatabaseSet_ContextMenuItemValidateCalculationEnabled()
@@ -564,14 +564,14 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
- RingtoetsCommonFormsResources.Validate,
- RingtoetsCommonFormsResources.Validate_ToolTip,
- RingtoetsCommonFormsResources.ValidateIcon);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+ RingtoetsCommonFormsResources.Validate,
+ RingtoetsCommonFormsResources.Validate_ToolTip,
+ RingtoetsCommonFormsResources.ValidateIcon);
+ }
}
}
- }
[Test]
public void GivenCalculationWithNonExistingFilePath_WhenCalculatingFromContextMenu_ThenOutputClearedLogMessagesAddedAndUpdateObserver()
@@ -635,25 +635,25 @@
using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl))
{
- // When
+ // When
Action action = () => { contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); };
- // Then
- TestHelper.AssertLogMessages(action, messages =>
- {
- var msgs = messages.ToArray();
- StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
- StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
- StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
- StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]);
- StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]);
- StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]);
- });
+ // Then
+ TestHelper.AssertLogMessages(action, messages =>
+ {
+ var msgs = messages.ToArray();
+ StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+ StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+ StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
+ StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]);
+ StringAssert.StartsWith(string.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]);
+ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]);
+ });
- Assert.IsNull(calculation.Output);
+ Assert.IsNull(calculation.Output);
+ }
}
}
- }
[Test]
public void GivenCalculationWithNonExistingFilePath_WhenValidatingFromContextMenu_ThenLogMessagesAdded()
@@ -708,19 +708,19 @@
using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl))
{
- // When
+ // When
Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick();
- // Then
- TestHelper.AssertLogMessages(action, messages =>
- {
- var msgs = messages.ToArray();
- StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
- StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
- });
+ // Then
+ TestHelper.AssertLogMessages(action, messages =>
+ {
+ var msgs = messages.ToArray();
+ StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+ StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+ });
+ }
}
}
- }
[Test]
public void OnNodeRemoved_ParentIsCalculationGroupContext_RemoveCalculationFromGroup()
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf1d18cd382e0e192259deb5dd2a8577ad05b22c1 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision f1d18cd382e0e192259deb5dd2a8577ad05b22c1)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -49,6 +49,7 @@
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using GrassCoverErosionInwardsFormResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
using GrassCoverErosionInwardsPluginResources = Ringtoets.GrassCoverErosionInwards.Plugin.Properties.Resources;
+using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
{
@@ -525,7 +526,7 @@
ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup];
Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
- StringAssert.Contains(string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+ StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
Assert.IsFalse(contextMenuItem.Enabled);
}
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r915001caffacbbee15c0e3bf449072245bc5f509 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 915001caffacbbee15c0e3bf449072245bc5f509)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -38,14 +38,14 @@
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Common.Service.Properties;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
using Ringtoets.GrassCoverErosionInwards.Plugin;
using Ringtoets.HydraRing.Data;
using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
{
@@ -263,34 +263,34 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
{
- // Assert
- Assert.AreEqual(7, menu.Items.Count);
+ // Assert
+ Assert.AreEqual(7, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
- RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
- RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
- RingtoetsCommonFormsResources.Checkbox_ticked);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
+ RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
+ RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
+ RingtoetsCommonFormsResources.Checkbox_ticked);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
- RingtoetsCommonFormsResources.Validate_all,
- RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
- RingtoetsCommonFormsResources.ValidateAllIcon,
- false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+ RingtoetsCommonFormsResources.Validate_all,
+ RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+ RingtoetsCommonFormsResources.ValidateAllIcon,
+ false);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
- RingtoetsCommonFormsResources.Calculate_all,
- RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
- RingtoetsCommonFormsResources.CalculateAllIcon,
- false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
+ RingtoetsCommonFormsResources.Calculate_all,
+ RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
+ RingtoetsCommonFormsResources.CalculateAllIcon,
+ false);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndex,
- RingtoetsCommonFormsResources.Clear_all_output,
- RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
- RingtoetsCommonFormsResources.ClearIcon,
- false);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndex,
+ RingtoetsCommonFormsResources.Clear_all_output,
+ RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+ RingtoetsCommonFormsResources.ClearIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_FailureMechanismIsNotRelevant_AddCustomItems()
@@ -318,16 +318,16 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
{
- // Assert
- Assert.AreEqual(2, menu.Items.Count);
+ // Assert
+ Assert.AreEqual(2, menu.Items.Count);
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
- RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
- RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
- RingtoetsCommonFormsResources.Checkbox_empty);
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
+ RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
+ RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
+ RingtoetsCommonFormsResources.Checkbox_empty);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_FailureMechanismIsRelevantAndClickOnIsRelevantItem_OnChangeActionRemovesAllViewsForItem()
@@ -353,10 +353,10 @@
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl))
{
- // Call
- contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick();
+ // Call
+ contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick();
+ }
}
- }
// Assert
// Assert expectancies are called in TearDown()
}
@@ -384,10 +384,10 @@
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl))
{
- // Call
- contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick();
+ // Call
+ contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick();
+ }
}
- }
// Assert
// Assert expectancies are called in TearDown()
}
@@ -416,15 +416,15 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
- RingtoetsCommonFormsResources.Calculate_all,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
- RingtoetsCommonFormsResources.CalculateAllIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
+ RingtoetsCommonFormsResources.Calculate_all,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+ RingtoetsCommonFormsResources.CalculateAllIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetNoDatabase_ContextMenuItemCalculateAllDisabledAndTooltipSet()
@@ -454,15 +454,15 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex,
- RingtoetsCommonFormsResources.Calculate_all,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
- RingtoetsCommonFormsResources.CalculateAllIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex,
+ RingtoetsCommonFormsResources.Calculate_all,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+ RingtoetsCommonFormsResources.CalculateAllIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet()
@@ -493,16 +493,16 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
+ // Assert
+ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
- Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
- StringAssert.Contains(string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
- TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
- Assert.IsFalse(contextMenuItem.Enabled);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text);
+ StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+ TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
+ Assert.IsFalse(contextMenuItem.Enabled);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsAndDatabaseSet_ContextMenuItemCalculateAllEnabled()
@@ -541,14 +541,14 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
- RingtoetsCommonFormsResources.Calculate_all,
- RingtoetsCommonFormsResources.Calculate_all_ToolTip,
- RingtoetsCommonFormsResources.CalculateAllIcon);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
+ RingtoetsCommonFormsResources.Calculate_all,
+ RingtoetsCommonFormsResources.Calculate_all_ToolTip,
+ RingtoetsCommonFormsResources.CalculateAllIcon);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_NoSections_ContextMenuItemValidateAllDisabledAndTooltipSet()
@@ -573,15 +573,15 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
- RingtoetsCommonFormsResources.Validate_all,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
- RingtoetsCommonFormsResources.ValidateAllIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+ RingtoetsCommonFormsResources.Validate_all,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+ RingtoetsCommonFormsResources.ValidateAllIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetNoDatabase_ContextMenuItemValidateAllDisabledAndTooltipSet()
@@ -611,15 +611,15 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex,
- RingtoetsCommonFormsResources.Validate_all,
- RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
- RingtoetsCommonFormsResources.ValidateAllIcon,
- false);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex,
+ RingtoetsCommonFormsResources.Validate_all,
+ RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+ RingtoetsCommonFormsResources.ValidateAllIcon,
+ false);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsSetDatabaseNotValid_ContextMenuItemValidateAllDisabledAndTooltipSet()
@@ -650,16 +650,16 @@
// Call
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
+ // Assert
+ ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
- Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
- StringAssert.Contains(string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
- TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
- Assert.IsFalse(contextMenuItem.Enabled);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text);
+ StringAssert.Contains(string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+ TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image);
+ Assert.IsFalse(contextMenuItem.Enabled);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_SectionsAndDatabaseSet_ContextMenuItemValidateAllEnabled()
@@ -698,14 +698,14 @@
// Call
using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
{
- // Assert
- TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
- RingtoetsCommonFormsResources.Validate_all,
- RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip,
- RingtoetsCommonFormsResources.ValidateAllIcon);
+ // Assert
+ TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+ RingtoetsCommonFormsResources.Validate_all,
+ RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip,
+ RingtoetsCommonFormsResources.ValidateAllIcon);
+ }
}
}
- }
[Test]
public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations()
@@ -770,31 +770,31 @@
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl))
{
- // Call
- TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(), messages =>
- {
- var messageList = messages.ToList();
+ // Call
+ TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(), messages =>
+ {
+ var messageList = messages.ToList();
- // Assert
- Assert.AreEqual(14, messageList.Count);
- StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
- StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
- StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]);
- StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[3]);
- Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'A' is niet gelukt.", messageList[4]);
- StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[5]);
- StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[6]);
- StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[7]);
- StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[8]);
- StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[9]);
- Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'B' is niet gelukt.", messageList[10]);
- StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[11]);
- Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[12]);
- Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[13]);
- });
+ // Assert
+ Assert.AreEqual(14, messageList.Count);
+ StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
+ StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
+ StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]);
+ StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[3]);
+ Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'A' is niet gelukt.", messageList[4]);
+ StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[5]);
+ StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[6]);
+ StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[7]);
+ StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[8]);
+ StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[9]);
+ Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'B' is niet gelukt.", messageList[10]);
+ StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[11]);
+ Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[12]);
+ Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[13]);
+ });
+ }
}
}
- }
[Test]
public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations()
@@ -851,21 +851,21 @@
using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl))
{
- // Call
- TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(), messages =>
- {
- var messageList = messages.ToList();
+ // Call
+ TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(), messages =>
+ {
+ var messageList = messages.ToList();
- // Assert
- Assert.AreEqual(4, messageList.Count);
- StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
- StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
- StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]);
- StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]);
- });
+ // Assert
+ Assert.AreEqual(4, messageList.Count);
+ StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
+ StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
+ StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]);
+ StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]);
+ });
+ }
}
}
- }
public override void TearDown()
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsHydraulicBoundaryLocation.cs
===================================================================
diff -u -r29da56189cadeccce7975ea121af33d647021398 -r53d198935bc65c7417f5162ecbfaffb892605901
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsHydraulicBoundaryLocation.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocation.cs) (revision 29da56189cadeccce7975ea121af33d647021398)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsHydraulicBoundaryLocation.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocation.cs) (revision 53d198935bc65c7417f5162ecbfaffb892605901)
@@ -106,9 +106,6 @@
}
}
- ///
- /// Gets or sets the unique identifier for the storage of the class.
- ///
public long StorageId { get; set; }
}
}
\ No newline at end of file