Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -265,18 +265,18 @@
///
/// Looks up a localized string similar to Alles be&rekenen.
///
- public static string Calculate_all {
+ public static string Calculate_All {
get {
- return ResourceManager.GetString("Calculate_all", resourceCulture);
+ return ResourceManager.GetString("Calculate_All", resourceCulture);
}
}
///
/// Looks up a localized string similar to Voer alle berekeningen binnen dit toetsspoor uit..
///
- public static string Calculate_all_ToolTip {
+ public static string Calculate_All_ToolTip {
get {
- return ResourceManager.GetString("Calculate_all_ToolTip", resourceCulture);
+ return ResourceManager.GetString("Calculate_All_ToolTip", resourceCulture);
}
}
@@ -1020,6 +1020,15 @@
}
///
+ /// Looks up a localized string similar to Alle toetspeilen berekenen..
+ ///
+ public static string DesignWaterLevel_Calculate_All_ToolTip {
+ get {
+ return ResourceManager.GetString("DesignWaterLevel_Calculate_All_ToolTip", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Toetspeil.
///
public static string DesignWaterLevel_DisplayName {
@@ -3856,6 +3865,15 @@
}
///
+ /// Looks up a localized string similar to Alle golfhoogtes berekenen..
+ ///
+ public static string WaveHeight_Calculate_All_ToolTip {
+ get {
+ return ResourceManager.GetString("WaveHeight_Calculate_All_ToolTip", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Locatie (RD) [m].
///
public static string WorldReferencePoint_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -136,7 +136,7 @@
Oordeel
-
+
Alles be&rekenen
@@ -160,9 +160,15 @@
..\resources\playall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
+
Voer alle berekeningen binnen dit toetsspoor uit.
+
+ Alle toetspeilen berekenen.
+
+
+ Alle golfhoogtes berekenen.
+
Wis de uitvoer van alle berekeningen binnen dit toetsspoor.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -118,7 +118,7 @@
where TCalculationGroupContext : ICalculationContext
{
var menuItem = new StrictContextMenuItem(
- Resources.Calculate_all,
+ Resources.Calculate_All,
Resources.CalculationGroup_CalculateAll_ToolTip,
Resources.CalculateAllIcon,
(o, args) => calculateAllAction(calculationGroup, calculationGroupContext));
@@ -331,8 +331,8 @@
where TFailureMechanismContext : IFailureMechanismContext
{
var menuItem = new StrictContextMenuItem(
- Resources.Calculate_all,
- Resources.Calculate_all_ToolTip,
+ Resources.Calculate_All,
+ Resources.Calculate_All_ToolTip,
Resources.CalculateAllIcon,
(o, args) => calculateAllAction(failureMechanismContext));
Index: Ringtoets/Common/src/Ringtoets.Common.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -0,0 +1,78 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Ringtoets.Common.Service.Properties;
+
+namespace Ringtoets.Common.Service.MessageProviders
+{
+ ///
+ /// This class provides messages used during the design water level calculation.
+ ///
+ public class DesignWaterLevelCalculationMessageProvider : ICalculationMessageProvider
+ {
+ private readonly string categoryBoundaryName;
+
+ ///
+ /// Creates a new instance of .
+ ///
+ /// The category boundary name.
+ /// Thrown when is null or empty.
+ public DesignWaterLevelCalculationMessageProvider(string categoryBoundaryName)
+ {
+ if (string.IsNullOrEmpty(categoryBoundaryName))
+ {
+ throw new ArgumentException($"'{nameof(categoryBoundaryName)}' must have a value.");
+ }
+
+ this.categoryBoundaryName = categoryBoundaryName;
+ }
+
+ public string GetActivityDescription(string calculationSubject)
+ {
+ return string.Format(Resources.DesignWaterLevelCalculationService_Name_Calculate_assessment_level_for_HydraulicBoundaryLocation_0_Category_1_,
+ calculationSubject,
+ categoryBoundaryName);
+ }
+
+ public string GetCalculationFailedMessage(string calculationSubject)
+ {
+ return string.Format(Resources.DesignWaterLevelCalculationService_Calculate_Error_in_DesignWaterLevelCalculation_0_Category_1_no_error_report,
+ calculationSubject,
+ categoryBoundaryName);
+ }
+
+ public string GetCalculatedNotConvergedMessage(string calculationSubject)
+ {
+ return string.Format(Resources.DesignWaterLevelCalculationActivity_DesignWaterLevelCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged,
+ calculationSubject,
+ categoryBoundaryName);
+ }
+
+ public string GetCalculationFailedWithErrorReportMessage(string calculationSubject, string errorReport)
+ {
+ return string.Format(Resources.DesignWaterLevelCalculationService_Calculate_Error_in_DesignWaterLevelCalculation_0_Category_1_click_details_for_last_error_report_2,
+ calculationSubject,
+ categoryBoundaryName,
+ errorReport);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -0,0 +1,78 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Ringtoets.Common.Service.Properties;
+
+namespace Ringtoets.Common.Service.MessageProviders
+{
+ ///
+ /// This class provides messages used during the wave height calculation.
+ ///
+ public class WaveHeightCalculationMessageProvider : ICalculationMessageProvider
+ {
+ private readonly string categoryBoundaryName;
+
+ ///
+ /// Creates a new instance of .
+ ///
+ /// The category boundary name.
+ /// Thrown when is null or empty.
+ public WaveHeightCalculationMessageProvider(string categoryBoundaryName)
+ {
+ if (string.IsNullOrEmpty(categoryBoundaryName))
+ {
+ throw new ArgumentException($"'{nameof(categoryBoundaryName)}' must have a value.");
+ }
+
+ this.categoryBoundaryName = categoryBoundaryName;
+ }
+
+ public string GetActivityDescription(string calculationSubject)
+ {
+ return string.Format(Resources.WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_Category_1_,
+ calculationSubject,
+ categoryBoundaryName);
+ }
+
+ public string GetCalculationFailedMessage(string calculationSubject)
+ {
+ return string.Format(Resources.WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_no_error_report,
+ calculationSubject,
+ categoryBoundaryName);
+ }
+
+ public string GetCalculatedNotConvergedMessage(string calculationSubject)
+ {
+ return string.Format(Resources.WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged,
+ calculationSubject,
+ categoryBoundaryName);
+ }
+
+ public string GetCalculationFailedWithErrorReportMessage(string calculationSubject, string errorReport)
+ {
+ return string.Format(Resources.WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_click_details_for_last_error_report_2,
+ calculationSubject,
+ categoryBoundaryName,
+ errorReport);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -30,7 +30,9 @@
+
+
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -0,0 +1,158 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.Common.Service.MessageProviders;
+
+namespace Ringtoets.Common.Service.Test.MessageProviders
+{
+ [TestFixture]
+ public class DesignWaterLevelCalculationMessageProviderTest
+ {
+ [Test]
+ public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+ {
+ // Call
+ TestDelegate call = () => new DesignWaterLevelCalculationMessageProvider(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
+ }
+
+ [Test]
+ public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
+ {
+ // Call
+ TestDelegate call = () => new DesignWaterLevelCalculationMessageProvider("");
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
+ }
+
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var provider = new DesignWaterLevelCalculationMessageProvider("Category description");
+
+ // Assert
+ Assert.IsInstanceOf(provider);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetActivityDescription_VariousParameters_ReturnsExpectedValue(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+
+ // Call
+ string activityDescription = provider.GetActivityDescription(name);
+
+ // Assert
+ string expectedName = $"Toetspeil berekenen voor locatie '{name}' ({categoryBoundaryName})";
+ Assert.AreEqual(expectedName, activityDescription);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculationFailedMessage_VariousParameters_ReturnsExpectedValue(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+
+ // Call
+ string message = provider.GetCalculationFailedMessage(name);
+
+ // Assert
+ string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' ({categoryBoundaryName}). " +
+ "Er is geen foutrapport beschikbaar.";
+ Assert.AreEqual(expectedMessage, message);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculationFailedWithErrorReportMessage_ValidNames_ExpectedValues(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+ const string failureMessage = "It failed";
+
+ // Call
+ string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
+
+ // Assert
+ string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' ({categoryBoundaryName}). " +
+ $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
+ Assert.AreEqual(expectedMessage, message);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculationFailedWithErrorReportMessage_ValidFailureMessages_ExpectedValues(string failureMessage)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+ const string name = "calculation name";
+
+ // Call
+ string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
+
+ // Assert
+ string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' ({categoryBoundaryName}). " +
+ $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
+ Assert.AreEqual(expectedMessage, message);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculatedNotConvergedMessage_VariousParameters_ReturnsExpectedValue(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+
+ // Call
+ string message = provider.GetCalculatedNotConvergedMessage(name);
+
+ // Assert
+ string expectedMessage = $"Toetspeil berekening voor locatie '{name}' ({categoryBoundaryName}) is niet geconvergeerd.";
+ Assert.AreEqual(expectedMessage, message);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -0,0 +1,158 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.Common.Service.MessageProviders;
+
+namespace Ringtoets.Common.Service.Test.MessageProviders
+{
+ [TestFixture]
+ public class WaveHeightCalculationMessageProviderTest
+ {
+ [Test]
+ public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+ {
+ // Call
+ TestDelegate call = () => new WaveHeightCalculationMessageProvider(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
+ }
+
+ [Test]
+ public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
+ {
+ // Call
+ TestDelegate call = () => new WaveHeightCalculationMessageProvider("");
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
+ }
+
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var provider = new WaveHeightCalculationMessageProvider("Category description");
+
+ // Assert
+ Assert.IsInstanceOf(provider);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetActivityDescription_VariousParameters_ReturnsExpectedValue(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+
+ // Call
+ string activityDescription = provider.GetActivityDescription(name);
+
+ // Assert
+ string expectedName = $"Golfhoogte berekenen voor locatie '{name}' ({categoryBoundaryName})";
+ Assert.AreEqual(expectedName, activityDescription);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculationFailedMessage_VariousParameters_ReturnsExpectedValue(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+
+ // Call
+ string message = provider.GetCalculationFailedMessage(name);
+
+ // Assert
+ string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' ({categoryBoundaryName}). " +
+ "Er is geen foutrapport beschikbaar.";
+ Assert.AreEqual(expectedMessage, message);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculationFailedWithErrorReportMessage_ValidNames_ExpectedValues(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+ const string failureMessage = "It failed";
+
+ // Call
+ string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
+
+ // Assert
+ string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' ({categoryBoundaryName}). " +
+ $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
+ Assert.AreEqual(expectedMessage, message);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculationFailedWithErrorReportMessage_ValidFailureMessages_ExpectedValues(string failureMessage)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+ const string name = "calculation name";
+
+ // Call
+ string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
+
+ // Assert
+ string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' ({categoryBoundaryName}). " +
+ $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
+ Assert.AreEqual(expectedMessage, message);
+ }
+
+ [Test]
+ [TestCase(null)]
+ [TestCase("")]
+ [TestCase("value")]
+ public void GetCalculatedNotConvergedMessage_VariousParameters_ReturnsExpectedValue(string name)
+ {
+ // Setup
+ const string categoryBoundaryName = "Category description";
+ var provider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+
+ // Call
+ string message = provider.GetCalculatedNotConvergedMessage(name);
+
+ // Assert
+ string expectedMessage = $"Golfhoogte berekening voor locatie '{name}' ({categoryBoundaryName}) is niet geconvergeerd.";
+ Assert.AreEqual(expectedMessage, message);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj
===================================================================
diff -u -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -44,6 +44,8 @@
+
+
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rab394dc8ca5029652c0d8586281aa26ae70d2d9c -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision ab394dc8ca5029652c0d8586281aa26ae70d2d9c)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -321,7 +321,7 @@
private ContextMenuStrip DuneLocationCalculationsContextMenuStrip(DuneLocationCalculationsContext context, object parent, TreeViewControl treeViewControl)
{
var calculateAllItem = new StrictContextMenuItem(
- RingtoetsCommonFormsResources.Calculate_all,
+ RingtoetsCommonFormsResources.Calculate_All,
Resources.DuneErosionPlugin_DuneLocationCalculationsContextMenuStrip_Calculate_all_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r8f7a19a208f1acd5bd20bd602e4c8627a4f76ac7 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8f7a19a208f1acd5bd20bd602e4c8627a4f76ac7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -515,24 +515,6 @@
}
///
- /// Looks up a localized string similar to Alles be&rekenen.
- ///
- public static string DesignWaterLevel_Calculate_All {
- get {
- return ResourceManager.GetString("DesignWaterLevel_Calculate_All", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Alle toetspeilen berekenen..
- ///
- public static string DesignWaterLevel_Calculate_All_ToolTip {
- get {
- return ResourceManager.GetString("DesignWaterLevel_Calculate_All_ToolTip", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Is convergentie bereikt in de toetspeil berekening?.
///
public static string DesignWaterLevelCalculation_Convergence_Description {
@@ -905,24 +887,6 @@
}
///
- /// Looks up a localized string similar to Alles be&rekenen.
- ///
- public static string WaveHeight_Calculate_All {
- get {
- return ResourceManager.GetString("WaveHeight_Calculate_All", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Alle golfhoogtes berekenen..
- ///
- public static string WaveHeight_Calculate_All_ToolTip {
- get {
- return ResourceManager.GetString("WaveHeight_Calculate_All_ToolTip", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Is convergentie bereikt in de golfhoogte berekening?.
///
public static string WaveHeightCalculation_Convergence_Description {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r8f7a19a208f1acd5bd20bd602e4c8627a4f76ac7 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8f7a19a208f1acd5bd20bd602e4c8627a4f76ac7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -141,12 +141,6 @@
Weet u zeker dat u wilt doorgaan?
-
- Alles be&rekenen
-
-
- Alle toetspeilen berekenen.
-
&Koppel aan database...
@@ -243,12 +237,6 @@
Golfhoogtes
-
- Alles be&rekenen
-
-
- Alle golfhoogtes berekenen.
-
Is convergentie bereikt in de toetspeil berekening?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs
===================================================================
diff -u -r82189953ee9562a0cb73686eef4783764c153e31 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs (.../DesignWaterLevelCalculationsView.cs) (revision 82189953ee9562a0cb73686eef4783764c153e31)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelCalculationsView.cs (.../DesignWaterLevelCalculationsView.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -26,9 +26,9 @@
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Integration.Forms.PresentationObjects;
using Ringtoets.Integration.Forms.Properties;
-using Ringtoets.Integration.Service.MessageProviders;
namespace Ringtoets.Integration.Forms.Views
{
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs
===================================================================
diff -u -r82189953ee9562a0cb73686eef4783764c153e31 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs (.../WaveHeightCalculationsView.cs) (revision 82189953ee9562a0cb73686eef4783764c153e31)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightCalculationsView.cs (.../WaveHeightCalculationsView.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -26,9 +26,9 @@
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Integration.Forms.PresentationObjects;
using Ringtoets.Integration.Forms.Properties;
-using Ringtoets.Integration.Service.MessageProviders;
namespace Ringtoets.Integration.Forms.Views
{
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -ra57fa7943b448178d966241987678c2f0b28c32e -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision a57fa7943b448178d966241987678c2f0b28c32e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -62,6 +62,7 @@
using Ringtoets.Common.IO.ReferenceLines;
using Ringtoets.Common.Plugin;
using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Common.Util.TypeConverters;
using Ringtoets.DuneErosion.Data;
using Ringtoets.DuneErosion.Forms.PresentationObjects;
@@ -89,7 +90,6 @@
using Ringtoets.Integration.Plugin.Handlers;
using Ringtoets.Integration.Plugin.Properties;
using Ringtoets.Integration.Service;
-using Ringtoets.Integration.Service.MessageProviders;
using Ringtoets.MacroStabilityInwards.Data;
using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
using Ringtoets.Piping.Data;
@@ -1721,8 +1721,8 @@
private ContextMenuStrip DesignWaterLevelCalculationsContextMenuStrip(DesignWaterLevelCalculationsContext nodeData, object parentData, TreeViewControl treeViewControl)
{
var designWaterLevelItem = new StrictContextMenuItem(
- RingtoetsFormsResources.DesignWaterLevel_Calculate_All,
- RingtoetsFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.Calculate_All,
+ RingtoetsCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
@@ -1753,8 +1753,8 @@
private ContextMenuStrip WaveHeightCalculationsContextMenuStrip(WaveHeightCalculationsContext nodeData, object parentData, TreeViewControl treeViewControl)
{
var waveHeightItem = new StrictContextMenuItem(
- RingtoetsFormsResources.WaveHeight_Calculate_All,
- RingtoetsFormsResources.WaveHeight_Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.Calculate_All,
+ RingtoetsCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
@@ -1944,8 +1944,8 @@
IAssessmentSection assessmentSection = nodeData.AssessmentSection;
var designWaterLevelItem = new StrictContextMenuItem(
- RingtoetsFormsResources.DesignWaterLevel_Calculate_All,
- RingtoetsFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.Calculate_All,
+ RingtoetsCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
@@ -2003,8 +2003,8 @@
IAssessmentSection assessmentSection = nodeData.AssessmentSection;
var waveHeightItem = new StrictContextMenuItem(
- RingtoetsFormsResources.WaveHeight_Calculate_All,
- RingtoetsFormsResources.WaveHeight_Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.Calculate_All,
+ RingtoetsCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
Fisheye: Tag d3b14a0f327184e0239e5239c826805c565fe8be refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Service/MessageProviders/DesignWaterLevelCalculationMessageProvider.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag d3b14a0f327184e0239e5239c826805c565fe8be refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj
===================================================================
diff -u -rb481a13603a741048170f814724170508b712ca5 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj (.../Ringtoets.Integration.Service.csproj) (revision b481a13603a741048170f814724170508b712ca5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj (.../Ringtoets.Integration.Service.csproj) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -11,8 +11,6 @@
-
-
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -41,7 +41,6 @@
using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Integration.Forms.PresentationObjects;
using Ringtoets.Integration.Forms.Views;
-using Ringtoets.Integration.Service.MessageProviders;
namespace Ringtoets.Integration.Forms.Test.Views
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -41,7 +41,6 @@
using Ringtoets.Common.Service.MessageProviders;
using Ringtoets.Integration.Forms.PresentationObjects;
using Ringtoets.Integration.Forms.Views;
-using Ringtoets.Integration.Service.MessageProviders;
namespace Ringtoets.Integration.Forms.Test.Views
{
Fisheye: Tag d3b14a0f327184e0239e5239c826805c565fe8be refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag d3b14a0f327184e0239e5239c826805c565fe8be refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj
===================================================================
diff -u -rf1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41 -rd3b14a0f327184e0239e5239c826805c565fe8be
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj (.../Ringtoets.Integration.Service.Test.csproj) (revision f1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj (.../Ringtoets.Integration.Service.Test.csproj) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
@@ -19,8 +19,6 @@
-
-
@@ -124,6 +122,9 @@
Ringtoets.Integration.TestUtil
+
+
+