Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs =================================================================== diff -u -r4e0b333b9e7d89ba6563e1b2f9cb011c92c8015f -r602aa9de93c40ec9ca76e79530d13e7e32b45151 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs (.../MacroStabilityInwardsSoilLayerTransformerTest.cs) (revision 4e0b333b9e7d89ba6563e1b2f9cb011c92c8015f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs (.../MacroStabilityInwardsSoilLayerTransformerTest.cs) (revision 602aa9de93c40ec9ca76e79530d13e7e32b45151) @@ -27,8 +27,6 @@ using Ringtoets.Common.IO.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.SoilProfiles; using Ringtoets.MacroStabilityInwards.Primitives; -using CommonShearStrengthModel = Ringtoets.Common.IO.SoilProfile.ShearStrengthModel; -using ShearStrengthModel = Ringtoets.MacroStabilityInwards.Primitives.ShearStrengthModel; namespace Ringtoets.MacroStabilityInwards.IO.Test.SoilProfiles { @@ -57,7 +55,7 @@ const string materialName = "materialX"; Color color = Color.AliceBlue; bool usePop = random.NextBoolean(); - var shearStrengthModel = random.NextEnumValue(); + var shearStrengthModel = random.NextEnumValue(); double abovePhreaticLevelMean = random.NextDouble(); double abovePhreaticLevelDeviation = random.NextDouble(); @@ -146,7 +144,7 @@ // Setup var layer = new SoilLayer1D(1) { - ShearStrengthModel = (CommonShearStrengthModel) 99 + ShearStrengthModel = (ShearStrengthModel) 99 }; // Call @@ -158,18 +156,18 @@ Assert.IsInstanceOf(exception.InnerException); } - private ShearStrengthModel GetMacroStabilityInwardsShearStrengthModel(CommonShearStrengthModel shearStrengthModel) + private MacroStabilityInwardsShearStrengthModel GetMacroStabilityInwardsShearStrengthModel(ShearStrengthModel shearStrengthModel) { switch (shearStrengthModel) { - case CommonShearStrengthModel.None: - return ShearStrengthModel.None; - case CommonShearStrengthModel.SuCalculated: - return ShearStrengthModel.SuCalculated; - case CommonShearStrengthModel.CPhi: - return ShearStrengthModel.CPhi; - case CommonShearStrengthModel.CPhiOrSuCalculated: - return ShearStrengthModel.CPhiOrSuCalculated; + case ShearStrengthModel.None: + return MacroStabilityInwardsShearStrengthModel.None; + case ShearStrengthModel.SuCalculated: + return MacroStabilityInwardsShearStrengthModel.SuCalculated; + case ShearStrengthModel.CPhi: + return MacroStabilityInwardsShearStrengthModel.CPhi; + case ShearStrengthModel.CPhiOrSuCalculated: + return MacroStabilityInwardsShearStrengthModel.CPhiOrSuCalculated; default: throw new ArgumentOutOfRangeException(nameof(shearStrengthModel), shearStrengthModel, null); }