Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -52,14 +52,14 @@
using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
-using Ringtoets.Revetment.Forms.PresentationObjects;
using Ringtoets.Revetment.Service;
using RingtoetsGrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources;
using RingtoetsGrassCoverErosionOutwardsDataResources = Ringtoets.GrassCoverErosionOutwards.Data.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonIoResources = Ringtoets.Common.IO.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsGrassCoverErosionOutwardsServiceResources = Ringtoets.GrassCoverErosionOutwards.Service.Properties.Resources;
namespace Ringtoets.GrassCoverErosionOutwards.Plugin
{
@@ -619,7 +619,10 @@
{
foreach (GrassCoverErosionOutwardsWaveConditionsCalculation calculation in calculations)
{
- WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters, database, calculation.Name);
+ WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters,
+ database,
+ calculation.Name,
+ RingtoetsGrassCoverErosionOutwardsServiceResources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_LogMessage_DesignWaterLevel_name);
}
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r9f5fa34afb489eb0d46dab724e9d8121a31a04bb -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 9f5fa34afb489eb0d46dab724e9d8121a31a04bb)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -89,7 +89,8 @@
{
PerformRun(() => WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters,
assessmentSection.HydraulicBoundaryDatabase,
- calculation.Name),
+ calculation.Name,
+ Resources.GrassCoverErosionOutwardsWaveConditionsCalculationActivity_LogMessage_DesignWaterLevel_name),
() => GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation),
() =>
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r595f353e98d132713e4f64452332eef14627140c -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 595f353e98d132713e4f64452332eef14627140c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -157,6 +157,16 @@
}
///
+ /// Looks up a localized string similar to de waterstand bij doorsnede-eis.
+ ///
+ public static string GrassCoverErosionOutwardsWaveConditionsCalculationActivity_LogMessage_DesignWaterLevel_name {
+ get {
+ return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditionsCalculationActivity_LogMessage_DesignWater" +
+ "Level_name", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Waterstand '{0}' berekenen..
///
public static string GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Calculate_waterlevel_0_ {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx
===================================================================
diff -u -r595f353e98d132713e4f64452332eef14627140c -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 595f353e98d132713e4f64452332eef14627140c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -150,4 +150,7 @@
Golfhoogte bij doorsnede-eis berekening voor locatie {0} is niet geconvergeerd.
+
+ de waterstand bij doorsnede-eis
+
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r4438e5f52238284921d2f6505b424804ee2e458c -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 4438e5f52238284921d2f6505b424804ee2e458c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -225,7 +225,7 @@
var msgs = messages.ToArray();
Assert.AreEqual(3, msgs.Length);
StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
- StringAssert.StartsWith("Validatie mislukt: Kan het toetspeil niet afleiden op basis van de invoer.", msgs[1]);
+ StringAssert.StartsWith("Validatie mislukt: Kan de waterstand bij doorsnede-eis niet afleiden op basis van de invoer.", msgs[1]);
StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[2]);
});
Assert.AreEqual(ActivityState.Failed, activity.State);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs
===================================================================
diff -u -r9f5fa34afb489eb0d46dab724e9d8121a31a04bb -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs (.../IWaveConditionsCalculationService.cs) (revision 9f5fa34afb489eb0d46dab724e9d8121a31a04bb)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs (.../IWaveConditionsCalculationService.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -37,9 +37,10 @@
/// The that holds the information required to perform a calculation.
/// The used when performing a calculation.
/// The name of the calculation to validate.
+ /// The name of the design water level to be displayed when a related error message needs to be generated
/// False if contains invalid values or when no locations could be obtained from
/// the ; True otherwise.
- bool Validate(WaveConditionsInput input, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string name);
+ bool Validate(WaveConditionsInput input, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string name, string designWaterLevelName);
///
/// Performs a wave conditions cosine calculation based on the supplied
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -rf09f2ae0881378aedf0b5b576df6ecc3ff44ceee -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f09f2ae0881378aedf0b5b576df6ecc3ff44ceee)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -43,7 +43,7 @@
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
+ public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
@@ -57,7 +57,7 @@
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
+ public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.Revetment.Service.Properties.Resources", typeof(Resources).Assembly);
@@ -72,7 +72,7 @@
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
+ public static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -82,27 +82,37 @@
}
///
- /// Looks up a localized string similar to Kan geen waterstanden afleiden op basis van de invoer. Controleer de opgegeven boven- en ondergrenzen..
+ /// Looks up a localized string similar to het toetspeil.
///
- internal static string WaveConditionsCalculationService_ValidateInput_No_derived_WaterLevels {
+ public static string WaveConditionsCalculationService_LogMessage_default_DesignWaterLevel_name {
get {
- return ResourceManager.GetString("WaveConditionsCalculationService_ValidateInput_No_derived_WaterLevels", resourceCulture);
+ return ResourceManager.GetString("WaveConditionsCalculationService_ValidateInput_default_DesignWaterLevel__log_mess" +
+ "age_name", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Kan het toetspeil niet afleiden op basis van de invoer..
+ /// Looks up a localized string similar to Kan {0} niet afleiden op basis van de invoer..
///
- internal static string WaveConditionsCalculationService_ValidateInput_No_DesignWaterLevel_calculated {
+ public static string WaveConditionsCalculationService_ValidateInput_No_0_DesignWaterLevel_calculated {
get {
- return ResourceManager.GetString("WaveConditionsCalculationService_ValidateInput_No_DesignWaterLevel_calculated", resourceCulture);
+ return ResourceManager.GetString("WaveConditionsCalculationService_ValidateInput_No_0_DesignWaterLevel_calculated", resourceCulture);
}
}
///
+ /// Looks up a localized string similar to Kan geen waterstanden afleiden op basis van de invoer. Controleer de opgegeven boven- en ondergrenzen..
+ ///
+ public static string WaveConditionsCalculationService_ValidateInput_No_derived_WaterLevels {
+ get {
+ return ResourceManager.GetString("WaveConditionsCalculationService_ValidateInput_No_derived_WaterLevels", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Er is geen hydraulische randvoorwaardenlocatie geselecteerd..
///
- internal static string WaveConditionsCalculationService_ValidateInput_No_HydraulicBoundaryLocation_selected {
+ public static string WaveConditionsCalculationService_ValidateInput_No_HydraulicBoundaryLocation_selected {
get {
return ResourceManager.GetString("WaveConditionsCalculationService_ValidateInput_No_HydraulicBoundaryLocation_selec" +
"ted", resourceCulture);
@@ -112,7 +122,7 @@
///
/// Looks up a localized string similar to Berekening '{0}' voor waterstand '{1}' is niet gelukt..
///
- internal static string WaveConditionsCalculationService_VerifyWaveConditionsCalculationOutput_Error_in_wave_conditions_calculation_0_for_waterlevel_1 {
+ public static string WaveConditionsCalculationService_VerifyWaveConditionsCalculationOutput_Error_in_wave_conditions_calculation_0_for_waterlevel_1 {
get {
return ResourceManager.GetString("WaveConditionsCalculationService_VerifyWaveConditionsCalculationOutput_Error_in_w" +
"ave_conditions_calculation_0_for_waterlevel_1", resourceCulture);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.resx
===================================================================
diff -u -rf09f2ae0881378aedf0b5b576df6ecc3ff44ceee -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.resx (.../Resources.resx) (revision f09f2ae0881378aedf0b5b576df6ecc3ff44ceee)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.resx (.../Resources.resx) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -123,10 +123,13 @@
Er is geen hydraulische randvoorwaardenlocatie geselecteerd.
-
- Kan het toetspeil niet afleiden op basis van de invoer.
+
+ Kan {0} niet afleiden op basis van de invoer.
Kan geen waterstanden afleiden op basis van de invoer. Controleer de opgegeven boven- en ondergrenzen.
+
+ het toetspeil
+
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj
===================================================================
diff -u -r3a89e41054c6cfe6babdc150e8282cbe4a6dc672 -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj (.../Ringtoets.Revetment.Service.csproj) (revision 3a89e41054c6cfe6babdc150e8282cbe4a6dc672)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj (.../Ringtoets.Revetment.Service.csproj) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -102,9 +102,9 @@
- ResXFileCodeGenerator
- Resources.Designer.cs
Designer
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationService.cs
===================================================================
diff -u -r9f5fa34afb489eb0d46dab724e9d8121a31a04bb -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationService.cs (.../WaveConditionsCalculationService.cs) (revision 9f5fa34afb489eb0d46dab724e9d8121a31a04bb)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationService.cs (.../WaveConditionsCalculationService.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -64,11 +64,12 @@
}
}
- public bool Validate(WaveConditionsInput input, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string name)
+ public bool Validate(WaveConditionsInput input, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string name, string designWaterLevelName)
{
return CalculationServiceHelper.PerformValidation(name,
- () => ValidateAllInputs(hydraulicBoundaryDatabase, input));
-
+ () => ValidateAllInputs(hydraulicBoundaryDatabase,
+ input,
+ designWaterLevelName));
}
public WaveConditionsOutput Calculate(RoundedDouble waterLevel, double a, double b, double c, double norm, WaveConditionsInput input, string hlcdDirectory, string ringId, string name)
@@ -133,22 +134,30 @@
return input.UseForeshore ? input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)) : new HydraRingForelandPoint[0];
}
- private static string[] ValidateAllInputs(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, WaveConditionsInput input)
+ private static string[] ValidateAllInputs(HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
+ WaveConditionsInput input,
+ string designWaterLevelName)
{
string message = ValidateHydraulicBoundaryDatabase(hydraulicBoundaryDatabase);
if (!string.IsNullOrEmpty(message))
{
- return new[]{message};
+ return new[]
+ {
+ message
+ };
}
- message = ValidateWaveConditionsInput(input);
+ message = ValidateWaveConditionsInput(input, designWaterLevelName);
if (!string.IsNullOrEmpty(message))
{
- return new[]{message};
+ return new[]
+ {
+ message
+ };
}
-
+
return new string[0];
- }
+ }
private static string ValidateHydraulicBoundaryDatabase(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
{
@@ -167,7 +176,7 @@
return null;
}
- private static string ValidateWaveConditionsInput(WaveConditionsInput input)
+ private static string ValidateWaveConditionsInput(WaveConditionsInput input, string designWaterLevelName)
{
if (input.HydraulicBoundaryLocation == null)
{
@@ -176,7 +185,7 @@
if (double.IsNaN(input.HydraulicBoundaryLocation.DesignWaterLevel))
{
- return Resources.WaveConditionsCalculationService_ValidateInput_No_DesignWaterLevel_calculated;
+ return string.Format(Resources.WaveConditionsCalculationService_ValidateInput_No_0_DesignWaterLevel_calculated, designWaterLevelName);
}
if (!input.WaterLevels.Any())
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -51,7 +51,7 @@
bool isValid = false;
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(null, null, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(null, null, name, null);
// Assert
TestHelper.AssertLogMessages(action, messages =>
@@ -79,7 +79,7 @@
};
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(null, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(null, database, name, null);
// Assert
TestHelper.AssertLogMessages(action, messages =>
@@ -109,7 +109,7 @@
var input = new WaveConditionsInput();
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name, null);
// Assert
TestHelper.AssertLogMessages(action, messages =>
@@ -141,16 +141,24 @@
HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
};
+ string designWaterLevelName = "";
+
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input,
+ database,
+ name,
+ designWaterLevelName);
// Assert
+ string expectedMessage = string.Format("Validatie mislukt: Kan {0} niet afleiden op basis van de invoer",
+ designWaterLevelName);
+
TestHelper.AssertLogMessages(action, messages =>
{
var msgs = messages.ToArray();
Assert.AreEqual(3, msgs.Length);
StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs[0]);
- StringAssert.StartsWith("Validatie mislukt: Kan het toetspeil niet afleiden op basis van de invoer.", msgs[1]);
+ StringAssert.StartsWith(expectedMessage, msgs[1]);
StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]);
});
@@ -160,7 +168,9 @@
[Test]
[TestCase(double.NaN, 10.0, 12.0)]
[TestCase(1.0, double.NaN, 12.0)]
- public void Validate_NoWaterLevels_ReturnsFalseAndLogsValidationError(double lowerBoundaryRevetments, double upperBoundaryRevetments, double designWaterLevel)
+ public void Validate_NoWaterLevels_ReturnsFalseAndLogsValidationError(double lowerBoundaryRevetments,
+ double upperBoundaryRevetments,
+ double designWaterLevel)
{
// Setup
string name = "test";
@@ -185,7 +195,10 @@
};
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input,
+ database,
+ name,
+ "DesignWaterLevelName");
// Assert
TestHelper.AssertLogMessages(action, messages =>
@@ -220,7 +233,10 @@
input.UseBreakWater = false;
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input,
+ database,
+ name,
+ "DesignWaterLevelName");
// Assert
TestHelper.AssertLogMessages(action, messages =>
@@ -254,7 +270,10 @@
input.UseBreakWater = true;
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input,
+ database,
+ name,
+ "DesignWaterLevelName");
// Assert
TestHelper.AssertLogMessages(action, messages =>
@@ -302,7 +321,10 @@
}
// Call
- Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name);
+ Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input,
+ database,
+ name,
+ "DesignWaterLevelName");
// Assert
TestHelper.AssertLogMessages(action, messages =>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -47,7 +47,7 @@
var testService = new TestWaveConditionsCalculationService();
// Call
- var valid = testService.Validate(null, null, string.Empty);
+ var valid = testService.Validate(null, null, string.Empty, string.Empty);
// Assert
Assert.IsTrue(valid);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationService.cs
===================================================================
diff -u -r9f5fa34afb489eb0d46dab724e9d8121a31a04bb -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationService.cs (.../TestWaveConditionsCalculationService.cs) (revision 9f5fa34afb489eb0d46dab724e9d8121a31a04bb)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationService.cs (.../TestWaveConditionsCalculationService.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -53,7 +53,7 @@
}
}
- public bool Validate(WaveConditionsInput input, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string name)
+ public bool Validate(WaveConditionsInput input, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, string name, string designWaterLevelName)
{
return true;
}
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -38,7 +38,6 @@
using Ringtoets.Common.Forms.TreeNodeInfos;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
-using Ringtoets.Revetment.Forms.PresentationObjects;
using Ringtoets.Revetment.Service;
using Ringtoets.StabilityStoneCover.Data;
using Ringtoets.StabilityStoneCover.Forms;
@@ -52,6 +51,7 @@
using StabilityStoneCoverDataResources = Ringtoets.StabilityStoneCover.Data.Properties.Resources;
using StabilityStoneCoverFormsResources = Ringtoets.StabilityStoneCover.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources;
namespace Ringtoets.StabilityStoneCover.Plugin
{
@@ -426,7 +426,10 @@
{
foreach (StabilityStoneCoverWaveConditionsCalculation calculation in calculations)
{
- WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters, database, calculation.Name);
+ WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters,
+ database,
+ calculation.Name,
+ RingtoetsRevetmentServiceResources.WaveConditionsCalculationService_LogMessage_default_DesignWaterLevel_name);
}
}
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -rf1e93120b55e4ddbe23c8c28b0f36fa9d159502f -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs (.../StabilityStoneCoverWaveConditionsCalculationActivity.cs) (revision f1e93120b55e4ddbe23c8c28b0f36fa9d159502f)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs (.../StabilityStoneCoverWaveConditionsCalculationActivity.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -30,6 +30,7 @@
using Ringtoets.StabilityStoneCover.Data;
using Ringtoets.StabilityStoneCover.Service.Properties;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources;
namespace Ringtoets.StabilityStoneCover.Service
{
@@ -85,7 +86,8 @@
{
PerformRun(() => WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters,
assessmentSection.HydraulicBoundaryDatabase,
- calculation.Name),
+ calculation.Name,
+ RingtoetsRevetmentServiceResources.WaveConditionsCalculationService_LogMessage_default_DesignWaterLevel_name),
() => StabilityStoneCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation),
() =>
{
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -38,7 +38,6 @@
using Ringtoets.Common.Forms.TreeNodeInfos;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
-using Ringtoets.Revetment.Forms.PresentationObjects;
using Ringtoets.Revetment.Service;
using Ringtoets.WaveImpactAsphaltCover.Data;
using Ringtoets.WaveImpactAsphaltCover.Forms;
@@ -49,8 +48,10 @@
using Ringtoets.WaveImpactAsphaltCover.Service;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources;
using WaveImpactAsphaltCoverDataResources = Ringtoets.WaveImpactAsphaltCover.Data.Properties.Resources;
+
namespace Ringtoets.WaveImpactAsphaltCover.Plugin
{
///
@@ -429,7 +430,10 @@
{
foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in calculations)
{
- WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters, database, calculation.Name);
+ WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters,
+ database,
+ calculation.Name,
+ RingtoetsRevetmentServiceResources.WaveConditionsCalculationService_LogMessage_default_DesignWaterLevel_name);
}
}
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r7719a619d76f39384209dba87f836da02cf2846a -r1d0754dba6c2a05f96d4ea937cc0d6de62644755
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision 7719a619d76f39384209dba87f836da02cf2846a)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755)
@@ -32,6 +32,7 @@
using Ringtoets.WaveImpactAsphaltCover.Data;
using Ringtoets.WaveImpactAsphaltCover.Service.Properties;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
+using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources;
namespace Ringtoets.WaveImpactAsphaltCover.Service
{
@@ -89,7 +90,8 @@
{
PerformRun(() => WaveConditionsCalculationService.Instance.Validate(calculation.InputParameters,
assessmentSection.HydraulicBoundaryDatabase,
- calculation.Name),
+ calculation.Name,
+ RingtoetsRevetmentServiceResources.WaveConditionsCalculationService_LogMessage_default_DesignWaterLevel_name),
() => WaveImpactAsphaltCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation),
() =>
{