Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -re390f6a1553c21ed32ebf3426f35cc0924a9900c -r62e5cde54b97bfdd8377d512ffd21f1c7752c412 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e390f6a1553c21ed32ebf3426f35cc0924a9900c) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 62e5cde54b97bfdd8377d512ffd21f1c7752c412) @@ -118,7 +118,7 @@ } /// - /// Looks up a localized string similar to Faalkans kunstwerk gegeven erosie bodem [-]. + /// Looks up a localized string similar to Faalkans gegeven erosie bodem [1/jaar]. /// public static string FailureProbabilityStructureWithErosion_DisplayName { get { Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx =================================================================== diff -u -re390f6a1553c21ed32ebf3426f35cc0924a9900c -r62e5cde54b97bfdd8377d512ffd21f1c7752c412 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision e390f6a1553c21ed32ebf3426f35cc0924a9900c) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 62e5cde54b97bfdd8377d512ffd21f1c7752c412) @@ -142,7 +142,7 @@ De faalkans van het kunstwerk gegeven de erosie in de bodem. - Faalkans kunstwerk gegeven erosie bodem [-] + Faalkans gegeven erosie bodem [1/jaar] De kerende hoogte van het kunstwerk. Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/UITypeEditors/HeightStructuresInputContextForeshoreProfileEditor.cs =================================================================== diff -u -r0a6fd2fa18908a63fc029833ea3735709ebd5829 -r62e5cde54b97bfdd8377d512ffd21f1c7752c412 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/UITypeEditors/HeightStructuresInputContextForeshoreProfileEditor.cs (.../HeightStructuresInputContextForeshoreProfileEditor.cs) (revision 0a6fd2fa18908a63fc029833ea3735709ebd5829) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/UITypeEditors/HeightStructuresInputContextForeshoreProfileEditor.cs (.../HeightStructuresInputContextForeshoreProfileEditor.cs) (revision 62e5cde54b97bfdd8377d512ffd21f1c7752c412) @@ -21,10 +21,13 @@ using System.Collections.Generic; using System.ComponentModel; +using System.Linq; +using Core.Common.Base.Geometry; using Core.Common.Utils.Reflection; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Forms.UITypeEditors; using Ringtoets.HeightStructures.Forms.PropertyClasses; +using CoreCommonControlsResources = Core.Common.Controls.Properties.Resources; namespace Ringtoets.HeightStructures.Forms.UITypeEditors { @@ -41,6 +44,10 @@ public HeightStructuresInputContextForeshoreProfileEditor() { DisplayMember = TypeUtils.GetMemberName(fp => fp.Name); + NullItem = new ForeshoreProfile(new Point2D(0, 0), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties + { + Name = CoreCommonControlsResources.DisplayName_None + }); } protected override IEnumerable GetAvailableOptions(ITypeDescriptorContext context) Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -re390f6a1553c21ed32ebf3426f35cc0924a9900c -r62e5cde54b97bfdd8377d512ffd21f1c7752c412 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision e390f6a1553c21ed32ebf3426f35cc0924a9900c) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 62e5cde54b97bfdd8377d512ffd21f1c7752c412) @@ -481,7 +481,7 @@ PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex]; Assert.IsFalse(failureProbabilityStructureWithErosionProperty.IsReadOnly); Assert.AreEqual(schematizationCategory, failureProbabilityStructureWithErosionProperty.Category); - Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityStructureWithErosionProperty.DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", failureProbabilityStructureWithErosionProperty.DisplayName); Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityStructureWithErosionProperty.Description); PropertyDescriptor modelFactorSuperCriticalFlowProperty = dynamicProperties[modelFactorSuperCriticalFlowPropertyIndex]; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextForeshoreProfileEditorTest.cs =================================================================== diff -u -r0a6fd2fa18908a63fc029833ea3735709ebd5829 -r62e5cde54b97bfdd8377d512ffd21f1c7752c412 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextForeshoreProfileEditorTest.cs (.../HeightStructuresInputContextForeshoreProfileEditorTest.cs) (revision 0a6fd2fa18908a63fc029833ea3735709ebd5829) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextForeshoreProfileEditorTest.cs (.../HeightStructuresInputContextForeshoreProfileEditorTest.cs) (revision 62e5cde54b97bfdd8377d512ffd21f1c7752c412) @@ -48,7 +48,7 @@ } [Test] - public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue() + public void EditValue_NoCurrentItemInAvailableItems_ReturnsNullValue() { // Setup var assessmentSectionMock = mockRepository.Stub(); @@ -85,7 +85,7 @@ var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue); // Assert - Assert.AreSame(someValue, result); + Assert.IsNull(result); mockRepository.VerifyAll(); }