Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionConfiguration.cs =================================================================== diff -u -r36f876bc134b1a66c64ab0e7c8e4882ecfd541d1 -re09bbeb55638aedcf61e375c0abf416f4df1322e --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionConfiguration.cs (.../FailureMechanismSectionConfiguration.cs) (revision 36f876bc134b1a66c64ab0e7c8e4882ecfd541d1) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionConfiguration.cs (.../FailureMechanismSectionConfiguration.cs) (revision e09bbeb55638aedcf61e375c0abf416f4df1322e) @@ -28,9 +28,9 @@ namespace Riskeer.Common.Data.FailureMechanism { /// - /// This base class holds the configuration of a . + /// This holds the configuration of a . /// - public abstract class FailureMechanismSectionConfiguration : Observable + public class FailureMechanismSectionConfiguration : Observable { private const int aNrOfDecimals = 3; @@ -43,17 +43,15 @@ /// Creates a new instance of . /// /// The the configuration belongs to. - /// The 'a' parameter representing the failure mechanism sensitive fraction. /// Thrown when is null. - /// Thrown when is not in the range [0, 1]. - protected FailureMechanismSectionConfiguration(FailureMechanismSection section, RoundedDouble a) + public FailureMechanismSectionConfiguration(FailureMechanismSection section) { if (section == null) { throw new ArgumentNullException(nameof(section)); } - A = a; + A = new RoundedDouble(aNrOfDecimals, 1); Section = section; } Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismSectionConfigurationTest.cs =================================================================== diff -u -r36f876bc134b1a66c64ab0e7c8e4882ecfd541d1 -re09bbeb55638aedcf61e375c0abf416f4df1322e --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismSectionConfigurationTest.cs (.../FailureMechanismSectionConfigurationTest.cs) (revision 36f876bc134b1a66c64ab0e7c8e4882ecfd541d1) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismSectionConfigurationTest.cs (.../FailureMechanismSectionConfigurationTest.cs) (revision e09bbeb55638aedcf61e375c0abf416f4df1322e) @@ -35,48 +35,26 @@ [Test] public void Constructor_SectionNull_ThrowsArgumentNullException() { - // Setup - var random = new Random(21); - // Call - void Call() => new TestFailureMechanismSectionConfiguration(null, random.NextRoundedDouble()); + void Call() => new FailureMechanismSectionConfiguration(null); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("section", exception.ParamName); } [Test] - [SetCulture("nl-NL")] - [TestCaseSource(nameof(GetInvalidAValues))] - public void Constructor_WithInvalidAValue_ThrowsArgumentOutOfRangeException(double invalidA) - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - - // Call - void Call() => new TestFailureMechanismSectionConfiguration(section, (RoundedDouble) invalidA); - - // Assert - const string expectedMessage = "De waarde voor 'a' moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - } - - [Test] public void Constructor_ExpectedValues() { // Setup - var random = new Random(21); - RoundedDouble a = random.NextRoundedDouble(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - var sectionConfiguration = new TestFailureMechanismSectionConfiguration(section, a); + var sectionConfiguration = new FailureMechanismSectionConfiguration(section); // Assert Assert.AreEqual(3, sectionConfiguration.A.NumberOfDecimalPlaces); - Assert.AreEqual(a, sectionConfiguration.A, sectionConfiguration.A.GetAccuracy()); + Assert.AreEqual(1, sectionConfiguration.A, sectionConfiguration.A.GetAccuracy()); Assert.AreSame(section, sectionConfiguration.Section); } @@ -87,10 +65,8 @@ public void A_InvalidValue_ThrowsArgumentOutOfRangeException(double a) { // Setup - var random = new Random(21); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var sectionConfiguration = new TestFailureMechanismSectionConfiguration(section, random.NextRoundedDouble()); + var sectionConfiguration = new FailureMechanismSectionConfiguration(section); // Call void Call() => sectionConfiguration.A = (RoundedDouble) a; @@ -112,7 +88,7 @@ var random = new Random(21); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var sectionConfiguration = new TestFailureMechanismSectionConfiguration(section, random.NextRoundedDouble()); + var sectionConfiguration = new FailureMechanismSectionConfiguration(section); // Call sectionConfiguration.A = (RoundedDouble) a; Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Probability/FailureMechanismSectionConfigurationExtensionsTest.cs =================================================================== diff -u -ree1415bc96a9cb5154a9a429ffe5f5ae8de78a86 -re09bbeb55638aedcf61e375c0abf416f4df1322e --- Riskeer/Common/test/Riskeer.Common.Data.Test/Probability/FailureMechanismSectionConfigurationExtensionsTest.cs (.../FailureMechanismSectionConfigurationExtensionsTest.cs) (revision ee1415bc96a9cb5154a9a429ffe5f5ae8de78a86) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Probability/FailureMechanismSectionConfigurationExtensionsTest.cs (.../FailureMechanismSectionConfigurationExtensionsTest.cs) (revision e09bbeb55638aedcf61e375c0abf416f4df1322e) @@ -57,7 +57,10 @@ new Point2D(length, 0) }); - var configuration = new TestFailureMechanismSectionConfiguration(section, (RoundedDouble) a); + var configuration = new FailureMechanismSectionConfiguration(section) + { + A = (RoundedDouble) a + }; // Call double actualN = configuration.GetN(b); @@ -91,7 +94,10 @@ new Point2D(length, 0) }); - var configuration = new TestFailureMechanismSectionConfiguration(section, (RoundedDouble) a); + var configuration = new FailureMechanismSectionConfiguration(section) + { + A = (RoundedDouble) a + }; // Call double actualFailureMechanismSensitiveSectionLength = configuration.GetFailureMechanismSensitiveSectionLength(); Fisheye: Tag e09bbeb55638aedcf61e375c0abf416f4df1322e refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanismSectionConfiguration.cs'. Fisheye: No comparison available. Pass `N' to diff?