Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/RegistrationState/StabilityPointStructuresFailureMechanismProperties.cs =================================================================== diff -u -rb930a51f930edf4ea180e3a19da19b6f80ee490c -r7abc63d23e19c5d00c779e8557fa70771140c9f1 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/RegistrationState/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision b930a51f930edf4ea180e3a19da19b6f80ee490c) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/RegistrationState/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 7abc63d23e19c5d00c779e8557fa70771140c9f1) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Util.Attributes; using Core.Gui.Attributes; using Riskeer.StabilityPointStructures.Data; @@ -36,8 +35,6 @@ private const int namePropertyIndex = 1; private const int codePropertyIndex = 2; private const int inAssemblyPropertyIndex = 3; - private const int nPropertyIndex = 4; - private const int applyLengthEffectInSectionPropertyIndex = 5; /// /// Creates a new instance of . @@ -66,52 +63,5 @@ } #endregion - - [DynamicVisibleValidationMethod] - public bool DynamicVisibleValidationMethod(string propertyName) - { - return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); - } - - private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) - { - return nameof(N).Equals(propertyName) - || nameof(ApplyLengthEffectInSection).Equals(propertyName); - } - - #region Length effect parameters - - [DynamicVisible] - [PropertyOrder(nPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Description))] - public RoundedDouble N - { - get - { - return data.GeneralInput.N; - } - set - { - data.GeneralInput.N = value; - data.NotifyObservers(); - } - } - - [DynamicVisible] - [PropertyOrder(applyLengthEffectInSectionPropertyIndex)] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] - [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ApplyLengthEffectInSection_DisplayName))] - [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ApplyLengthEffectInSection_Description))] - public bool ApplyLengthEffectInSection - { - get - { - return data.GeneralInput.ApplyLengthEffectInSection; - } - } - - #endregion } } \ No newline at end of file Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/RegistrationState/StabilityPointStructuresFailureMechanismPropertiesTest.cs =================================================================== diff -u -rb930a51f930edf4ea180e3a19da19b6f80ee490c -r7abc63d23e19c5d00c779e8557fa70771140c9f1 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/RegistrationState/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision b930a51f930edf4ea180e3a19da19b6f80ee490c) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/RegistrationState/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 7abc63d23e19c5d00c779e8557fa70771140c9f1) @@ -21,13 +21,9 @@ using System; using System.ComponentModel; -using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.TestUtil; using Core.Gui.TestUtil; using NUnit.Framework; -using Rhino.Mocks; -using Riskeer.Common.Data.TestUtil; using Riskeer.StabilityPointStructures.Data; using Riskeer.StabilityPointStructures.Forms.PropertyClasses; using Riskeer.StabilityPointStructures.Forms.PropertyClasses.RegistrationState; @@ -40,8 +36,6 @@ private const int namePropertyIndex = 0; private const int codePropertyIndex = 1; private const int inAssemblyPropertyIndex = 2; - private const int nPropertyIndex = 3; - private const int applyLengthEffectInSectionPropertyIndex = 4; [Test] public void Constructor_ExpectedValues() @@ -61,17 +55,10 @@ Assert.AreEqual(failureMechanism.Name, properties.Name); Assert.AreEqual(failureMechanism.Code, properties.Code); Assert.AreEqual(failureMechanism.InAssembly, properties.InAssembly); - - GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; - Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces); - Assert.AreEqual(generalInput.N, - properties.N, - properties.N.GetAccuracy()); - Assert.AreEqual(generalInput.ApplyLengthEffectInSection, properties.ApplyLengthEffectInSection); } [Test] - public void Constructor_InAssemblyTrue_PropertiesHaveExpectedAttributesValues() + public void Constructor_PropertiesHaveExpectedAttributesValues() { // Setup var failureMechanism = new StabilityPointStructuresFailureMechanism(); @@ -81,60 +68,6 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(5, dynamicProperties.Count); - - const string generalCategory = "Algemeen"; - const string lengthEffectCategory = "Lengte-effect"; - - PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, - generalCategory, - "Naam", - "De naam van het faalmechanisme.", - true); - - PropertyDescriptor labelProperty = dynamicProperties[codePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(labelProperty, - generalCategory, - "Label", - "Het label van het faalmechanisme.", - true); - - PropertyDescriptor inAssemblyProperty = dynamicProperties[inAssemblyPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(inAssemblyProperty, - generalCategory, - "In assemblage", - "Geeft aan of dit faalmechanisme wordt meegenomen in de assemblage.", - true); - - PropertyDescriptor nProperty = dynamicProperties[nPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nProperty, - lengthEffectCategory, - "N [-]", - "De parameter 'N' die gebruikt wordt om het lengte-effect mee te nemen in de beoordeling."); - - PropertyDescriptor applySectionLengthInSectionProperty = dynamicProperties[applyLengthEffectInSectionPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(applySectionLengthInSectionProperty, - lengthEffectCategory, - "Toepassen lengte-effect binnen vak", - "Geeft aan of het lengte-effect binnen een vak toegepast wordt.", - true); - } - - [Test] - public void Constructor_InAssemblyFalse_PropertiesHaveExpectedAttributesValues() - { - // Setup - var failureMechanism = new StabilityPointStructuresFailureMechanism - { - InAssembly = false - }; - - // Call - var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism); - - // Assert - PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Assert.AreEqual(3, dynamicProperties.Count); const string generalCategory = "Algemeen"; @@ -160,81 +93,5 @@ "Geeft aan of dit faalmechanisme wordt meegenomen in de assemblage.", true); } - - [Test] - [SetCulture("nl-NL")] - [TestCase(0.0)] - [TestCase(-1.0)] - [TestCase(-20.0)] - public void N_InvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double value) - { - // Setup - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - mocks.ReplayAll(); - - var failureMechanism = new StabilityPointStructuresFailureMechanism(); - failureMechanism.Attach(observer); - - var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism); - - // Call - void Call() => properties.N = (RoundedDouble) value; - - // Assert - const string expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - - mocks.VerifyAll(); - } - - [Test] - [TestCase(1.0)] - [TestCase(10.0)] - [TestCase(20.0)] - public void N_SetValidValue_UpdateDataAndNotifyObservers(double value) - { - // Setup - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - observer.Expect(o => o.UpdateObserver()); - mocks.ReplayAll(); - - var failureMechanism = new StabilityPointStructuresFailureMechanism(); - failureMechanism.Attach(observer); - - var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism); - - // Call - properties.N = (RoundedDouble) value; - - // Assert - Assert.AreEqual(value, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy()); - - mocks.VerifyAll(); - } - - [Test] - [TestCase(true)] - [TestCase(false)] - public void DynamicVisibleValidationMethod_DependingOnInAssembly_ReturnExpectedVisibility(bool inAssembly) - { - // Setup - var failureMechanism = new StabilityPointStructuresFailureMechanism - { - InAssembly = inAssembly - }; - var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism); - - // Call & Assert - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Code))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.InAssembly))); - - Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.N))); - Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.ApplyLengthEffectInSection))); - - Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); - } } } \ No newline at end of file