Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -rd100891e1e3198966bf906399f570a1e1c0849fb -r26526273b41c27da77879f295a5ade4d4a9a84bb --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs (.../AssessmentSectionAssemblyCalculatorStubTest.cs) (revision d100891e1e3198966bf906399f570a1e1c0849fb) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs (.../AssessmentSectionAssemblyCalculatorStubTest.cs) (revision 26526273b41c27da77879f295a5ade4d4a9a84bb) @@ -46,7 +46,7 @@ Assert.IsNull(calculator.FailureMechanismsWithProbabilityInput); Assert.AreEqual(0.0, calculator.LowerLimitNormInput); Assert.AreEqual(0.0, calculator.SignalingNormInput); - Assert.AreEqual((AssessmentSectionAssemblyCategoryGroup) 0, + Assert.AreEqual((FailureMechanismAssemblyCategoryGroup) 0, calculator.FailureMechanismsWithoutProbabilityInput); } @@ -63,7 +63,7 @@ // Assert Assert.AreEqual(0.75, output.Probability); - Assert.AreEqual(AssessmentSectionAssemblyCategoryGroup.D, output.Group); + Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.IIIt, output.Group); } [Test] @@ -137,7 +137,7 @@ FailureMechanismAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty()); // Assert - Assert.AreEqual(AssessmentSectionAssemblyCategoryGroup.D, output); + Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.IIIt, output); } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs =================================================================== diff -u -r4c78adc6aba8a1a80c45f01515d97c84224ba56d -r26526273b41c27da77879f295a5ade4d4a9a84bb --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs (.../CategoriesListTestFactoryTest.cs) (revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs (.../CategoriesListTestFactoryTest.cs) (revision 26526273b41c27da77879f295a5ade4d4a9a84bb) @@ -16,19 +16,19 @@ Assert.IsNotNull(categories); FmSectionCategory[] sectionCategories = categories.Categories; - Assert.AreEqual(4, sectionCategories); + Assert.AreEqual(4, sectionCategories.Length); Assert.AreEqual(0, sectionCategories[0].LowerLimit); Assert.AreEqual(0.25, sectionCategories[0].UpperLimit); - Assert.AreEqual(0.25, sectionCategories[0].LowerLimit); - Assert.AreEqual(0.5, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.25, sectionCategories[1].LowerLimit); + Assert.AreEqual(0.5, sectionCategories[1].UpperLimit); - Assert.AreEqual(0.5, sectionCategories[0].LowerLimit); - Assert.AreEqual(0.75, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.5, sectionCategories[2].LowerLimit); + Assert.AreEqual(0.75, sectionCategories[2].UpperLimit); - Assert.AreEqual(0.75, sectionCategories[0].LowerLimit); - Assert.AreEqual(1, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.75, sectionCategories[3].LowerLimit); + Assert.AreEqual(1, sectionCategories[3].UpperLimit); } [Test] @@ -41,19 +41,19 @@ Assert.IsNotNull(categories); FailureMechanismCategory[] sectionCategories = categories.Categories; - Assert.AreEqual(4, sectionCategories); + Assert.AreEqual(4, sectionCategories.Length); Assert.AreEqual(0, sectionCategories[0].LowerLimit); Assert.AreEqual(0.25, sectionCategories[0].UpperLimit); - Assert.AreEqual(0.25, sectionCategories[0].LowerLimit); - Assert.AreEqual(0.5, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.25, sectionCategories[1].LowerLimit); + Assert.AreEqual(0.5, sectionCategories[1].UpperLimit); - Assert.AreEqual(0.5, sectionCategories[0].LowerLimit); - Assert.AreEqual(0.75, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.5, sectionCategories[2].LowerLimit); + Assert.AreEqual(0.75, sectionCategories[2].UpperLimit); - Assert.AreEqual(0.75, sectionCategories[0].LowerLimit); - Assert.AreEqual(1, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.75, sectionCategories[3].LowerLimit); + Assert.AreEqual(1, sectionCategories[3].UpperLimit); } [Test] @@ -66,19 +66,19 @@ Assert.IsNotNull(categories); AssessmentSectionCategory[] sectionCategories = categories.Categories; - Assert.AreEqual(4, sectionCategories); + Assert.AreEqual(4, sectionCategories.Length); Assert.AreEqual(0, sectionCategories[0].LowerLimit); Assert.AreEqual(0.25, sectionCategories[0].UpperLimit); - Assert.AreEqual(0.25, sectionCategories[0].LowerLimit); - Assert.AreEqual(0.5, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.25, sectionCategories[1].LowerLimit); + Assert.AreEqual(0.5, sectionCategories[1].UpperLimit); - Assert.AreEqual(0.5, sectionCategories[0].LowerLimit); - Assert.AreEqual(0.75, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.5, sectionCategories[2].LowerLimit); + Assert.AreEqual(0.75, sectionCategories[2].UpperLimit); - Assert.AreEqual(0.75, sectionCategories[0].LowerLimit); - Assert.AreEqual(1, sectionCategories[0].UpperLimit); + Assert.AreEqual(0.75, sectionCategories[3].LowerLimit); + Assert.AreEqual(1, sectionCategories[3].UpperLimit); } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -r7648be0e861a95a6480b0f7b5593ad65ca4bea14 -r26526273b41c27da77879f295a5ade4d4a9a84bb --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs (.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs) (revision 7648be0e861a95a6480b0f7b5593ad65ca4bea14) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs (.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs) (revision 26526273b41c27da77879f295a5ade4d4a9a84bb) @@ -150,9 +150,8 @@ var kernel = new CombinedFailureMechanismSectionAssemblyKernelStub(); // Call - TestDelegate test = () => kernel.AssembleCommonFailureMechanismSections(Enumerable.Empty(), - random.NextDouble(), - random.NextBoolean()); + TestDelegate test = () => kernel.FindGreatestCommonDenominatorSectionsWbi3A1(Enumerable.Empty(), + random.NextDouble()); // Assert Assert.Throws(test); @@ -162,7 +161,6 @@ public void TranslateFailureMechanismResultsToCommonSectionsWbi3B1_Always_ThrowsNotImplementedException() { // Setup - var random = new Random(21); var kernel = new CombinedFailureMechanismSectionAssemblyKernelStub(); // Call @@ -190,7 +188,10 @@ private static FailureMechanismSectionList CreateFailureMechanismSectionList() { - return new FailureMechanismSectionList(string.Empty, Enumerable.Empty()); + return new FailureMechanismSectionList(string.Empty, new[] + { + new FailureMechanismSection(0, 1) + }); } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs =================================================================== diff -u -r31eb94566191863035510d891c7dc5f655e36772 -r26526273b41c27da77879f295a5ade4d4a9a84bb --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs (.../FailureMechanismAssemblyKernelStubTest.cs) (revision 31eb94566191863035510d891c7dc5f655e36772) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs (.../FailureMechanismAssemblyKernelStubTest.cs) (revision 26526273b41c27da77879f295a5ade4d4a9a84bb) @@ -51,7 +51,7 @@ Assert.IsNull(kernel.FailureMechanismAssemblyResult); Assert.IsNull(kernel.FmSectionAssemblyResultsWithProbabilityInput); Assert.IsNull(kernel.FmSectionAssemblyResultsInput); - Assert.AreEqual(EFailureMechanismCategory.It, kernel.FailureMechanismCategoryResult); + Assert.AreEqual((EFailureMechanismCategory) 0, kernel.FailureMechanismCategoryResult); } [Test] @@ -71,7 +71,7 @@ // Assert Assert.AreSame(sectionAssemblyResults, kernel.FmSectionAssemblyResultsInput); - Assert.AreSame(partialAssembly, kernel.PartialAssembly); + Assert.AreEqual(partialAssembly, kernel.PartialAssembly); Assert.IsTrue(kernel.Calculated); } @@ -111,7 +111,7 @@ Assert.IsNull(kernel.FmSectionAssemblyResultsInput); Assert.IsNull(kernel.PartialAssembly); Assert.IsFalse(kernel.Calculated); - Assert.AreEqual(EFailureMechanismCategory.It, kernel.FailureMechanismCategoryResult); + Assert.AreEqual((EFailureMechanismCategory) 0, kernel.FailureMechanismCategoryResult); } [Test] @@ -134,7 +134,7 @@ Assert.IsNull(kernel.FmSectionAssemblyResultsInput); Assert.IsNull(kernel.PartialAssembly); Assert.IsFalse(kernel.Calculated); - Assert.AreEqual(EFailureMechanismCategory.It, kernel.FailureMechanismCategoryResult); + Assert.AreEqual((EFailureMechanismCategory) 0, kernel.FailureMechanismCategoryResult); } [Test] @@ -220,7 +220,7 @@ Assert.IsNull(kernel.FmSectionAssemblyResultsInput); Assert.IsNull(kernel.PartialAssembly); Assert.IsFalse(kernel.Calculated); - Assert.AreEqual(EFailureMechanismCategory.It, kernel.FailureMechanismCategoryResult); + Assert.AreEqual((EFailureMechanismCategory) 0, kernel.FailureMechanismCategoryResult); } [Test] @@ -249,19 +249,13 @@ Assert.IsNull(kernel.FmSectionAssemblyResultsInput); Assert.IsNull(kernel.PartialAssembly); Assert.IsFalse(kernel.Calculated); - Assert.AreEqual(EFailureMechanismCategory.It, kernel.FailureMechanismCategoryResult); + Assert.AreEqual((EFailureMechanismCategory) 0, kernel.FailureMechanismCategoryResult); } private static FailureMechanism CreateRandomFailureMechanism(Random random) { var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble()); return failureMechanism; } - - private static AssessmentSection CreateRandomAssessmentSection(Random random) - { - var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0)); - return assessmentSection; - } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -r782024fce80b8d92ae6fad70a1d27620540f1f3e -r26526273b41c27da77879f295a5ade4d4a9a84bb --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 782024fce80b8d92ae6fad70a1d27620540f1f3e) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 26526273b41c27da77879f295a5ade4d4a9a84bb) @@ -106,14 +106,15 @@ var random = new Random(39); var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()) + FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()) }; // Call FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0E1(0); // Assert - Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); + Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); } [Test] @@ -199,14 +200,15 @@ var random = new Random(39); var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()) + FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()) }; // Call FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0E3(0); // Assert - Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); + Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); } [Test] @@ -415,7 +417,7 @@ categories); // Assert - Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); + Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); } [Test] @@ -1280,7 +1282,7 @@ simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); // Assert - Assert.AreSame(kernel.FailureMechanismSectionDirectResult, result); + Assert.AreSame(kernel.FailureMechanismAssessmentResult, result); } [Test] @@ -1310,23 +1312,6 @@ Assert.IsNull(kernel.FailureMechanismAssessmentResult); } - [Test] - public void TranslateAssessmentResultWbi0A1_WithIndirectResult_ThrowNotImplementedException() - { - // Setup - var random = new Random(11); - var kernel = new FailureMechanismSectionAssemblyKernelStub(); - - // Call - TestDelegate test = () => kernel.TranslateAssessmentResultWbi0A1( - new FmSectionAssemblyIndirectResult(random.NextEnumValue()), - new FmSectionAssemblyIndirectResult(random.NextEnumValue()), - new FmSectionAssemblyIndirectResult(random.NextEnumValue())); - - // Assert - Assert.Throws(test); - } - #endregion } } \ No newline at end of file