Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rc96fb56602a4b48d007208923213ab5efa09699f -r9db0ef475c732008dc2ecda3a485e4f933b704fc --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision c96fb56602a4b48d007208923213ab5efa09699f) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 9db0ef475c732008dc2ecda3a485e4f933b704fc) @@ -1038,7 +1038,8 @@ yield return new TreeNodeInfo { - Text = context => noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability), + Text = context => CalculationsDisplayNameHelper.GetUniqueDisplayNameForWaterLevelCalculations(context.AssessmentSection, + context.WrappedData.HydraulicBoundaryLocationCalculations), Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon, EnsureVisibleOnCreate = (context, o) => true, OnRemoveConfirmationText = context => Resources.RiskeerPlugin_GetTreeNodeInfos_Confirm_remove_TargetProbability, Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r7e6c0b97836346830f6d1d4ffea8df72695710cc -r9db0ef475c732008dc2ecda3a485e4f933b704fc --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 7e6c0b97836346830f6d1d4ffea8df72695710cc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 9db0ef475c732008dc2ecda3a485e4f933b704fc) @@ -42,6 +42,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Data.TestUtil.IllustrationPoints; @@ -105,13 +106,35 @@ } [Test] - public void Text_WithContext_ReturnsFormattedTargetProbability() + [TestCase(0.1, 0.01, 0.025, 0.0025, "1/400")] + [TestCase(0.1, 0.01, 0.0025, 0.0025, "1/400 (2)")] + [TestCase(0.1, 0.0025, 0.025, 0.0025, "1/400 (2)")] + [TestCase(0.0025, 0.00025, 0.025, 0.0025, "1/400 (2)")] + [TestCase(0.0025, 0.0025, 0.025, 0.0025, "1/400 (3)")] + [TestCase(0.0025, 0.0025, 0.0025, 0.0025, "1/400 (4)")] + public void Text_WithContext_ReturnsUniquelyFormattedTargetProbability(double lowerLimitNorm, double signalingNorm, + double userDefinedTargetProbability1, + double userDefinedTargetProbability2, + string expectedText) { // Setup + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(userDefinedTargetProbability2); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); + + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); + assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return( + new ObservableList + { + new HydraulicBoundaryLocationCalculationsForTargetProbability(userDefinedTargetProbability1), + calculationsForTargetProbability + }); + mockRepository.ReplayAll(); - var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01), + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculationsForTargetProbability, assessmentSection); using (var plugin = new RiskeerPlugin()) @@ -122,7 +145,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual("1/100", text); + Assert.AreEqual(expectedText, text); } mockRepository.VerifyAll();