Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs =================================================================== diff -u -r39f2d719ad3592053c7f7f3baf7408ba1e9ea529 -rae2cfba9834c018bc87b9ed90a88d41dd920fda8 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs (.../FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs) (revision 39f2d719ad3592053c7f7f3baf7408ba1e9ea529) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs (.../FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs) (revision ae2cfba9834c018bc87b9ed90a88d41dd920fda8) @@ -46,11 +46,8 @@ var failureMechanism = mocks.Stub(); mocks.ReplayAll(); - IEnumerable sections = Enumerable.Empty(); - // Call - TestDelegate call = () => new FailureMechanismSectionsProbabilityAssessmentProperties(sections, - failureMechanism, + TestDelegate call = () => new FailureMechanismSectionsProbabilityAssessmentProperties(failureMechanism, null); // Assert @@ -60,52 +57,27 @@ } [Test] - public void Constructor_FailureMechanismSectionsNull_ThrowsArgumentNullException() + public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); - var random = new Random(39); var probabilityAssessmentInput = new TestProbabilityAssessmentInput(random.NextDouble(), random.NextDouble()); // Call TestDelegate call = () => new FailureMechanismSectionsProbabilityAssessmentProperties(null, - failureMechanism, probabilityAssessmentInput); // Assert var exception = Assert.Throws(call); - Assert.AreEqual("sections", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() - { - // Setup - var random = new Random(39); - var probabilityAssessmentInput = new TestProbabilityAssessmentInput(random.NextDouble(), random.NextDouble()); - IEnumerable sections = Enumerable.Empty(); - - // Call - TestDelegate call = () => new FailureMechanismSectionsProbabilityAssessmentProperties(sections, - null, - probabilityAssessmentInput); - - // Assert - var exception = Assert.Throws(call); Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); + var failureMechanism = new TestFailureMechanism(); + string sourcePath = TestHelper.GetScratchPadPath(); var random = new Random(39); var probabilityAssessmentInput = new TestProbabilityAssessmentInput(random.NextDouble(), random.NextDouble()); @@ -114,16 +86,16 @@ { FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }; + failureMechanism.SetSections(sections, sourcePath); // Call - using (var properties = new FailureMechanismSectionsProbabilityAssessmentProperties(sections, - failureMechanism, + using (var properties = new FailureMechanismSectionsProbabilityAssessmentProperties(failureMechanism, probabilityAssessmentInput)) { // Assert - Assert.IsInstanceOf>>(properties); + Assert.IsInstanceOf>(properties); Assert.IsInstanceOf(properties); - Assert.AreSame(sections, properties.Data); + Assert.AreSame(failureMechanism, properties.Data); TestHelper.AssertTypeConverter( nameof(FailureMechanismSectionsProperties.Sections)); @@ -140,7 +112,7 @@ property.N.GetAccuracy()); } - mocks.VerifyAll(); + Assert.AreEqual(sourcePath, properties.SourcePath); } } @@ -154,24 +126,30 @@ var random = new Random(39); var probabilityAssessmentInput = new TestProbabilityAssessmentInput(random.NextDouble(), random.NextDouble()); - IEnumerable sections = Enumerable.Empty(); // Call - using (var properties = new FailureMechanismSectionsProbabilityAssessmentProperties(sections, - failureMechanism, + using (var properties = new FailureMechanismSectionsProbabilityAssessmentProperties(failureMechanism, probabilityAssessmentInput)) { // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(1, dynamicProperties.Count); + Assert.AreEqual(2, dynamicProperties.Count); PropertyDescriptor sectionsProperty = dynamicProperties[0]; + var generalCategoryName = "Algemeen"; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sectionsProperty, - "Algemeen", + generalCategoryName, "Vakindeling", "Vakindeling waarmee de waterkering voor dit toetsspoor is " + "geschematiseerd ten behoeve van de beoordeling.", true); + + PropertyDescriptor sourcePathProperty = dynamicProperties[1]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sourcePathProperty, + generalCategoryName, + "Bronlocatie", + "De locatie van het bestand waaruit de vakindeling is geïmporteerd.", + true); mocks.VerifyAll(); } } @@ -183,10 +161,8 @@ var random = new Random(39); var probabilityAssessmentInput = new TestProbabilityAssessmentInput(random.NextDouble(), random.NextDouble()); var failureMechanism = new TestFailureMechanism(); - IEnumerable sections = Enumerable.Empty(); - using (var properties = new FailureMechanismSectionsProbabilityAssessmentProperties(sections, - failureMechanism, + using (var properties = new FailureMechanismSectionsProbabilityAssessmentProperties(failureMechanism, probabilityAssessmentInput)) { var refreshRequiredRaised = 0;