Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r9d781268ca54cba6a02715876d34a775396407b5 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 0981b22c56801334d3f71343f1a861070a404e3e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 9d781268ca54cba6a02715876d34a775396407b5) @@ -89,7 +89,7 @@ { BrowsableAttribute.Yes }); - Assert.AreEqual(16, dynamicProperties.Count); + Assert.AreEqual(17, dynamicProperties.Count); var hydraulicDataCategory = "Hydraulische gegevens"; var schematizationCategory = "Schematisatie"; @@ -182,31 +182,39 @@ Assert.AreEqual("Totale deklaagdikte bij uittredepunt [m]", thicknessCoverageLayerProperty.DisplayName); Assert.AreEqual("Totale deklaagdikte bij uittredepunt.", thicknessCoverageLayerProperty.Description); - PropertyDescriptor thicknessAquiferLayerProperty = dynamicProperties[12]; + PropertyDescriptor effectiveThicknessCoverageLayerProperty = dynamicProperties[12]; + Assert.IsNotNull(effectiveThicknessCoverageLayerProperty); + Assert.IsInstanceOf(effectiveThicknessCoverageLayerProperty.Converter); + Assert.IsTrue(effectiveThicknessCoverageLayerProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, effectiveThicknessCoverageLayerProperty.Category); + Assert.AreEqual("Effectieve deklaagdikte bij uittredepunt [m]", effectiveThicknessCoverageLayerProperty.DisplayName); + Assert.AreEqual("Effectieve deklaagdikte bij uittredepunt.", effectiveThicknessCoverageLayerProperty.Description); + + PropertyDescriptor thicknessAquiferLayerProperty = dynamicProperties[13]; Assert.IsNotNull(thicknessAquiferLayerProperty); Assert.IsInstanceOf(thicknessAquiferLayerProperty.Converter); Assert.IsTrue(thicknessAquiferLayerProperty.IsReadOnly); Assert.AreEqual(schematizationCategory, thicknessAquiferLayerProperty.Category); Assert.AreEqual("Dikte watervoerend pakket [m]", thicknessAquiferLayerProperty.DisplayName); Assert.AreEqual("De dikte van de bovenste voor doorlatendheid te onderscheiden zandlaag of combinatie van zandlagen.", thicknessAquiferLayerProperty.Description); - PropertyDescriptor darcyPermeabilityProperty = dynamicProperties[13]; + PropertyDescriptor darcyPermeabilityProperty = dynamicProperties[14]; Assert.IsNotNull(darcyPermeabilityProperty); Assert.IsInstanceOf(darcyPermeabilityProperty.Converter); Assert.IsTrue(darcyPermeabilityProperty.IsReadOnly); Assert.AreEqual(schematizationCategory, darcyPermeabilityProperty.Category); Assert.AreEqual("Doorlatendheid aquifer [m/s]", darcyPermeabilityProperty.DisplayName); Assert.AreEqual("Darcy-snelheid waarmee water door de eerste voor doorlatendheid te onderscheiden zandlaag loopt.", darcyPermeabilityProperty.Description); - PropertyDescriptor diameter70Property = dynamicProperties[14]; + PropertyDescriptor diameter70Property = dynamicProperties[15]; Assert.IsNotNull(diameter70Property); Assert.IsInstanceOf(diameter70Property.Converter); Assert.IsTrue(diameter70Property.IsReadOnly); Assert.AreEqual(schematizationCategory, diameter70Property.Category); Assert.AreEqual("De d70 in de bovenste zandlaag [m]", diameter70Property.DisplayName); Assert.AreEqual("Zeefmaat waar 70 gewichtsprocent van de korrels uit een zandlaag doorheen gaat. Hier de korreldiameter van het bovenste gedeelte van de voor doorlatendheid te onderscheiden zandlaag, bepaald zonder fijne fractie (< 63µm).", diameter70Property.Description); - PropertyDescriptor saturatedVolumicWeightOfCoverageLayerProperty = dynamicProperties[15]; + PropertyDescriptor saturatedVolumicWeightOfCoverageLayerProperty = dynamicProperties[16]; Assert.IsNotNull(saturatedVolumicWeightOfCoverageLayerProperty); Assert.IsInstanceOf(saturatedVolumicWeightOfCoverageLayerProperty.Converter); Assert.IsTrue(saturatedVolumicWeightOfCoverageLayerProperty.IsReadOnly); @@ -269,6 +277,8 @@ Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExit.Distribution); Assert.AreEqual(inputParameters.ThicknessCoverageLayer.Mean, properties.ThicknessCoverageLayer.Distribution.Mean); Assert.AreEqual(inputParameters.ThicknessCoverageLayer.StandardDeviation, properties.ThicknessCoverageLayer.Distribution.StandardDeviation); + Assert.AreEqual(inputParameters.EffectiveThicknessCoverageLayer.Mean, properties.EffectiveThicknessCoverageLayer.Distribution.Mean); + Assert.AreEqual(inputParameters.EffectiveThicknessCoverageLayer.StandardDeviation, properties.EffectiveThicknessCoverageLayer.Distribution.StandardDeviation); Assert.AreEqual(inputParameters.Diameter70.Mean, properties.Diameter70.Distribution.Mean); Assert.AreEqual(inputParameters.Diameter70.StandardDeviation, properties.Diameter70.Distribution.StandardDeviation); Assert.AreEqual(inputParameters.DarcyPermeability.Mean, properties.DarcyPermeability.Distribution.Mean);