Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -90,7 +90,6 @@ Assert.AreEqual(validValue, sectionResult.TailorMadeAssessmentProbability); } - [Test] [SetCulture("nl-NL")] [TestCase(-20)] @@ -107,9 +106,8 @@ TestDelegate test = () => result.ManualAssemblyProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -re3f913fddac4cfa598ef5439ce6b832f354d7dd8 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -81,9 +82,8 @@ TestDelegate test = () => result.TailorMadeAssessmentProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] @@ -122,9 +122,8 @@ TestDelegate test = () => result.ManualAssemblyProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -106,9 +106,8 @@ TestDelegate test = () => result.ManualAssemblyProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; @@ -69,9 +70,8 @@ TestDelegate test = () => result.DetailedAssessmentProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] @@ -110,9 +110,8 @@ TestDelegate test = () => result.TailorMadeAssessmentProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rcb5473dc9372632b858565eef6a48a1efb6f14a2 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision cb5473dc9372632b858565eef6a48a1efb6f14a2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -67,9 +67,8 @@ TestDelegate test = () => result.TailorMadeAssessmentProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] @@ -108,9 +107,8 @@ TestDelegate test = () => result.ManualAssemblyProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -66,9 +67,8 @@ TestDelegate test = () => result.TailorMadeAssessmentProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] @@ -107,9 +107,8 @@ TestDelegate test = () => result.ManualAssemblyProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test] Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -re3f913fddac4cfa598ef5439ce6b832f354d7dd8 -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) @@ -106,9 +106,8 @@ TestDelegate test = () => result.ManualAssemblyProbability = newValue; // Assert - string message = Assert.Throws(test).Message; - const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - Assert.AreEqual(expectedMessage, message); + const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); } [Test]