Index: Ringtoets.sln =================================================================== diff -u -rb148f2c61b813fd11f316acfc1a21135bb622248 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets.sln (.../Ringtoets.sln) (revision b148f2c61b813fd11f316acfc1a21135bb622248) +++ Ringtoets.sln (.../Ringtoets.sln) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2026 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{89F6BC2C-78E6-42F1-A056-704C877B5453}" EndProject @@ -1881,6 +1881,11 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.AssemblyTool.Data.TestUtil", "Ringtoets\AssemblyTool\test\Ringtoets.AssemblyTool.Data.TestUtil\Ringtoets.AssemblyTool.Data.TestUtil.csproj", "{C6EE9E6A-6578-49DF-914F-CDB531E61891}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CreateInstaller|x86 = CreateInstaller|x86 @@ -4957,6 +4962,15 @@ {A0CC3B88-0CCE-4AEE-9166-D0F3859CD0D4}.Release|x86.Build.0 = Release|x86 {A0CC3B88-0CCE-4AEE-9166-D0F3859CD0D4}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {A0CC3B88-0CCE-4AEE-9166-D0F3859CD0D4}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.CreateInstaller|x86.ActiveCfg = CreateInstaller|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.CreateInstallerWithDemoProject|x86.Build.0 = CreateInstallerWithDemoProject|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.Debug|x86.ActiveCfg = Debug|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.Debug|x86.Build.0 = Debug|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.Release|x86.ActiveCfg = Release|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.Release|x86.Build.0 = Release|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 + {C6EE9E6A-6578-49DF-914F-CDB531E61891}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5359,6 +5373,7 @@ {9AADA1BD-E47C-429A-B455-A13522645F76} = {91119B0B-C26B-4ADF-BE4A-B4228331786E} {B60FC9A2-22B5-4E4C-986E-40766B843AB5} = {2A2E6519-A2B8-4A6B-8849-4873578D7C8C} {A0CC3B88-0CCE-4AEE-9166-D0F3859CD0D4} = {E550D725-9C80-4242-8A3F-C1A3E020DEA2} + {C6EE9E6A-6578-49DF-914F-CDB531E61891} = {614D79BC-9919-4AC8-A2B1-9DD89BCB0653} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {039D31AA-B517-4354-B8CD-0B2B826D0B1F} Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs =================================================================== diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs (.../AssemblyCategoriesCalculator.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs (.../AssemblyCategoriesCalculator.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -72,13 +72,13 @@ public IEnumerable CalculateFailureMechanismSectionCategories(double signalingNorm, double lowerLimitNorm, - double probabilityDistributionFactor, + double failureMechanismContribution, double n) { try { var input = new CalculateFailureMechanismSectionCategoriesInput(new Probability(signalingNorm), new Probability(lowerLimitNorm), - probabilityDistributionFactor, n); + failureMechanismContribution, n); ICategoriesCalculator kernel = factory.CreateAssemblyCategoriesKernel(); CalculationOutput output = kernel.CalculateFailureMechanismSectionCategories(input); @@ -92,13 +92,13 @@ public IEnumerable CalculateGeotechnicFailureMechanismSectionCategories(double signalingNorm, double lowerLimitNorm, - double probabilityDistributionFactor, + double failureMechanismContribution, double n) { try { var input = new CalculateFailureMechanismSectionCategoriesInput(new Probability(signalingNorm), new Probability(lowerLimitNorm), - probabilityDistributionFactor, n); + failureMechanismContribution, n); ICategoriesCalculator kernel = factory.CreateAssemblyCategoriesKernel(); CalculationOutput output = kernel.CalculateGeotechnicFailureMechanismSectionCategories(input); Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyCategoriesCalculator.cs =================================================================== diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyCategoriesCalculator.cs (.../IAssemblyCategoriesCalculator.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyCategoriesCalculator.cs (.../IAssemblyCategoriesCalculator.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -46,27 +46,27 @@ /// /// The signaling norm to calculate with. /// The lower limit norm to calculate with. - /// The probability distribution factor to calculate with. + /// The failure mechanism contribution to calculate with. /// The 'N' parameter used to factor in the 'length effect'. /// An with categories of /// . /// Thrown when an error occurs /// when performing the calculation. IEnumerable CalculateFailureMechanismSectionCategories( - double signalingNorm, double lowerLimitNorm, double probabilityDistributionFactor, double n); + double signalingNorm, double lowerLimitNorm, double failureMechanismContribution, double n); /// /// Performs the calculation for getting the geotechnic failure mechanism section categories. /// /// The signaling norm to calculate with. /// The lower limit norm to calculate with. - /// The probability distribution factor to calculate with. + /// The failure mechanism contribution to calculate with. /// The 'N' parameter used to factor in the 'length effect'. /// An with categories of /// . /// Thrown when an error occurs /// when performing the calculation. IEnumerable CalculateGeotechnicFailureMechanismSectionCategories( - double signalingNorm, double lowerLimitNorm, double probabilityDistributionFactor, double n); + double signalingNorm, double lowerLimitNorm, double failureMechanismContribution, double n); } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/AssemblyToolTestHelper.cs =================================================================== diff -u --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/AssemblyToolTestHelper.cs (revision 0) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/AssemblyToolTestHelper.cs (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -0,0 +1,45 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using NUnit.Framework; + +namespace Ringtoets.AssemblyTool.Data.TestUtil +{ + /// + /// Helper class to test assembly tool data objects. + /// + public static class AssemblyToolTestHelper + { + /// + /// Asserts that two are equal. + /// + /// The expected assembly. + /// The actual assembly. + /// Thrown when is not + /// equal to . + public static void AssertAreEqual(FailureMechanismSectionAssembly expectedSectionAssembly, + FailureMechanismSectionAssembly actualSectionAssembly) + { + Assert.AreEqual(expectedSectionAssembly.Group, actualSectionAssembly.Group); + Assert.AreEqual(expectedSectionAssembly.Probability, actualSectionAssembly.Probability); + } + } +} \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/Properties/AssemblyInfo.cs =================================================================== diff -u --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/Properties/AssemblyInfo.cs (revision 0) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/Properties/AssemblyInfo.cs (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -0,0 +1,25 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Reflection; + +[assembly: AssemblyTitle("Ringtoets.AssemblyTool.Data.TestUtil")] +[assembly: AssemblyProduct("Ringtoets.AssemblyTool.Data.TestUtil")] \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/Ringtoets.AssemblyTool.Data.TestUtil.csproj =================================================================== diff -u --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/Ringtoets.AssemblyTool.Data.TestUtil.csproj (revision 0) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/Ringtoets.AssemblyTool.Data.TestUtil.csproj (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -0,0 +1,31 @@ + + + + {C6EE9E6A-6578-49DF-914F-CDB531E61891} + Ringtoets.AssemblyTool.Data.TestUtil + Ringtoets.AssemblyTool.Data.TestUtil + + + + + ..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll + + + + + + + + + + + {420ED9C3-0C33-47EA-B893-121A9C0DB4F1} + Ringtoets.AssemblyTool.Data + + + + + Copying.licenseheader + + + \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/packages.config =================================================================== diff -u --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/packages.config (revision 0) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.TestUtil/packages.config (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -0,0 +1,4 @@ + + + + \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs =================================================================== diff -u -r1fd2033b78aa540d01635bcf993080e5fe2437bd -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs (.../AssemblyCategoriesCalculatorTest.cs) (revision 1fd2033b78aa540d01635bcf993080e5fe2437bd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs (.../AssemblyCategoriesCalculatorTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -149,7 +149,7 @@ var random = new Random(11); double lowerLimitNorm = random.NextDouble(0.5, 1.0); double signalingNorm = random.NextDouble(0.0, 0.4); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(1, 5); using (new AssemblyToolKernelFactoryConfig()) @@ -161,12 +161,12 @@ var calculator = new AssemblyCategoriesCalculator(factory); // Call - calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, probabilityDistributionFactor, n); + calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, failureMechanismContribution, n); // Assert Assert.AreEqual(lowerLimitNorm, kernel.LowerLimitNorm); Assert.AreEqual(signalingNorm, kernel.SignalingNorm); - Assert.AreEqual(probabilityDistributionFactor, kernel.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution, kernel.FailureMechanismContribution); Assert.AreEqual(n, kernel.N); } } @@ -178,7 +178,7 @@ var random = new Random(11); double lowerLimitNorm = random.NextDouble(); double signalingNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(1, 5); CalculationOutput output = CreateFailureMechanismSectionCategoryKernelOutput(); @@ -192,7 +192,7 @@ // Call IEnumerable result = calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, n); + failureMechanismContribution, n); // Assert AssemblyCategoryAssert.AssertFailureMechanismSectionAssemblyCategories(output, result); @@ -206,7 +206,7 @@ var random = new Random(11); double lowerLimitNorm = random.NextDouble(); double signalingNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); using (new AssemblyToolKernelFactoryConfig()) @@ -219,7 +219,7 @@ // Call TestDelegate test = () => calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, n); + failureMechanismContribution, n); // Assert var exception = Assert.Throws(test); @@ -235,7 +235,7 @@ var random = new Random(11); double lowerLimitNorm = random.NextDouble(); double signalingNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(1, 5); using (new AssemblyToolKernelFactoryConfig()) @@ -247,12 +247,12 @@ var calculator = new AssemblyCategoriesCalculator(factory); // Call - calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, probabilityDistributionFactor, n); + calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, failureMechanismContribution, n); // Assert Assert.AreEqual(lowerLimitNorm, kernel.LowerLimitNorm); Assert.AreEqual(signalingNorm, kernel.SignalingNorm); - Assert.AreEqual(probabilityDistributionFactor, kernel.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution, kernel.FailureMechanismContribution); Assert.AreEqual(n, kernel.N); } } @@ -264,7 +264,7 @@ var random = new Random(11); double lowerLimitNorm = random.NextDouble(); double signalingNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(1, 5); CalculationOutput output = CreateFailureMechanismSectionCategoryKernelOutput(); @@ -278,7 +278,7 @@ // Call IEnumerable result = calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, n); + failureMechanismContribution, n); // Assert AssemblyCategoryAssert.AssertFailureMechanismSectionAssemblyCategories(output, result); @@ -292,7 +292,7 @@ var random = new Random(11); double lowerLimitNorm = random.NextDouble(); double signalingNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); using (new AssemblyToolKernelFactoryConfig()) @@ -305,7 +305,7 @@ // Call TestDelegate test = () => calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, n); + failureMechanismContribution, n); // Assert var exception = Assert.Throws(test); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -r5180f3c52adce7b8214e51b81b0ad8c7b21f4521 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 5180f3c52adce7b8214e51b81b0ad8c7b21f4521) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -56,9 +56,9 @@ Assert.AreEqual(0.0, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual((TailorMadeAssessmentProbabilityAndDetailedCalculationResultType) 0, - calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResult); + calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput); Assert.AreEqual((TailorMadeAssessmentProbabilityCalculationResultType) 0, - calculator.TailorMadeAssessmentProbabilityCalculationResultType); + calculator.TailorMadeAssessmentProbabilityCalculationResultInput); Assert.IsNull(calculator.TailorMadeAssessmentAssemblyOutput); Assert.IsNull(calculator.CombinedSimpleAssemblyInput); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs =================================================================== diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs (.../AssemblyCategoriesCalculatorStubTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs (.../AssemblyCategoriesCalculatorStubTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -150,18 +150,18 @@ var random = new Random(39); double signalingNorm = random.NextDouble(); double lowerLimitNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); var calculator = new AssemblyCategoriesCalculatorStub(); // Call - calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, probabilityDistributionFactor, n); + calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, failureMechanismContribution, n); // Assert Assert.AreEqual(signalingNorm, calculator.SignalingNorm); Assert.AreEqual(lowerLimitNorm, calculator.LowerLimitNorm); - Assert.AreEqual(probabilityDistributionFactor, calculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution, calculator.FailureMechanismContribution); Assert.AreEqual(n, calculator.N); } @@ -221,18 +221,18 @@ var random = new Random(39); double signalingNorm = random.NextDouble(); double lowerLimitNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); var calculator = new AssemblyCategoriesCalculatorStub(); // Call - calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, probabilityDistributionFactor, n); + calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, failureMechanismContribution, n); // Assert Assert.AreEqual(signalingNorm, calculator.SignalingNorm); Assert.AreEqual(lowerLimitNorm, calculator.LowerLimitNorm); - Assert.AreEqual(probabilityDistributionFactor, calculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution, calculator.FailureMechanismContribution); Assert.AreEqual(n, calculator.N); } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs =================================================================== diff -u -r1fd2033b78aa540d01635bcf993080e5fe2437bd -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs (.../AssemblyCategoriesKernelStubTest.cs) (revision 1fd2033b78aa540d01635bcf993080e5fe2437bd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs (.../AssemblyCategoriesKernelStubTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -129,19 +129,19 @@ var random = new Random(11); var lowerLimitNorm = new Probability(random.NextDouble()); var signalingNorm = new Probability(random.NextDouble()); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(1, 5); var kernelStub = new AssemblyCategoriesKernelStub(); - var input = new CalculateFailureMechanismSectionCategoriesInput(signalingNorm, lowerLimitNorm, probabilityDistributionFactor, n); + var input = new CalculateFailureMechanismSectionCategoriesInput(signalingNorm, lowerLimitNorm, failureMechanismContribution, n); // Call kernelStub.CalculateFailureMechanismSectionCategories(input); // Assert Assert.AreEqual(signalingNorm, kernelStub.SignalingNorm); Assert.AreEqual(lowerLimitNorm, kernelStub.LowerLimitNorm); - Assert.AreEqual(probabilityDistributionFactor, kernelStub.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution, kernelStub.FailureMechanismContribution); Assert.AreEqual(n, kernelStub.N); } @@ -209,19 +209,19 @@ var random = new Random(11); var lowerLimitNorm = new Probability(random.NextDouble()); var signalingNorm = new Probability(random.NextDouble()); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(1, 5); var kernelStub = new AssemblyCategoriesKernelStub(); - var input = new CalculateFailureMechanismSectionCategoriesInput(signalingNorm, lowerLimitNorm, probabilityDistributionFactor, n); + var input = new CalculateFailureMechanismSectionCategoriesInput(signalingNorm, lowerLimitNorm, failureMechanismContribution, n); // Call kernelStub.CalculateGeotechnicFailureMechanismSectionCategories(input); // Assert Assert.AreEqual(signalingNorm, kernelStub.SignalingNorm); Assert.AreEqual(lowerLimitNorm, kernelStub.LowerLimitNorm); - Assert.AreEqual(probabilityDistributionFactor, kernelStub.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution, kernelStub.FailureMechanismContribution); Assert.AreEqual(n, kernelStub.N); } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs =================================================================== diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs (.../AssemblyCategoriesCalculatorStub.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs (.../AssemblyCategoriesCalculatorStub.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -42,9 +42,9 @@ public double LowerLimitNorm { get; private set; } /// - /// Gets the probability distribution factor that is used in the calculation. + /// Gets the failure mechanism contribution that is used in the calculation. /// - public double ProbabilityDistributionFactor { get; private set; } + public double FailureMechanismContribution { get; private set; } /// /// Gets the n that is used in the calculation. @@ -86,7 +86,7 @@ } public IEnumerable CalculateFailureMechanismSectionCategories(double signalingNorm, double lowerLimitNorm, - double probabilityDistributionFactor, double n) + double failureMechanismContribution, double n) { if (ThrowExceptionOnCalculate) { @@ -95,7 +95,7 @@ SignalingNorm = signalingNorm; LowerLimitNorm = lowerLimitNorm; - ProbabilityDistributionFactor = probabilityDistributionFactor; + FailureMechanismContribution = failureMechanismContribution; N = n; return FailureMechanismSectionCategoriesOutput @@ -108,7 +108,7 @@ } public IEnumerable CalculateGeotechnicFailureMechanismSectionCategories(double signalingNorm, double lowerLimitNorm, - double probabilityDistributionFactor, double n) + double failureMechanismContribution, double n) { if (ThrowExceptionOnCalculate) { @@ -117,7 +117,7 @@ SignalingNorm = signalingNorm; LowerLimitNorm = lowerLimitNorm; - ProbabilityDistributionFactor = probabilityDistributionFactor; + FailureMechanismContribution = failureMechanismContribution; N = n; return FailureMechanismSectionCategoriesOutput Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs =================================================================== diff -u -r0466dbd9ab95f101ffade262f66384cf0215f0ff -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs (.../AssemblyCategoriesKernelStub.cs) (revision 0466dbd9ab95f101ffade262f66384cf0215f0ff) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs (.../AssemblyCategoriesKernelStub.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -48,9 +48,9 @@ public double SignalingNorm { get; private set; } /// - /// Gets the probability distribution factor. + /// Gets the failure mechanism contribution. /// - public double ProbabilityDistributionFactor { get; private set; } + public double FailureMechanismContribution { get; private set; } /// /// Gets the n. @@ -101,7 +101,7 @@ SignalingNorm = input.SignalingStandard; LowerLimitNorm = input.LowerBoundaryStandard; - ProbabilityDistributionFactor = input.ProbabilityDistributionFactor; + FailureMechanismContribution = input.ProbabilityDistributionFactor; N = input.NValue; Calculated = true; @@ -118,7 +118,7 @@ SignalingNorm = input.SignalingStandard; LowerLimitNorm = input.LowerBoundaryStandard; - ProbabilityDistributionFactor = input.ProbabilityDistributionFactor; + FailureMechanismContribution = input.ProbabilityDistributionFactor; N = input.NValue; Calculated = true; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -209,7 +209,7 @@ calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.GeneralInput.N, categoryCalculator.N); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll(); Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs =================================================================== diff -u -r10da55f5cb8bf1b8a8309e43f923072a29db254d -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs (.../AssemblyToolCategoriesFactory.cs) (revision 10da55f5cb8bf1b8a8309e43f923072a29db254d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs (.../AssemblyToolCategoriesFactory.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -60,15 +60,15 @@ /// /// The signaling norm to use in the calculation. /// The lower limit norm to use in the calculation. - /// The probability distribution factor to calculate with. + /// The failure mechanism contribution to calculate with. /// The 'N' parameter used to factor in the 'length effect'. /// An with categories of /// . /// Thrown when an error occurred while creating the categories. public static IEnumerable CreateFailureMechanismSectionAssemblyCategories( double signalingNorm, double lowerLimitNorm, - double probabilityDistributionFactor, + double failureMechanismContribution, double n) { IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssemblyCategoriesCalculator( @@ -78,7 +78,7 @@ { return calculator.CalculateFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor / 100, + failureMechanismContribution / 100, n); } catch (AssemblyCategoriesCalculatorException e) @@ -92,15 +92,15 @@ /// /// The signaling norm to use in the calculation. /// The lower limit norm to use in the calculation. - /// The probability distribution factor to calculate with. + /// The failure mechanism contribution to calculate with. /// The 'N' parameter used to factor in the 'length effect'. /// An with categories of /// . /// Thrown when an error occurred while creating the categories. public static IEnumerable CreateGeotechnicFailureMechanismSectionAssemblyCategories( double signalingNorm, double lowerLimitNorm, - double probabilityDistributionFactor, + double failureMechanismContribution, double n) { IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssemblyCategoriesCalculator( @@ -110,7 +110,7 @@ { return calculator.CalculateGeotechnicFailureMechanismSectionCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, + failureMechanismContribution / 100, n); } catch (AssemblyCategoriesCalculatorException e) Fisheye: Tag b29487c198d87b176783f2396c2b59cd76b9f246 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -0,0 +1,475 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// 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 Core.Common.Controls.DataGrid; +using Core.Common.Util; +using Ringtoets.AssemblyTool.Data; +using Ringtoets.Common.Forms.Properties; +using Ringtoets.Common.Primitives; + +namespace Ringtoets.Common.Forms.Builders +{ + /// + /// Builder class for adding various columns to a in + /// failure mechanism result views. + /// + public static class FailureMechanismSectionResultViewColumnBuilder + { + /// + /// Adds a column to the showing the section name. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddSectionNameColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.Section_DisplayName, + true); + } + + private static IEnumerable> CreateEnumDisplayWrappers() + { + return Enum.GetValues(typeof(T)) + .OfType() + .Select(e => new EnumDisplayWrapper(e)) + .ToArray(); + } + + #region Assessment + + /// + /// Adds a column to the showing a + /// . + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddSimpleAssessmentResultColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + IEnumerable> dataSource = CreateEnumDisplayWrappers(); + + dataGridViewControl.AddComboBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName, + dataSource, + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); + } + + /// + /// Adds a column to the showing a + /// . + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddSimpleAssessmentResultValidityOnlyColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + IEnumerable> dataSource = CreateEnumDisplayWrappers(); + + dataGridViewControl.AddComboBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName, + dataSource, + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); + } + + /// + /// Adds a column to the showing a + /// . + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddDetailedAssessmentResultColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + IEnumerable> dataSource = CreateEnumDisplayWrappers(); + + dataGridViewControl.AddComboBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_DetailedAssessmentResult_DisplayName, + dataSource, + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); + } + + /// + /// Adds a column to the showing the detailed + /// assessment probability. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddDetailedAssessmentProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_DetailedAssessmentProbability_DisplayName); + } + + /// + /// Adds a column to the showing a + /// . + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + IEnumerable> dataSource = + CreateEnumDisplayWrappers(); + + dataGridViewControl.AddComboBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_TailorMadeAssessmentResult_DisplayName, + dataSource, + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); + } + + /// + /// Adds a column to the showing a + /// . + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddTailorMadeAssessmentProbabilityCalculationResultColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + IEnumerable> dataSource = + CreateEnumDisplayWrappers(); + + dataGridViewControl.AddComboBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_TailorMadeAssessmentResult_DisplayName, + dataSource, + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); + } + + /// + /// Adds a column to the showing the tailor made + /// assessment probability. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddTailorMadeAssessmentProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_TailorMadeAssessmentProbability_DisplayName); + } + + #endregion + + #region Assembly Category Group + + /// + /// Adds a column to the showing the simple + /// assembly category group. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddSimpleAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_SimpleAssemblyCategoryGroup_DisplayName); + } + + /// + /// Adds a column to the showing the detailed + /// assembly category group. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddDetailedAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_DetailedAssemblyCategoryGroup_DisplayName); + } + + /// + /// Adds a column to the showing the tailor made + /// assembly category group. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddTailorMadeAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_TailorMadeAssemblyCategoryGroup_DisplayName); + } + + /// + /// Adds a column to the showing the combined + /// assembly category group. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddCombinedAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_CombinedAssemblyCategoryGroup_DisplayName); + } + + /// + /// Adds a column to the showing the combined + /// assembly probability. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddCombinedAssemblyProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_CombinedAssemblyProbability_DisplayName); + } + + #endregion + + #region Override Assembly + + /// + /// Adds a column to the showing the + /// checkbox for the combined assembly overriding. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddUseManualAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddCheckBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_UseManualAssemblyCategoryGroup_DisplayName); + } + + /// + /// Adds a column to the showing the + /// overridden combined assembly group. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddManualAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + IEnumerable> dataSource = CreateEnumDisplayWrappers(); + + dataGridViewControl.AddComboBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_ManualAssembly_DisplayName, + dataSource, + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); + } + + /// + /// Adds a column to the showing the + /// overridden combined assembly probability. + /// + /// The to add the column to. + /// The data property name of the column. + /// Thrown when any parameter is null. + public static void AddManualAssemblyProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + { + if (dataGridViewControl == null) + { + throw new ArgumentNullException(nameof(dataGridViewControl)); + } + + if (dataPropertyName == null) + { + throw new ArgumentNullException(nameof(dataPropertyName)); + } + + dataGridViewControl.AddTextBoxColumn( + dataPropertyName, + Resources.FailureMechanismResultView_ManualAssembly_DisplayName); + } + + #endregion + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -rf536315fb0233c46461380a38e856f3ddcb43f7e -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision f536315fb0233c46461380a38e856f3ddcb43f7e) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -20,7 +20,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs =================================================================== diff -u -r10da55f5cb8bf1b8a8309e43f923072a29db254d -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs (.../AssemblyToolCategoriesFactoryTest.cs) (revision 10da55f5cb8bf1b8a8309e43f923072a29db254d) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs (.../AssemblyToolCategoriesFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -110,7 +110,7 @@ var random = new Random(11); double signalingNorm = random.NextDouble(); double lowerLimitNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); using (new AssemblyToolCalculatorFactoryConfig()) @@ -121,13 +121,13 @@ // Call AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, + failureMechanismContribution, n); // Assert Assert.AreEqual(signalingNorm, calculator.SignalingNorm); Assert.AreEqual(lowerLimitNorm, calculator.LowerLimitNorm); - Assert.AreEqual(probabilityDistributionFactor / 100, calculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution / 100, calculator.FailureMechanismContribution); Assert.AreEqual(n, calculator.N); } } @@ -139,7 +139,7 @@ var random = new Random(11); double signalingNorm = random.NextDouble(); double lowerLimitNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); using (new AssemblyToolCalculatorFactoryConfig()) @@ -151,7 +151,7 @@ FailureMechanismSectionAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories( signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, + failureMechanismContribution, n).ToArray(); // Assert @@ -191,7 +191,7 @@ var random = new Random(11); double signalingNorm = random.NextDouble(); double lowerLimitNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); using (new AssemblyToolCalculatorFactoryConfig()) @@ -202,13 +202,13 @@ // Call AssemblyToolCategoriesFactory.CreateGeotechnicFailureMechanismSectionAssemblyCategories(signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, + failureMechanismContribution, n); // Assert Assert.AreEqual(signalingNorm, calculator.SignalingNorm); Assert.AreEqual(lowerLimitNorm, calculator.LowerLimitNorm); - Assert.AreEqual(probabilityDistributionFactor, calculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanismContribution / 100, calculator.FailureMechanismContribution); Assert.AreEqual(n, calculator.N); } } @@ -220,7 +220,7 @@ var random = new Random(11); double signalingNorm = random.NextDouble(); double lowerLimitNorm = random.NextDouble(); - double probabilityDistributionFactor = random.NextDouble(); + double failureMechanismContribution = random.NextDouble(); double n = random.NextDouble(); using (new AssemblyToolCalculatorFactoryConfig()) @@ -232,7 +232,7 @@ FailureMechanismSectionAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateGeotechnicFailureMechanismSectionAssemblyCategories( signalingNorm, lowerLimitNorm, - probabilityDistributionFactor, + failureMechanismContribution, n).ToArray(); // Assert Fisheye: Tag b29487c198d87b176783f2396c2b59cd76b9f246 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -0,0 +1,897 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// 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 System.Windows.Forms; +using Core.Common.Controls.DataGrid; +using Core.Common.Util; +using NUnit.Extensions.Forms; +using NUnit.Framework; +using Ringtoets.AssemblyTool.Data; +using Ringtoets.Common.Forms.Builders; +using Ringtoets.Common.Primitives; + +namespace Ringtoets.Common.Forms.Test.Builders +{ + [TestFixture] + public class FailureMechanismSectionResultViewColumnBuilderTest + { + private const string dataPropertyName = "test property"; + + [Test] + public void AddSectionNameColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddSectionNameColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddSectionNameColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Vak", columnData.HeaderText); + Assert.IsTrue(columnData.ReadOnly); + } + } + + private static IEnumerable> CreateExpectedEnumDisplayWrappers() + { + return Enum.GetValues(typeof(T)) + .OfType() + .Select(e => new EnumDisplayWrapper(e)) + .ToArray(); + } + + /// + /// Method that asserts whether and + /// are equal. + /// + /// The expected object. + /// The actual object. + /// Thrown when and + /// are not equal. + private static void AssertEnumDisplayWrappersAreEqual(IEnumerable> expected, + IEnumerable> actual) + { + Assert.AreEqual(expected.Count(), actual.Count()); + for (var i = 0; i < expected.Count(); i++) + { + EnumDisplayWrapper expectedWrapper = expected.ElementAt(i); + EnumDisplayWrapper actualWrapper = actual.ElementAt(i); + Assert.AreEqual(expectedWrapper.Value, actualWrapper.Value); + Assert.AreEqual(expectedWrapper.DisplayName, actualWrapper.DisplayName); + } + } + + #region Simple Assessment + + [Test] + public void AddSimpleAssessmentResultColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddSimpleAssessmentResultColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddSimpleAssessmentResultColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Eenvoudige toets", columnData.HeaderText); + Assert.AreEqual("Value", columnData.ValueMember); + Assert.AreEqual("DisplayName", columnData.DisplayMember); + + IEnumerable> expectedDataSource = CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); + } + } + + [Test] + public void AddSimpleAssessmentResultValidityOnlyColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddSimpleAssessmentResultValidityOnlyColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddSimpleAssessmentResultValidityOnlyColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Eenvoudige toets", columnData.HeaderText); + Assert.AreEqual("Value", columnData.ValueMember); + Assert.AreEqual("DisplayName", columnData.DisplayMember); + + IEnumerable> expectedDataSource = + CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); + } + } + + #endregion + + #region Detailed Assessment + + [Test] + public void AddDetailedAssessmentResultColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentResultColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddDetailedAssessmentResultColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentResultColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddDetailedAssessmentResultColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentResultColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Gedetailleerde toets per vak", columnData.HeaderText); + Assert.AreEqual("Value", columnData.ValueMember); + Assert.AreEqual("DisplayName", columnData.DisplayMember); + + IEnumerable> expectedDataSource = CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); + } + } + + [Test] + public void AddDetailedAssessmentProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddDetailedAssessmentProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddDetailedAssessmentProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Gedetailleerde toets per vak\r\nfaalkans", columnData.HeaderText); + } + } + + #endregion + + #region Tailor Made Assessment + + [Test] + public void AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Toets op maat", columnData.HeaderText); + Assert.AreEqual("Value", columnData.ValueMember); + Assert.AreEqual("DisplayName", columnData.DisplayMember); + + IEnumerable> expectedDataSource = + CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, + (EnumDisplayWrapper[]) columnData.DataSource); + } + } + + [Test] + public void AddTailorMadeAssessmentProbabilityCalculationResultColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssessmentProbabilityCalculationResultColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssessmentProbabilityCalculationResultColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Toets op maat", columnData.HeaderText); + Assert.AreEqual("Value", columnData.ValueMember); + Assert.AreEqual("DisplayName", columnData.DisplayMember); + + IEnumerable> expectedDataSource = + CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, + (EnumDisplayWrapper[]) columnData.DataSource); + } + } + + [Test] + public void AddTailorMadeAssessmentProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssessmentProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssessmentProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Toets op maat\r\nfaalkans", columnData.HeaderText); + } + } + + #endregion + + #region Assessment Assembly + + [Test] + public void AddSimpleAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssemblyCategoryGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddSimpleAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddSimpleAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssemblyCategoryGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\neenvoudige toets", columnData.HeaderText); + } + } + + [Test] + public void AddDetailedAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssemblyCategoryGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddDetailedAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddDetailedAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssemblyCategoryGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\ngedetailleerde toets per vak", columnData.HeaderText); + } + } + + [Test] + public void AddTailorMadeAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddTailorMadeAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\ntoets op maat", columnData.HeaderText); + } + } + + [Test] + public void AddCombinedAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddCombinedAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddCombinedAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\ngecombineerd", columnData.HeaderText); + } + } + + [Test] + public void AddCombinedAssemblyProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyProbabilityColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddCombinedAssemblyProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyProbabilityColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddCombinedAssemblyProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyProbabilityColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\ngecombineerde\r\nfaalkansschatting", columnData.HeaderText); + } + } + + #endregion + + #region Manual Assembly + + [Test] + public void AddUseManualAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddUseManualAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddUseManualAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewCheckBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Overschrijf\r\nassemblageresultaat", columnData.HeaderText); + } + } + + [Test] + public void AddManualAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddManualAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddManualAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\nhandmatig", columnData.HeaderText); + Assert.AreEqual("Value", columnData.ValueMember); + Assert.AreEqual("DisplayName", columnData.DisplayMember); + + IEnumerable> expectedDataSource = + CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); + } + } + + [Test] + public void AddManualAssemblyProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn(null, "property"); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataGridViewControl", exception.ParamName); + } + + [Test] + public void AddManualAssemblyProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn(new DataGridViewControl(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("dataPropertyName", exception.ParamName); + } + + [Test] + public void AddManualAssemblyProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl() + { + // Setup + using (var form = new Form()) + using (var control = new DataGridViewControl()) + { + form.Controls.Add(control); + form.Show(); + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.ColumnCount); + + // Call + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn(control, dataPropertyName); + + // Assert + Assert.AreEqual(1, dataGridView.ColumnCount); + + var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0]; + Assert.AreEqual(dataPropertyName, columnData.DataPropertyName); + Assert.AreEqual("Assemblageresultaat\r\nhandmatig", columnData.HeaderText); + } + } + + #endregion + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -rf536315fb0233c46461380a38e856f3ddcb43f7e -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision f536315fb0233c46461380a38e856f3ddcb43f7e) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -44,7 +44,7 @@ - + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -ra07327b1e6f53a7628c2bf145b0356ae43d39ba8 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision a07327b1e6f53a7628c2bf145b0356ae43d39ba8) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -122,55 +122,55 @@ protected override void AddDataGridColumns() { - FailureMechanismSectionResultColumnBuilder.AddSectionNameColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.Name)); - FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.SimpleAssessmentResult)); - FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentResultColumn( + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentResultColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.DetailedAssessmentResult)); - FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentProbabilityColumn( + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.DetailedAssessmentProbability)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn( + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.TailorMadeAssessmentResult)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityColumn( + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.TailorMadeAssessmentProbability)); - FailureMechanismSectionResultColumnBuilder.AddSimpleAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.SimpleAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddDetailedAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.DetailedAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.TailorMadeAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.CombinedAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyProbabilityColumn( + FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyProbabilityColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.CombinedAssemblyProbability)); - FailureMechanismSectionResultColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.UseManualAssemblyProbability)); - FailureMechanismSectionResultColumnBuilder.AddManualAssemblyProbabilityColumn( + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn( DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.ManualAssemblyProbability)); } @@ -210,7 +210,6 @@ { GrassCoverErosionInwardsFailureMechanismSectionResultRow row = GetDataAtRow(e.RowIndex); - IEnumerable> rules = FormattingRules; IEnumerable> formattingRules = rules.Where(r => r.ColumnIndices.Contains(e.ColumnIndex)); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -rbb5e6710b02c9c28009245953196a7088ef2e111 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision bb5e6710b02c9c28009245953196a7088ef2e111) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -149,8 +149,8 @@ /// /// Gets the simple assembly category group. /// - /// Thrown when the - /// could not be created. + /// Thrown when the + /// could not be calculated. public FailureMechanismSectionAssemblyCategoryGroup SimpleAssemblyCategoryGroup { get @@ -162,8 +162,8 @@ /// /// Gets the detailed assembly category group. /// - /// Thrown when the - /// could not be created. + /// Thrown when the + /// could not be calculated. public FailureMechanismSectionAssemblyCategoryGroup DetailedAssemblyCategoryGroup { get @@ -178,8 +178,8 @@ /// /// Gets the tailor made assembly category group. /// - /// Thrown when the - /// could not be created. + /// Thrown when the + /// could not be calculated. public FailureMechanismSectionAssemblyCategoryGroup TailorMadeAssemblyCategoryGroup { get @@ -194,8 +194,8 @@ /// /// Gets the combined assembly category group. /// - /// Thrown when the - /// could not be created. + /// Thrown when the + /// could not be calculated. public FailureMechanismSectionAssemblyCategoryGroup CombinedAssemblyCategoryGroup { get @@ -210,8 +210,7 @@ /// /// Gets the combined assembly probability. /// - /// Thrown when the - /// could not be created. + /// Thrown when the probability could not be calculated. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double CombinedAssemblyProbability { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -ra9238f94c62a8feaa5d84250b1c99e2eca163afc -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision a9238f94c62a8feaa5d84250b1c99e2eca163afc) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -24,6 +24,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.AssemblyTool.Data; +using Ringtoets.AssemblyTool.Data.TestUtil; using Ringtoets.AssemblyTool.KernelWrapper.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; @@ -100,7 +101,7 @@ } [Test] - public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException() + public void AssembleSimpleAssessment_CalculatorThrowsException_ThrowsAssemblyException() { // Setup FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); @@ -207,15 +208,20 @@ // Assert Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); - Assert.AreEqual(failureMechanism.GeneralInput.N, categoryCalculator.N); + AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll(); } } + private static void AssertCategoryCalculatorInput(IAssessmentSection assessmentSection, AssemblyCategoriesCalculatorStub categoryCalculator, GrassCoverErosionInwardsFailureMechanism failureMechanism) + { + Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); + Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); + Assert.AreEqual(failureMechanism.GeneralInput.N, categoryCalculator.N); + } + [Test] public void AssembleDetailedAssembly_AssemblyRan_ReturnsOutput() { @@ -247,7 +253,7 @@ } [Test] - public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException() + public void AssembleDetailedAssembly_CalculatorThrowsException_ThrowsAssemblyException() { // Setup var mocks = new MockRepository(); @@ -363,11 +369,7 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput); - - Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); - Assert.AreEqual(failureMechanism.GeneralInput.N, categoryCalculator.N); + AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.TailorMadeAssessmentCategoriesInput); mocks.VerifyAll(); } @@ -405,7 +407,7 @@ } [Test] - public void AssembleTailorMadeAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException() + public void AssembleTailorMadeAssembly_CalculatorThrowsException_ThrowsAssemblyException() { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -530,12 +532,9 @@ failureMechanism, assessmentSection); - Assert.AreEqual(expectedSimpleAssembly.Group, calculator.CombinedSimpleAssemblyInput.Group); - Assert.AreEqual(expectedSimpleAssembly.Probability, calculator.CombinedSimpleAssemblyInput.Probability); - Assert.AreEqual(expectedDetailedAssembly.Group, calculator.CombinedDetailedAssemblyInput.Group); - Assert.AreEqual(expectedDetailedAssembly.Probability, calculator.CombinedDetailedAssemblyInput.Probability); - Assert.AreEqual(expectedTailorMadeAssembly.Group, calculator.CombinedTailorMadeAssemblyInput.Group); - Assert.AreEqual(expectedTailorMadeAssembly.Probability, calculator.CombinedTailorMadeAssemblyInput.Probability); + AssemblyToolTestHelper.AssertAreEqual(expectedSimpleAssembly, calculator.CombinedSimpleAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(expectedDetailedAssembly, calculator.CombinedDetailedAssemblyInput); + AssemblyToolTestHelper.AssertAreEqual(expectedTailorMadeAssembly, calculator.CombinedTailorMadeAssemblyInput); mocks.VerifyAll(); } } @@ -572,7 +571,7 @@ } [Test] - public void AssembleCombinedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException() + public void AssembleCombinedAssembly_CalculatorThrowsException_ThrowsAssemblyException() { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r6973c50cba4def41918b738d36b7069f65caa16d -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 6973c50cba4def41918b738d36b7069f65caa16d) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -47,7 +47,7 @@ Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, result.TailorMadeAssessmentResult); Assert.IsNaN(result.TailorMadeAssessmentProbability); Assert.IsFalse(result.UseManualAssemblyProbability); - Assert.AreEqual(double.NaN, result.ManualAssemblyProbability); + Assert.IsNaN(result.ManualAssemblyProbability); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj =================================================================== diff -u -r739752c5cc7ed800dacf74e12221c227183ddc6f -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision 739752c5cc7ed800dacf74e12221c227183ddc6f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -63,6 +63,10 @@ {358B6DA2-A1DF-477F-B6AC-C30204265CB0} Ringtoets.AssemblyTool.KernelWrapper + + {C6EE9E6A-6578-49DF-914F-CDB531E61891} + Ringtoets.AssemblyTool.Data.TestUtil + {0AB432BB-E2CC-42EA-A72C-7AFEF7536B38} Ringtoets.AssemblyTool.KernelWrapper.TestUtil Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rbb5e6710b02c9c28009245953196a7088ef2e111 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision bb5e6710b02c9c28009245953196a7088ef2e111) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -134,15 +134,14 @@ result.Attach(observer); var row = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(result, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); + bool originalValue = result.UseManualAssemblyProbability; + bool newValue = !originalValue; - // Precondition - Assert.IsFalse(result.UseManualAssemblyProbability); - // Call - row.UseManualAssemblyProbability = true; + row.UseManualAssemblyProbability = newValue; // Assert - Assert.IsTrue(result.UseManualAssemblyProbability); + Assert.AreEqual(newValue, result.UseManualAssemblyProbability); mocks.VerifyAll(); } @@ -196,9 +195,8 @@ TestDelegate test = () => row.ManualAssemblyProbability = value; // 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); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); mocks.VerifyAll(); } @@ -486,9 +484,8 @@ TestDelegate test = () => row.TailorMadeAssessmentProbability = value; // 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); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); mocks.VerifyAll(); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -209,7 +209,7 @@ calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.GeneralInput.N, categoryCalculator.N); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs =================================================================== diff -u -ra07327b1e6f53a7628c2bf145b0356ae43d39ba8 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision a07327b1e6f53a7628c2bf145b0356ae43d39ba8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs (.../MacroStabilityOutwardsResultView.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -88,51 +88,51 @@ protected override void AddDataGridColumns() { - FailureMechanismSectionResultColumnBuilder.AddSectionNameColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.Name)); - FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentResultColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssessmentResultColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.SimpleAssessmentResult)); - FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentResultColumn( + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentResultColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.DetailedAssessmentResult)); - FailureMechanismSectionResultColumnBuilder.AddDetailedAssessmentProbabilityColumn( + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssessmentProbabilityColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.DetailedAssessmentProbability)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn( + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.TailorMadeAssessmentResult)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityColumn( + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssessmentProbabilityColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.TailorMadeAssessmentProbability)); - FailureMechanismSectionResultColumnBuilder.AddSimpleAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddSimpleAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.SimpleAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddDetailedAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddDetailedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.DetailedAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddTailorMadeAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.TailorMadeAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddCombinedAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.CombinedAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.UseManualAssemblyCategoryGroup)); - FailureMechanismSectionResultColumnBuilder.AddManualAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn( DataGridViewControl, nameof(MacroStabilityOutwardsSectionResultRow.ManualAssemblyCategoryGroup)); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -ra9238f94c62a8feaa5d84250b1c99e2eca163afc -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision a9238f94c62a8feaa5d84250b1c99e2eca163afc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -214,7 +214,7 @@ Assert.AreEqual(sectionResult.DetailedAssessmentProbability, calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), categoryCalculator.N); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); @@ -374,7 +374,7 @@ Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), categoryCalculator.N); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.TailorMadeAssessmentCategoriesInput); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs =================================================================== diff -u -r405b3462fe3bd495b4820bf225a68a4188c9c112 -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 405b3462fe3bd495b4820bf225a68a4188c9c112) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -814,9 +814,8 @@ TestDelegate test = () => row.DetailedAssessmentProbability = value; // 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); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); mocks.VerifyAll(); } } @@ -916,9 +915,8 @@ TestDelegate test = () => row.TailorMadeAssessmentProbability = value; // 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); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); mocks.VerifyAll(); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -246,7 +246,7 @@ calculator.DetailedAssessmentNInput); Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN( failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength), categoryCalculator.N); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -247,7 +247,7 @@ calculator.DetailedAssessmentNInput); Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN( failureMechanism.PipingProbabilityAssessmentInput.SectionLength), categoryCalculator.N); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rb29487c198d87b176783f2396c2b59cd76b9f246 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) @@ -209,7 +209,7 @@ calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.ProbabilityDistributionFactor); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); Assert.AreEqual(failureMechanism.GeneralInput.N, categoryCalculator.N); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll();