Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs =================================================================== diff -u -r751aaf9b7623bac357cbacf4e6ddae87b2b69f1f -rcb6877f670bacc7a6a896ab132d592eeef1107b5 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision 751aaf9b7623bac357cbacf4e6ddae87b2b69f1f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision cb6877f670bacc7a6a896ab132d592eeef1107b5) @@ -270,7 +270,7 @@ } [Test] - public void AsPipingSoilLayer_PropertiesSetWithDifferentIsAquifer_PropertiesAreSetInPipingSoilLayer() + public void AsPipingSoilLayer_PropertiesSetWithDifferentLayerParameters_PropertiesAreSetInPipingSoilLayer() { // Setup var random = new Random(22); @@ -285,18 +285,15 @@ var color = Color.DarkSeaGreen; double bottom; - var belowPhreaticLevelDistribution = random.Next(); - var belowPhreaticLevelShift = random.NextDouble(); + var logNormalDistribution = 3; + var logNormalShift = 0; + var belowPhreaticLevelMean = random.NextDouble(); var belowPhreaticLevelDeviation = random.NextDouble(); - var diameterD70Distribution = random.Next(); - var diameterD70Shift = random.NextDouble(); var diameterD70Mean = random.NextDouble(); var diameterD70Deviation = random.NextDouble(); - var permeabilityDistribution = random.Next(); - var permeabilityShift = random.NextDouble(); var permeabilityMean = random.NextDouble(); var permeabilityDeviation = random.NextDouble(); @@ -308,18 +305,18 @@ DryUnitWeight = dryUnitWeight, Color = color.ToArgb(), - BelowPhreaticLevelDistribution = belowPhreaticLevelDistribution, - BelowPhreaticLevelShift = belowPhreaticLevelShift, + BelowPhreaticLevelDistribution = logNormalDistribution, + BelowPhreaticLevelShift = logNormalShift, BelowPhreaticLevelMean = belowPhreaticLevelMean, BelowPhreaticLevelDeviation = belowPhreaticLevelDeviation, - DiameterD70Distribution = diameterD70Distribution, - DiameterD70Shift = diameterD70Shift, + DiameterD70Distribution = logNormalDistribution, + DiameterD70Shift = logNormalShift, DiameterD70Mean = diameterD70Mean, DiameterD70Deviation = diameterD70Deviation, - PermeabilityDistribution = permeabilityDistribution, - PermeabilityShift = permeabilityShift, + PermeabilityDistribution = logNormalDistribution, + PermeabilityShift = logNormalShift, PermeabilityMean = permeabilityMean, PermeabilityDeviation = permeabilityDeviation, @@ -354,10 +351,16 @@ Assert.AreEqual(y2, resultLayer.Top, 1e-6); Assert.IsTrue(resultLayer.IsAquifer); Assert.AreEqual(abovePhreaticLevel, resultLayer.AbovePhreaticLevel); - Assert.AreEqual(belowPhreaticLevelMean, resultLayer.BelowPhreaticLevel); Assert.AreEqual(dryUnitWeight, resultLayer.DryUnitWeight); Assert.AreEqual(materialName, resultLayer.MaterialName); Assert.AreEqual(Color.FromArgb(color.ToArgb()), resultLayer.Color); + + Assert.AreEqual(belowPhreaticLevelMean, resultLayer.BelowPhreaticLevelMean); + Assert.AreEqual(belowPhreaticLevelDeviation, resultLayer.BelowPhreaticLevelDeviation); + Assert.AreEqual(diameterD70Mean, resultLayer.DiameterD70Mean); + Assert.AreEqual(diameterD70Deviation, resultLayer.DiameterD70Deviation); + Assert.AreEqual(permeabilityMean, resultLayer.PermeabilityMean); + Assert.AreEqual(permeabilityDeviation, resultLayer.PermeabilityDeviation); } [Test] @@ -826,7 +829,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(atX, out bottom); // Assert - var exception = Assert.Throws(test); + var exception = Assert.Throws(test); Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); } @@ -864,7 +867,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(atX, out bottom); // Assert - var exception = Assert.Throws(test); + var exception = Assert.Throws(test); Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); } }