Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -55,20 +55,20 @@ this.factory = factory; } - public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult, + public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, IEnumerable categories) { - if (!Enum.IsDefined(typeof(DetailedAssessmentResultType), detailedAssessmentResult)) + if (!Enum.IsDefined(typeof(DetailedAssessmentProbabilityOnlyResultType), detailedAssessmentResult)) { throw new InvalidEnumArgumentException(nameof(detailedAssessmentResult), (int) detailedAssessmentResult, - typeof(DetailedAssessmentResultType)); + typeof(DetailedAssessmentProbabilityOnlyResultType)); } switch (detailedAssessmentResult) { - case DetailedAssessmentResultType.Probability: + case DetailedAssessmentProbabilityOnlyResultType.Probability: try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); @@ -82,7 +82,7 @@ { throw new FailureMechanismSectionAssemblyCalculatorException(e.Message, e); } - case DetailedAssessmentResultType.NotAssessed: + case DetailedAssessmentProbabilityOnlyResultType.NotAssessed: return FailureMechanismSectionAssemblyCreator.Create(new FailureMechanismSectionAssemblyCategoryResult( FailureMechanismSectionCategoryGroup.VIIv, new Probability(0.0))); @@ -123,21 +123,21 @@ } } - public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult, + public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, IEnumerable categories, double n) { - if (!Enum.IsDefined(typeof(DetailedAssessmentResultType), detailedAssessmentResult)) + if (!Enum.IsDefined(typeof(DetailedAssessmentProbabilityOnlyResultType), detailedAssessmentResult)) { throw new InvalidEnumArgumentException(nameof(detailedAssessmentResult), (int) detailedAssessmentResult, - typeof(DetailedAssessmentResultType)); + typeof(DetailedAssessmentProbabilityOnlyResultType)); } switch (detailedAssessmentResult) { - case DetailedAssessmentResultType.Probability: + case DetailedAssessmentProbabilityOnlyResultType.Probability: try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); @@ -152,7 +152,7 @@ { throw new FailureMechanismSectionAssemblyCalculatorException(e.Message, e); } - case DetailedAssessmentResultType.NotAssessed: + case DetailedAssessmentProbabilityOnlyResultType.NotAssessed: return FailureMechanismSectionAssemblyCreator.Create(new FailureMechanismSectionAssemblyCategoryResult( FailureMechanismSectionCategoryGroup.VIIv, new Probability(0.0))); Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -53,17 +53,17 @@ /// /// Assembles the detailed assessment based on the input parameters. /// - /// The detailed assessment result. + /// The to assemble for. /// The calculated probability. /// The collection of categories for this failure mechanism section. /// A . /// Thrown when is - /// an invalid . + /// an invalid . /// Thrown when contains - /// a valid but unsupported . + /// a valid but unsupported . /// Thrown when /// an error occurs when performing the assembly. - FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult, + FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, IEnumerable categories); @@ -77,15 +77,16 @@ /// A . /// Thrown when /// an error occurs when performing the assembly. - FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult, + FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, IEnumerable categories, double n); /// /// Assembles the tailor made assessment based on the input parameters. /// - /// The tailor made assessment result. + /// The + /// to assemble for. /// The calculated probability. /// The collection of categories for this failure mechanism section. /// A . @@ -98,7 +99,8 @@ /// /// Assembles the tailor made assessment based on the input parameters. /// - /// The tailor made assessment result. + /// The + /// to assemble for. /// The calculated probability. /// The collection of categories for this failure mechanism section. /// A . Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -766,12 +766,12 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment((DetailedAssessmentResultType) 99, + TestDelegate test = () => calculator.AssembleDetailedAssessment((DetailedAssessmentProbabilityOnlyResultType) 99, new Random(39).NextDouble(), Enumerable.Empty()); // Assert - string expectedMessage = $"The value of argument 'detailedAssessmentResult' (99) is invalid for Enum type '{nameof(DetailedAssessmentResultType)}'."; + string expectedMessage = $"The value of argument 'detailedAssessmentResult' (99) is invalid for Enum type '{nameof(DetailedAssessmentProbabilityOnlyResultType)}'."; string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage).ParamName; Assert.AreEqual("detailedAssessmentResult", parameterName); } @@ -795,7 +795,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, random.NextDouble(), categories); + TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories); // Assert var exception = Assert.Throws(test); @@ -827,7 +827,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - FailureMechanismSectionAssembly detailedAssembly = calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.NotAssessed, + FailureMechanismSectionAssembly detailedAssembly = calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, random.NextDouble(), categories); @@ -860,7 +860,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, probability, categories); + calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, probability, categories); // Assert Assert.AreEqual(probability, kernel.DetailedAssessmentFailureMechanismFromProbabilityInput.Probability); @@ -895,7 +895,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories); @@ -926,7 +926,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories); @@ -959,7 +959,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories); @@ -982,13 +982,13 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment((DetailedAssessmentResultType) 99, + TestDelegate test = () => calculator.AssembleDetailedAssessment((DetailedAssessmentProbabilityOnlyResultType) 99, random.NextDouble(), Enumerable.Empty(), random.NextDouble()); // Assert - string expectedMessage = $"The value of argument 'detailedAssessmentResult' (99) is invalid for Enum type '{nameof(DetailedAssessmentResultType)}'."; + string expectedMessage = $"The value of argument 'detailedAssessmentResult' (99) is invalid for Enum type '{nameof(DetailedAssessmentProbabilityOnlyResultType)}'."; string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage).ParamName; Assert.AreEqual("detailedAssessmentResult", parameterName); } @@ -1012,7 +1012,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories, random.NextDouble(1.0, 10.0)); @@ -1047,7 +1047,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - FailureMechanismSectionAssembly detailedAssembly = calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.NotAssessed, + FailureMechanismSectionAssembly detailedAssembly = calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, random.NextDouble(), categories, random.NextDouble(1.0, 10.0)); @@ -1082,7 +1082,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, probability, categories, n); + calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, probability, categories, n); // Assert Assert.AreEqual(probability, kernel.DetailedAssessmentFailureMechanismFromProbabilityWithLengthEffectInput.Probability); @@ -1118,7 +1118,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories, random.NextDouble(1.0, 10.0)); @@ -1150,7 +1150,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories, random.NextDouble(1.0, 10.0)); @@ -1184,7 +1184,7 @@ var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentResultType.Probability, + TestDelegate test = () => calculator.AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType.Probability, random.NextDouble(), categories, random.NextDouble(1.0, 10.0)); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -49,7 +49,7 @@ Assert.IsNull(calculator.DetailedAssessmentCategoriesInput); Assert.AreEqual(0.0, calculator.DetailedAssessmentNInput); Assert.AreEqual(0.0, calculator.DetailedAssessmentProbabilityInput); - Assert.AreEqual((DetailedAssessmentResultType) 0, calculator.DetailedAssessmentResultInput); + Assert.AreEqual((DetailedAssessmentProbabilityOnlyResultType) 0, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.IsNull(calculator.DetailedAssessmentAssemblyOutput); Assert.IsNull(calculator.TailorMadeAssessmentCategoriesInput); @@ -212,7 +212,7 @@ // Call FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment( - random.NextEnumValue(), + random.NextEnumValue(), random.NextDouble(), new FailureMechanismSectionAssemblyCategory[0]); @@ -235,7 +235,7 @@ // Call FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment( - random.NextEnumValue(), + random.NextEnumValue(), random.NextDouble(), new FailureMechanismSectionAssemblyCategory[0]); @@ -249,7 +249,7 @@ // Setup var random = new Random(39); double probability = random.NextDouble(); - var detailedAssessmentResult = random.NextEnumValue(); + var detailedAssessmentResult = random.NextEnumValue(); IEnumerable categoryInput = Enumerable.Empty(); var calculator = new FailureMechanismSectionAssemblyCalculatorStub(); @@ -258,7 +258,7 @@ calculator.AssembleDetailedAssessment(detailedAssessmentResult, probability, categoryInput); // Assert - Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput); Assert.AreSame(categoryInput, calculator.DetailedAssessmentCategoriesInput); } @@ -275,7 +275,7 @@ // Call TestDelegate test = () => calculator.AssembleDetailedAssessment( - random.NextEnumValue(), + random.NextEnumValue(), random.NextDouble(), new FailureMechanismSectionAssemblyCategory[0]); @@ -294,7 +294,7 @@ // Call FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment( - random.NextEnumValue(), + random.NextEnumValue(), random.NextDouble(), new FailureMechanismSectionAssemblyCategory[0], random.NextRoundedDouble(1.0, 10.0)); @@ -318,7 +318,7 @@ // Call FailureMechanismSectionAssembly assembly = calculator.AssembleDetailedAssessment( - random.NextEnumValue(), + random.NextEnumValue(), random.NextDouble(), new FailureMechanismSectionAssemblyCategory[0], random.NextRoundedDouble(1.0, 10.0)); @@ -334,7 +334,7 @@ var random = new Random(39); double probability = random.NextDouble(); double n = random.NextRoundedDouble(1.0, 10.0); - var detailedAssessmentResult = random.NextEnumValue(); + var detailedAssessmentResult = random.NextEnumValue(); IEnumerable categoriesInput = Enumerable.Empty(); var calculator = new FailureMechanismSectionAssemblyCalculatorStub(); @@ -343,7 +343,7 @@ calculator.AssembleDetailedAssessment(detailedAssessmentResult, probability, categoriesInput, n); // Assert - Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(n, calculator.DetailedAssessmentNInput); @@ -362,7 +362,7 @@ // Call TestDelegate test = () => calculator.AssembleDetailedAssessment( - random.NextEnumValue(), + random.NextEnumValue(), random.NextDouble(), new FailureMechanismSectionAssemblyCategory[0], random.NextRoundedDouble(1.0, 10.0)); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -55,7 +55,7 @@ /// /// Gets the result type of the detailed assessment calculation. /// - public DetailedAssessmentResultType DetailedAssessmentResultInput { get; private set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentProbabilityOnlyResultInput { get; private set; } /// /// Gets the probability input of the detailed assessment calculation. @@ -178,7 +178,7 @@ (SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIIv)); } - public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult, + public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, IEnumerable categories) { @@ -187,15 +187,15 @@ throw new FailureMechanismSectionAssemblyCalculatorException("Message", new Exception()); } - DetailedAssessmentResultInput = detailedAssessmentResult; + DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult; DetailedAssessmentProbabilityInput = probability; DetailedAssessmentCategoriesInput = categories; return DetailedAssessmentAssemblyOutput ?? (DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv)); } - public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentResultType detailedAssessmentResult, + public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, IEnumerable categories, double n) @@ -205,7 +205,7 @@ throw new FailureMechanismSectionAssemblyCalculatorException("Message", new Exception()); } - DetailedAssessmentResultInput = detailedAssessmentResult; + DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult; DetailedAssessmentProbabilityInput = probability; DetailedAssessmentCategoriesInput = categories; DetailedAssessmentNInput = n; Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (.../ClosingStructuresFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (.../ClosingStructuresFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -45,7 +45,7 @@ public ClosingStructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { SimpleAssessmentResult = SimpleAssessmentResultType.None; - DetailedAssessmentResult = DetailedAssessmentResultType.Probability; + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability; TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None; TailorMadeAssessmentProbability = double.NaN; ManualAssemblyProbability = double.NaN; @@ -65,7 +65,7 @@ /// /// Gets or sets the detailed assessment result. /// - public DetailedAssessmentResultType DetailedAssessmentResult { get; set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get; set; } /// /// Gets or sets the tailor made assessment result. Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -rf665294814c085178591a35d0d811a1df72feb55 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision f665294814c085178591a35d0d811a1df72feb55) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -133,7 +133,7 @@ /// /// Thrown when /// is a valid value, but unsupported. - public DetailedAssessmentResultType DetailedAssessmentResult + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get { Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rd37598c4755f2fd8c65cdb79bb5152cc60279414 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision d37598c4755f2fd8c65cdb79bb5152cc60279414) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -204,7 +204,7 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - DetailedAssessmentResult = new Random(21).NextEnumValue() + DetailedAssessmentResult = new Random(21).NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -220,7 +220,7 @@ assessmentSection); // Assert - Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); AssertCategoryCalculatorInput(assessmentSection, failureMechanism, categoryCalculator); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -rbfd84af2152b697561a499f15caa6d1f9f5fd4ed -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision bfd84af2152b697561a499f15caa6d1f9f5fd4ed) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -44,7 +44,7 @@ Assert.IsInstanceOf(sectionResult); Assert.IsNull(sectionResult.Calculation); Assert.AreEqual(SimpleAssessmentResultType.None, sectionResult.SimpleAssessmentResult); - Assert.AreEqual(DetailedAssessmentResultType.Probability, sectionResult.DetailedAssessmentResult); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, sectionResult.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult); Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability); Assert.AreSame(section, sectionResult.Section); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -rf0ba49747b6479aae5f07afdd435fcc87e2d9181 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision f0ba49747b6479aae5f07afdd435fcc87e2d9181) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -185,7 +185,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r6e77288277cd675878afe22f3bfd5526e37e0fa5 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision 6e77288277cd675878afe22f3bfd5526e37e0fa5) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -524,9 +524,9 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -878,7 +878,7 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new TestClosingStructuresCalculation(), - DetailedAssessmentResult = DetailedAssessmentResultType.NotAssessed + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -1022,7 +1022,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new ClosingStructuresFailureMechanismSectionResult(section); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs =================================================================== diff -u -r32abca44b759d2532e1bb10090cda0ec073c34ff -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision 32abca44b759d2532e1bb10090cda0ec073c34ff) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -131,7 +131,7 @@ /// /// Adds a column to the showing a - /// . + /// . /// /// The to add the column to. /// The data property name of the column. @@ -148,14 +148,14 @@ throw new ArgumentNullException(nameof(dataPropertyName)); } - IEnumerable> dataSource = CreateEnumDisplayWrappers(); + IEnumerable> dataSource = CreateEnumDisplayWrappers(); dataGridViewControl.AddComboBoxColumn( dataPropertyName, Resources.FailureMechanismResultView_DetailedAssessmentResult_DisplayName, dataSource, - nameof(EnumDisplayWrapper.Value), - nameof(EnumDisplayWrapper.DisplayName)); + nameof(EnumDisplayWrapper.Value), + nameof(EnumDisplayWrapper.DisplayName)); } /// Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -93,14 +93,14 @@ /// /// Helper method that determines whether the detailed assessment - /// is . + /// is . /// /// The detailed assessment result to check. /// true when the detailed assessment is - /// , false otherwise. - public static bool DetailedAssessmentResultIsProbability(DetailedAssessmentResultType detailedAssessmentResult) + /// , false otherwise. + public static bool DetailedAssessmentResultIsProbability(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult) { - return detailedAssessmentResult == DetailedAssessmentResultType.Probability; + return detailedAssessmentResult == DetailedAssessmentProbabilityOnlyResultType.Probability; } /// Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentProbabilityOnlyResultType.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentProbabilityOnlyResultType.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentProbabilityOnlyResultType.cs (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -0,0 +1,48 @@ +// 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 Core.Common.Util.Attributes; +using Ringtoets.Common.Primitives.Properties; + +namespace Ringtoets.Common.Primitives +{ + /// + /// This enum defines the possible result types for a detailed assessment + /// on a failure mechanism section. + /// + public enum DetailedAssessmentProbabilityOnlyResultType + { + /// + /// The calculated probability for this failure + /// mechanism section has to be entered. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_Probability))] + Probability = 1, + + /// + /// No assessment has been performed for this failure + /// mechanism section. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_NotAssessed))] + NotAssessed = 2 + + } +} \ No newline at end of file Fisheye: Tag 192447bfd98b506637875ed87ed50a805fc568e9 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentResultType.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/Ringtoets.Common.Primitives.csproj =================================================================== diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Common/src/Ringtoets.Common.Primitives/Ringtoets.Common.Primitives.csproj (.../Ringtoets.Common.Primitives.csproj) (revision 712c1aad8e5486980f259491130e4ae07ea48149) +++ Ringtoets/Common/src/Ringtoets.Common.Primitives/Ringtoets.Common.Primitives.csproj (.../Ringtoets.Common.Primitives.csproj) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -19,7 +19,7 @@ True Resources.resx - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs =================================================================== diff -u -r32abca44b759d2532e1bb10090cda0ec073c34ff -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision 32abca44b759d2532e1bb10090cda0ec073c34ff) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -277,8 +277,8 @@ Assert.AreEqual("Value", columnData.ValueMember); Assert.AreEqual("DisplayName", columnData.DisplayMember); - IEnumerable> expectedDataSource = CreateExpectedEnumDisplayWrappers(); - AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); + IEnumerable> expectedDataSource = CreateExpectedEnumDisplayWrappers(); + AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -84,10 +84,10 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void DetailedAssessmentResultIsProbability_WithDetailedAssessmentResultType_ReturnsExpectedResult( - DetailedAssessmentResultType detailedAssessmentResult, bool expectedIsProbability) + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void DetailedAssessmentResultIsProbability_WithDetailedAssessmentProbabilityOnlyResultType_ReturnsExpectedResult( + DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool expectedIsProbability) { // Call bool isProbability = FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(detailedAssessmentResult); Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentProbabilityOnlyResultTypeTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentProbabilityOnlyResultTypeTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentProbabilityOnlyResultTypeTest.cs (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -0,0 +1,63 @@ +// 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.Collections.Generic; +using Core.Common.TestUtil; +using NUnit.Framework; + +namespace Ringtoets.Common.Primitives.Test +{ + [TestFixture] + public class DetailedAssessmentProbabilityOnlyResultTypeTest : EnumWithDisplayNameTestFixture + { + protected override IDictionary ExpectedValueForEnumValues + { + get + { + return new Dictionary + { + { + DetailedAssessmentProbabilityOnlyResultType.Probability, 1 + }, + { + DetailedAssessmentProbabilityOnlyResultType.NotAssessed, 2 + } + }; + } + } + + protected override IDictionary ExpectedDisplayNameForEnumValues + { + get + { + return new Dictionary + { + { + DetailedAssessmentProbabilityOnlyResultType.Probability, "Faalkans" + }, + { + DetailedAssessmentProbabilityOnlyResultType.NotAssessed, "NGO" + } + }; + } + } + } +} \ No newline at end of file Fisheye: Tag 192447bfd98b506637875ed87ed50a805fc568e9 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentResultTypeTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/Ringtoets.Common.Primitives.Test.csproj =================================================================== diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/Ringtoets.Common.Primitives.Test.csproj (.../Ringtoets.Common.Primitives.Test.csproj) (revision 712c1aad8e5486980f259491130e4ae07ea48149) +++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/Ringtoets.Common.Primitives.Test.csproj (.../Ringtoets.Common.Primitives.Test.csproj) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -17,7 +17,7 @@ - + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -44,7 +44,7 @@ public GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None; - DetailedAssessmentResult = DetailedAssessmentResultType.Probability; + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability; TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None; TailorMadeAssessmentProbability = double.NaN; ManualAssemblyProbability = double.NaN; @@ -64,7 +64,7 @@ /// /// Gets or sets the detailed assessment result. /// - public DetailedAssessmentResultType DetailedAssessmentResult { get; set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get; set; } /// /// Gets or sets the tailor made assessment result. Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -r8dddc6b41ea847c80b1be688b7a97a2fbd79be79 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 8dddc6b41ea847c80b1be688b7a97a2fbd79be79) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -134,7 +134,7 @@ /// /// Thrown when /// is a valid value, but unsupported. - public DetailedAssessmentResultType DetailedAssessmentResult + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r3cb5cd49de86f4379c54d71949a76e23c42f228a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 3cb5cd49de86f4379c54d71949a76e23c42f228a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -204,7 +204,7 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - DetailedAssessmentResult = new Random(39).NextEnumValue() + DetailedAssessmentResult = new Random(39).NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -222,7 +222,7 @@ // Assert Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -43,7 +43,7 @@ Assert.IsInstanceOf(result); Assert.AreSame(section, result.Section); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, result.SimpleAssessmentResult); - Assert.AreEqual(DetailedAssessmentResultType.Probability, result.DetailedAssessmentResult); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, result.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, result.TailorMadeAssessmentResult); Assert.IsNaN(result.TailorMadeAssessmentProbability); Assert.IsFalse(result.UseManualAssemblyProbability); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r1e3089629e173570e410660194416103a7125bc1 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 1e3089629e173570e410660194416103a7125bc1) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -185,7 +185,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r6e77288277cd675878afe22f3bfd5526e37e0fa5 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 6e77288277cd675878afe22f3bfd5526e37e0fa5) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -473,9 +473,9 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -827,7 +827,7 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new GrassCoverErosionInwardsCalculation(), - DetailedAssessmentResult = DetailedAssessmentResultType.NotAssessed + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -950,7 +950,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs (.../HeightStructuresFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs (.../HeightStructuresFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -45,7 +45,7 @@ public HeightStructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { SimpleAssessmentResult = SimpleAssessmentResultType.None; - DetailedAssessmentResult = DetailedAssessmentResultType.Probability; + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability; TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None; TailorMadeAssessmentProbability = double.NaN; ManualAssemblyProbability = double.NaN; @@ -65,7 +65,7 @@ /// /// Gets or sets the detailed assessment result. /// - public DetailedAssessmentResultType DetailedAssessmentResult { get; set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get; set; } /// /// Gets or sets the tailor made assessment result. Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -r8dddc6b41ea847c80b1be688b7a97a2fbd79be79 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision 8dddc6b41ea847c80b1be688b7a97a2fbd79be79) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -132,7 +132,7 @@ /// /// Thrown when /// is a valid value, but unsupported. - public DetailedAssessmentResultType DetailedAssessmentResult + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rb8d245df1e76b29dcdffdd73b7d38583edc4e273 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision b8d245df1e76b29dcdffdd73b7d38583edc4e273) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -204,7 +204,7 @@ var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - DetailedAssessmentResult = new Random(21).NextEnumValue() + DetailedAssessmentResult = new Random(21).NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -222,7 +222,7 @@ // Assert Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); - Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -re5e23e07a418655a45382dd5cc01d537fc17dfa4 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision e5e23e07a418655a45382dd5cc01d537fc17dfa4) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs (.../HeightStructuresFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -44,7 +44,7 @@ Assert.IsInstanceOf(sectionResult); Assert.IsNull(sectionResult.Calculation); Assert.AreEqual(SimpleAssessmentResultType.None, sectionResult.SimpleAssessmentResult); - Assert.AreEqual(DetailedAssessmentResultType.Probability, sectionResult.DetailedAssessmentResult); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, sectionResult.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult); Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability); Assert.AreSame(section, sectionResult.Section); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r6a712dd526ae9c33c62d9b0c057199ad62de5f3e -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 6a712dd526ae9c33c62d9b0c057199ad62de5f3e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -186,7 +186,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r6e77288277cd675878afe22f3bfd5526e37e0fa5 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision 6e77288277cd675878afe22f3bfd5526e37e0fa5) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -473,9 +473,9 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -825,7 +825,7 @@ var sectionResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new TestHeightStructuresCalculation(), - DetailedAssessmentResult = DetailedAssessmentResultType.NotAssessed + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -969,7 +969,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new HeightStructuresFailureMechanismSectionResult(section); Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs =================================================================== diff -u -rd941c131f9c9ef14eaf09b9865b6c072e1a7c3c3 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs (.../MacroStabilityOutwardsFailureMechanismSectionResult.cs) (revision d941c131f9c9ef14eaf09b9865b6c072e1a7c3c3) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs (.../MacroStabilityOutwardsFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -46,7 +46,7 @@ public MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { SimpleAssessmentResult = SimpleAssessmentResultType.None; - DetailedAssessmentResult = DetailedAssessmentResultType.Probability; + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability; DetailedAssessmentProbability = double.NaN; TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None; TailorMadeAssessmentProbability = double.NaN; @@ -61,7 +61,7 @@ /// /// Gets or sets the detailed assessment result. /// - public DetailedAssessmentResultType DetailedAssessmentResult { get; set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get; set; } /// /// Gets or sets the tailor made assessment result. Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs =================================================================== diff -u -rebad9aba8cf976073338b40279fb12bcecdcac46 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs (.../MacroStabilityOutwardsSectionResultRow.cs) (revision ebad9aba8cf976073338b40279fb12bcecdcac46) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs (.../MacroStabilityOutwardsSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -134,7 +134,7 @@ /// /// Thrown when /// is a valid value, but unsupported. - public DetailedAssessmentResultType DetailedAssessmentResult + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get { Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r98dfbea73193ead6d8760747b8e5a688d1ad2fe2 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 98dfbea73193ead6d8760747b8e5a688d1ad2fe2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -221,7 +221,7 @@ assessmentSection); // Assert - Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(sectionResult.DetailedAssessmentProbability, calculator.DetailedAssessmentProbabilityInput); AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 712c1aad8e5486980f259491130e4ae07ea48149) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -45,7 +45,7 @@ Assert.IsInstanceOf(result); Assert.AreSame(section, result.Section); Assert.AreEqual(SimpleAssessmentResultType.None, result.SimpleAssessmentResult); - Assert.AreEqual(DetailedAssessmentResultType.Probability, result.DetailedAssessmentResult); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, result.DetailedAssessmentResult); Assert.IsNaN(result.DetailedAssessmentProbability); Assert.AreEqual(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, result.TailorMadeAssessmentResult); Assert.IsNaN(result.TailorMadeAssessmentProbability); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs =================================================================== diff -u -r275d62944f0a593f8e32f1f4adb3dd7b1f52403a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 275d62944f0a593f8e32f1f4adb3dd7b1f52403a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -482,9 +482,9 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -710,7 +710,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new MacroStabilityOutwardsFailureMechanismSectionResult(section); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs =================================================================== diff -u -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -187,7 +187,7 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -123,7 +123,7 @@ failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength)); return calculator.AssembleDetailedAssessment( - DetailedAssessmentResultType.Probability, + DetailedAssessmentProbabilityOnlyResultType.Probability, failureMechanismSectionResult.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection), categories, failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(failureMechanismSectionResult.Section.Length)); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -237,7 +237,7 @@ assessmentSection); // Assert - Assert.AreEqual(DetailedAssessmentResultType.Probability, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability( calculationScenarios, failureMechanism, Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -44,7 +44,7 @@ public PipingFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { SimpleAssessmentResult = SimpleAssessmentResultType.None; - DetailedAssessmentResult = DetailedAssessmentResultType.Probability; + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability; TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None; TailorMadeAssessmentProbability = double.NaN; ManualAssemblyProbability = double.NaN; @@ -58,7 +58,7 @@ /// /// Gets or sets the detailed assessment result. /// - public DetailedAssessmentResultType DetailedAssessmentResult { get; set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get; set; } /// /// Gets or sets the tailor made assessment result. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -rf665294814c085178591a35d0d811a1df72feb55 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision f665294814c085178591a35d0d811a1df72feb55) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -146,7 +146,7 @@ /// /// Thrown when /// is a valid value, but unsupported. - public DetailedAssessmentResultType DetailedAssessmentResult + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -rf16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision f16e1fa0ee4ca929195c9e1bb77eb2e522ffd0bd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs (.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -251,7 +251,7 @@ assessmentSection); // Assert - Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability( calculationScenarios, failureMechanism, Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -r861b8bfa0a1cdce016f3feb13e762a43e4315080 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 861b8bfa0a1cdce016f3feb13e762a43e4315080) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -43,7 +43,7 @@ Assert.IsInstanceOf(sectionResult); Assert.AreSame(section, sectionResult.Section); Assert.AreEqual(SimpleAssessmentResultType.None, sectionResult.SimpleAssessmentResult); - Assert.AreEqual(DetailedAssessmentResultType.Probability, sectionResult.DetailedAssessmentResult); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, sectionResult.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult); Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability); Assert.IsFalse(sectionResult.UseManualAssemblyProbability); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -rf665294814c085178591a35d0d811a1df72feb55 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision f665294814c085178591a35d0d811a1df72feb55) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -190,7 +190,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rf665294814c085178591a35d0d811a1df72feb55 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision f665294814c085178591a35d0d811a1df72feb55) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -563,9 +563,9 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -1011,7 +1011,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new PipingFailureMechanismSectionResult(section); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs =================================================================== diff -u -r4fd3626f7269dc868877b00a69f3a65f1d27e33a -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs (.../StabilityPointStructuresFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs (.../StabilityPointStructuresFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -45,7 +45,7 @@ public StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None; - DetailedAssessmentResult = DetailedAssessmentResultType.Probability; + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability; TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None; TailorMadeAssessmentProbability = double.NaN; ManualAssemblyProbability = double.NaN; @@ -65,7 +65,7 @@ /// /// Gets or sets the detailed assessment result. /// - public DetailedAssessmentResultType DetailedAssessmentResult { get; set; } + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get; set; } /// /// Gets or sets the tailor made assessment result. Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -rabc3cf3083d9681a4775f0c9978a1944902d874b -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision abc3cf3083d9681a4775f0c9978a1944902d874b) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -135,7 +135,7 @@ /// /// Thrown when /// is a valid value, but unsupported. - public DetailedAssessmentResultType DetailedAssessmentResult + public DetailedAssessmentProbabilityOnlyResultType DetailedAssessmentResult { get { Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -r2a001846d27cc4ead0a66ad14501deabb291c4f8 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 2a001846d27cc4ead0a66ad14501deabb291c4f8) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -204,7 +204,7 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - DetailedAssessmentResult = new Random(21).NextEnumValue() + DetailedAssessmentResult = new Random(21).NextEnumValue() }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -220,7 +220,7 @@ assessmentSection); // Assert - Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); + Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), calculator.DetailedAssessmentProbabilityInput); AssertCategoryCalculatorInput(assessmentSection, failureMechanism, categoryCalculator); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -re5e23e07a418655a45382dd5cc01d537fc17dfa4 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision e5e23e07a418655a45382dd5cc01d537fc17dfa4) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -44,7 +44,7 @@ Assert.IsInstanceOf(sectionResult); Assert.IsNull(sectionResult.Calculation); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, sectionResult.SimpleAssessmentResult); - Assert.AreEqual(DetailedAssessmentResultType.Probability, sectionResult.DetailedAssessmentResult); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, sectionResult.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult); Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability); Assert.AreSame(section, sectionResult.Section); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r4e98433abe1e020a0579d7c6ed3a24a3e57ac677 -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 4e98433abe1e020a0579d7c6ed3a24a3e57ac677) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -187,7 +187,7 @@ Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value); - Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value); Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); Assert.AreEqual("-", cells[tailorMadeAssessmentProbabilityIndex].FormattedValue); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r81073c4011710d9d0a21fee3cd6c2d0eb1d25d3c -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 81073c4011710d9d0a21fee3cd6c2d0eb1d25d3c) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -506,9 +506,9 @@ } [Test] - [TestCase(DetailedAssessmentResultType.NotAssessed, false)] - [TestCase(DetailedAssessmentResultType.Probability, true)] - public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult, + [TestCase(DetailedAssessmentProbabilityOnlyResultType.NotAssessed, false)] + [TestCase(DetailedAssessmentProbabilityOnlyResultType.Probability, true)] + public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, bool cellEnabled) { // Setup @@ -860,7 +860,7 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new TestStabilityPointStructuresCalculation(), - DetailedAssessmentResult = DetailedAssessmentResultType.NotAssessed + DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -981,7 +981,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs =================================================================== diff -u -r19311fc87ea75a0407d8cdc617cc90b8c160429c -r192447bfd98b506637875ed87ed50a805fc568e9 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision 19311fc87ea75a0407d8cdc617cc90b8c160429c) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9) @@ -55,7 +55,7 @@ /// the result is a value of . /// public AssessmentLayerTwoAResult AssessmentLayerTwoA { get; set; } - + /// /// Gets or sets the value of the tailored assessment of safety. ///