Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -ra083279a13d4efdd702c50f37a5a8ae059e5d0ef -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a083279a13d4efdd702c50f37a5a8ae059e5d0ef)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -128,7 +128,7 @@
}
///
- /// Looks up a localized string similar to Waterstand berekening voor locatie '{0}' ({1}) is niet geconvergeerd..
+ /// Looks up a localized string similar to Waterstand berekening voor locatie '{0}' (Categorie {1}) is niet geconvergeerd..
///
public static string DesignWaterLevelCalculationActivity_DesignWaterLevelCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged {
get {
@@ -148,7 +148,7 @@
}
///
- /// Looks up a localized string similar to Er is een fout opgetreden tijdens de toetspeil berekening '{0}' ({1}). Bekijk het foutrapport door op details te klikken.
+ /// Looks up a localized string similar to Er is een fout opgetreden tijdens de toetspeil berekening '{0}' (Categorie {1}). Bekijk het foutrapport door op details te klikken.
///{2}.
///
public static string DesignWaterLevelCalculationService_Calculate_Error_in_DesignWaterLevelCalculation_0_Category_1_click_details_for_last_error_report_2 {
@@ -159,7 +159,7 @@
}
///
- /// Looks up a localized string similar to Er is een fout opgetreden tijdens de toetspeil berekening '{0}' ({1}). Er is geen foutrapport beschikbaar..
+ /// Looks up a localized string similar to Er is een fout opgetreden tijdens de toetspeil berekening '{0}' (Categorie {1}). Er is geen foutrapport beschikbaar..
///
public static string DesignWaterLevelCalculationService_Calculate_Error_in_DesignWaterLevelCalculation_0_Category_1_no_error_report {
get {
@@ -169,7 +169,7 @@
}
///
- /// Looks up a localized string similar to Waterstand berekenen voor locatie '{0}' ({1}).
+ /// Looks up a localized string similar to Waterstand berekenen voor locatie '{0}' (Categorie {1}).
///
public static string DesignWaterLevelCalculationService_Name_Calculate_assessment_level_for_HydraulicBoundaryLocation_0_Category_1_ {
get {
@@ -338,7 +338,7 @@
}
///
- /// Looks up a localized string similar to Golfhoogte berekening voor locatie '{0}' ({1}) is niet geconvergeerd..
+ /// Looks up a localized string similar to Golfhoogte berekening voor locatie '{0}' (Categorie {1}) is niet geconvergeerd..
///
public static string WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged {
get {
@@ -358,7 +358,7 @@
}
///
- /// Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' ({1}). Bekijk het foutrapport door op details te klikken.
+ /// Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' (Categorie {1}). Bekijk het foutrapport door op details te klikken.
///{2}.
///
public static string WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_click_details_for_last_error_report_2 {
@@ -369,7 +369,7 @@
}
///
- /// Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' ({1}). Er is geen foutrapport beschikbaar..
+ /// Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' (Categorie {1}). Er is geen foutrapport beschikbaar..
///
public static string WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_no_error_report {
get {
@@ -379,7 +379,7 @@
}
///
- /// Looks up a localized string similar to Golfhoogte berekenen voor locatie '{0}' ({1}).
+ /// Looks up a localized string similar to Golfhoogte berekenen voor locatie '{0}' (Categorie {1}).
///
public static string WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_Category_1_ {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx
===================================================================
diff -u -ra083279a13d4efdd702c50f37a5a8ae059e5d0ef -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx (.../Resources.resx) (revision a083279a13d4efdd702c50f37a5a8ae059e5d0ef)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx (.../Resources.resx) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -136,19 +136,19 @@
Validatie is gestart.
- Waterstand berekening voor locatie '{0}' ({1}) is niet geconvergeerd.
+ Waterstand berekening voor locatie '{0}' (Categorie {1}) is niet geconvergeerd.
- Waterstand berekenen voor locatie '{0}' ({1})
+ Waterstand berekenen voor locatie '{0}' (Categorie {1})
Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. {0}
- Golfhoogte berekening voor locatie '{0}' ({1}) is niet geconvergeerd.
+ Golfhoogte berekening voor locatie '{0}' (Categorie {1}) is niet geconvergeerd.
- Golfhoogte berekenen voor locatie '{0}' ({1})
+ Golfhoogte berekenen voor locatie '{0}' (Categorie {1})
De waarde voor 'hoogte' van de dam moet een concreet getal zijn.
@@ -178,11 +178,11 @@
Golfhoogte berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.
- Er is een fout opgetreden tijdens de toetspeil berekening '{0}' ({1}). Bekijk het foutrapport door op details te klikken.
+ Er is een fout opgetreden tijdens de toetspeil berekening '{0}' (Categorie {1}). Bekijk het foutrapport door op details te klikken.
{2}
- Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' ({1}). Bekijk het foutrapport door op details te klikken.
+ Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' (Categorie {1}). Bekijk het foutrapport door op details te klikken.
{2}
@@ -207,10 +207,10 @@
Het uitlezen van illustratiepunten is mislukt.
- Er is een fout opgetreden tijdens de toetspeil berekening '{0}' ({1}). Er is geen foutrapport beschikbaar.
+ Er is een fout opgetreden tijdens de toetspeil berekening '{0}' (Categorie {1}). Er is geen foutrapport beschikbaar.
- Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' ({1}). Er is geen foutrapport beschikbaar.
+ Er is een fout opgetreden tijdens de golfhoogte berekening '{0}' (Categorie {1}). Er is geen foutrapport beschikbaar.
Fout bij het uitlezen van de illustratiepunten voor berekening {0}: {1} Het uitlezen van illustratiepunten wordt overgeslagen.
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (.../DesignWaterLevelCalculationMessageProviderTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (.../DesignWaterLevelCalculationMessageProviderTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -74,7 +74,7 @@
string activityDescription = provider.GetActivityDescription(name);
// Assert
- string expectedName = $"Waterstand berekenen voor locatie '{name}' ({categoryBoundaryName})";
+ string expectedName = $"Waterstand berekenen voor locatie '{name}' (Categorie {categoryBoundaryName})";
Assert.AreEqual(expectedName, activityDescription);
}
@@ -92,7 +92,7 @@
string message = provider.GetCalculationFailedMessage(name);
// Assert
- string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' ({categoryBoundaryName}). " +
+ string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' (Categorie {categoryBoundaryName}). " +
"Er is geen foutrapport beschikbaar.";
Assert.AreEqual(expectedMessage, message);
}
@@ -112,7 +112,7 @@
string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
// Assert
- string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' ({categoryBoundaryName}). " +
+ string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' (Categorie {categoryBoundaryName}). " +
$"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
@@ -132,7 +132,7 @@
string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
// Assert
- string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' ({categoryBoundaryName}). " +
+ string expectedMessage = $"Er is een fout opgetreden tijdens de toetspeil berekening '{name}' (Categorie {categoryBoundaryName}). " +
$"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
@@ -151,7 +151,7 @@
string message = provider.GetCalculatedNotConvergedMessage(name);
// Assert
- string expectedMessage = $"Waterstand berekening voor locatie '{name}' ({categoryBoundaryName}) is niet geconvergeerd.";
+ string expectedMessage = $"Waterstand berekening voor locatie '{name}' (Categorie {categoryBoundaryName}) is niet geconvergeerd.";
Assert.AreEqual(expectedMessage, message);
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs (.../WaveHeightCalculationMessageProviderTest.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs (.../WaveHeightCalculationMessageProviderTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -74,7 +74,7 @@
string activityDescription = provider.GetActivityDescription(name);
// Assert
- string expectedName = $"Golfhoogte berekenen voor locatie '{name}' ({categoryBoundaryName})";
+ string expectedName = $"Golfhoogte berekenen voor locatie '{name}' (Categorie {categoryBoundaryName})";
Assert.AreEqual(expectedName, activityDescription);
}
@@ -92,7 +92,7 @@
string message = provider.GetCalculationFailedMessage(name);
// Assert
- string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' ({categoryBoundaryName}). " +
+ string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' (Categorie {categoryBoundaryName}). " +
"Er is geen foutrapport beschikbaar.";
Assert.AreEqual(expectedMessage, message);
}
@@ -112,7 +112,7 @@
string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
// Assert
- string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' ({categoryBoundaryName}). " +
+ string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' (Categorie {categoryBoundaryName}). " +
$"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
@@ -132,7 +132,7 @@
string message = provider.GetCalculationFailedWithErrorReportMessage(name, failureMessage);
// Assert
- string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' ({categoryBoundaryName}). " +
+ string expectedMessage = $"Er is een fout opgetreden tijdens de golfhoogte berekening '{name}' (Categorie {categoryBoundaryName}). " +
$"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{failureMessage}";
Assert.AreEqual(expectedMessage, message);
}
@@ -151,7 +151,7 @@
string message = provider.GetCalculatedNotConvergedMessage(name);
// Assert
- string expectedMessage = $"Golfhoogte berekening voor locatie '{name}' ({categoryBoundaryName}) is niet geconvergeerd.";
+ string expectedMessage = $"Golfhoogte berekening voor locatie '{name}' (Categorie {categoryBoundaryName}) is niet geconvergeerd.";
Assert.AreEqual(expectedMessage, message);
}
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs
===================================================================
diff -u -ra5115968c170dddb9ef42d207adcc4195cacc892 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs) (revision a5115968c170dddb9ef42d207adcc4195cacc892)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -73,7 +73,7 @@
}
FailureMechanism = failureMechanism;
- messageProvider = new DesignWaterLevelCalculationMessageProvider(string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName));
+ messageProvider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
failureMechanismObserver = new Observer(UpdateCalculateForSelectedButton)
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs
===================================================================
diff -u -ra5115968c170dddb9ef42d207adcc4195cacc892 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs) (revision a5115968c170dddb9ef42d207adcc4195cacc892)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -73,7 +73,7 @@
}
FailureMechanism = failureMechanism;
- messageProvider = new WaveHeightCalculationMessageProvider(string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName));
+ messageProvider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
failureMechanismObserver = new Observer(UpdateCalculateForSelectedButton)
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -ra5115968c170dddb9ef42d207adcc4195cacc892 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision a5115968c170dddb9ef42d207adcc4195cacc892)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -572,7 +572,7 @@
assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
nodeData.WrappedData,
nodeData.GetNormFunc(),
- new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(nodeData.CategoryBoundaryName)));
+ new DesignWaterLevelCalculationMessageProvider(nodeData.CategoryBoundaryName));
});
string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism);
@@ -620,7 +620,7 @@
assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
nodeData.WrappedData,
nodeData.GetNormFunc(),
- new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(nodeData.CategoryBoundaryName)));
+ new WaveHeightCalculationMessageProvider(nodeData.CategoryBoundaryName));
});
string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism);
@@ -1009,35 +1009,35 @@
preprocessorDirectory,
failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
- new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
- new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
- new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
- new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
- new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName))));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)));
ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
});
@@ -1118,35 +1118,35 @@
preprocessorDirectory,
failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
- new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
- new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
- new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
- new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
- new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName))));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)));
ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
});
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -rc1dacdcb866d2c12cacd5a9f7be63c2c344382b0 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c1dacdcb866d2c12cacd5a9f7be63c2c344382b0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -219,42 +219,6 @@
}
///
- /// Looks up a localized string similar to Categorie C->D.
- ///
- public static string Hydraulic_category_boundary_factorizedLowerLimitNorm_name {
- get {
- return ResourceManager.GetString("Hydraulic_category_boundary_factorizedLowerLimitNorm_name", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Categorie A+->A.
- ///
- public static string Hydraulic_category_boundary_factorizedSignalingNorm_name {
- get {
- return ResourceManager.GetString("Hydraulic_category_boundary_factorizedSignalingNorm_name", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Categorie B->C.
- ///
- public static string Hydraulic_category_boundary_lowerLimitNorm_name {
- get {
- return ResourceManager.GetString("Hydraulic_category_boundary_lowerLimitNorm_name", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Categorie A->B.
- ///
- public static string Hydraulic_category_boundary_signalingNorm_name {
- get {
- return ResourceManager.GetString("Hydraulic_category_boundary_signalingNorm_name", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Na het importeren van een aangepaste ligging van de referentielijn zullen alle geïmporteerde en berekende gegevens van alle toetssporen worden gewist.
///
///Wilt u doorgaan?.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -rc1dacdcb866d2c12cacd5a9f7be63c2c344382b0 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision c1dacdcb866d2c12cacd5a9f7be63c2c344382b0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -173,18 +173,6 @@
Weet u zeker dat u wilt doorgaan?
-
- Categorie A+->A
-
-
- Categorie A->B
-
-
- Categorie B->C
-
-
- Categorie C->D
-
..\Resources\AssemblyResultPerSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r540cb5503a23ea9ea7b1e633888df92fa0531151 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -403,7 +403,7 @@
yield return new ViewInfo, DesignWaterLevelCalculationsView>
{
- GetViewName = (view, context) => $"{RingtoetsFormsResources.DesignWaterLevelCalculationsContext_DisplayName} - {context.CategoryBoundaryName}",
+ GetViewName = (view, context) => $"{RingtoetsFormsResources.DesignWaterLevelCalculationsContext_DisplayName} - {FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
GetViewData = context => context.WrappedData,
Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
CloseForData = CloseHydraulicBoundaryCalculationsViewForData,
@@ -416,7 +416,7 @@
yield return new ViewInfo, WaveHeightCalculationsView>
{
- GetViewName = (view, context) => $"{RingtoetsFormsResources.WaveHeightCalculationsContext_DisplayName} - {context.CategoryBoundaryName}",
+ GetViewName = (view, context) => $"{RingtoetsFormsResources.WaveHeightCalculationsContext_DisplayName} - {FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
GetViewData = context => context.WrappedData,
Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
CloseForData = CloseHydraulicBoundaryCalculationsViewForData,
@@ -804,7 +804,7 @@
yield return new TreeNodeInfo
{
- Text = context => context.CategoryBoundaryName,
+ Text = context => FormatCategoryBoundaryName(context.CategoryBoundaryName),
Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
ContextMenuStrip = DesignWaterLevelCalculationsContextMenuStrip
};
@@ -819,7 +819,7 @@
yield return new TreeNodeInfo
{
- Text = context => context.CategoryBoundaryName,
+ Text = context => FormatCategoryBoundaryName(context.CategoryBoundaryName),
Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
ContextMenuStrip = WaveHeightCalculationsContextMenuStrip
};
@@ -968,6 +968,11 @@
};
}
+ private static string FormatCategoryBoundaryName(string categoryBoundaryName)
+ {
+ return string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName);
+ }
+
private TreeNodeInfo> CreateFailureMechanismSectionResultTreeNodeInfo()
where T : FailureMechanismSectionResult
{
@@ -1963,28 +1968,28 @@
preprocessorDirectory,
assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
- new DesignWaterLevelCalculationMessageProvider(Resources.Hydraulic_category_boundary_factorizedSignalingNorm_name)));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaterLevelCalculationsForSignalingNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
- new DesignWaterLevelCalculationMessageProvider(Resources.Hydraulic_category_boundary_signalingNorm_name)));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
- new DesignWaterLevelCalculationMessageProvider(Resources.Hydraulic_category_boundary_lowerLimitNorm_name)));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm),
- new DesignWaterLevelCalculationMessageProvider(Resources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)));
+ new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName)));
ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
});
@@ -2022,28 +2027,28 @@
preprocessorDirectory,
assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
- new WaveHeightCalculationMessageProvider(Resources.Hydraulic_category_boundary_factorizedSignalingNorm_name)));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaveHeightCalculationsForSignalingNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
- new WaveHeightCalculationMessageProvider(Resources.Hydraulic_category_boundary_signalingNorm_name)));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
- new WaveHeightCalculationMessageProvider(Resources.Hydraulic_category_boundary_lowerLimitNorm_name)));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName)));
calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm),
- new WaveHeightCalculationMessageProvider(Resources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)));
+ new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName)));
ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
});
@@ -2065,19 +2070,19 @@
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
- Resources.Hydraulic_category_boundary_factorizedSignalingNorm_name),
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName),
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForSignalingNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
- Resources.Hydraulic_category_boundary_signalingNorm_name),
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName),
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
- Resources.Hydraulic_category_boundary_lowerLimitNorm_name),
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName),
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm),
- Resources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName)
};
}
@@ -2088,19 +2093,19 @@
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
- Resources.Hydraulic_category_boundary_factorizedSignalingNorm_name),
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName),
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForSignalingNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
- Resources.Hydraulic_category_boundary_signalingNorm_name),
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName),
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForLowerLimitNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
- Resources.Hydraulic_category_boundary_lowerLimitNorm_name),
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName),
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
context.AssessmentSection,
() => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm),
- Resources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)
+ RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName)
};
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -405,7 +405,7 @@
// Assert
Assert.IsInstanceOf(messageProviderValue);
- Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+ Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
messageProviderValue.GetActivityDescription("Location name"));
Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
Assert.AreEqual("", preprocessorDirectoryValue);
@@ -477,7 +477,7 @@
// Assert
Assert.IsInstanceOf(messageProviderValue);
- Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+ Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
messageProviderValue.GetActivityDescription("Location name"));
Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue);
@@ -548,7 +548,7 @@
// Assert
Assert.IsInstanceOf(messageProviderValue);
- Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+ Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
messageProviderValue.GetActivityDescription("Location name"));
Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
Assert.AreEqual(string.Empty, preprocessorDirectoryValue);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -405,7 +405,7 @@
// Assert
Assert.IsInstanceOf(messageProviderValue);
- Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+ Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
messageProviderValue.GetActivityDescription("Location name"));
Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
Assert.AreEqual("", preprocessorDirectoryValue);
@@ -477,7 +477,7 @@
// Assert
Assert.IsInstanceOf(messageProviderValue);
- Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+ Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
messageProviderValue.GetActivityDescription("Location name"));
Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue);
@@ -548,7 +548,7 @@
// Assert
Assert.IsInstanceOf(messageProviderValue);
- Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+ Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
messageProviderValue.GetActivityDescription("Location name"));
Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
Assert.AreEqual(string.Empty, preprocessorDirectoryValue);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbcab4543e8b75f5d00850c4e7780097cfabf67da -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision bcab4543e8b75f5d00850c4e7780097cfabf67da)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -110,7 +110,7 @@
string text = info.Text(context);
// Assert
- Assert.AreEqual(categoryBoundaryName, text);
+ Assert.AreEqual("Categorie " + categoryBoundaryName, text);
}
mockRepository.VerifyAll();
@@ -586,14 +586,14 @@
{
string[] msgs = messages.ToArray();
Assert.AreEqual(8, msgs.Length);
- Assert.AreEqual($"Waterstand berekenen voor locatie '{locationName}' ({categoryBoundaryName}) is gestart.", msgs[0]);
+ Assert.AreEqual($"Waterstand berekenen voor locatie '{locationName}' (Categorie {categoryBoundaryName}) is gestart.", msgs[0]);
CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
- Assert.AreEqual($"Waterstand berekening voor locatie '{locationName}' ({categoryBoundaryName}) is niet geconvergeerd.", msgs[4]);
+ Assert.AreEqual($"Waterstand berekening voor locatie '{locationName}' (Categorie {categoryBoundaryName}) is niet geconvergeerd.", msgs[4]);
StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
- Assert.AreEqual($"Waterstand berekenen voor locatie '{locationName}' ({categoryBoundaryName}) is gelukt.", msgs[7]);
+ Assert.AreEqual($"Waterstand berekenen voor locatie '{locationName}' (Categorie {categoryBoundaryName}) is gelukt.", msgs[7]);
});
HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbcab4543e8b75f5d00850c4e7780097cfabf67da -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision bcab4543e8b75f5d00850c4e7780097cfabf67da)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -496,19 +496,19 @@
Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection)));
- Assert.AreEqual("Categorie A+->A", calculationsContexts[0].CategoryBoundaryName);
+ Assert.AreEqual("A+->A", calculationsContexts[0].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, calculationsContexts[0].WrappedData);
Assert.AreEqual(signalingNorm / 30, calculationsContexts[0].GetNormFunc());
- Assert.AreEqual("Categorie A->B", calculationsContexts[1].CategoryBoundaryName);
+ Assert.AreEqual("A->B", calculationsContexts[1].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaterLevelCalculationsForSignalingNorm, calculationsContexts[1].WrappedData);
Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc());
- Assert.AreEqual("Categorie B->C", calculationsContexts[2].CategoryBoundaryName);
+ Assert.AreEqual("B->C", calculationsContexts[2].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[2].WrappedData);
Assert.AreEqual(lowerLimitNorm, calculationsContexts[2].GetNormFunc());
- Assert.AreEqual("Categorie C->D", calculationsContexts[3].CategoryBoundaryName);
+ Assert.AreEqual("C->D", calculationsContexts[3].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, calculationsContexts[3].WrappedData);
Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[3].GetNormFunc());
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -110,7 +110,7 @@
string text = info.Text(context);
// Assert
- Assert.AreEqual(categoryBoundaryName, text);
+ Assert.AreEqual("Categorie " + categoryBoundaryName, text);
}
mockRepository.VerifyAll();
@@ -589,14 +589,14 @@
{
string[] msgs = messages.ToArray();
Assert.AreEqual(8, msgs.Length);
- Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' ({categoryBoundaryName}) is gestart.", msgs[0]);
+ Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' (Categorie {categoryBoundaryName}) is gestart.", msgs[0]);
CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
- Assert.AreEqual($"Golfhoogte berekening voor locatie '{locationName}' ({categoryBoundaryName}) is niet geconvergeerd.", msgs[4]);
+ Assert.AreEqual($"Golfhoogte berekening voor locatie '{locationName}' (Categorie {categoryBoundaryName}) is niet geconvergeerd.", msgs[4]);
StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
- Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' ({categoryBoundaryName}) is gelukt.", msgs[7]);
+ Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' (Categorie {categoryBoundaryName}) is gelukt.", msgs[7]);
});
HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbcab4543e8b75f5d00850c4e7780097cfabf67da -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision bcab4543e8b75f5d00850c4e7780097cfabf67da)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -497,19 +497,19 @@
Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection)));
- Assert.AreEqual("Categorie A+->A", calculationsContexts[0].CategoryBoundaryName);
+ Assert.AreEqual("A+->A", calculationsContexts[0].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, calculationsContexts[0].WrappedData);
Assert.AreEqual(signalingNorm / 30, calculationsContexts[0].GetNormFunc());
- Assert.AreEqual("Categorie A->B", calculationsContexts[1].CategoryBoundaryName);
+ Assert.AreEqual("A->B", calculationsContexts[1].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaveHeightCalculationsForSignalingNorm, calculationsContexts[1].WrappedData);
Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc());
- Assert.AreEqual("Categorie B->C", calculationsContexts[2].CategoryBoundaryName);
+ Assert.AreEqual("B->C", calculationsContexts[2].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, calculationsContexts[2].WrappedData);
Assert.AreEqual(lowerLimitNorm, calculationsContexts[2].GetNormFunc());
- Assert.AreEqual("Categorie C->D", calculationsContexts[3].CategoryBoundaryName);
+ Assert.AreEqual("C->D", calculationsContexts[3].CategoryBoundaryName);
Assert.AreSame(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, calculationsContexts[3].WrappedData);
Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[3].GetNormFunc());
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs
===================================================================
diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -82,7 +82,7 @@
string viewName = info.GetViewName(null, context);
// Assert
- Assert.AreEqual($"Toetspeilen - {categoryBoundaryName}", viewName);
+ Assert.AreEqual($"Toetspeilen - Categorie {categoryBoundaryName}", viewName);
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs
===================================================================
diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
@@ -82,7 +82,7 @@
string viewName = info.GetViewName(null, context);
// Assert
- Assert.AreEqual($"Golfhoogtes - {categoryBoundaryName}", viewName);
+ Assert.AreEqual($"Golfhoogtes - Categorie {categoryBoundaryName}", viewName);
}
[Test]