Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -rf3c0feca6537b292a0c7d73f058ce13c8096f5e5 --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision f3c0feca6537b292a0c7d73f058ce13c8096f5e5) @@ -453,26 +453,22 @@ yield return new TestCaseData( assessmentSection, AssessmentSectionCategoryType.FactorizedSignalingNorm, - signalingNorm / 30 - ).SetName("FactorizedSignalingNorm"); + signalingNorm / 30); yield return new TestCaseData( assessmentSection, AssessmentSectionCategoryType.SignalingNorm, - signalingNorm - ).SetName("SignalingNorm"); + signalingNorm); yield return new TestCaseData( assessmentSection, AssessmentSectionCategoryType.LowerLimitNorm, - lowerLimitNorm - ).SetName("LowerLimitNorm"); + lowerLimitNorm); yield return new TestCaseData( assessmentSection, AssessmentSectionCategoryType.FactorizedLowerLimitNorm, - lowerLimitNorm * 30 - ).SetName("FactorizedLowerLimitNorm"); + lowerLimitNorm * 30); } private static IEnumerable GetNormativeHydraulicBoundaryLocationCalculationPerNormType() @@ -489,15 +485,13 @@ assessmentSection, hydraulicBoundaryLocation, NormType.Signaling, - assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0) - ).SetName("SignalingNorm"); + assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0)); yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, NormType.LowerLimit, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0) - ).SetName("LowerLimitNorm"); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r80c53924c7488a48f8148ba8b73260446a262883 -rf3c0feca6537b292a0c7d73f058ce13c8096f5e5 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 80c53924c7488a48f8148ba8b73260446a262883) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision f3c0feca6537b292a0c7d73f058ce13c8096f5e5) @@ -1044,61 +1044,49 @@ "Z onder moet kleiner zijn dan of gelijk zijn aan Z boven, of NaN. " + "Berekening 'Calculation' is overgeslagen."; yield return new TestCaseData("validConfigurationCalculationWithInvalidLeftGridZTopAndZBottom.xml", - expectedZTopZBottomMessage) - .SetName("Invalid left grid ZTop And ZBottom"); + expectedZTopZBottomMessage); yield return new TestCaseData("validConfigurationCalculationWithInvalidRightGridZTopAndZBottom.xml", - expectedZTopZBottomMessage) - .SetName("Invalid right grid ZTop And ZBottom"); + expectedZTopZBottomMessage); const string expectedXLeftXRightMessage = "Een waarde van '10,00' als X links en '0,00' als X rechts is ongeldig. " + "X rechts moet groter zijn dan of gelijk zijn aan X links, of NaN. " + "Berekening 'Calculation' is overgeslagen."; yield return new TestCaseData("validConfigurationCalculationWithInvalidLeftGridXLeftAndXRight.xml", - expectedXLeftXRightMessage) - .SetName("Invalid left grid XLeft And XRight"); + expectedXLeftXRightMessage); yield return new TestCaseData("validConfigurationCalculationWithInvalidRightGridXLeftAndXRight.xml", - expectedXLeftXRightMessage) - .SetName("Invalid left grid XLeft And XRight"); + expectedXLeftXRightMessage); const string expectedNumberOfHorizontalPointsTooLargeMessage = "Een waarde van '101' als aantal horizontale punten is ongeldig. " + "De waarde voor het aantal horizontale punten moet in het bereik [1, 100] liggen. " + "Berekening 'Calculation' is overgeslagen."; yield return new TestCaseData("validConfigurationCalculationWithInvalidLeftGridNumberOfHorizontalPointsTooLarge.xml", - expectedNumberOfHorizontalPointsTooLargeMessage) - .SetName("Invalid left grid NumberOfHorizontalPoints too large"); + expectedNumberOfHorizontalPointsTooLargeMessage); yield return new TestCaseData("validConfigurationCalculationWithInvalidRightGridNumberOfHorizontalPointsTooLarge.xml", - expectedNumberOfHorizontalPointsTooLargeMessage) - .SetName("Invalid left grid NumberOfHorizontalPoints too large"); + expectedNumberOfHorizontalPointsTooLargeMessage); const string expectedNumberOfHorizontalPointsTooLowMessage = "Een waarde van '0' als aantal horizontale punten is ongeldig. " + "De waarde voor het aantal horizontale punten moet in het bereik [1, 100] liggen. " + "Berekening 'Calculation' is overgeslagen."; yield return new TestCaseData("validConfigurationCalculationWithInvalidLeftGridNumberOfHorizontalPointsTooLow.xml", - expectedNumberOfHorizontalPointsTooLowMessage) - .SetName("Invalid left grid NumberOfHorizontalPoints too low"); + expectedNumberOfHorizontalPointsTooLowMessage); yield return new TestCaseData("validConfigurationCalculationWithInvalidRightGridNumberOfHorizontalPointsTooLow.xml", - expectedNumberOfHorizontalPointsTooLowMessage) - .SetName("Invalid left grid NumberOfHorizontalPoints too low"); + expectedNumberOfHorizontalPointsTooLowMessage); const string expectedNumberOfVerticalPointsTooLargeMessage = "Een waarde van '101' als aantal verticale punten is ongeldig. " + "De waarde voor het aantal verticale punten moet in het bereik [1, 100] liggen. " + "Berekening 'Calculation' is overgeslagen."; yield return new TestCaseData("validConfigurationCalculationWithInvalidLeftGridNumberOfVerticalPointsTooLarge.xml", - expectedNumberOfVerticalPointsTooLargeMessage) - .SetName("Invalid left grid NumberOfVerticalPoints too large"); + expectedNumberOfVerticalPointsTooLargeMessage); yield return new TestCaseData("validConfigurationCalculationWithInvalidRightGridNumberOfVerticalPointsTooLarge.xml", - expectedNumberOfVerticalPointsTooLargeMessage) - .SetName("Invalid left grid NumberOfVerticalPoints too large"); + expectedNumberOfVerticalPointsTooLargeMessage); const string expectedNumberOfVerticalPointsTooLowMessage = "Een waarde van '0' als aantal verticale punten is ongeldig. " + "De waarde voor het aantal verticale punten moet in het bereik [1, 100] liggen. " + "Berekening 'Calculation' is overgeslagen."; yield return new TestCaseData("validConfigurationCalculationWithInvalidLeftGridNumberOfVerticalPointsTooLow.xml", - expectedNumberOfVerticalPointsTooLowMessage) - .SetName("Invalid left grid NumberOfVerticalPoints too low"); + expectedNumberOfVerticalPointsTooLowMessage); yield return new TestCaseData("validConfigurationCalculationWithInvalidRightGridNumberOfVerticalPointsTooLow.xml", - expectedNumberOfVerticalPointsTooLowMessage) - .SetName("Invalid left grid NumberOfVerticalPoints too low"); + expectedNumberOfVerticalPointsTooLowMessage); } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs =================================================================== diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rf3c0feca6537b292a0c7d73f058ce13c8096f5e5 --- Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0) +++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision f3c0feca6537b292a0c7d73f058ce13c8096f5e5) @@ -59,8 +59,6 @@ IPipingCalculationScenario, PipingCalculationConfiguration> { - protected const string testNameFormat = "{m}({0:40}.xml)"; - protected override PipingCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) { return new PipingCalculationConfigurationExporter(calculations, filePath); @@ -88,29 +86,21 @@ get { yield return new TestCaseData("semiProbabilisticCalculationWithoutHydraulicLocation", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutHydraulicLocation()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutHydraulicLocation()); yield return new TestCaseData("semiProbabilisticCalculationWithAssessmentLevel", - PipingTestDataGenerator.GetPipingCalculationScenarioWithAssessmentLevel()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithAssessmentLevel()); yield return new TestCaseData("semiProbabilisticCalculationWithoutSurfaceLine", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSurfaceLine()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSurfaceLine()); yield return new TestCaseData("semiProbabilisticCalculationWithoutSoilModel", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilModel()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilModel()); yield return new TestCaseData("semiProbabilisticCalculationWithoutSoilProfile", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilProfile()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilProfile()); yield return new TestCaseData("semiProbabilisticCalculationIrrelevant", - PipingTestDataGenerator.GetIrrelevantPipingCalculationScenario()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetIrrelevantPipingCalculationScenario()); yield return new TestCaseData("semiProbabilisticCalculationWithNaNs", - PipingTestDataGenerator.GetSemiProbabilisticPipingCalculationScenarioWithNaNs()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetSemiProbabilisticPipingCalculationScenarioWithNaNs()); yield return new TestCaseData("semiProbabilisticCalculationWithInfinities", - PipingTestDataGenerator.GetSemiProbabilisticPipingCalculationScenarioWithInfinities()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetSemiProbabilisticPipingCalculationScenarioWithInfinities()); yield return new TestCaseData( "folderWithSubfolderAndSemiProbabilisticCalculation", new CalculationGroup @@ -129,8 +119,7 @@ } } } - ) - .SetName(testNameFormat); + ); } } @@ -154,26 +143,19 @@ get { yield return new TestCaseData("probabilisticCalculationWithoutHydraulicLocation", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutHydraulicLocation()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutHydraulicLocation()); yield return new TestCaseData("probabilisticCalculationWithoutSurfaceLine", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSurfaceLine()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSurfaceLine()); yield return new TestCaseData("probabilisticCalculationWithoutSoilModel", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilModel()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilModel()); yield return new TestCaseData("probabilisticCalculationWithoutSoilProfile", - PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilProfile()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilProfile()); yield return new TestCaseData("probabilisticCalculationIrrelevant", - PipingTestDataGenerator.GetIrrelevantPipingCalculationScenario()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetIrrelevantPipingCalculationScenario()); yield return new TestCaseData("probabilisticCalculationWithNaNs", - PipingTestDataGenerator.GetProbabilisticPipingCalculationScenarioWithNaNs()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetProbabilisticPipingCalculationScenarioWithNaNs()); yield return new TestCaseData("probabilisticCalculationWithInfinities", - PipingTestDataGenerator.GetProbabilisticPipingCalculationScenarioWithInfinities()) - .SetName(testNameFormat); + PipingTestDataGenerator.GetProbabilisticPipingCalculationScenarioWithInfinities()); var probabilisticPipingCalculationScenarioWithIllustrationPoints = PipingTestDataGenerator.GetPipingCalculationScenario(); probabilisticPipingCalculationScenarioWithIllustrationPoints.InputParameters.ShouldProfileSpecificIllustrationPointsBeCalculated = true; @@ -197,8 +179,7 @@ } } } - ) - .SetName(testNameFormat); + ); } }