Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerDataTest.cs =================================================================== diff -u -r472d38ee5a4169cc628526afb7b72f7f4a1af013 -r23736f02aebaa81ea07ebd03f782a2548e2096df --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerDataTest.cs (.../MacroStabilityInwardsSoilLayerDataTest.cs) (revision 472d38ee5a4169cc628526afb7b72f7f4a1af013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerDataTest.cs (.../MacroStabilityInwardsSoilLayerDataTest.cs) (revision 23736f02aebaa81ea07ebd03f782a2548e2096df) @@ -188,51 +188,38 @@ private static IEnumerable GetUnequalTestCases() { - foreach (ChangePropertyTestCase changeSingleDataProperty in ChangeSingleDataProperties()) + foreach (ChangePropertyData changeSingleDataProperty in ChangeSingleDataProperties()) { MacroStabilityInwardsSoilLayerData baseData = CreateRandomData(21); changeSingleDataProperty.ActionToChangeProperty(baseData); yield return new TestCaseData(baseData).SetName(changeSingleDataProperty.PropertyName); } } - private static IEnumerable ChangeSingleDataProperties() + private static IEnumerable> ChangeSingleDataProperties() { - yield return new ChangePropertyTestCase(lp => lp.ShearStrengthModel = (MacroStabilityInwardsShearStrengthModel) 9, "ShearStrengthModel"); - yield return new ChangePropertyTestCase(lp => lp.MaterialName = "interesting", "MaterialName"); - yield return new ChangePropertyTestCase(lp => lp.IsAquifer = !lp.IsAquifer, "IsAquifer"); - yield return new ChangePropertyTestCase(lp => lp.UsePop = !lp.UsePop, "UsePoP"); - yield return new ChangePropertyTestCase(lp => lp.Color = lp.Color.ToArgb().Equals(Color.Aqua.ToArgb()) ? Color.Bisque : Color.Aqua, "Color"); - yield return new ChangePropertyTestCase(lp => lp.AbovePhreaticLevel.Mean = (RoundedDouble) (11.0 - lp.AbovePhreaticLevel.Mean), "AbovePhreaticLevelMean"); - yield return new ChangePropertyTestCase(lp => lp.AbovePhreaticLevel.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.AbovePhreaticLevel.CoefficientOfVariation), "AbovePhreaticLevelCoefficientOfVariation"); - yield return new ChangePropertyTestCase(lp => lp.AbovePhreaticLevel.Shift = (RoundedDouble) (1.0 - lp.AbovePhreaticLevel.Shift), "AbovePhreaticLevelShift"); - yield return new ChangePropertyTestCase(lp => lp.BelowPhreaticLevel.Mean = (RoundedDouble) (12.0 - lp.BelowPhreaticLevel.Mean), "BelowPhreaticLevelMean"); - yield return new ChangePropertyTestCase(lp => lp.BelowPhreaticLevel.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.BelowPhreaticLevel.CoefficientOfVariation), "BelowPhreaticLevelCoefficientOFVariation"); - yield return new ChangePropertyTestCase(lp => lp.BelowPhreaticLevel.Shift = (RoundedDouble) (1.0 - lp.BelowPhreaticLevel.Shift), "BelowPhreaticLevelShift"); - yield return new ChangePropertyTestCase(lp => lp.Cohesion.Mean = (RoundedDouble) (11.0 - lp.Cohesion.Mean), "CohesionMean"); - yield return new ChangePropertyTestCase(lp => lp.Cohesion.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.Cohesion.CoefficientOfVariation), "CohesionCoefficientOfVariation"); - yield return new ChangePropertyTestCase(lp => lp.FrictionAngle.Mean = (RoundedDouble) (11.0 - lp.FrictionAngle.Mean), "FrictionAngleMean"); - yield return new ChangePropertyTestCase(lp => lp.FrictionAngle.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.FrictionAngle.CoefficientOfVariation), "FrictionAngleCoefficientOfVariation"); - yield return new ChangePropertyTestCase(lp => lp.ShearStrengthRatio.Mean = (RoundedDouble) (11.0 - lp.ShearStrengthRatio.Mean), "ShearStrengthRatioMean"); - yield return new ChangePropertyTestCase(lp => lp.ShearStrengthRatio.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.ShearStrengthRatio.CoefficientOfVariation), "ShearStrengthRatioCoefficientOfVariation"); - yield return new ChangePropertyTestCase(lp => lp.StrengthIncreaseExponent.Mean = (RoundedDouble) (11.0 - lp.StrengthIncreaseExponent.Mean), "StrengthIncreaseExponentMean"); - yield return new ChangePropertyTestCase(lp => lp.StrengthIncreaseExponent.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.StrengthIncreaseExponent.CoefficientOfVariation), "StrengthIncreaseExponentCoefficientOfVariation"); - yield return new ChangePropertyTestCase(lp => lp.Pop.Mean = (RoundedDouble) (11.0 - lp.Pop.Mean), "PoMean"); - yield return new ChangePropertyTestCase(lp => lp.Pop.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.Pop.CoefficientOfVariation), "PopCoefficientOfVariation"); + yield return new ChangePropertyData(lp => lp.ShearStrengthModel = (MacroStabilityInwardsShearStrengthModel) 9, "ShearStrengthModel"); + yield return new ChangePropertyData(lp => lp.MaterialName = "interesting", "MaterialName"); + yield return new ChangePropertyData(lp => lp.IsAquifer = !lp.IsAquifer, "IsAquifer"); + yield return new ChangePropertyData(lp => lp.UsePop = !lp.UsePop, "UsePoP"); + yield return new ChangePropertyData(lp => lp.Color = lp.Color.ToArgb().Equals(Color.Aqua.ToArgb()) ? Color.Bisque : Color.Aqua, "Color"); + yield return new ChangePropertyData(lp => lp.AbovePhreaticLevel.Mean = (RoundedDouble) (11.0 - lp.AbovePhreaticLevel.Mean), "AbovePhreaticLevelMean"); + yield return new ChangePropertyData(lp => lp.AbovePhreaticLevel.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.AbovePhreaticLevel.CoefficientOfVariation), "AbovePhreaticLevelCoefficientOfVariation"); + yield return new ChangePropertyData(lp => lp.AbovePhreaticLevel.Shift = (RoundedDouble) (1.0 - lp.AbovePhreaticLevel.Shift), "AbovePhreaticLevelShift"); + yield return new ChangePropertyData(lp => lp.BelowPhreaticLevel.Mean = (RoundedDouble) (12.0 - lp.BelowPhreaticLevel.Mean), "BelowPhreaticLevelMean"); + yield return new ChangePropertyData(lp => lp.BelowPhreaticLevel.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.BelowPhreaticLevel.CoefficientOfVariation), "BelowPhreaticLevelCoefficientOFVariation"); + yield return new ChangePropertyData(lp => lp.BelowPhreaticLevel.Shift = (RoundedDouble) (1.0 - lp.BelowPhreaticLevel.Shift), "BelowPhreaticLevelShift"); + yield return new ChangePropertyData(lp => lp.Cohesion.Mean = (RoundedDouble) (11.0 - lp.Cohesion.Mean), "CohesionMean"); + yield return new ChangePropertyData(lp => lp.Cohesion.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.Cohesion.CoefficientOfVariation), "CohesionCoefficientOfVariation"); + yield return new ChangePropertyData(lp => lp.FrictionAngle.Mean = (RoundedDouble) (11.0 - lp.FrictionAngle.Mean), "FrictionAngleMean"); + yield return new ChangePropertyData(lp => lp.FrictionAngle.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.FrictionAngle.CoefficientOfVariation), "FrictionAngleCoefficientOfVariation"); + yield return new ChangePropertyData(lp => lp.ShearStrengthRatio.Mean = (RoundedDouble) (11.0 - lp.ShearStrengthRatio.Mean), "ShearStrengthRatioMean"); + yield return new ChangePropertyData(lp => lp.ShearStrengthRatio.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.ShearStrengthRatio.CoefficientOfVariation), "ShearStrengthRatioCoefficientOfVariation"); + yield return new ChangePropertyData(lp => lp.StrengthIncreaseExponent.Mean = (RoundedDouble) (11.0 - lp.StrengthIncreaseExponent.Mean), "StrengthIncreaseExponentMean"); + yield return new ChangePropertyData(lp => lp.StrengthIncreaseExponent.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.StrengthIncreaseExponent.CoefficientOfVariation), "StrengthIncreaseExponentCoefficientOfVariation"); + yield return new ChangePropertyData(lp => lp.Pop.Mean = (RoundedDouble) (11.0 - lp.Pop.Mean), "PoMean"); + yield return new ChangePropertyData(lp => lp.Pop.CoefficientOfVariation = (RoundedDouble) (1.0 - lp.Pop.CoefficientOfVariation), "PopCoefficientOfVariation"); } - - private class ChangePropertyTestCase - { - public ChangePropertyTestCase(Action actionToChangeProperty, - string propertyName) - { - ActionToChangeProperty = actionToChangeProperty; - PropertyName = propertyName; - } - - public Action ActionToChangeProperty { get; } - public string PropertyName { get; } - } } private class DerivedMacroStabilityInwardsSoilLayerData : MacroStabilityInwardsSoilLayerData