Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r25a6f6fc7f89feb479282171ab01fc277e5c8d64 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 25a6f6fc7f89feb479282171ab01fc277e5c8d64)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -721,7 +721,7 @@
[TestCase("validConfigurationUnknownForeshoreProfile.xml",
"Het voorlandprofiel met ID 'unknown' bestaat niet.")]
[TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml",
- "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")]
+ "De hydraulische belastingenlocatie 'unknown' bestaat niet.")]
[TestCase("validConfigurationUnknownStructure.xml",
"Het kunstwerk met ID 'unknown' bestaat niet.")]
public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -re7359d916fa8cd9a3a28e6944d65abdcfe2e0789 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e7359d916fa8cd9a3a28e6944d65abdcfe2e0789)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -206,7 +206,7 @@
}
///
- /// Looks up a localized string similar to De locatie met hydraulische randvoorwaarden '{0}' bestaat niet..
+ /// Looks up a localized string similar to De hydraulische belastingenlocatie '{0}' bestaat niet..
///
public static string CalculationConfigurationImporter_ReadHydraulicBoundaryLocation_HydraulicBoundaryLocation_0_does_not_exist {
get {
@@ -947,7 +947,7 @@
}
///
- /// Looks up a localized string similar to De hydraulische randvoorwaardenlocaties zijn ingelezen..
+ /// Looks up a localized string similar to De hydraulische belastingenlocaties zijn ingelezen..
///
public static string HydraulicBoundaryDatabaseImporter_Import_All_hydraulic_locations_read {
get {
@@ -956,7 +956,7 @@
}
///
- /// Looks up a localized string similar to {0} Er zijn geen hydraulische randvoorwaarden locaties geëxporteerd..
+ /// Looks up a localized string similar to {0} Er zijn geen hydraulische belastingenlocaties geëxporteerd..
///
public static string HydraulicBoundaryLocationsExporter_Error_Exception_0_no_HydraulicBoundaryLocations_exported {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -re7359d916fa8cd9a3a28e6944d65abdcfe2e0789 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision e7359d916fa8cd9a3a28e6944d65abdcfe2e0789)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -298,7 +298,7 @@
De locatie parameter 'X0' bevat een ongeldig getal.
- {0} Er zijn geen hydraulische randvoorwaarden locaties geëxporteerd.
+ {0} Er zijn geen hydraulische belastingenlocaties geëxporteerd.
Het kunstwerk heeft geen geldige waarde voor attribuut '{0}'.
@@ -376,7 +376,7 @@
Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand.
- De hydraulische randvoorwaardenlocaties zijn ingelezen.
+ De hydraulische belastingenlocaties zijn ingelezen.
De profiellocatie met ID '{0}' ligt niet op de referentielijn.
@@ -526,7 +526,7 @@
..\Resources\VoorlandProfielSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
- De locatie met hydraulische randvoorwaarden '{0}' bestaat niet.
+ De hydraulische belastingenlocatie '{0}' bestaat niet.
Het kunstwerk met ID '{0}' bestaat niet.
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -422,7 +422,7 @@
Action validate = () => valid = importer.PublicTryReadHydraulicBoundaryLocation(locationName, calculationName, Enumerable.Empty(), out location);
// Assert
- string expectedMessage = $"De locatie met hydraulische randvoorwaarden '{locationName}' bestaat niet. Berekening '{calculationName}' is overgeslagen.";
+ string expectedMessage = $"De hydraulische belastingenlocatie '{locationName}' bestaat niet. Berekening '{calculationName}' is overgeslagen.";
TestHelper.AssertLogMessageWithLevelIsGenerated(validate, Tuple.Create(expectedMessage, LogLevelConstant.Error));
Assert.IsFalse(valid);
Assert.IsNull(location);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r1d03a921a3d2541866841d5f089139ae7d9c50f2 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 1d03a921a3d2541866841d5f089139ae7d9c50f2)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -204,7 +204,7 @@
TestHelper.AssertLogMessages(call, messages =>
{
string[] messageArray = messages.ToArray();
- StringAssert.EndsWith("De hydraulische randvoorwaardenlocaties zijn ingelezen.", messageArray[0]);
+ StringAssert.EndsWith("De hydraulische belastingenlocaties zijn ingelezen.", messageArray[0]);
});
Assert.IsTrue(importResult);
IEnumerable importedLocations = assessmentSection.HydraulicBoundaryDatabase.Locations;
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs
===================================================================
diff -u -recb0e5b29e11012efd3944171530d9310e07804a -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs (.../DuneLocationCalculationsExporterTest.cs) (revision ecb0e5b29e11012efd3944171530d9310e07804a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsExporterTest.cs (.../DuneLocationCalculationsExporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -169,7 +169,7 @@
// Assert
string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. "
- + "Er zijn geen hydraulische randvoorwaarden locaties geëxporteerd.";
+ + "Er zijn geen hydraulische belastingenlocaties geëxporteerd.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage);
Assert.IsFalse(isExported);
}
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -215,7 +215,7 @@
Action call = () => successful = importer.Import();
// Assert
- const string expectedMessage = "De locatie met hydraulische randvoorwaarden 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
+ const string expectedMessage = "De hydraulische belastingenlocatie 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
Assert.IsTrue(successful);
CollectionAssert.IsEmpty(calculationGroup.Children);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs
===================================================================
diff -u -rf1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs) (revision f1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -180,7 +180,7 @@
// Assert
string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. " +
- "Er zijn geen hydraulische randvoorwaarden locaties geëxporteerd.";
+ "Er zijn geen hydraulische belastingenlocaties geëxporteerd.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage);
Assert.IsFalse(isExported);
}
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -613,7 +613,7 @@
[TestCase("validConfigurationUnknownForeshoreProfile.xml",
"Het voorlandprofiel met ID 'unknown' bestaat niet.")]
[TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml",
- "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")]
+ "De hydraulische belastingenlocatie 'unknown' bestaat niet.")]
[TestCase("validConfigurationUnknownStructure.xml",
"Het kunstwerk met ID 'unknown' bestaat niet.")]
public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage)
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Exporters/HydraulicBoundaryLocationsExporterTest.cs
===================================================================
diff -u -rb1b71a40d77daee847b347b731a8442d666b9e0e -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Exporters/HydraulicBoundaryLocationsExporterTest.cs (.../HydraulicBoundaryLocationsExporterTest.cs) (revision b1b71a40d77daee847b347b731a8442d666b9e0e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Exporters/HydraulicBoundaryLocationsExporterTest.cs (.../HydraulicBoundaryLocationsExporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -154,7 +154,7 @@
// Assert
string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'. " +
- "Er zijn geen hydraulische randvoorwaarden locaties geëxporteerd.";
+ "Er zijn geen hydraulische belastingenlocaties geëxporteerd.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage);
Assert.IsFalse(isExported);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -re4e651ef6dc88bacd83779f7128206d9ee0bd836 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision e4e651ef6dc88bacd83779f7128206d9ee0bd836)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -329,7 +329,7 @@
{
string[] msgs = messages.ToArray();
Assert.AreEqual(2, msgs.Length);
- Assert.AreEqual("De hydraulische randvoorwaardenlocaties zijn ingelezen.", msgs[0]);
+ Assert.AreEqual("De hydraulische belastingenlocaties zijn ingelezen.", msgs[0]);
Assert.AreEqual($"Database op pad '{testFile}' gekoppeld.", msgs[1]);
});
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rc70132b60d5cf87d12af98447ed9b7ebb69b52e1 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision c70132b60d5cf87d12af98447ed9b7ebb69b52e1)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -105,7 +105,7 @@
Action call = () => successful = importer.Import();
// Assert
- const string expectedMessage = "De locatie met hydraulische randvoorwaarden 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
+ const string expectedMessage = "De hydraulische belastingenlocatie 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1);
Assert.IsTrue(successful);
CollectionAssert.IsEmpty(calculationGroup.Children);
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r775a5c80cac9b66fbfd3cd4c05a54df37632ad7e -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision 775a5c80cac9b66fbfd3cd4c05a54df37632ad7e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -165,7 +165,7 @@
Action call = () => successful = importer.Import();
// Assert
- const string expectedMessage = "De locatie met hydraulische randvoorwaarden 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
+ const string expectedMessage = "De hydraulische belastingenlocatie 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
Assert.IsTrue(successful);
CollectionAssert.IsEmpty(calculationGroup.Children);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r649997fac0baeea92b9d625ca1e0f4828918f28c -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 649997fac0baeea92b9d625ca1e0f4828918f28c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -137,7 +137,7 @@
Action call = () => successful = importer.Import();
// Assert
- const string expectedMessage = "De locatie met hydraulische randvoorwaarden 'HRlocatie' bestaat niet. Berekening 'Berekening 1' is overgeslagen.";
+ const string expectedMessage = "De hydraulische belastingenlocatie 'HRlocatie' bestaat niet. Berekening 'Berekening 1' is overgeslagen.";
TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1);
Assert.IsTrue(successful);
CollectionAssert.IsEmpty(calculationGroup.Children);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -rd907ed695ba2fb1bdf239919d9e475b51e7d812c
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision d907ed695ba2fb1bdf239919d9e475b51e7d812c)
@@ -1152,7 +1152,7 @@
"Het voorlandprofiel met ID 'unknown' bestaat niet.",
TestName = "Import_UnknownData({0:80})")]
[TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml",
- "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.",
+ "De hydraulische belastingenlocatie 'unknown' bestaat niet.",
TestName = "Import_UnknownData({0:80})")]
[TestCase("validConfigurationUnknownStructure.xml",
"Het kunstwerk met ID 'unknown' bestaat niet.",