Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs =================================================================== diff -u -r3e3087bd9c43ca5a3910438b3c9daf0defcb09bf -rd39966fb0ba934896979db057b1d4b07dad086ed --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 3e3087bd9c43ca5a3910438b3c9daf0defcb09bf) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision d39966fb0ba934896979db057b1d4b07dad086ed) @@ -70,21 +70,6 @@ Assert.AreEqual(structure.Location, properties.Location); Assert.AreEqual(structure.StructureNormalOrientation, properties.StructureNormalOrientation); - Assert.AreEqual("Normaal", properties.LevelCrestStructure.DistributionType); - Assert.AreEqual(structure.LevelCrestStructure, properties.LevelCrestStructure.Data); - Assert.IsTrue(properties.LevelCrestStructure.DynamicReadOnlyValidationMethod("Mean")); - Assert.IsTrue(properties.LevelCrestStructure.DynamicReadOnlyValidationMethod("StandardDeviation")); - - Assert.AreEqual("Lognormaal", properties.AllowedLevelIncreaseStorage.DistributionType); - Assert.AreEqual(structure.AllowedLevelIncreaseStorage, properties.AllowedLevelIncreaseStorage.Data); - Assert.IsTrue(properties.AllowedLevelIncreaseStorage.DynamicReadOnlyValidationMethod("Mean")); - Assert.IsTrue(properties.AllowedLevelIncreaseStorage.DynamicReadOnlyValidationMethod("StandardDeviation")); - - Assert.AreEqual("Lognormaal", properties.StorageStructureArea.DistributionType); - Assert.AreEqual(structure.StorageStructureArea, properties.StorageStructureArea.Data); - Assert.IsTrue(properties.StorageStructureArea.DynamicReadOnlyValidationMethod("Mean")); - Assert.IsTrue(properties.StorageStructureArea.DynamicReadOnlyValidationMethod("CoefficientOfVariation")); - Assert.AreEqual("Lognormaal", properties.FlowWidthAtBottomProtection.DistributionType); Assert.AreEqual(structure.FlowWidthAtBottomProtection, properties.FlowWidthAtBottomProtection.Data); Assert.IsTrue(properties.FlowWidthAtBottomProtection.DynamicReadOnlyValidationMethod("Mean")); @@ -95,6 +80,21 @@ Assert.IsTrue(properties.WidthFlowApertures.DynamicReadOnlyValidationMethod("Mean")); Assert.IsTrue(properties.WidthFlowApertures.DynamicReadOnlyValidationMethod("CoefficientOfVariation")); + Assert.AreEqual("Lognormaal", properties.StorageStructureArea.DistributionType); + Assert.AreEqual(structure.StorageStructureArea, properties.StorageStructureArea.Data); + Assert.IsTrue(properties.StorageStructureArea.DynamicReadOnlyValidationMethod("Mean")); + Assert.IsTrue(properties.StorageStructureArea.DynamicReadOnlyValidationMethod("CoefficientOfVariation")); + + Assert.AreEqual("Lognormaal", properties.AllowedLevelIncreaseStorage.DistributionType); + Assert.AreEqual(structure.AllowedLevelIncreaseStorage, properties.AllowedLevelIncreaseStorage.Data); + Assert.IsTrue(properties.AllowedLevelIncreaseStorage.DynamicReadOnlyValidationMethod("Mean")); + Assert.IsTrue(properties.AllowedLevelIncreaseStorage.DynamicReadOnlyValidationMethod("StandardDeviation")); + + Assert.AreEqual("Normaal", properties.LevelCrestStructure.DistributionType); + Assert.AreEqual(structure.LevelCrestStructure, properties.LevelCrestStructure.Data); + Assert.IsTrue(properties.LevelCrestStructure.DynamicReadOnlyValidationMethod("Mean")); + Assert.IsTrue(properties.LevelCrestStructure.DynamicReadOnlyValidationMethod("StandardDeviation")); + Assert.AreEqual("Lognormaal", properties.CriticalOvertoppingDischarge.DistributionType); Assert.AreEqual(structure.CriticalOvertoppingDischarge, properties.CriticalOvertoppingDischarge.Data); Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean")); @@ -144,24 +144,6 @@ Assert.AreEqual("Oriëntatie [°]", structureNormalOrientationProperty.DisplayName); Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", structureNormalOrientationProperty.Description); - PropertyDescriptor levelCrestStructureProperty = dynamicProperties[levelCrestStructurePropertyIndex]; - Assert.IsInstanceOf(levelCrestStructureProperty.Converter); - Assert.AreEqual(schematizationCategory, levelCrestStructureProperty.Category); - Assert.AreEqual("Kerende hoogte [m+NAP]", levelCrestStructureProperty.DisplayName); - Assert.AreEqual("Kerende hoogte van het kunstwerk.", levelCrestStructureProperty.Description); - - PropertyDescriptor allowedLevelIncreaseStorageProperty = dynamicProperties[allowedLevelIncreaseStoragePropertyIndex]; - Assert.IsInstanceOf(allowedLevelIncreaseStorageProperty.Converter); - Assert.AreEqual(schematizationCategory, allowedLevelIncreaseStorageProperty.Category); - Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowedLevelIncreaseStorageProperty.DisplayName); - Assert.AreEqual("Toegestane peilverhoging komberging.", allowedLevelIncreaseStorageProperty.Description); - - PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex]; - Assert.IsInstanceOf(storageStructureAreaProperty.Converter); - Assert.AreEqual(schematizationCategory, storageStructureAreaProperty.Category); - Assert.AreEqual("Kombergend oppervlak [m²]", storageStructureAreaProperty.DisplayName); - Assert.AreEqual("Kombergend oppervlak.", storageStructureAreaProperty.Description); - PropertyDescriptor flowWidthAtBottomProtectionProperty = dynamicProperties[flowWidthAtBottomProtectionPropertyIndex]; Assert.IsInstanceOf(flowWidthAtBottomProtectionProperty.Converter); Assert.AreEqual(schematizationCategory, flowWidthAtBottomProtectionProperty.Category); @@ -174,6 +156,24 @@ Assert.AreEqual("Breedte van doorstroomopening [m]", widthFlowAperturesProperty.DisplayName); Assert.AreEqual("Breedte van de doorstroomopening.", widthFlowAperturesProperty.Description); + PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex]; + Assert.IsInstanceOf(storageStructureAreaProperty.Converter); + Assert.AreEqual(schematizationCategory, storageStructureAreaProperty.Category); + Assert.AreEqual("Kombergend oppervlak [m²]", storageStructureAreaProperty.DisplayName); + Assert.AreEqual("Kombergend oppervlak.", storageStructureAreaProperty.Description); + + PropertyDescriptor allowedLevelIncreaseStorageProperty = dynamicProperties[allowedLevelIncreaseStoragePropertyIndex]; + Assert.IsInstanceOf(allowedLevelIncreaseStorageProperty.Converter); + Assert.AreEqual(schematizationCategory, allowedLevelIncreaseStorageProperty.Category); + Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowedLevelIncreaseStorageProperty.DisplayName); + Assert.AreEqual("Toegestane peilverhoging komberging.", allowedLevelIncreaseStorageProperty.Description); + + PropertyDescriptor levelCrestStructureProperty = dynamicProperties[levelCrestStructurePropertyIndex]; + Assert.IsInstanceOf(levelCrestStructureProperty.Converter); + Assert.AreEqual(schematizationCategory, levelCrestStructureProperty.Category); + Assert.AreEqual("Kerende hoogte [m+NAP]", levelCrestStructureProperty.DisplayName); + Assert.AreEqual("Kerende hoogte van het kunstwerk.", levelCrestStructureProperty.Description); + PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex]; Assert.IsInstanceOf(criticalOvertoppingDischargeProperty.Converter); Assert.AreEqual(schematizationCategory, criticalOvertoppingDischargeProperty.Category);