Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilProfileCreatorTest.cs =================================================================== diff -u -r77da97f3ca4bc3de4c03c0ec921ff8b75bd5d466 -r2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilProfileCreatorTest.cs (.../SoilProfileCreatorTest.cs) (revision 77da97f3ca4bc3de4c03c0ec921ff8b75bd5d466) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SoilProfileCreatorTest.cs (.../SoilProfileCreatorTest.cs) (revision 2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39) @@ -37,10 +37,10 @@ public void Create_LayersWithSoilNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => SoilProfileCreator.Create(null); + void Call() => SoilProfileCreator.Create(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("layersWithSoil", exception.ParamName); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs =================================================================== diff -u -rbae8534f55938b7f47c4609d4a33d1b02d768391 -r2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs (.../SurfaceLineCreatorTest.cs) (revision bae8534f55938b7f47c4609d4a33d1b02d768391) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs (.../SurfaceLineCreatorTest.cs) (revision 2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39) @@ -37,10 +37,10 @@ public void Create_SurfaceLineNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => SurfaceLineCreator.Create(null); + void Call() => SurfaceLineCreator.Create(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("surfaceLine", exception.ParamName); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanLocationCreatorTest.cs =================================================================== diff -u -r19eb92ab810c2e3b1c2b7deefecd9ebcac364637 -r2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanLocationCreatorTest.cs (.../UpliftVanLocationCreatorTest.cs) (revision 19eb92ab810c2e3b1c2b7deefecd9ebcac364637) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanLocationCreatorTest.cs (.../UpliftVanLocationCreatorTest.cs) (revision 2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39) @@ -43,10 +43,10 @@ public void CreateExtreme_InputNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => UpliftVanLocationCreator.CreateExtreme(null); + void Call() => UpliftVanLocationCreator.CreateExtreme(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("input", exception.ParamName); } @@ -67,11 +67,11 @@ }); // Call - TestDelegate test = () => UpliftVanLocationCreator.CreateExtreme(input); + void Call() => UpliftVanLocationCreator.CreateExtreme(input); // Assert string message = $"The value of argument 'dikeSoilScenario' ({99}) is invalid for Enum type '{nameof(MacroStabilityInwardsDikeSoilScenario)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -119,11 +119,11 @@ }); // Call - TestDelegate test = () => UpliftVanLocationCreator.CreateExtreme(input); + void Call() => UpliftVanLocationCreator.CreateExtreme(input); // Assert string message = $"The value of argument 'waternetCreationMode' ({99}) is invalid for Enum type '{nameof(WaternetCreationMode)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -169,11 +169,11 @@ }); // Call - TestDelegate test = () => UpliftVanLocationCreator.CreateExtreme(input); + void Call() => UpliftVanLocationCreator.CreateExtreme(input); // Assert string message = $"The value of argument 'plLineCreationMethod' ({99}) is invalid for Enum type '{nameof(PlLineCreationMethod)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -265,10 +265,10 @@ public void CreateDaily_InputNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => UpliftVanLocationCreator.CreateDaily(null); + void Call() => UpliftVanLocationCreator.CreateDaily(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("input", exception.ParamName); } @@ -289,11 +289,11 @@ }); // Call - TestDelegate test = () => UpliftVanLocationCreator.CreateDaily(input); + void Call() => UpliftVanLocationCreator.CreateDaily(input); // Assert string message = $"The value of argument 'dikeSoilScenario' ({99}) is invalid for Enum type '{nameof(MacroStabilityInwardsDikeSoilScenario)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -341,11 +341,11 @@ }); // Call - TestDelegate test = () => UpliftVanLocationCreator.CreateDaily(input); + void Call() => UpliftVanLocationCreator.CreateDaily(input); // Assert string message = $"The value of argument 'waternetCreationMode' ({99}) is invalid for Enum type '{nameof(WaternetCreationMode)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -391,11 +391,11 @@ }); // Call - TestDelegate test = () => UpliftVanLocationCreator.CreateDaily(input); + void Call() => UpliftVanLocationCreator.CreateDaily(input); // Assert string message = $"The value of argument 'plLineCreationMethod' ({99}) is invalid for Enum type '{nameof(PlLineCreationMethod)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -501,6 +501,7 @@ Assert.AreEqual(input.LeakageLengthInwardsPhreaticLine4, location.LeakageLengthInwardsPl4); Assert.AreEqual(input.PiezometricHeadPhreaticLine2Outwards, location.HeadInPlLine2Outwards); Assert.AreEqual(input.PiezometricHeadPhreaticLine2Inwards, location.HeadInPlLine2Inwards); + Assert.IsTrue(location.Inwards); } private static void AssertIrrelevantValues(Location location) Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetLocationCreatorTest.cs =================================================================== diff -u -r19eb92ab810c2e3b1c2b7deefecd9ebcac364637 -r2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetLocationCreatorTest.cs (.../WaternetLocationCreatorTest.cs) (revision 19eb92ab810c2e3b1c2b7deefecd9ebcac364637) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetLocationCreatorTest.cs (.../WaternetLocationCreatorTest.cs) (revision 2fee3f09e48fbeb8bf0640c899d124a6cd0e4e39) @@ -43,10 +43,10 @@ public void Create_InputNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => WaternetLocationCreator.Create(null); + void Call() => WaternetLocationCreator.Create(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("input", exception.ParamName); } @@ -65,11 +65,11 @@ }); // Call - TestDelegate test = () => WaternetLocationCreator.Create(input); + void Call() => WaternetLocationCreator.Create(input); // Assert string message = $"The value of argument 'dikeSoilScenario' ({99}) is invalid for Enum type '{nameof(MacroStabilityInwardsDikeSoilScenario)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -113,11 +113,11 @@ }); // Call - TestDelegate test = () => WaternetLocationCreator.Create(input); + void Call() => WaternetLocationCreator.Create(input); // Assert string message = $"The value of argument 'waternetCreationMode' ({99}) is invalid for Enum type '{nameof(WaternetCreationMode)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test] @@ -159,11 +159,11 @@ }); // Call - TestDelegate test = () => WaternetLocationCreator.Create(input); + void Call() => WaternetLocationCreator.Create(input); // Assert string message = $"The value of argument 'plLineCreationMethod' ({99}) is invalid for Enum type '{nameof(PlLineCreationMethod)}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message); } [Test]