Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/LayerPropertiesTest.cs =================================================================== diff -u -rf878e05fdb2b65d1184118867e7d5664e6e3d9a6 -r3ed1b9c9241420ce15538e4b9b506e11e31ec945 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/LayerPropertiesTest.cs (.../LayerPropertiesTest.cs) (revision f878e05fdb2b65d1184118867e7d5664e6e3d9a6) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/LayerPropertiesTest.cs (.../LayerPropertiesTest.cs) (revision 3ed1b9c9241420ce15538e4b9b506e11e31ec945) @@ -84,7 +84,7 @@ double permeabilityMean = random.NextDouble(); double permeabilityCoefficientOfVariation = random.NextDouble(); bool usePop = random.NextBoolean(); - var shearStrengthModel = random.NextEnumValue(); + double shearStrengthModel = random.NextDouble(); int abovePhreaticLevelDistribution = random.Next(0, 3); double abovePhreaticLevelMean = random.NextDouble(); double abovePhreaticLevelCoefficientOfVariation = random.NextDouble(); @@ -128,7 +128,7 @@ reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.PermeabilityMean)).Return(permeabilityMean); reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.PermeabilityCoefficientOfVariation)).Return(permeabilityCoefficientOfVariation); reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.UsePop)).Return(usePop); - reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.ShearStrengthModel)).Return(shearStrengthModel); + reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.ShearStrengthModel)).Return(shearStrengthModel); reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.AbovePhreaticLevelDistribution)).Return(abovePhreaticLevelDistribution); reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.AbovePhreaticLevelMean)).Return(abovePhreaticLevelMean); reader.Expect(r => r.ReadOrDefault(SoilProfileTableDefinitions.AbovePhreaticLevelCoefficientOfVariation)).Return(abovePhreaticLevelCoefficientOfVariation); @@ -220,7 +220,6 @@ reader.Stub(r => r.ReadOrDefault(columnName)).Throw(invalidCastException); reader.Stub(r => r.ReadOrDefault(columnName)).Throw(invalidCastException); reader.Stub(r => r.ReadOrDefault(columnName)).Throw(invalidCastException); - reader.Stub(r => r.ReadOrDefault(columnName)).Throw(invalidCastException); reader.Stub(r => r.ReadOrDefault(Arg.Matches(s => s != columnName))) .Return(0); @@ -230,8 +229,6 @@ .Return(""); reader.Stub(r => r.ReadOrDefault(Arg.Matches(s => s != columnName))) .Return(false); - reader.Stub(r => r.ReadOrDefault(Arg.Matches(s => s != columnName))) - .Return(ShearStrengthModel.None); reader.Expect(r => r.Path).Return(path); mockRepository.ReplayAll();