Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r123d7de4c3aaefcc3ec328b8a9e0a0a0e6a20e66 -ra0377781039057fbf2d60672e74627f546c2baa8 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 123d7de4c3aaefcc3ec328b8a9e0a0a0e6a20e66) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision a0377781039057fbf2d60672e74627f546c2baa8) @@ -25,6 +25,7 @@ using Assembly.Kernel.Model; using Assembly.Kernel.Model.AssessmentSection; using Assembly.Kernel.Model.Categories; +using Assembly.Kernel.Model.FailureMechanismSections; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; @@ -147,7 +148,7 @@ FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResult = new KernelFailureMechanismSectionAssemblyResult( - new Probability(random.NextDouble(0.0, 0.01)), new Probability(random.NextDouble(0.01, 0.02)), EInterpretationCategory.Zero); + new Probability(random.NextDouble(0.0, 0.01)), EInterpretationCategory.Zero); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -182,7 +183,6 @@ FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; var kernelResult = new KernelFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()), - new Probability(random.NextDouble()), random.NextEnumValue()); failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResult = kernelResult; @@ -195,8 +195,9 @@ Assert.IsTrue(categoryLimitsKernel.Calculated); Assert.IsTrue(failureMechanismSectionAssemblyKernel.Calculated); - Assert.AreEqual(kernelResult.ProbabilityProfile, result.ProfileProbability); + Assert.AreEqual(kernelResult.ProbabilitySection, result.ProfileProbability); Assert.AreEqual(kernelResult.ProbabilitySection, result.SectionProbability); + Assert.AreEqual(1.0, result.N); Assert.AreEqual(FailureMechanismSectionAssemblyGroupConverter.ConvertTo(kernelResult.InterpretationCategory), result.FailureMechanismSectionAssemblyGroup); } @@ -333,7 +334,7 @@ categoryLimitsKernel.InterpretationCategoryLimits = interpretationCategories; FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResult = new KernelFailureMechanismSectionAssemblyResult( + failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResultWithLengthEffect = new FailureMechanismSectionAssemblyResultWithLengthEffect( new Probability(random.NextDouble(0.0, 0.01)), new Probability(random.NextDouble(0.01, 0.02)), EInterpretationCategory.Zero); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -370,10 +371,10 @@ categoryLimitsKernel.InterpretationCategoryLimits = CreateInterpretationCategories(); FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - var kernelResult = new KernelFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()), - new Probability(random.NextDouble()), - random.NextEnumValue()); - failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResult = kernelResult; + var kernelResult = new FailureMechanismSectionAssemblyResultWithLengthEffect(new Probability(random.NextDouble()), + new Probability(random.NextDouble()), + random.NextEnumValue()); + failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResultWithLengthEffect = kernelResult; var calculator = new FailureMechanismSectionAssemblyCalculator(factory);