Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r552512346182908793906e5195f4aec36bc5039b -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -785,9 +785,9 @@ [TestCase(0.01, 0.01, "1/100", 0.1, 0.01, "1/10")] [TestCase(0.1, 0.01, "1/10", 0.01, 0.01, "1/100")] [Apartment(ApartmentState.STA)] - public void GivenPluginWithGuiSetAndOpenedDesignWaterLevelCalculationsViewForLowerLimitNorm_WhenChangingNormAndObserversNotified_ThenViewTitleUpdated( - double lowerLimitNorm, double signalingNorm, string originalProbabilityText, - double newLowerLimitNorm, double newSignalingNorm, string expectedProbabilityText) + public void GivenPluginWithGuiSetAndOpenedDesignWaterLevelCalculationsViewForMaximumAllowableFloodingProbability_WhenChangingFloodingProbabilitiesAndObserversNotified_ThenViewTitleUpdated( + double maximumAllowableFloodingProbability, double signalFloodingProbability, string originalProbabilityText, + double newMaximumAllowableFloodingProbability, double newSignalFloodingProbability, string expectedProbabilityText) { // Given var mocks = new MockRepository(); @@ -804,8 +804,8 @@ { FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalFloodingProbability } }; var project = new RiskeerProject(assessmentSection); @@ -824,8 +824,8 @@ // When FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution; - failureMechanismContribution.MaximumAllowableFloodingProbability = newLowerLimitNorm; - failureMechanismContribution.SignalFloodingProbability = newSignalingNorm; + failureMechanismContribution.MaximumAllowableFloodingProbability = newMaximumAllowableFloodingProbability; + failureMechanismContribution.SignalFloodingProbability = newSignalFloodingProbability; failureMechanismContribution.NotifyObservers(); // Then @@ -838,9 +838,9 @@ [TestCase(0.01, 0.01, "1/100 (1)", 0.1, 0.01, "1/100")] [TestCase(0.1, 0.01, "1/100", 0.01, 0.01, "1/100 (1)")] [Apartment(ApartmentState.STA)] - public void GivenPluginWithGuiSetAndOpenedDesignWaterLevelCalculationsViewForSignalingNorm_WhenChangingNormAndObserversNotified_ThenViewTitleUpdated( - double lowerLimitNorm, double signalingNorm, string originalProbabilityText, - double newLowerLimitNorm, double newSignalingNorm, string expectedProbabilityText) + public void GivenPluginWithGuiSetAndOpenedDesignWaterLevelCalculationsViewForSignalFloodingProbability_WhenChangingFloodingProbabilitiesAndObserversNotified_ThenViewTitleUpdated( + double maximumAllowableFloodingProbability, double signalFloodingProbability, string originalProbabilityText, + double newMaximumAllowableFloodingProbability, double newSignalFloodingProbability, string expectedProbabilityText) { // Given var mocks = new MockRepository(); @@ -857,8 +857,8 @@ { FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalFloodingProbability } }; var project = new RiskeerProject(assessmentSection); @@ -877,8 +877,8 @@ // When FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution; - failureMechanismContribution.MaximumAllowableFloodingProbability = newLowerLimitNorm; - failureMechanismContribution.SignalFloodingProbability = newSignalingNorm; + failureMechanismContribution.MaximumAllowableFloodingProbability = newMaximumAllowableFloodingProbability; + failureMechanismContribution.SignalFloodingProbability = newSignalFloodingProbability; failureMechanismContribution.NotifyObservers(); // Then Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r552512346182908793906e5195f4aec36bc5039b -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -126,12 +126,12 @@ public void ChildNodeObjects_Always_ReturnsChildrenOfData() { // Setup - const double signalingNorm = 0.002; - const double lowerLimitNorm = 0.005; + const double signalFloodingProbability = 0.002; + const double maximumAllowableFloodingProbability = 0.005; var assessmentSection = new AssessmentSectionStub(); - assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability = lowerLimitNorm; - assessmentSection.FailureMechanismContribution.SignalFloodingProbability = signalingNorm; + assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability; + assessmentSection.FailureMechanismContribution.SignalFloodingProbability = signalFloodingProbability; var locations = new ObservableList(); var calculationsGroupContext = new WaterLevelCalculationsForNormTargetProbabilitiesGroupContext(locations, assessmentSection); @@ -151,11 +151,11 @@ Assert.AreSame(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, calculationsContexts[0].WrappedData); Assert.AreSame(assessmentSection, calculationsContexts[0].AssessmentSection); - Assert.AreEqual(lowerLimitNorm, calculationsContexts[0].GetNormFunc()); + Assert.AreEqual(maximumAllowableFloodingProbability, calculationsContexts[0].GetNormFunc()); Assert.AreSame(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, calculationsContexts[1].WrappedData); Assert.AreSame(assessmentSection, calculationsContexts[1].AssessmentSection); - Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc()); + Assert.AreEqual(signalFloodingProbability, calculationsContexts[1].GetNormFunc()); } } @@ -464,8 +464,8 @@ public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenLogMessagesAddedOutputSet() { // Given - const double signalingNorm = 0.002; - const double lowerLimitNorm = 0.005; + const double signalFloodingProbability = 0.002; + const double maximumAllowableFloodingProbability = 0.005; var mockRepository = new MockRepository(); var assessmentSection = new AssessmentSectionStub @@ -476,8 +476,8 @@ }, FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalFloodingProbability } }; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r552512346182908793906e5195f4aec36bc5039b -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -100,21 +100,22 @@ [Test] [TestCase(0.1, 0.01, "1/10")] [TestCase(0.1, 0.1, "1/10")] - public void Text_WithContext_ReturnsUniquelyFormattedTargetProbabilityForLowerLimitNorm(double lowerLimitNorm, double signalingNorm, string expectedText) + public void Text_WithContext_ReturnsUniquelyFormattedTargetProbabilityForMaximumAllowableFloodingProbability( + double maximumAllowableFloodingProbability, double signalFloodingProbability, string expectedText) { // Setup - var lowerLimitNormCalculations = new ObservableList(); + var maximumAllowableFloodingProbabilityCalculations = new ObservableList(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(lowerLimitNormCalculations); + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability)); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(maximumAllowableFloodingProbabilityCalculations); assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return(new ObservableList()); mockRepository.ReplayAll(); - var context = new WaterLevelCalculationsForNormTargetProbabilityContext(lowerLimitNormCalculations, assessmentSection, () => lowerLimitNorm); + var context = new WaterLevelCalculationsForNormTargetProbabilityContext(maximumAllowableFloodingProbabilityCalculations, assessmentSection, () => maximumAllowableFloodingProbability); using (var plugin = new RiskeerPlugin()) { @@ -133,21 +134,22 @@ [Test] [TestCase(0.1, 0.01, "1/100")] [TestCase(0.1, 0.1, "1/10 (1)")] - public void Text_WithContext_ReturnsUniquelyFormattedTargetProbabilityForSignalingNorm(double lowerLimitNorm, double signalingNorm, string expectedText) + public void Text_WithContext_ReturnsUniquelyFormattedTargetProbabilityForSignalFloodingProbability( + double maximumAllowableFloodingProbability, double signalFloodingProbability, string expectedText) { // Setup - var signalingNormCalculations = new ObservableList(); + var signalFloodingProbabilityCalculations = new ObservableList(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability)); assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(new ObservableList()); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(signalingNormCalculations); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(signalFloodingProbabilityCalculations); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return(new ObservableList()); mockRepository.ReplayAll(); - var context = new WaterLevelCalculationsForNormTargetProbabilityContext(signalingNormCalculations, assessmentSection, () => lowerLimitNorm); + var context = new WaterLevelCalculationsForNormTargetProbabilityContext(signalFloodingProbabilityCalculations, assessmentSection, () => maximumAllowableFloodingProbability); using (var plugin = new RiskeerPlugin()) { @@ -767,7 +769,7 @@ [TestCaseSource(nameof(GetWaterLevelForNormTargetProbabilityCalculationConfigurations))] [Apartment(ApartmentState.STA)] public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenLogMessagesAddedOutputSet( - double lowerLimitNorm, double signalingNorm, + double maximumAllowableFloodingProbability, double signalingFloodingProbability, Func> getCalculationsFunc) { // Given @@ -776,8 +778,8 @@ { FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalingFloodingProbability }, HydraulicBoundaryDatabase = { @@ -933,16 +935,16 @@ [Apartment(ApartmentState.STA)] public void GivenNormCalculationWithIllustrationPoints_WhenClearIllustrationPointsClicked_ThenExpectedInquiryGiven( Func> getCalculationsFunc, - double lowerLimitNorm, double signalingNorm, string expectedText) + double maximumAllowableFloodingProbability, double signalFloodingProbability, string expectedText) { // Given var random = new Random(21); var assessmentSection = new AssessmentSectionStub { FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new HydraulicBoundaryLocation[] @@ -995,48 +997,48 @@ private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculations() { yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability)) - .SetName("SignalingNormCalculations"); + .SetName("SignalFloodingProbabilityCalculations"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) - .SetName("LowerLimitNormCalculations"); + .SetName("MaximumAllowableFloodingProbabilityCalculations"); } private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculationConfigurations() { yield return new TestCaseData(1 / 10.0, 1 / 100.0, new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability)) - .SetName("SignalingNormCalculations"); + .SetName("SignalFloodingProbabilityCalculations"); yield return new TestCaseData(1 / 100.0, 1 / 200.0, new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) - .SetName("LowerLimitNormCalculations"); + .SetName("MaximumAllowableFloodingProbabilityCalculations"); } private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculationContinuationCases() { yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), true) - .SetName("SignalingNormCalculationsContinued"); + .SetName("SignalFloodingProbabilityCalculationsContinued"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), false) - .SetName("SignalingNormCalculationsCancelled"); + .SetName("SignalFloodingProbabilityCalculationsCancelled"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), true) - .SetName("LowerLimitNormCalculationsContinued"); + .SetName("MaximumAllowableFloodingProbabilityCalculationsContinued"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), false) - .SetName("LowerLimitNormCalculationsCancelled"); + .SetName("MaximumAllowableFloodingProbabilityCalculationsCancelled"); } private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculationDisplayTextCases() { - const double lowerLimitNorm = 0.1; - const double signalingNorm = 0.01; + const double maximumAllowableFloodingProbability = 0.1; + const double signalFloodingProbability = 0.01; yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), - signalingNorm, signalingNorm, "1/100 (1)") - .SetName("SignalingNormCalculationsNormsSame"); + signalFloodingProbability, signalFloodingProbability, "1/100 (1)") + .SetName("SignalFloodingProbabilityCalculationsProbabilitiesSame"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), - lowerLimitNorm, signalingNorm, "1/100") - .SetName("SignalingNormCalculationsNormsDifferent"); + maximumAllowableFloodingProbability, signalFloodingProbability, "1/100") + .SetName("SignalFloodingProbabilityCalculationsProbabilitiesDifferent"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), - lowerLimitNorm, lowerLimitNorm, "1/10") - .SetName("LowerLimitNormCalculationsNormsSame"); + maximumAllowableFloodingProbability, maximumAllowableFloodingProbability, "1/10") + .SetName("MaximumAllowableFloodingProbabilityCalculationsProbabilitiesSame"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), - lowerLimitNorm, signalingNorm, "1/10") - .SetName("LowerLimitNormCalculationsNormsDifferent"); + maximumAllowableFloodingProbability, signalFloodingProbability, "1/10") + .SetName("MaximumAllowableFloodingProbabilityCalculationsProbabilitiesDifferent"); } public override void Setup() Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r552512346182908793906e5195f4aec36bc5039b -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -112,7 +112,8 @@ [TestCase(0.0025, 0.00025, 0.025, 0.0025, "1/400 (1)")] [TestCase(0.0025, 0.0025, 0.025, 0.0025, "1/400 (2)")] [TestCase(0.0025, 0.0025, 0.0025, 0.0025, "1/400 (3)")] - public void Text_WithContext_ReturnsUniquelyFormattedTargetProbability(double lowerLimitNorm, double signalingNorm, + public void Text_WithContext_ReturnsUniquelyFormattedTargetProbability(double maximumAllowableFloodingProbability, + double signalFloodingProbability, double userDefinedTargetProbability1, double userDefinedTargetProbability2, string expectedText) @@ -122,7 +123,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); - assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability)); assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return( @@ -1049,7 +1050,8 @@ [TestCase(0.0025, 0.00025, 0.025, 0.0025, "1/400 (1)")] [TestCase(0.0025, 0.0025, 0.025, 0.0025, "1/400 (2)")] [TestCase(0.0025, 0.0025, 0.0025, 0.0025, "1/400 (3)")] - public void GivenCalculationWithIllustrationPoints_WhenClearIllustrationPointsClicked_ThenExpectedInquiryGiven(double lowerLimitNorm, double signalingNorm, + public void GivenCalculationWithIllustrationPoints_WhenClearIllustrationPointsClicked_ThenExpectedInquiryGiven(double maximumAllowableFloodingProbability, + double signalFloodingProbability, double userDefinedTargetProbability1, double userDefinedTargetProbability2, string expectedText) @@ -1073,8 +1075,8 @@ { FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalFloodingProbability }, WaterLevelCalculationsForUserDefinedTargetProbabilities = { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r552512346182908793906e5195f4aec36bc5039b -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -87,15 +87,15 @@ [TestCaseSource(nameof(GetWaterLevelForNormTargetProbabilityCalculationDisplayTextCases))] public void GetViewName_WithContext_ReturnsExpectedViewName( Func> getCalculationsFunc, - double lowerLimitNorm, double signalingNorm, string expectedProbabilityText) + double maximumAllowableFloodingProbability, double signalFloodingProbability, string expectedProbabilityText) { // Setup var assessmentSection = new AssessmentSectionStub { FailureMechanismContribution = { - MaximumAllowableFloodingProbability = lowerLimitNorm, - SignalFloodingProbability = signalingNorm + MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability, + SignalFloodingProbability = signalFloodingProbability } }; var context = new WaterLevelCalculationsForNormTargetProbabilityContext(getCalculationsFunc(assessmentSection), @@ -376,28 +376,28 @@ private static IEnumerable GetWaterLevelForNormTargetProbabilities() { yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability)) - .SetName("SignalingNorm"); + .SetName("SignalFloodingProbability"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) - .SetName("LowerLimitNorm"); + .SetName("MaximumAllowableFloodingProbability"); } private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculationDisplayTextCases() { - const double lowerLimitNorm = 0.1; - const double signalingNorm = 0.01; + const double maximumAllowableFloodingProbability = 0.1; + const double signalFloodingProbability = 0.01; yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), - signalingNorm, signalingNorm, "1/100 (1)") - .SetName("SignalingNormCalculationsNormsSame"); + signalFloodingProbability, signalFloodingProbability, "1/100 (1)") + .SetName("SignalFloodingProbabilityCalculationsProbabilitiesSame"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), - lowerLimitNorm, signalingNorm, "1/100") - .SetName("SignalingNormCalculationsNormsDifferent"); + maximumAllowableFloodingProbability, signalFloodingProbability, "1/100") + .SetName("SignalFloodingProbabilityCalculationsProbabilitiesDifferent"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), - lowerLimitNorm, lowerLimitNorm, "1/10") - .SetName("LowerLimitNormCalculationsNormsSame"); + maximumAllowableFloodingProbability, maximumAllowableFloodingProbability, "1/10") + .SetName("MaximumAllowableFloodingProbabilityCalculationsProbabilitiesSame"); yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), - lowerLimitNorm, signalingNorm, "1/10") - .SetName("LowerLimitNormCalculationsNormsDifferent"); + maximumAllowableFloodingProbability, signalFloodingProbability, "1/10") + .SetName("MaximumAllowableFloodingProbabilityCalculationsProbabilitiesDifferent"); } private static ViewInfo GetViewInfo(RiskeerPlugin plugin) Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -83,31 +83,31 @@ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - double lowerLimitNorm = assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability; - const string lowerLimitNormText = "1/30.000"; - double signalingNorm = assessmentSection.FailureMechanismContribution.SignalFloodingProbability; - const string signalingNormText = "1/30.000 (1)"; + double maximumAllowableFloodingProbability = assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability; + const string maximumAllowableFloodingProbabilityText = "1/30.000"; + double signalFloodingProbability = assessmentSection.FailureMechanismContribution.SignalFloodingProbability; + const string signalFloodingProbabilityText = "1/30.000 (1)"; AssertDesignWaterLevelCalculationActivity(activities.ElementAt(0), hydraulicBoundaryLocation1, - lowerLimitNorm, - lowerLimitNormText, + maximumAllowableFloodingProbability, + maximumAllowableFloodingProbabilityText, hydraulicBoundaryDatabase); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, - lowerLimitNorm, - lowerLimitNormText, + maximumAllowableFloodingProbability, + maximumAllowableFloodingProbabilityText, hydraulicBoundaryDatabase); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, - signalingNorm, - signalingNormText, + signalFloodingProbability, + signalFloodingProbabilityText, hydraulicBoundaryDatabase); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation2, - signalingNorm, - signalingNormText, + signalFloodingProbability, + signalFloodingProbabilityText, hydraulicBoundaryDatabase); double firstWaterLevelTargetProbability = assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].TargetProbability; @@ -202,32 +202,32 @@ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - double lowerLimitNorm = assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability; - const string expectedLowerLimitNormText = "1/30.000"; + double maximumAllowableFloodingProbability = assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability; + const string expectedMaximumAllowableFloodingProbabilityText = "1/30.000"; - double signalingNorm = assessmentSection.FailureMechanismContribution.SignalFloodingProbability; - const string expectedSignalingNormText = "1/30.000 (1)"; + double signalFloodingProbability = assessmentSection.FailureMechanismContribution.SignalFloodingProbability; + const string expectedSignalFloodingProbabilityText = "1/30.000 (1)"; AssertDesignWaterLevelCalculationActivity(activities.ElementAt(0), hydraulicBoundaryLocation1, - lowerLimitNorm, - expectedLowerLimitNormText, + maximumAllowableFloodingProbability, + expectedMaximumAllowableFloodingProbabilityText, hydraulicBoundaryDatabase); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, - lowerLimitNorm, - expectedLowerLimitNormText, + maximumAllowableFloodingProbability, + expectedMaximumAllowableFloodingProbabilityText, hydraulicBoundaryDatabase); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, - signalingNorm, - expectedSignalingNormText, + signalFloodingProbability, + expectedSignalFloodingProbabilityText, hydraulicBoundaryDatabase); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation2, - signalingNorm, - expectedSignalingNormText, + signalFloodingProbability, + expectedSignalFloodingProbabilityText, hydraulicBoundaryDatabase); } Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -rb0f45be4fbc6672b59b96343d8a62876d9662e1d --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision b0f45be4fbc6672b59b96343d8a62876d9662e1d) @@ -210,10 +210,10 @@ "Id"); yield return new ChangePropertyData(sec => sec.HydraulicBoundaryDatabase.Version = "DifferentVersion", "HydraulicBoundaryDataBase"); - yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.MaximumAllowableFloodingProbability = sec.FailureMechanismContribution.MaximumAllowableFloodingProbability - 1e-15, - "LowerLimitNorm"); - yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.SignalFloodingProbability = sec.FailureMechanismContribution.SignalFloodingProbability - 1e-15, - "SignalingNorm"); + yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.MaximumAllowableFloodingProbability -= 1e-15, + "MaximumAllowableFloodingProbability"); + yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.SignalFloodingProbability -= 1e-15, + "SignalFloodingProbability"); yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.NormativeProbabilityType = sec.FailureMechanismContribution.NormativeProbabilityType == NormativeProbabilityType.MaximumAllowableFloodingProbability ? NormativeProbabilityType.SignalFloodingProbability : NormativeProbabilityType.MaximumAllowableFloodingProbability,