Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -r7d4cd8bd62fff02ccaa91f18ed6d53b46bc3b2ec -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 7d4cd8bd62fff02ccaa91f18ed6d53b46bc3b2ec) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -51,11 +51,11 @@ public void Constructor_PipingInputIsNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => new TestPipingCalculation(null); + void Call() => new TestPipingCalculation(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("pipingInput", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("pipingInput", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs =================================================================== diff -u -rd49838f35e7cb82cc5edc12795659dcaf0e08f29 -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs (.../ProbabilisticPipingOutputTest.cs) (revision d49838f35e7cb82cc5edc12795659dcaf0e08f29) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs (.../ProbabilisticPipingOutputTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -41,8 +41,8 @@ PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput()); // Assert - string paramName = Assert.Throws(Call).ParamName; - Assert.AreEqual("sectionSpecificOutput", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("sectionSpecificOutput", exception.ParamName); } [Test] @@ -53,8 +53,8 @@ null); // Assert - string paramName = Assert.Throws(Call).ParamName; - Assert.AreEqual("profileSpecificOutput", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("profileSpecificOutput", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs =================================================================== diff -u -r46a713c40ee453fff3441a9b4b4d8424abcb2d2c -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs (.../DerivedSemiProbabilisticPipingInputTest.cs) (revision 46a713c40ee453fff3441a9b4b4d8424abcb2d2c) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs (.../DerivedSemiProbabilisticPipingInputTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -37,11 +37,11 @@ public void GetPiezometricHeadExit_InputNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(null, RoundedDouble.NaN); + void Call() => DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(null, RoundedDouble.NaN); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("input", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("input", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs (.../PipingStochasticSoilModelTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs (.../PipingStochasticSoilModelTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -165,11 +165,11 @@ }); // Call - TestDelegate test = () => model.Update(null); + void Call() => model.Update(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("fromModel", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("fromModel", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs =================================================================== diff -u -r0f9855bca3472995aab6581fd182bf90b0f9812f -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs (.../PipingStochasticSoilProfileTest.cs) (revision 0f9855bca3472995aab6581fd182bf90b0f9812f) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs (.../PipingStochasticSoilProfileTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -90,11 +90,11 @@ var stochasticProfile = new PipingStochasticSoilProfile(0.0, PipingSoilProfileTestFactory.CreatePipingSoilProfile()); // Call - TestDelegate test = () => stochasticProfile.Update(null); + void Call() => stochasticProfile.Update(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("fromProfile", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("fromProfile", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingAssemblyMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r9c297dba6739032bcaddfb5ceb3452082c54db4a -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingAssemblyMapDataFeaturesFactoryTest.cs (.../PipingAssemblyMapDataFeaturesFactoryTest.cs) (revision 9c297dba6739032bcaddfb5ceb3452082c54db4a) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingAssemblyMapDataFeaturesFactoryTest.cs (.../PipingAssemblyMapDataFeaturesFactoryTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -44,11 +44,11 @@ public void CreateSimpleAssemblyFeatures_FailureMechanismNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(null); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -84,23 +84,23 @@ mocks.ReplayAll(); // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(null, assessmentSection); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(null, assessmentSection); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } [Test] public void CreateDetailedAssemblyFeatures_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(new PipingFailureMechanism(), null); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(new PipingFailureMechanism(), null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("assessmentSection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("assessmentSection", exception.ParamName); } [Test] @@ -138,23 +138,23 @@ mocks.ReplayAll(); // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(null, assessmentSection); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(null, assessmentSection); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } [Test] public void CreateTailorMadeAssemblyFeatures_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(new PipingFailureMechanism(), null); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(new PipingFailureMechanism(), null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("assessmentSection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("assessmentSection", exception.ParamName); } [Test] @@ -192,23 +192,23 @@ mocks.ReplayAll(); // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(null, assessmentSection); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(null, assessmentSection); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } [Test] public void CreateCombinedAssemblyFeatures_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(new PipingFailureMechanism(), null); + void Call() => PipingAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(new PipingFailureMechanism(), null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("assessmentSection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("assessmentSection", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingSurfaceLinesContextTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingSurfaceLinesContextTest.cs (.../PipingSurfaceLinesContextTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingSurfaceLinesContextTest.cs (.../PipingSurfaceLinesContextTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -80,11 +80,11 @@ var surfaceLines = new PipingSurfaceLineCollection(); // Call - TestDelegate call = () => new PipingSurfaceLinesContext(surfaceLines, null, assessmentSection); + void Call() => new PipingSurfaceLinesContext(surfaceLines, null, assessmentSection); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingOutputContextTest.cs =================================================================== diff -u -r5007379065eb83c6d21cfa16264b9e16fee696d7 -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingOutputContextTest.cs (.../SemiProbabilisticPipingOutputContextTest.cs) (revision 5007379065eb83c6d21cfa16264b9e16fee696d7) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingOutputContextTest.cs (.../SemiProbabilisticPipingOutputContextTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -43,11 +43,11 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new SemiProbabilisticPipingOutputContext(null, new PipingFailureMechanism(), assessmentSection); + void Call() => new SemiProbabilisticPipingOutputContext(null, new PipingFailureMechanism(), assessmentSection); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("wrappedData", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("wrappedData", exception.ParamName); mocks.VerifyAll(); } @@ -60,11 +60,11 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new SemiProbabilisticPipingOutputContext(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), null, assessmentSection); + void Call() => new SemiProbabilisticPipingOutputContext(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), null, assessmentSection); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs =================================================================== diff -u -re2b60a183f95fefe71686ac319c22bb7ad644bca -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision e2b60a183f95fefe71686ac319c22bb7ad644bca) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -74,8 +74,8 @@ void Call() => new PipingFailureMechanismProperties(null, assessmentSection, handler); // Assert - string paramName = Assert.Throws(Call).ParamName; - Assert.AreEqual("data", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("data", exception.ParamName); mocks.VerifyAll(); } @@ -107,8 +107,8 @@ void Call() => new PipingFailureMechanismProperties(new PipingFailureMechanism(), assessmentSection, null); // Assert - string paramName = Assert.Throws(Call).ParamName; - Assert.AreEqual("handler", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("handler", exception.ParamName); mocks.VerifyAll(); } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilModelCollectionPropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilModelCollectionPropertiesTest.cs (.../PipingStochasticSoilModelCollectionPropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilModelCollectionPropertiesTest.cs (.../PipingStochasticSoilModelCollectionPropertiesTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -37,11 +37,11 @@ public void Constructor_WithoutCollection_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new PipingStochasticSoilModelCollectionProperties(null); + void Call() => new PipingStochasticSoilModelCollectionProperties(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("collection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("collection", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingSurfaceLineCollectionPropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingSurfaceLineCollectionPropertiesTest.cs (.../PipingSurfaceLineCollectionPropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingSurfaceLineCollectionPropertiesTest.cs (.../PipingSurfaceLineCollectionPropertiesTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -38,11 +38,11 @@ public void Constructor_WithoutCollection_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new PipingSurfaceLineCollectionProperties(null); + void Call() => new PipingSurfaceLineCollectionProperties(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("collection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("collection", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs =================================================================== diff -u -r5007379065eb83c6d21cfa16264b9e16fee696d7 -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs (.../SemiProbabilisticPipingOutputPropertiesTest.cs) (revision 5007379065eb83c6d21cfa16264b9e16fee696d7) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs (.../SemiProbabilisticPipingOutputPropertiesTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -47,11 +47,11 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new SemiProbabilisticPipingOutputProperties(null, new PipingFailureMechanism(), assessmentSection); + void Call() => new SemiProbabilisticPipingOutputProperties(null, new PipingFailureMechanism(), assessmentSection); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("output", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("output", exception.ParamName); mocks.VerifyAll(); } @@ -64,11 +64,11 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), null, assessmentSection); + void Call() => new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), null, assessmentSection); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs =================================================================== diff -u -r6ca34a150fed87d16e0cf7489b3e0d41db51e74b -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs (.../PipingCalculatorInputTest.cs) (revision 6ca34a150fed87d16e0cf7489b3e0d41db51e74b) +++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs (.../PipingCalculatorInputTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -29,14 +29,14 @@ public class PipingCalculatorInputTest { [Test] - public void Constructor_WithoutConstructionProperies_ThrowsArgumentNullException() + public void Constructor_WithoutConstructionProperties_ThrowsArgumentNullException() { // Call void Call() => new PipingCalculatorInput(null); // Assert - string paramName = Assert.Throws(Call).ParamName; - Assert.AreEqual("properties", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("properties", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelReplaceDataStrategyTest.cs =================================================================== diff -u -r6c54938a7e5c7db2f879b78dac900a9fa8226d4d -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelReplaceDataStrategyTest.cs (.../PipingStochasticSoilModelReplaceDataStrategyTest.cs) (revision 6c54938a7e5c7db2f879b78dac900a9fa8226d4d) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelReplaceDataStrategyTest.cs (.../PipingStochasticSoilModelReplaceDataStrategyTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -44,11 +44,11 @@ public void Constructor_WithoutFailureMechanism_CreatesNewInstance() { // Call - TestDelegate test = () => new PipingStochasticSoilModelReplaceDataStrategy(null); + void Call() => new PipingStochasticSoilModelReplaceDataStrategy(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -69,11 +69,11 @@ var strategy = new PipingStochasticSoilModelReplaceDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(null, string.Empty); + void Call() => strategy.UpdateModelWithImportedData(null, string.Empty); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("importedDataCollection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("importedDataCollection", exception.ParamName); } [Test] @@ -83,11 +83,11 @@ var strategy = new PipingStochasticSoilModelReplaceDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(new List(), null); + void Call() => strategy.UpdateModelWithImportedData(new List(), null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("sourceFilePath", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("sourceFilePath", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -r6c54938a7e5c7db2f879b78dac900a9fa8226d4d -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs (.../PipingStochasticSoilModelUpdateDataStrategyTest.cs) (revision 6c54938a7e5c7db2f879b78dac900a9fa8226d4d) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs (.../PipingStochasticSoilModelUpdateDataStrategyTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -46,11 +46,11 @@ public void Constructor_WithoutCalculations_CreatesNewInstance() { // Call - TestDelegate test = () => new PipingStochasticSoilModelUpdateDataStrategy(null); + void Call() => new PipingStochasticSoilModelUpdateDataStrategy(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -71,11 +71,11 @@ var strategy = new PipingStochasticSoilModelUpdateDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(null, string.Empty); + void Call() => strategy.UpdateModelWithImportedData(null, string.Empty); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("importedDataCollection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("importedDataCollection", exception.ParamName); } [Test] @@ -85,11 +85,11 @@ var strategy = new PipingStochasticSoilModelUpdateDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateModelWithImportedData(new List(), null); + void Call() => strategy.UpdateModelWithImportedData(new List(), null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("sourceFilePath", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("sourceFilePath", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineReplaceDataStrategyTest.cs =================================================================== diff -u -r6c54938a7e5c7db2f879b78dac900a9fa8226d4d -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineReplaceDataStrategyTest.cs (.../PipingSurfaceLineReplaceDataStrategyTest.cs) (revision 6c54938a7e5c7db2f879b78dac900a9fa8226d4d) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineReplaceDataStrategyTest.cs (.../PipingSurfaceLineReplaceDataStrategyTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -44,11 +44,11 @@ public void Constructure_NullArgument_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new PipingSurfaceLineReplaceDataStrategy(null); + void Call() => new PipingSurfaceLineReplaceDataStrategy(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -69,12 +69,11 @@ var strategy = new PipingSurfaceLineReplaceDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateSurfaceLinesWithImportedData(null, - string.Empty); + void Call() => strategy.UpdateSurfaceLinesWithImportedData(null, string.Empty); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("importedDataCollection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("importedDataCollection", exception.ParamName); } [Test] @@ -84,12 +83,11 @@ var strategy = new PipingSurfaceLineReplaceDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateSurfaceLinesWithImportedData(Enumerable.Empty(), - null); + void Call() => strategy.UpdateSurfaceLinesWithImportedData(Enumerable.Empty(), null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("sourceFilePath", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("sourceFilePath", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r4738ba7126e4a8a1f25c74c0e725dd14392aa603 -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs (.../PipingSurfaceLineUpdateDataStrategyTest.cs) (revision 4738ba7126e4a8a1f25c74c0e725dd14392aa603) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs (.../PipingSurfaceLineUpdateDataStrategyTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -48,11 +48,11 @@ public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new PipingSurfaceLineUpdateDataStrategy(null); + void Call() => new PipingSurfaceLineUpdateDataStrategy(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -73,12 +73,11 @@ var strategy = new PipingSurfaceLineUpdateDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateSurfaceLinesWithImportedData(null, - string.Empty); + void Call() => strategy.UpdateSurfaceLinesWithImportedData(null, string.Empty); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("importedDataCollection", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("importedDataCollection", exception.ParamName); } [Test] @@ -88,12 +87,11 @@ var strategy = new PipingSurfaceLineUpdateDataStrategy(new PipingFailureMechanism()); // Call - TestDelegate test = () => strategy.UpdateSurfaceLinesWithImportedData(Enumerable.Empty(), - null); + void Call() => strategy.UpdateSurfaceLinesWithImportedData(Enumerable.Empty(), null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("sourceFilePath", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("sourceFilePath", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Primitives.Test/PipingSoilLayerTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -159,11 +159,11 @@ var layer = new PipingSoilLayer(top); // Call - TestDelegate test = () => layer.MaterialName = null; + void Call() => layer.MaterialName = null; // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("value", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("value", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Primitives.Test/PipingSurfaceLineTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Primitives.Test/PipingSurfaceLineTest.cs (.../PipingSurfaceLineTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Primitives.Test/PipingSurfaceLineTest.cs (.../PipingSurfaceLineTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -65,11 +65,11 @@ var surfaceLine = new PipingSurfaceLine(string.Empty); // Call - TestDelegate call = () => surfaceLine.CopyProperties(null); + void Call() => surfaceLine.CopyProperties(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("fromSurfaceLine", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("fromSurfaceLine", exception.ParamName); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs =================================================================== diff -u -r32a9fec1786bee59a54a6fa2a9d191deae9820b8 -rf3a22e965840f48f13164066b4d5999e97b464b9 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision 32a9fec1786bee59a54a6fa2a9d191deae9820b8) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) @@ -156,11 +156,11 @@ public void ClearReferenceLineDependentData_FailureMechanismNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => PipingDataSynchronizationService.ClearReferenceLineDependentData(null); + void Call() => PipingDataSynchronizationService.ClearReferenceLineDependentData(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -206,11 +206,11 @@ var surfaceLine = new PipingSurfaceLine(string.Empty); // Call - TestDelegate call = () => PipingDataSynchronizationService.RemoveSurfaceLine(null, surfaceLine); + void Call() => PipingDataSynchronizationService.RemoveSurfaceLine(null, surfaceLine); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -220,11 +220,11 @@ var failureMechanism = new PipingFailureMechanism(); // Call - TestDelegate call = () => PipingDataSynchronizationService.RemoveSurfaceLine(failureMechanism, null); + void Call() => PipingDataSynchronizationService.RemoveSurfaceLine(failureMechanism, null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("surfaceLine", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("surfaceLine", exception.ParamName); } [Test] @@ -279,11 +279,11 @@ public void RemoveAllSurfaceLine_PipingFailureMechanismNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => PipingDataSynchronizationService.RemoveAllSurfaceLines(null); + void Call() => PipingDataSynchronizationService.RemoveAllSurfaceLines(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -340,11 +340,11 @@ PipingStochasticSoilModel soilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel(); // Call - TestDelegate call = () => PipingDataSynchronizationService.RemoveStochasticSoilModel(null, soilModel); + void Call() => PipingDataSynchronizationService.RemoveStochasticSoilModel(null, soilModel); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] @@ -354,11 +354,11 @@ var failureMechanism = new PipingFailureMechanism(); // Call - TestDelegate call = () => PipingDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, null); + void Call() => PipingDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("soilModel", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("soilModel", exception.ParamName); } [Test] @@ -413,11 +413,11 @@ public void RemoveAllStochasticSoilModel_FailureMechanismNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => PipingDataSynchronizationService.RemoveAllStochasticSoilModels(null); + void Call() => PipingDataSynchronizationService.RemoveAllStochasticSoilModels(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("failureMechanism", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanism", exception.ParamName); } [Test]