Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs =================================================================== diff -u -rc875fba42a23b742e55f8798f93fddf2f872e282 -r4d10bc0d4756085a58be2734b2877cead7f47973 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs (.../SoilProfile1DReaderTest.cs) (revision c875fba42a23b742e55f8798f93fddf2f872e282) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs (.../SoilProfile1DReaderTest.cs) (revision 4d10bc0d4756085a58be2734b2877cead7f47973) @@ -318,7 +318,7 @@ 2, 2, 2 - }, profile.Layers.Select(l => l.BelowPhreaticLevelDistribution)); + }, profile.Layers.Select(l => l.BelowPhreaticLevelDistributionType)); CollectionAssert.AreEqual(new[] { 24, @@ -354,7 +354,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.DiameterD70Distribution)); + }, profile.Layers.Select(l => l.DiameterD70DistributionType)); CollectionAssert.AreEqual(new[] { 0.00017, @@ -383,7 +383,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.PermeabilityDistribution)); + }, profile.Layers.Select(l => l.PermeabilityDistributionType)); CollectionAssert.AreEqual(new[] { 0, @@ -428,7 +428,7 @@ 2, 2, 2 - }, profile.Layers.Select(l => l.AbovePhreaticLevelDistribution)); + }, profile.Layers.Select(l => l.AbovePhreaticLevelDistributionType)); CollectionAssert.AreEqual(new[] { 14, @@ -457,7 +457,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.CohesionDistribution)); + }, profile.Layers.Select(l => l.CohesionDistributionType)); CollectionAssert.AreEqual(new[] { 1, @@ -486,7 +486,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.FrictionAngleDistribution)); + }, profile.Layers.Select(l => l.FrictionAngleDistributionType)); CollectionAssert.AreEqual(new[] { 11, @@ -515,7 +515,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.ShearStrengthRatioDistribution)); + }, profile.Layers.Select(l => l.ShearStrengthRatioDistributionType)); CollectionAssert.AreEqual(new[] { 24, @@ -544,7 +544,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.StrengthIncreaseExponentDistribution)); + }, profile.Layers.Select(l => l.StrengthIncreaseExponentDistributionType)); CollectionAssert.AreEqual(new[] { 1, @@ -573,7 +573,7 @@ 3, 3, 3 - }, profile.Layers.Select(l => l.PopDistribution)); + }, profile.Layers.Select(l => l.PopDistributionType)); CollectionAssert.AreEqual(new[] { 111, @@ -622,51 +622,51 @@ Assert.IsNull(soilLayer.IsAquifer); Assert.IsNull(soilLayer.Color); - Assert.IsNull(soilLayer.BelowPhreaticLevelDistribution); + Assert.IsNull(soilLayer.BelowPhreaticLevelDistributionType); Assert.IsNaN(soilLayer.BelowPhreaticLevelMean); Assert.IsNaN(soilLayer.BelowPhreaticLevelDeviation); Assert.IsNaN(soilLayer.BelowPhreaticLevelCoefficientOfVariation); Assert.IsNaN(soilLayer.BelowPhreaticLevelShift); - Assert.IsNull(soilLayer.DiameterD70Distribution); + Assert.IsNull(soilLayer.DiameterD70DistributionType); Assert.IsNaN(soilLayer.DiameterD70Mean); Assert.IsNaN(soilLayer.DiameterD70CoefficientOfVariation); Assert.IsNaN(soilLayer.DiameterD70Shift); - Assert.IsNull(soilLayer.PermeabilityDistribution); + Assert.IsNull(soilLayer.PermeabilityDistributionType); Assert.IsNaN(soilLayer.PermeabilityMean); Assert.IsNaN(soilLayer.PermeabilityCoefficientOfVariation); Assert.IsNaN(soilLayer.PermeabilityShift); Assert.IsNull(soilLayer.UsePop); Assert.IsNull(soilLayer.ShearStrengthModel); - Assert.IsNull(soilLayer.AbovePhreaticLevelDistribution); + Assert.IsNull(soilLayer.AbovePhreaticLevelDistributionType); Assert.IsNaN(soilLayer.AbovePhreaticLevelMean); Assert.IsNaN(soilLayer.AbovePhreaticLevelCoefficientOfVariation); Assert.IsNaN(soilLayer.AbovePhreaticLevelShift); - Assert.IsNull(soilLayer.CohesionDistribution); + Assert.IsNull(soilLayer.CohesionDistributionType); Assert.IsNaN(soilLayer.CohesionMean); Assert.IsNaN(soilLayer.CohesionCoefficientOfVariation); Assert.IsNaN(soilLayer.CohesionShift); - Assert.IsNull(soilLayer.FrictionAngleDistribution); + Assert.IsNull(soilLayer.FrictionAngleDistributionType); Assert.IsNaN(soilLayer.FrictionAngleMean); Assert.IsNaN(soilLayer.FrictionAngleCoefficientOfVariation); Assert.IsNaN(soilLayer.FrictionAngleShift); - Assert.IsNull(soilLayer.ShearStrengthRatioDistribution); + Assert.IsNull(soilLayer.ShearStrengthRatioDistributionType); Assert.IsNaN(soilLayer.ShearStrengthRatioMean); Assert.IsNaN(soilLayer.ShearStrengthRatioCoefficientOfVariation); Assert.IsNaN(soilLayer.ShearStrengthRatioShift); - Assert.IsNull(soilLayer.StrengthIncreaseExponentDistribution); + Assert.IsNull(soilLayer.StrengthIncreaseExponentDistributionType); Assert.IsNaN(soilLayer.StrengthIncreaseExponentMean); Assert.IsNaN(soilLayer.StrengthIncreaseExponentCoefficientOfVariation); Assert.IsNaN(soilLayer.StrengthIncreaseExponentShift); - Assert.IsNull(soilLayer.PopDistribution); + Assert.IsNull(soilLayer.PopDistributionType); Assert.IsNaN(soilLayer.PopMean); Assert.IsNaN(soilLayer.PopCoefficientOfVariation); Assert.IsNaN(soilLayer.PopShift);