Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModel.cs
===================================================================
diff -u -r68f93b2729ea817ed986e779bde5599990eb2138 -r69073aa40549000b0d80aeb36b7b4ef67b1fa728
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModel.cs (.../PipingScenariosViewFailureMechanismSectionViewModel.cs) (revision 68f93b2729ea817ed986e779bde5599990eb2138)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModel.cs (.../PipingScenariosViewFailureMechanismSectionViewModel.cs) (revision 69073aa40549000b0d80aeb36b7b4ef67b1fa728)
@@ -22,6 +22,7 @@
using System;
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Piping.Data;
+using Riskeer.Piping.Forms.Properties;
using Riskeer.Piping.Forms.Views;
namespace Riskeer.Piping.Forms.PresentationObjects
@@ -81,8 +82,22 @@
{
get
{
- return Section.Name;
+ string name = Section.Name;
+
+ if (failureMechanism.ScenarioConfigurationType == PipingScenarioConfigurationType.PerFailureMechanismSection)
+ {
+ name += $" ({GetScenarioConfigurationTypeDisplayName()})";
+ }
+
+ return name;
}
}
+
+ private string GetScenarioConfigurationTypeDisplayName()
+ {
+ return ScenarioConfigurationPerSection.ScenarioConfigurationType == PipingScenarioConfigurationPerFailureMechanismSectionType.SemiProbabilistic
+ ? Resources.PipingScenariosViewFailureMechanismSectionViewModel_GetScenarioConfigurationTypeDisplayName_SemiProbabilistic
+ : Resources.PipingScenariosViewFailureMechanismSectionViewModel_GetScenarioConfigurationTypeDisplayName_Probabilistic;
+ }
}
}
\ No newline at end of file
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r889f5f6435e53be9b83d35ebb7c29cb25a609193 -r69073aa40549000b0d80aeb36b7b4ef67b1fa728
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 889f5f6435e53be9b83d35ebb7c29cb25a609193)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 69073aa40549000b0d80aeb36b7b4ef67b1fa728)
@@ -947,6 +947,26 @@
}
///
+ /// Looks up a localized string similar to probabilistisch.
+ ///
+ public static string PipingScenariosViewFailureMechanismSectionViewModel_GetScenarioConfigurationTypeDisplayName_Probabilistic {
+ get {
+ return ResourceManager.GetString("PipingScenariosViewFailureMechanismSectionViewModel_GetScenarioConfigurationTypeD" +
+ "isplayName_Probabilistic", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to semi-probabilistisch.
+ ///
+ public static string PipingScenariosViewFailureMechanismSectionViewModel_GetScenarioConfigurationTypeDisplayName_SemiProbabilistic {
+ get {
+ return ResourceManager.GetString("PipingScenariosViewFailureMechanismSectionViewModel_GetScenarioConfigurationTypeD" +
+ "isplayName_SemiProbabilistic", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Kans op
///heave
///[1/jaar].
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r889f5f6435e53be9b83d35ebb7c29cb25a609193 -r69073aa40549000b0d80aeb36b7b4ef67b1fa728
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 889f5f6435e53be9b83d35ebb7c29cb25a609193)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 69073aa40549000b0d80aeb36b7b4ef67b1fa728)
@@ -504,4 +504,10 @@
Probabilistische berekeningen
+
+ semi-probabilistisch
+
+
+ probabilistisch
+
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModelTest.cs
===================================================================
diff -u -r68f93b2729ea817ed986e779bde5599990eb2138 -r69073aa40549000b0d80aeb36b7b4ef67b1fa728
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModelTest.cs (.../PipingScenariosViewFailureMechanismSectionViewModelTest.cs) (revision 68f93b2729ea817ed986e779bde5599990eb2138)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModelTest.cs (.../PipingScenariosViewFailureMechanismSectionViewModelTest.cs) (revision 69073aa40549000b0d80aeb36b7b4ef67b1fa728)
@@ -88,18 +88,51 @@
}
[Test]
- public void DisplayName_Always_ReturnsExpectedName()
+ [TestCase(PipingScenarioConfigurationType.SemiProbabilistic)]
+ [TestCase(PipingScenarioConfigurationType.Probabilistic)]
+ public void DisplayName_FailureMechanismScenarioConfigurationTypeNotPerSection_ReturnsExpectedName(PipingScenarioConfigurationType scenarioConfigurationType)
{
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var pipingFailureMechanism = new PipingFailureMechanism
+ {
+ ScenarioConfigurationType = scenarioConfigurationType
+ };
var scenarioConfiguration = new PipingScenarioConfigurationPerFailureMechanismSection(section);
- var viewModel = new PipingScenariosViewFailureMechanismSectionViewModel(section, new PipingFailureMechanism(), scenarioConfiguration);
+ var viewModel = new PipingScenariosViewFailureMechanismSectionViewModel(section, pipingFailureMechanism, scenarioConfiguration);
+
// Call
string displayName = viewModel.DisplayName;
// Assert
Assert.AreEqual(section.Name, displayName);
}
+
+ [Test]
+ [TestCase(PipingScenarioConfigurationPerFailureMechanismSectionType.SemiProbabilistic, "semi-probabilistisch")]
+ [TestCase(PipingScenarioConfigurationPerFailureMechanismSectionType.Probabilistic, "probabilistisch")]
+ public void DisplayName_FailureMechanismScenarioConfigurationTypePerSection_ReturnsExpectedName(
+ PipingScenarioConfigurationPerFailureMechanismSectionType scenarioConfigurationType, string displayNameSuffix)
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var pipingFailureMechanism = new PipingFailureMechanism
+ {
+ ScenarioConfigurationType = PipingScenarioConfigurationType.PerFailureMechanismSection
+ };
+ var scenarioConfiguration = new PipingScenarioConfigurationPerFailureMechanismSection(section)
+ {
+ ScenarioConfigurationType = scenarioConfigurationType
+ };
+
+ var viewModel = new PipingScenariosViewFailureMechanismSectionViewModel(section, pipingFailureMechanism, scenarioConfiguration);
+
+ // Call
+ string displayName = viewModel.DisplayName;
+
+ // Assert
+ Assert.AreEqual($"{section.Name} ({displayNameSuffix})", displayName);
+ }
}
}
\ No newline at end of file