Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -rcf5f823ea7dde6c1cb19c480b0eab12bb72b1058 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs (.../NormProperties.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs (.../NormProperties.cs) (revision cf5f823ea7dde6c1cb19c480b0eab12bb72b1058) @@ -67,7 +67,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.MaximumAllowableFloodingProbability_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.MaximumAllowableFloodingProbability_Description))] - public double LowerLimitNorm + public double MaximumAllowableFloodingProbability { get => data.LowerLimitNorm; set @@ -81,7 +81,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.SignalFloodingProbability_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.SignalFloodingProbability_Description))] - public double SignalingNorm + public double SignalFloodingProbability { get => data.SignalingNorm; set Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs =================================================================== diff -u -r5afa4c676b610d8bc1352920b68efb785a87b972 -rcf5f823ea7dde6c1cb19c480b0eab12bb72b1058 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs (.../NormPropertiesTest.cs) (revision 5afa4c676b610d8bc1352920b68efb785a87b972) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs (.../NormPropertiesTest.cs) (revision cf5f823ea7dde6c1cb19c480b0eab12bb72b1058) @@ -87,9 +87,9 @@ Assert.AreSame(failureMechanismContribution, properties.Data); TestHelper.AssertTypeConverter( - nameof(NormProperties.SignalingNorm)); + nameof(NormProperties.SignalFloodingProbability)); TestHelper.AssertTypeConverter( - nameof(NormProperties.LowerLimitNorm)); + nameof(NormProperties.MaximumAllowableFloodingProbability)); TestHelper.AssertTypeConverter( nameof(NormProperties.NormativeNorm)); mocks.VerifyAll(); @@ -115,14 +115,14 @@ const string expectedCategory = "Algemeen"; - PropertyDescriptor lowerLevelNormProperty = dynamicProperties[0]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lowerLevelNormProperty, + PropertyDescriptor maximumAllowableFloodingProbabilityProperty = dynamicProperties[0]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(maximumAllowableFloodingProbabilityProperty, expectedCategory, "Omgevingswaarde [1/jaar]", "De maximale toelaatbare overstromingskans van het traject."); - PropertyDescriptor signalingNormProperty = dynamicProperties[1]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(signalingNormProperty, + PropertyDescriptor signalFloodingProbabilityProperty = dynamicProperties[1]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(signalFloodingProbabilityProperty, expectedCategory, "Signaleringsparameter [1/jaar]", "De overstromingskans voor de signalering over de veiligheid van het traject."); @@ -150,14 +150,14 @@ var properties = new NormProperties(failureMechanismContribution, failureMechanismContributionNormChangeHandler); // Assert - Assert.AreEqual(failureMechanismContribution.LowerLimitNorm, properties.LowerLimitNorm); - Assert.AreEqual(failureMechanismContribution.SignalingNorm, properties.SignalingNorm); + Assert.AreEqual(failureMechanismContribution.LowerLimitNorm, properties.MaximumAllowableFloodingProbability); + Assert.AreEqual(failureMechanismContribution.SignalingNorm, properties.SignalFloodingProbability); Assert.AreEqual(failureMechanismContribution.NormativeNorm, properties.NormativeNorm); mocks.VerifyAll(); } [Test] - public void GivenNormativeNormIsLowerLimitNorm_WhenChangingLowerLimitNorm_ThenHandlerCalledAndPropertySet() + public void GivenNormativeNormIsMaximumAllowableFloodingProbability_WhenChangingMaximumAllowableFloodingProbability_ThenHandlerCalledAndPropertySet() { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); @@ -178,15 +178,15 @@ const double newValue = 0.001; // When - properties.LowerLimitNorm = newValue; + properties.MaximumAllowableFloodingProbability = newValue; // Then Assert.AreEqual(newValue, failureMechanismContribution.LowerLimitNorm); mocks.VerifyAll(); } [Test] - public void GivenNormativeNormIsSignalingNorm_WhenChangingLowerLimitNorm_ThenHandlerCalledAndPropertySet() + public void GivenNormativeNormIsSignalFloodingProbability_WhenChangingMaximumAllowableFloodingProbability_ThenHandlerCalledAndPropertySet() { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); @@ -208,15 +208,15 @@ const double newValue = 0.001; // When - properties.LowerLimitNorm = newValue; + properties.MaximumAllowableFloodingProbability = newValue; // Then Assert.AreEqual(newValue, failureMechanismContribution.LowerLimitNorm); mocks.VerifyAll(); } [Test] - public void GivenNormativeNormIsSignalingNorm_WhenChangingSignalingNorm_ThenHandlerCalledAndPropertySet() + public void GivenNormativeNormIsSignalFloodingProbability_WhenChangingSignalFloodingProbability_ThenHandlerCalledAndPropertySet() { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); @@ -238,15 +238,15 @@ const double newValue = 0.00001; // When - properties.SignalingNorm = newValue; + properties.SignalFloodingProbability = newValue; // Then Assert.AreEqual(newValue, failureMechanismContribution.SignalingNorm); mocks.VerifyAll(); } [Test] - public void GivenNormativeNormIsLowerLimitNorm_WhenChangingSignalingNorm_ThenHandlerCalledAndPropertySet() + public void GivenNormativeNormIsMaximumAllowableFloodingProbability_WhenChangingSignalFloodingProbability_ThenHandlerCalledAndPropertySet() { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); @@ -267,7 +267,7 @@ const double newValue = 0.00001; // When - properties.SignalingNorm = newValue; + properties.SignalFloodingProbability = newValue; // Then Assert.AreEqual(newValue, failureMechanismContribution.SignalingNorm);