Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs =================================================================== diff -u -ra3208f166c59e9b18a6dfcbdb26b6f2a458abb0a -ra63a4395cf2ae38111ea606161f5b85ea8e08fc5 --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs (.../FailureMechanismBaseTest.cs) (revision a3208f166c59e9b18a6dfcbdb26b6f2a458abb0a) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs (.../FailureMechanismBaseTest.cs) (revision a63a4395cf2ae38111ea606161f5b85ea8e08fc5) @@ -73,7 +73,6 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf(failureMechanism); - Assert.AreEqual(0, failureMechanism.Contribution); Assert.AreEqual(name, failureMechanism.Name); Assert.AreEqual(code, failureMechanism.Code); Assert.IsNotNull(failureMechanism.InAssemblyInputComments); @@ -87,52 +86,16 @@ } [Test] - [SetCulture("nl-NL")] - [TestCase(double.NaN)] - [TestCase(101)] - [TestCase(-1e-6)] - [TestCase(-1)] - [TestCase(100 + 1e-6)] - public void Contribution_ValueOutsideValidRegionOrNaN_ThrowsArgumentException(double value) - { - // Setup - var failureMechanism = new SimpleFailureMechanismBase(); - - // Call - TestDelegate test = () => failureMechanism.Contribution = value; - - // Assert - const string expectedMessage = "De waarde voor de toegestane bijdrage aan de faalkans moet in het bereik [0,0, 100,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); - } - - [Test] - [TestCase(100)] - [TestCase(50)] - [TestCase(0)] - public void Contribution_ValueInsideValidRegion_DoesNotThrow(double value) - { - // Setup - var failureMechanism = new SimpleFailureMechanismBase(); - - // Call - TestDelegate test = () => failureMechanism.Contribution = value; - - // Assert - Assert.DoesNotThrow(test); - } - - [Test] public void SetSections_SectionsNull_ThrowArgumentNullException() { // Setup var failureMechanism = new SimpleFailureMechanismBase(); // Call - TestDelegate call = () => failureMechanism.SetSections(null, string.Empty); + void Call() => failureMechanism.SetSections(null, string.Empty); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("sections", exception.ParamName); } @@ -143,10 +106,10 @@ var failureMechanism = new SimpleFailureMechanismBase(); // Call - TestDelegate call = () => failureMechanism.SetSections(Enumerable.Empty(), null); + void Call() => failureMechanism.SetSections(Enumerable.Empty(), null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("sourcePath", exception.ParamName); } @@ -214,15 +177,15 @@ section2 }; - failureMechanism.SetSections(new [] + failureMechanism.SetSections(new[] { new FailureMechanismSection("X", new[] { new Point2D(matchingX, matchingY), new Point2D(0, 0) }) }, sourcePath); - + // When failureMechanism.SetSections(sections, sourcePath); @@ -254,15 +217,15 @@ }); // Call - TestDelegate call = () => failureMechanism.SetSections(new[] + void Call() => failureMechanism.SetSections(new[] { section1, section2 }, string.Empty); // Assert const string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het toetsspoor."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); } [Test] @@ -283,15 +246,15 @@ }); // Call - TestDelegate call = () => failureMechanism.SetSections(new[] + void Call() => failureMechanism.SetSections(new[] { section1, section2 }, string.Empty); // Assert const string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het toetsspoor."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); } [Test]