Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -r052b1eeb395a60708c12cefdaca64bfaf456aa6f -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 052b1eeb395a60708c12cefdaca64bfaf456aa6f)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -118,7 +118,7 @@
}
///
- /// Looks up a localized string similar to Waterstanden bij norm.
+ /// Looks up a localized string similar to Waterstanden bij vaste doelkans.
///
public static string WaterLevelCalculationsForNormTargetProbabilities_DisplayName {
get {
Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx
===================================================================
diff -u -r052b1eeb395a60708c12cefdaca64bfaf456aa6f -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx (.../Resources.resx) (revision 052b1eeb395a60708c12cefdaca64bfaf456aa6f)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx (.../Resources.resx) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -127,7 +127,7 @@
'{0}' is geen geldige Riskeer of Ringtoets projectbestand versie.
- Waterstanden bij norm
+ Waterstanden bij vaste doelkans
Waterstanden bij doelkans
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs
===================================================================
diff -u -rb03cdb29fdc02ffab1dfe1ab980d043438809ae7 -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs (.../HydraulicBoundaryLocationCalculationsExporterTest.cs) (revision b03cdb29fdc02ffab1dfe1ab980d043438809ae7)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs (.../HydraulicBoundaryLocationCalculationsExporterTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -142,7 +142,7 @@
void Call() => isExported = exporter.Export();
// Assert
- string expectedFilePath = Path.Combine(directoryPath, "~temp", "Waterstanden bij norm", "Waterstanden_30000.shp");
+ string expectedFilePath = Path.Combine(directoryPath, "~temp", "Waterstanden bij vaste doelkans", "Waterstanden_30000.shp");
string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{expectedFilePath}'. " +
"Er zijn geen hydraulische belastingenlocaties geƫxporteerd.";
TestHelper.AssertLogMessageIsGenerated(Call, expectedMessage);
@@ -203,8 +203,8 @@
});
yield return new TestCaseData(assessmentSectionWithTargetProbabilities, new[]
{
- "Waterstanden bij norm/Waterstanden_30000.shp",
- "Waterstanden bij norm/Waterstanden_30000 (1).shp",
+ "Waterstanden bij vaste doelkans/Waterstanden_30000.shp",
+ "Waterstanden bij vaste doelkans/Waterstanden_30000 (1).shp",
"Waterstanden bij doelkans/Waterstanden_10000.shp",
"Waterstanden bij doelkans/Waterstanden_100000.shp",
"Golfhoogten bij doelkans/Golfhoogten_4000.shp",
@@ -220,8 +220,8 @@
assessmentSectionWithoutTargetProbabilities.WaveHeightCalculationsForUserDefinedTargetProbabilities.Clear();
yield return new TestCaseData(assessmentSectionWithoutTargetProbabilities, new[]
{
- "Waterstanden bij norm/Waterstanden_30000.shp",
- "Waterstanden bij norm/Waterstanden_30000 (1).shp"
+ "Waterstanden bij vaste doelkans/Waterstanden_30000.shp",
+ "Waterstanden bij vaste doelkans/Waterstanden_30000 (1).shp"
}).SetName("Without UserDefinedTargetProbabilities");
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextExportInfoTest.cs
===================================================================
diff -u -rffdaea5b476af6072fa570ad76cd7649b5490fac -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextExportInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextExportInfoTest.cs) (revision ffdaea5b476af6072fa570ad76cd7649b5490fac)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextExportInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextExportInfoTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -68,7 +68,7 @@
string name = info.Name(null);
// Assert
- Assert.AreEqual("Waterstanden bij norm", name);
+ Assert.AreEqual("Waterstanden bij vaste doelkans", name);
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rb0f45be4fbc6672b59b96343d8a62876d9662e1d -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -820,7 +820,7 @@
// Precondition
Assert.IsInstanceOf(view);
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij norm - {originalProbabilityText}"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij vaste doelkans - {originalProbabilityText}"));
// When
FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
@@ -829,7 +829,7 @@
failureMechanismContribution.NotifyObservers();
// Then
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij norm - {expectedProbabilityText}"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij vaste doelkans - {expectedProbabilityText}"));
mocks.VerifyAll();
}
}
@@ -873,7 +873,7 @@
// Precondition
Assert.IsInstanceOf(view);
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij norm - {originalProbabilityText}"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij vaste doelkans - {originalProbabilityText}"));
// When
FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
@@ -882,7 +882,7 @@
failureMechanismContribution.NotifyObservers();
// Then
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij norm - {expectedProbabilityText}"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, $"Waterstanden bij vaste doelkans - {expectedProbabilityText}"));
mocks.VerifyAll();
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb0f45be4fbc6672b59b96343d8a62876d9662e1d -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -102,7 +102,7 @@
string text = info.Text(null);
// Assert
- Assert.AreEqual("Waterstanden bij norm", text);
+ Assert.AreEqual("Waterstanden bij vaste doelkans", text);
}
}
@@ -607,7 +607,7 @@
contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
// Then
- const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij norm' wilt wissen?";
+ const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij vaste doelkans' wilt wissen?";
Assert.AreEqual(expectedMessage, messageBoxText);
Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput));
@@ -668,7 +668,7 @@
contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
// Then
- const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij norm' wilt wissen?";
+ const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij vaste doelkans' wilt wissen?";
Assert.AreEqual(expectedMessage, messageBoxText);
Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -rb0f45be4fbc6672b59b96343d8a62876d9662e1d -rbb45aca6597aab5315eedf1e0c39d5b631597b21
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
@@ -109,7 +109,7 @@
string viewName = info.GetViewName(null, context);
// Assert
- Assert.AreEqual($"Waterstanden bij norm - {expectedProbabilityText}", viewName);
+ Assert.AreEqual($"Waterstanden bij vaste doelkans - {expectedProbabilityText}", viewName);
}
}