Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -rbb45aca6597aab5315eedf1e0c39d5b631597b21 -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -127,7 +127,7 @@
}
///
- /// Looks up a localized string similar to Waterstanden bij doelkans.
+ /// Looks up a localized string similar to Waterstanden bij vrije doelkans.
///
public static string WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName {
get {
Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx
===================================================================
diff -u -rbb45aca6597aab5315eedf1e0c39d5b631597b21 -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx (.../Resources.resx) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx (.../Resources.resx) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -130,7 +130,7 @@
Waterstanden bij vaste doelkans
- Waterstanden bij doelkans
+ Waterstanden bij vrije doelkans
Golfhoogten bij doelkans
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs
===================================================================
diff -u -rbb45aca6597aab5315eedf1e0c39d5b631597b21 -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs (.../HydraulicBoundaryLocationCalculationsExporterTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs (.../HydraulicBoundaryLocationCalculationsExporterTest.cs) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -205,8 +205,8 @@
{
"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",
+ "Waterstanden bij vrije doelkans/Waterstanden_10000.shp",
+ "Waterstanden bij vrije doelkans/Waterstanden_100000.shp",
"Golfhoogten bij doelkans/Golfhoogten_4000.shp",
"Golfhoogten bij doelkans/Golfhoogten_40000.shp"
}).SetName("With UserDefinedTargetProbabilities");
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs
===================================================================
diff -u -r4171e0f1413bbd2ba5a5402525fa98a354c9676b -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs) (revision 4171e0f1413bbd2ba5a5402525fa98a354c9676b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -69,7 +69,7 @@
string name = info.Name(null);
// Assert
- Assert.AreEqual("Waterstanden bij doelkans", name);
+ Assert.AreEqual("Waterstanden bij vrije doelkans", name);
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rbb45aca6597aab5315eedf1e0c39d5b631597b21 -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision bb45aca6597aab5315eedf1e0c39d5b631597b21)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -926,14 +926,14 @@
// Precondition
Assert.IsInstanceOf(view);
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10"));
// When
calculationsForTargetProbability.TargetProbability = 0.01;
calculationsForTargetProbability.NotifyObservers();
// Then
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/100"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/100"));
mocks.VerifyAll();
}
}
@@ -975,14 +975,14 @@
// Precondition
Assert.IsInstanceOf(view);
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10"));
// When
assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability = 0.1;
assessmentSection.FailureMechanismContribution.NotifyObservers();
// Then
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10 (1)"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10 (1)"));
mocks.VerifyAll();
}
}
@@ -1025,14 +1025,14 @@
// Precondition
Assert.IsInstanceOf(view);
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10 (1)"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10 (1)"));
// When
updatedCalculations.TargetProbability = 0.01;
updatedCalculations.NotifyObservers();
// Then
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10"));
mocks.VerifyAll();
}
}
@@ -1075,14 +1075,14 @@
// Precondition
Assert.IsInstanceOf(view);
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10 (1)"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10 (1)"));
// When
assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Remove(removedCalculations);
assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.NotifyObservers();
// Then
- Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij doelkans - 1/10"));
+ Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Waterstanden bij vrije doelkans - 1/10"));
mocks.VerifyAll();
}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rec0ab8efb8b68f383e9317609b0307e612485703 -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision ec0ab8efb8b68f383e9317609b0307e612485703)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -105,7 +105,7 @@
string text = info.Text(null);
// Assert
- Assert.AreEqual("Waterstanden bij doelkans", text);
+ Assert.AreEqual("Waterstanden bij vrije doelkans", text);
}
}
@@ -704,7 +704,7 @@
contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
// Then
- const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij doelkans' wilt wissen?";
+ const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij vrije doelkans' wilt wissen?";
Assert.AreEqual(expectedMessage, messageBoxText);
Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput));
@@ -767,7 +767,7 @@
contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
// Then
- const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij doelkans' wilt wissen?";
+ const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Waterstanden bij vrije doelkans' wilt wissen?";
Assert.AreEqual(expectedMessage, messageBoxText);
Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r013435ed49ecc69ce2a584e37c9d0d7039fa6a7b -rd1b8dd5379737316d073a9f1d81120591c8c10f5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 013435ed49ecc69ce2a584e37c9d0d7039fa6a7b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
@@ -113,7 +113,7 @@
string viewName = info.GetViewName(null, context);
// Assert
- Assert.AreEqual($"Waterstanden bij doelkans - {expectedProbabilityText}", viewName);
+ Assert.AreEqual($"Waterstanden bij vrije doelkans - {expectedProbabilityText}", viewName);
}
}