Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs =================================================================== diff -u -r1f16a57392fb30cd9e33fdc63f701a483b40316b -r135e4770c78601dfb46d2b3387413e924ef7abb7 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs (.../MacroStabilityInwardsFailureMechanismProperties.cs) (revision 1f16a57392fb30cd9e33fdc63f701a483b40316b) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs (.../MacroStabilityInwardsFailureMechanismProperties.cs) (revision 135e4770c78601dfb46d2b3387413e924ef7abb7) @@ -206,7 +206,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))] - public virtual double Contribution + public double Contribution { get { @@ -222,7 +222,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_Description))] - public virtual double A + public double A { get { @@ -239,7 +239,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_Description))] - public virtual double B + public double B { get { @@ -251,7 +251,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.ReferenceLine_Length_Rounded_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.ReferenceLine_Length_Rounded_Description))] - public virtual RoundedDouble SectionLength + public RoundedDouble SectionLength { get { @@ -263,7 +263,7 @@ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_Description))] - public virtual RoundedDouble N + public RoundedDouble N { get { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs =================================================================== diff -u -rb265245de0e0fe11a5004f6cca7f4e1c43de0d0b -r135e4770c78601dfb46d2b3387413e924ef7abb7 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs (.../MacroStabilityInwardsFailurePathProperties.cs) (revision b265245de0e0fe11a5004f6cca7f4e1c43de0d0b) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs (.../MacroStabilityInwardsFailurePathProperties.cs) (revision 135e4770c78601dfb46d2b3387413e924ef7abb7) @@ -20,11 +20,7 @@ // All rights reserved. using System; -using Core.Common.Base.Data; -using Core.Common.Util.Attributes; -using Core.Gui.Attributes; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Probability; using Riskeer.MacroStabilityInwards.Data; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -39,11 +35,10 @@ private const int codePropertyIndex = 2; private const int groupPropertyIndex = 3; private const int contributionPropertyIndex = 4; - private const int isRelevantPropertyIndex = 5; - private const int aPropertyIndex = 6; - private const int bPropertyIndex = 7; - private const int sectionLengthPropertyIndex = 8; - private const int nPropertyIndex = 9; + private const int aPropertyIndex = 5; + private const int bPropertyIndex = 6; + private const int sectionLengthPropertyIndex = 7; + private const int nPropertyIndex = 8; /// /// Creates a new instance of . @@ -64,111 +59,5 @@ SectionLengthPropertyIndex = sectionLengthPropertyIndex, NPropertyIndex = nPropertyIndex }, assessmentSection) {} - - [DynamicVisibleValidationMethod] - public bool DynamicVisibleValidationMethod(string propertyName) - { - return data.IsRelevant || !ShouldHidePropertyWhenFailureMechanismIrrelevant(propertyName); - } - - private bool ShouldHidePropertyWhenFailureMechanismIrrelevant(string propertyName) - { - return nameof(Contribution).Equals(propertyName) - || nameof(A).Equals(propertyName) - || nameof(B).Equals(propertyName) - || nameof(SectionLength).Equals(propertyName) - || nameof(N).Equals(propertyName); - } - - #region General - - [DynamicVisible] - [PropertyOrder(contributionPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))] - public override double Contribution - { - get - { - return data.Contribution; - } - } - - [PropertyOrder(isRelevantPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_IsRelevant_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_IsRelevant_Description))] - public bool IsRelevant - { - get - { - return data.IsRelevant; - } - } - - #endregion - - #region Length effect parameters - - [DynamicVisible] - [PropertyOrder(aPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_Description))] - public override double A - { - get - { - return data.MacroStabilityInwardsProbabilityAssessmentInput.A; - } - set - { - data.MacroStabilityInwardsProbabilityAssessmentInput.A = value; - data.NotifyObservers(); - } - } - - [DynamicVisible] - [PropertyOrder(bPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_Description))] - public override double B - { - get - { - return data.MacroStabilityInwardsProbabilityAssessmentInput.B; - } - } - - [DynamicVisible] - [PropertyOrder(sectionLengthPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.ReferenceLine_Length_Rounded_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.ReferenceLine_Length_Rounded_Description))] - public override RoundedDouble SectionLength - { - get - { - return new RoundedDouble(2, AssessmentSection.ReferenceLine.Length); - } - } - - [DynamicVisible] - [PropertyOrder(nPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_Description))] - public override RoundedDouble N - { - get - { - MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = data.MacroStabilityInwardsProbabilityAssessmentInput; - return new RoundedDouble(2, probabilityAssessmentInput.GetN(AssessmentSection.ReferenceLine.Length)); - } - } - - #endregion } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r1f16a57392fb30cd9e33fdc63f701a483b40316b -r135e4770c78601dfb46d2b3387413e924ef7abb7 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs) (revision 1f16a57392fb30cd9e33fdc63f701a483b40316b) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs) (revision 135e4770c78601dfb46d2b3387413e924ef7abb7) @@ -102,7 +102,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); mocks.ReplayAll(); - + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call @@ -138,7 +138,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); mocks.ReplayAll(); - + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailurePathPropertiesTest.cs =================================================================== diff -u -r1f16a57392fb30cd9e33fdc63f701a483b40316b -r135e4770c78601dfb46d2b3387413e924ef7abb7 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailurePathPropertiesTest.cs (.../MacroStabilityInwardsFailurePathPropertiesTest.cs) (revision 1f16a57392fb30cd9e33fdc63f701a483b40316b) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailurePathPropertiesTest.cs (.../MacroStabilityInwardsFailurePathPropertiesTest.cs) (revision 135e4770c78601dfb46d2b3387413e924ef7abb7) @@ -40,11 +40,10 @@ private const int codePropertyIndex = 1; private const int groupPropertyIndex = 2; private const int contributionPropertyIndex = 3; - private const int isRelevantPropertyIndex = 4; - private const int aPropertyIndex = 5; - private const int bPropertyIndex = 6; - private const int sectionLengthPropertyIndex = 7; - private const int nPropertyIndex = 8; + private const int aPropertyIndex = 4; + private const int bPropertyIndex = 5; + private const int sectionLengthPropertyIndex = 6; + private const int nPropertyIndex = 7; private MockRepository mocks; [SetUp] @@ -60,19 +59,14 @@ } [Test] - [TestCase(true)] - [TestCase(false)] - public void Constructor_ExpectedValues(bool isRelevant) + public void Constructor_ExpectedValues() { // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); mocks.ReplayAll(); - var failureMechanism = new MacroStabilityInwardsFailureMechanism - { - IsRelevant = isRelevant - }; + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call var properties = new MacroStabilityInwardsFailurePathProperties(failureMechanism, assessmentSection); @@ -83,7 +77,6 @@ Assert.AreEqual(failureMechanism.Code, properties.Code); Assert.AreEqual(failureMechanism.Group, properties.Group); Assert.AreEqual(failureMechanism.Contribution, properties.Contribution); - Assert.AreEqual(isRelevant, properties.IsRelevant); MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput; Assert.AreEqual(probabilityAssessmentInput.A, properties.A); @@ -99,23 +92,20 @@ } [Test] - public void Constructor_IsRelevantTrue_PropertiesHaveExpectedAttributesValues() + public void Constructor_Always_PropertiesHaveExpectedAttributesValues() { // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failureMechanism = new MacroStabilityInwardsFailureMechanism - { - IsRelevant = true - }; + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call var properties = new MacroStabilityInwardsFailurePathProperties(failureMechanism, assessmentSection); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(9, dynamicProperties.Count); + Assert.AreEqual(8, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string lengthEffectCategory = "Lengte-effect parameters"; @@ -148,13 +138,6 @@ "Procentuele bijdrage van dit toetsspoor aan de totale overstromingskans van het traject.", true); - PropertyDescriptor isRelevantProperty = dynamicProperties[isRelevantPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(isRelevantProperty, - generalCategory, - "Is relevant", - "Geeft aan of dit toetsspoor relevant is of niet.", - true); - PropertyDescriptor aProperty = dynamicProperties[aPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(aProperty, lengthEffectCategory, @@ -184,56 +167,6 @@ } [Test] - public void Constructor_IsRelevantFalse_PropertiesHaveExpectedAttributesValues() - { - // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new MacroStabilityInwardsFailureMechanism - { - IsRelevant = false - }; - - // Call - var properties = new MacroStabilityInwardsFailurePathProperties(failureMechanism, assessmentSection); - - // Assert - PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(4, dynamicProperties.Count); - - const string generalCategory = "Algemeen"; - - PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, - generalCategory, - "Naam", - "De naam van het toetsspoor.", - true); - - PropertyDescriptor labelProperty = dynamicProperties[codePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(labelProperty, - generalCategory, - "Label", - "Het label van het toetsspoor.", - true); - - PropertyDescriptor groupProperty = dynamicProperties[groupPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(groupProperty, - generalCategory, - "Groep", - "De groep waar het toetsspoor toe behoort.", - true); - - PropertyDescriptor isRelevantProperty = dynamicProperties[isRelevantPropertyIndex - 1]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(isRelevantProperty, - generalCategory, - "Is relevant", - "Geeft aan of dit toetsspoor relevant is of niet.", - true); - } - - [Test] [SetCulture("nl-NL")] [TestCase(-1)] [TestCase(-0.1)] @@ -284,37 +217,5 @@ // Assert Assert.AreEqual(value, failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.A); } - - [Test] - [TestCase(true)] - [TestCase(false)] - public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) - { - // Setup - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var pipingFailureMechanism = new MacroStabilityInwardsFailureMechanism - { - IsRelevant = isRelevant - }; - - var properties = new MacroStabilityInwardsFailurePathProperties(pipingFailureMechanism, assessmentSection); - - // Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Group))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.IsRelevant))); - - Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.Contribution))); - Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.A))); - Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.B))); - Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.SectionLength))); - Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.N))); - - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); - } } -} - +} \ No newline at end of file