Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs =================================================================== diff -u -r2b627763a2f14ffa0c47f2bfd433ce16be7fd136 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 2b627763a2f14ffa0c47f2bfd433ce16be7fd136) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -169,6 +169,36 @@ } [Test] + public void LowerLimitNorm_ValidValue_SetsNewValue() + { + // Setup + const double norm = 1.0 / 30000; + const double newLowerLimitNorm = 1.0 / 20000; + var failureMechanismContribution = new FailureMechanismContribution(norm, norm); + + // Call + failureMechanismContribution.LowerLimitNorm = newLowerLimitNorm; + + // Assert + Assert.AreEqual(newLowerLimitNorm, failureMechanismContribution.LowerLimitNorm); + } + + [Test] + public void SignalingNorm_ValidValue_SetsNewValue() + { + // Setup + const double norm = 1.0 / 30000; + const double newSignalingNorm = 1.0 / 40000; + var failureMechanismContribution = new FailureMechanismContribution(norm, norm); + + // Call + failureMechanismContribution.SignalingNorm = newSignalingNorm; + + // Assert + Assert.AreEqual(newSignalingNorm, failureMechanismContribution.SignalingNorm); + } + + [Test] [TestCase(NormType.Signaling, 0.01)] [TestCase(NormType.LowerLimit, 0.1)] public void Norm_DifferentNormativeNormTypes_ReturnNorm(NormType normType, double expectedNorm) Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionStubTest.cs =================================================================== diff -u -ree0b06e16e0b412094a542efd74a6d1cfc602819 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionStubTest.cs (.../AssessmentSectionStubTest.cs) (revision ee0b06e16e0b412094a542efd74a6d1cfc602819) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionStubTest.cs (.../AssessmentSectionStubTest.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -120,13 +120,13 @@ } [Test] - public void GetContributingFailureMechanisms_Always_ReturnEmpty() + public void GetFailureMechanisms_Always_ReturnEmpty() { // Setup var assessmentSection = new AssessmentSectionStub(); // Call - IEnumerable failureMechanism = assessmentSection.GetContributingFailureMechanisms(); + IEnumerable failureMechanism = assessmentSection.GetFailureMechanisms(); // Assert CollectionAssert.IsEmpty(failureMechanism); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs =================================================================== diff -u -r3d83417547aa8ed6c00ad15c94280d41b22072b2 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs (.../AssessmentSectionHelper.cs) (revision 3d83417547aa8ed6c00ad15c94280d41b22072b2) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs (.../AssessmentSectionHelper.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -71,7 +71,7 @@ var assessmentSection = mockRepository.Stub(); assessmentSection.Stub(a => a.Id).Return("21"); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, - 1.0 / 30000)); + 1.0 / 30000)); assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(failureMechanisms); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(GetHydraulicBoundaryDatabase(filePath)); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismContributionTestFactory.cs =================================================================== diff -u -r08b15bc9c953bf705b8b1a4a327c7674c657ea2f -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismContributionTestFactory.cs (.../FailureMechanismContributionTestFactory.cs) (revision 08b15bc9c953bf705b8b1a4a327c7674c657ea2f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/FailureMechanismContributionTestFactory.cs (.../FailureMechanismContributionTestFactory.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -19,11 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; -using System.Linq; using Ringtoets.Common.Data.Contribution; -using Ringtoets.Common.Data.FailureMechanism; namespace Ringtoets.Common.Data.TestUtil { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -r1ea9cbac62263bb26a111baa8521674cc7613bce -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 1ea9cbac62263bb26a111baa8521674cc7613bce) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -129,7 +129,7 @@ Resources.FailureMechanism_Name_DisplayName, true); dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.IsRelevant), - Resources.FailureMechanismMergeDataRow_IsRelevant_DisplayName, + Resources.FailureMechanism_IsRelevant_DisplayName, true); dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.HasSections), Resources.FailureMechanismMergeDataRow_HasSections_DisplayName, Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6b07c6db3f8145cfe25f28fc717ab64a81073074 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6b07c6db3f8145cfe25f28fc717ab64a81073074) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -498,6 +498,15 @@ } /// + /// Looks up a localized string similar to Is relevant. + /// + public static string FailureMechanism_IsRelevant_DisplayName { + get { + return ResourceManager.GetString("FailureMechanism_IsRelevant_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Toetsspoor. /// public static string FailureMechanism_Name_DisplayName { @@ -564,15 +573,6 @@ } /// - /// Looks up a localized string similar to Algemeen filter. - /// - public static string FailureMechanismContributionView_GridColumn_RelevancyFilter { - get { - return ResourceManager.GetString("FailureMechanismContributionView_GridColumn_RelevancyFilter", resourceCulture); - } - } - - /// /// Looks up a localized string similar to n.v.t. /// public static string FailureMechanismContributionView_ProbabilityPerYear_Not_applicable { @@ -601,15 +601,6 @@ } /// - /// Looks up a localized string similar to Is relevant. - /// - public static string FailureMechanismMergeDataRow_IsRelevant_DisplayName { - get { - return ResourceManager.GetString("FailureMechanismMergeDataRow_IsRelevant_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Selecteer. /// public static string FailureMechanismMergeDataRow_IsSelected_DisplayName { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r6b07c6db3f8145cfe25f28fc717ab64a81073074 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6b07c6db3f8145cfe25f28fc717ab64a81073074) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -348,9 +348,6 @@ Faalkansruimte [1/jaar] - - Algemeen filter - Assemblageresultaat verversen @@ -387,7 +384,7 @@ Selecteer - + Is relevant Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionItemRow.cs =================================================================== diff -u -r6a411281d307a08d8647b8436319f940ddd96386 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionItemRow.cs (.../FailureMechanismContributionItemRow.cs) (revision 6a411281d307a08d8647b8436319f940ddd96386) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionItemRow.cs (.../FailureMechanismContributionItemRow.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -60,7 +60,7 @@ /// /// The failure mechanism this row contains. /// The failure mechanism contribution to get the norm from. - /// >Class responsible for exposing high level + /// Class responsible for exposing high level /// related commands. /// The property values required to create an instance of /// . Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs =================================================================== diff -u -r6a411281d307a08d8647b8436319f940ddd96386 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision 6a411281d307a08d8647b8436319f940ddd96386) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -244,7 +244,7 @@ private void InitializeGridColumns() { probabilityDistributionGrid.AddCheckBoxColumn(nameof(FailureMechanismContributionItemRow.IsRelevant), - Resources.FailureMechanismContributionView_GridColumn_RelevancyFilter); + Resources.FailureMechanism_IsRelevant_DisplayName); probabilityDistributionGrid.AddTextBoxColumn(nameof(FailureMechanismContributionItemRow.Name), Resources.FailureMechanism_Name_DisplayName, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs =================================================================== diff -u -rbab91913d39fe8b282192cea809eba967dcb62a9 -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs (.../StandAloneFailureMechanismPropertiesTest.cs) (revision bab91913d39fe8b282192cea809eba967dcb62a9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs (.../StandAloneFailureMechanismPropertiesTest.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -79,17 +79,20 @@ var random = new Random(39); double otherContribution = random.NextDouble(); - var failureMechanism = new OtherFailureMechanism + var failureMechanism = new TestFailureMechanism { - IsRelevant = isRelevant, - Contribution = otherContribution + IsRelevant = isRelevant }; var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - assessmentSection.Stub(section => section.GetContributingFailureMechanisms()).Return(new[] + assessmentSection.Stub(section => section.GetContributingFailureMechanisms()).Return(new IFailureMechanism[] { - failureMechanism + failureMechanism, + new OtherFailureMechanism + { + Contribution = otherContribution + } }); mocks.ReplayAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs =================================================================== diff -u -r51e98f5938f7444882dcfd65fa2254b0fe32a3be -rd60925cd696d45ef950800cda038df1d6c959e8b --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision 51e98f5938f7444882dcfd65fa2254b0fe32a3be) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision d60925cd696d45ef950800cda038df1d6c959e8b) @@ -168,7 +168,7 @@ var dataGridView = (DataGridView) new ControlTester(dataGridViewControlName).TheObject; string isRelevantColumnHeaderText = dataGridView.Columns[isRelevantColumnIndex].HeaderText; - Assert.AreEqual("Algemeen filter", isRelevantColumnHeaderText); + Assert.AreEqual("Is relevant", isRelevantColumnHeaderText); string nameColumnHeaderText = dataGridView.Columns[nameColumnIndex].HeaderText; Assert.AreEqual("Toetsspoor", nameColumnHeaderText);