Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs =================================================================== diff -u -r299be933b87eea233f728ae92b0ec1bcb38087c4 -rabf1d3474ec720db318ee0b614c639629143fa2a --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs (.../PipingStructureFailurePathProperties.cs) (revision 299be933b87eea233f728ae92b0ec1bcb38087c4) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs (.../PipingStructureFailurePathProperties.cs) (revision abf1d3474ec720db318ee0b614c639629143fa2a) @@ -36,10 +36,9 @@ { private const int namePropertyIndex = 1; private const int codePropertyIndex = 2; - private const int contributionPropertyIndex = 3; - private const int inAssemblyPropertyIndex = 4; - private const int nPropertyIndex = 5; - private const int applyLengthEffectInSectionPropertyIndex = 6; + private const int inAssemblyPropertyIndex = 3; + private const int nPropertyIndex = 4; + private const int applyLengthEffectInSectionPropertyIndex = 5; /// /// Creates a new instance of . @@ -64,8 +63,7 @@ private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { - return nameof(Contribution).Equals(propertyName) - || nameof(N).Equals(propertyName) + return nameof(N).Equals(propertyName) || nameof(ApplyLengthEffectInSection).Equals(propertyName); } @@ -130,19 +128,6 @@ } } - [DynamicVisible] - [PropertyOrder(contributionPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Contribution_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Contribution_Description))] - public double Contribution - { - get - { - return data.Contribution; - } - } - [PropertyOrder(inAssemblyPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))] Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/PipingStructureFailurePathPropertiesTest.cs =================================================================== diff -u -r299be933b87eea233f728ae92b0ec1bcb38087c4 -rabf1d3474ec720db318ee0b614c639629143fa2a --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/PipingStructureFailurePathPropertiesTest.cs (.../PipingStructureFailurePathPropertiesTest.cs) (revision 299be933b87eea233f728ae92b0ec1bcb38087c4) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/PipingStructureFailurePathPropertiesTest.cs (.../PipingStructureFailurePathPropertiesTest.cs) (revision abf1d3474ec720db318ee0b614c639629143fa2a) @@ -39,10 +39,9 @@ { private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; - private const int contributionPropertyIndex = 2; - private const int inAssemblyPropertyIndex = 3; - private const int nPropertyIndex = 4; - private const int applyLengthEffectInSectionPropertyIndex = 5; + private const int inAssemblyPropertyIndex = 2; + private const int nPropertyIndex = 3; + private const int applyLengthEffectInSectionPropertyIndex = 4; [Test] public void Constructor_DataIsNull_ThrowArgumentNullException() @@ -72,7 +71,6 @@ Assert.IsInstanceOf>(properties); Assert.AreEqual(failureMechanism.Name, properties.Name); Assert.AreEqual(failureMechanism.Code, properties.Code); - Assert.AreEqual(failureMechanism.Contribution, properties.Contribution); Assert.AreEqual(failureMechanism.InAssembly, properties.InAssembly); GeneralInput generalInput = failureMechanism.GeneralInput; @@ -97,7 +95,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(6, dynamicProperties.Count); + Assert.AreEqual(5, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string lengthEffectCategory = "Lengte-effect"; @@ -116,13 +114,6 @@ "Het label van het toetsspoor.", true); - PropertyDescriptor contributionProperty = dynamicProperties[contributionPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(contributionProperty, - generalCategory, - "Faalkansbijdrage [%]", - "Procentuele bijdrage van dit toetsspoor aan de totale overstromingskans van het traject.", - true); - PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(inAssemblyProperty, generalCategory, @@ -176,7 +167,7 @@ "Het label van het toetsspoor.", true); - PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex - 1]; + PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(inAssemblyProperty, generalCategory, "In assemblage", @@ -251,7 +242,6 @@ Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.InAssembly))); - Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.Contribution))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.N))); Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.ApplyLengthEffectInSection)));