Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs =================================================================== diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -r71e1436f87f7c238853f1a7e3e5ba6cf65f00d60 --- Riskeer/Piping/test/Riskeer.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs (.../PipingSoilLayerTransformerTest.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0) +++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs (.../PipingSoilLayerTransformerTest.cs) (revision 71e1436f87f7c238853f1a7e3e5ba6cf65f00d60) @@ -1121,12 +1121,9 @@ private static IEnumerable GetColorCases() { - yield return new TestCaseData(null, Color.Empty) - .SetName("Color result Empty"); - yield return new TestCaseData((double) -12156236, Color.FromArgb(70, 130, 180)) - .SetName("Color result Purple"); - yield return new TestCaseData((double) -65281, Color.FromArgb(255, 0, 255)) - .SetName("Color result Pink"); + yield return new TestCaseData(null, Color.Empty); + yield return new TestCaseData((double) -12156236, Color.FromArgb(70, 130, 180)); + yield return new TestCaseData((double) -65281, Color.FromArgb(255, 0, 255)); } private static string CreateExpectedErrorMessageForParameterVariable(string materialName, string parameterName, string errorMessage) @@ -1143,17 +1140,16 @@ private static IEnumerable IncorrectLogNormalDistributionsTypeSoilLayer1D() { - return IncorrectLogNormalDistributionsType(() => new SoilLayer1D(0.0), nameof(SoilLayer1D)); + return IncorrectLogNormalDistributionsType(() => new SoilLayer1D(0.0)); } private static IEnumerable IncorrectLogNormalDistributionsTypeSoilLayer2D() { - return IncorrectLogNormalDistributionsType(SoilLayer2DTestFactory.CreateSoilLayer2D, nameof(SoilLayer2D)); + return IncorrectLogNormalDistributionsType(SoilLayer2DTestFactory.CreateSoilLayer2D); } - private static IEnumerable IncorrectLogNormalDistributionsType(Func soilLayer, string typeName) + private static IEnumerable IncorrectLogNormalDistributionsType(Func soilLayer) { - const string testNameFormat = "{0}Transform_IncorrectDistribution{{1}}_ThrowsImportedDataTransformException"; const long validDistributionType = SoilLayerConstants.LogNormalDistributionValue; const double validShift = 0.0; @@ -1164,8 +1160,7 @@ invalidDiameterD70Distribution.PermeabilityDistributionType = validDistributionType; invalidDiameterD70Distribution.PermeabilityShift = validShift; - yield return new TestCaseData(invalidDiameterD70Distribution, "d70" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidDiameterD70Distribution, "d70"); SoilLayerBase invalidPermeabilityDistribution = soilLayer(); invalidPermeabilityDistribution.BelowPhreaticLevelDistributionType = validDistributionType; @@ -1174,8 +1169,7 @@ invalidPermeabilityDistribution.PermeabilityDistributionType = -1; invalidPermeabilityDistribution.PermeabilityShift = validShift; - yield return new TestCaseData(invalidPermeabilityDistribution, "Doorlatendheid" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidPermeabilityDistribution, "Doorlatendheid"); } #endregion @@ -1184,17 +1178,16 @@ private static IEnumerable IncorrectLogNormalDistributionsShiftSoilLayer1D() { - return IncorrectLogNormalDistributionsShift(() => new SoilLayer1D(0.0), nameof(SoilLayer1D)); + return IncorrectLogNormalDistributionsShift(() => new SoilLayer1D(0.0)); } private static IEnumerable IncorrectLogNormalDistributionsShiftSoilLayer2D() { - return IncorrectLogNormalDistributionsShift(SoilLayer2DTestFactory.CreateSoilLayer2D, nameof(SoilLayer2D)); + return IncorrectLogNormalDistributionsShift(SoilLayer2DTestFactory.CreateSoilLayer2D); } - private static IEnumerable IncorrectLogNormalDistributionsShift(Func soilLayer, string typeName) + private static IEnumerable IncorrectLogNormalDistributionsShift(Func soilLayer) { - const string testNameFormat = "{0}Transform_IncorrectShift{{1}}_ThrowsImportedDataTransformException"; const long validDistributionType = SoilLayerConstants.LogNormalDistributionValue; const double validShift = 0.0; @@ -1205,8 +1198,7 @@ invalidDiameterD70Shift.PermeabilityDistributionType = validDistributionType; invalidDiameterD70Shift.PermeabilityShift = validShift; - yield return new TestCaseData(invalidDiameterD70Shift, "d70" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidDiameterD70Shift, "d70"); SoilLayerBase invalidPermeabilityShift = soilLayer(); invalidPermeabilityShift.BelowPhreaticLevelDistributionType = validDistributionType; @@ -1215,8 +1207,7 @@ invalidPermeabilityShift.PermeabilityDistributionType = validDistributionType; invalidPermeabilityShift.PermeabilityShift = -1; - yield return new TestCaseData(invalidPermeabilityShift, "Doorlatendheid" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidPermeabilityShift, "Doorlatendheid"); } #endregion @@ -1225,34 +1216,30 @@ private static IEnumerable InvalidStochasticDistributionValuesSoilLayer1D() { - return InvalidStochasticDistributionValues(() => SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer(), nameof(SoilLayer1D)); + return InvalidStochasticDistributionValues(() => SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer()); } private static IEnumerable InvalidStochasticDistributionValuesSoilLayer2D() { - return InvalidStochasticDistributionValues(SoilLayer2DTestFactory.CreateSoilLayer2D, nameof(SoilLayer2D)); + return InvalidStochasticDistributionValues(SoilLayer2DTestFactory.CreateSoilLayer2D); } - private static IEnumerable InvalidStochasticDistributionValues(Func soilLayer, string typeName) + private static IEnumerable InvalidStochasticDistributionValues(Func soilLayer) { - const string testNameFormat = "{0}Transform_InvalidStochasticDistributionValues{{1}}_ThrowsImportedDataTransformException"; const double invalidMean = 0; SoilLayerBase invalidBelowPhreaticLevel = soilLayer(); invalidBelowPhreaticLevel.BelowPhreaticLevelMean = 1; invalidBelowPhreaticLevel.BelowPhreaticLevelShift = 2; - yield return new TestCaseData(invalidBelowPhreaticLevel, "Verzadigd gewicht" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidBelowPhreaticLevel, "Verzadigd gewicht"); SoilLayerBase invalidPermeability = soilLayer(); invalidPermeability.PermeabilityMean = invalidMean; - yield return new TestCaseData(invalidPermeability, "Doorlatendheid" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidPermeability, "Doorlatendheid"); SoilLayerBase invalidDiameterD70 = soilLayer(); invalidDiameterD70.DiameterD70Mean = invalidMean; - yield return new TestCaseData(invalidDiameterD70, "d70" - ).SetName(string.Format(testNameFormat, typeName)); + yield return new TestCaseData(invalidDiameterD70, "d70"); } #endregion