Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyCategoriesCalculator.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyCategoriesCalculator.cs (.../IAssemblyCategoriesCalculator.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyCategoriesCalculator.cs (.../IAssemblyCategoriesCalculator.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using Ringtoets.AssemblyTool.Data; Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs =================================================================== diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs (.../FailureMechanismSectionAssemblyCreator.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs (.../FailureMechanismSectionAssemblyCreator.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -54,7 +54,7 @@ if (!Enum.IsDefined(typeof(FailureMechanismSectionCategoryGroup), originalGroup)) { throw new InvalidEnumArgumentException(nameof(originalGroup), - (int)originalGroup, + (int) originalGroup, typeof(FailureMechanismSectionCategoryGroup)); } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssemblyCategoryTest.cs =================================================================== diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssemblyCategoryTest.cs (.../AssemblyCategoryTest.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssemblyCategoryTest.cs (.../AssemblyCategoryTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -45,7 +45,7 @@ private class SimpleCategory : AssemblyCategory { - public SimpleCategory(double lowerBoundary, double upperBoundary) + public SimpleCategory(double lowerBoundary, double upperBoundary) : base(lowerBoundary, upperBoundary) {} } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs =================================================================== diff -u -r5530fd1bc0d417f35463e60e8ce198c14aad75e1 -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs (.../AssemblyToolCalculatorFactoryTest.cs) (revision 5530fd1bc0d417f35463e60e8ce198c14aad75e1) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs (.../AssemblyToolCalculatorFactoryTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -96,7 +96,7 @@ using (new AssemblyToolKernelFactoryConfig()) { // Call - IFailureMechanismSectionAssemblyCalculator calculator = + IFailureMechanismSectionAssemblyCalculator calculator = factory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance); // Assert Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -151,8 +151,8 @@ var random = new Random(11); var output = new CalculationOutput(new[] { - new FailureMechanismSectionCategory(random.NextEnumValue(), - new Probability(random.GetFromRange(0, 0.5)), + new FailureMechanismSectionCategory(random.NextEnumValue(), + new Probability(random.GetFromRange(0, 0.5)), new Probability(random.GetFromRange(0.5, 1))), null }); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -200,7 +200,7 @@ const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'FailureMechanismSectionAssemblyCategoryGroup'."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } - + [Test] public void CreateDetailedCalculationInputFromProbabilityWithLengthEffect_CategoriesContainsNull_ThrowArgumentNullException() { @@ -238,6 +238,7 @@ var exception = Assert.Throws(test); Assert.AreEqual("categories", exception.ParamName); } + [Test] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, FailureMechanismCategoryGroup.NotApplicable)] [TestCase(FailureMechanismSectionAssemblyCategoryGroup.None, FailureMechanismSectionCategoryGroup.None)] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -276,7 +276,6 @@ Assert.AreEqual(n, calculator.DetailedAssessmentNInput); Assert.AreSame(assemblyCategory, calculator.DetailedAssessmentCategoriesInput.Single()); - } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/AssemblyToolCalculatorFactoryConfigTest.cs =================================================================== diff -u -rccc77eb1d25d2f6e73e7b6547f2cc87b4d077713 -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/AssemblyToolCalculatorFactoryConfigTest.cs (.../AssemblyToolCalculatorFactoryConfigTest.cs) (revision ccc77eb1d25d2f6e73e7b6547f2cc87b4d077713) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/AssemblyToolCalculatorFactoryConfigTest.cs (.../AssemblyToolCalculatorFactoryConfigTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -58,7 +58,7 @@ IAssemblyToolCalculatorFactory expectedFactory = AssemblyToolCalculatorFactory.Instance; // Call - using (new AssemblyToolCalculatorFactoryConfig()) { } + using (new AssemblyToolCalculatorFactoryConfig()) {} // Assert Assert.AreSame(expectedFactory, AssemblyToolCalculatorFactory.Instance); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs (.../AssemblyCategoriesCalculatorStubTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs (.../AssemblyCategoriesCalculatorStubTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Linq; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs =================================================================== diff -u -rb46cba3269d292e5ca3374ec0f75810686cf3ec6 -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs (.../AssemblyCategoriesCalculatorStub.cs) (revision b46cba3269d292e5ca3374ec0f75810686cf3ec6) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs (.../AssemblyCategoriesCalculatorStub.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -78,11 +78,11 @@ return AssessmentSectionCategoriesOutput ?? (AssessmentSectionCategoriesOutput = new[] - { - new AssessmentSectionAssemblyCategory(1, 2, AssessmentSectionAssemblyCategoryGroup.A), - new AssessmentSectionAssemblyCategory(2.01, 3, AssessmentSectionAssemblyCategoryGroup.B), - new AssessmentSectionAssemblyCategory(3.01, 4, AssessmentSectionAssemblyCategoryGroup.C) - }); + { + new AssessmentSectionAssemblyCategory(1, 2, AssessmentSectionAssemblyCategoryGroup.A), + new AssessmentSectionAssemblyCategory(2.01, 3, AssessmentSectionAssemblyCategoryGroup.B), + new AssessmentSectionAssemblyCategory(3.01, 4, AssessmentSectionAssemblyCategoryGroup.C) + }); } public IEnumerable CalculateFailureMechanismSectionCategories(double signalingNorm, double lowerLimitNorm, @@ -99,12 +99,12 @@ N = n; return FailureMechanismSectionCategoriesOutput - ?? (FailureMechanismSectionCategoriesOutput = new[] - { - new FailureMechanismSectionAssemblyCategory(1, 2, FailureMechanismSectionAssemblyCategoryGroup.Iv), - new FailureMechanismSectionAssemblyCategory(2.01, 3, FailureMechanismSectionAssemblyCategoryGroup.IIv), - new FailureMechanismSectionAssemblyCategory(3.01, 4, FailureMechanismSectionAssemblyCategoryGroup.IIIv) - }); + ?? (FailureMechanismSectionCategoriesOutput = new[] + { + new FailureMechanismSectionAssemblyCategory(1, 2, FailureMechanismSectionAssemblyCategoryGroup.Iv), + new FailureMechanismSectionAssemblyCategory(2.01, 3, FailureMechanismSectionAssemblyCategoryGroup.IIv), + new FailureMechanismSectionAssemblyCategory(3.01, 4, FailureMechanismSectionAssemblyCategoryGroup.IIIv) + }); } public IEnumerable CalculateGeotechnicFailureMechanismSectionCategories(double signalingNorm, double lowerLimitNorm, @@ -122,11 +122,11 @@ return FailureMechanismSectionCategoriesOutput ?? (FailureMechanismSectionCategoriesOutput = new[] - { - new FailureMechanismSectionAssemblyCategory(1, 2, FailureMechanismSectionAssemblyCategoryGroup.Iv), - new FailureMechanismSectionAssemblyCategory(2.01, 3, FailureMechanismSectionAssemblyCategoryGroup.IIv), - new FailureMechanismSectionAssemblyCategory(3.01, 4, FailureMechanismSectionAssemblyCategoryGroup.IIIv) - }); + { + new FailureMechanismSectionAssemblyCategory(1, 2, FailureMechanismSectionAssemblyCategoryGroup.Iv), + new FailureMechanismSectionAssemblyCategory(2.01, 3, FailureMechanismSectionAssemblyCategoryGroup.IIv), + new FailureMechanismSectionAssemblyCategory(3.01, 4, FailureMechanismSectionAssemblyCategoryGroup.IIIv) + }); } } } \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -100,7 +100,7 @@ } IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance; - IFailureMechanismSectionAssemblyCalculator calculator = + IFailureMechanismSectionAssemblyCalculator calculator = calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance); try Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rad607a97ef8cdcdfe5909e73f590008a5b1b904b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Linq; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; @@ -31,7 +30,6 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil;