Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r8a817e4f882227425511d9e51a6a734542971a29 -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 8a817e4f882227425511d9e51a6a734542971a29) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) @@ -334,7 +334,7 @@ Assert.AreEqual(assessmentSectionLength, kernel.AssessmentSectionLength); Assert.IsTrue(kernel.CalculatedCommonSections); - Assert.AreSame(kernel.FailureMechanismSectionLists.First(), kernel.FailureMechanismSectionList); + Assert.AreSame(kernel.FailureMechanismSectionLists.Single(), kernel.FailureMechanismSectionList); Assert.AreSame(kernel.CommonSections, kernel.CommonSectionsInput); Assert.IsTrue(kernel.CalculatedCommonSectionResults); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs (.../FailureMechanismAssemblyCalculatorTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs (.../FailureMechanismAssemblyCalculatorTest.cs) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) @@ -154,7 +154,6 @@ Assert.AreEqual(failureMechanismN, kernel.LenghtEffectFactor); Assert.IsFalse(kernel.PartialAssembly); - Assert.AreEqual(sectionAssemblyResults.Length, kernel.FailureMechanismSectionProbabilities.Count()); CollectionAssert.AreEqual(sectionAssemblyResults.Select(r => new Probability(r.SectionProbability)), kernel.FailureMechanismSectionProbabilities); } } @@ -177,13 +176,13 @@ var calculator = new FailureMechanismAssemblyCalculator(factory); // Call - FailureMechanismAssemblyResultWrapper assemblyResult = calculator.Assemble(random.NextDouble(), Enumerable.Empty(), - applyLengthEffect); + FailureMechanismAssemblyResultWrapper assemblyResultWrapper = calculator.Assemble(random.NextDouble(), Enumerable.Empty(), + applyLengthEffect); // Assert Assert.IsTrue(kernel.Calculated); - ProbabilityAssert.AreEqual(assemblyResult.AssemblyResult, output.Probability); - Assert.AreEqual(assemblyResult.AssemblyMethod, expectedAssemblyMethod); + ProbabilityAssert.AreEqual(assemblyResultWrapper.AssemblyResult, output.Probability); + Assert.AreEqual(assemblyResultWrapper.AssemblyMethod, expectedAssemblyMethod); } } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs =================================================================== diff -u -rf8ed810aa64e69da377648a3fd46527877d46205 -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismAssemblyCalculatorInputCreatorTest.cs) (revision f8ed810aa64e69da377648a3fd46527877d46205) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismAssemblyCalculatorInputCreatorTest.cs) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) @@ -50,7 +50,7 @@ // Setup var random = new Random(21); var result = new FailureMechanismSectionAssemblyResult( - random.NextDouble(), random.NextDouble(), random.NextDouble(), + random.NextDouble(0.001, 0.01), random.NextDouble(0.01, 0.1), random.NextDouble(), random.NextEnumValue()); // Call Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs =================================================================== diff -u -rac057bfc203ff382b76cc8f1fc370f8359321848 -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs (.../CombinedFailureMechanismSectionAssemblyKernelStub.cs) (revision ac057bfc203ff382b76cc8f1fc370f8359321848) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs (.../CombinedFailureMechanismSectionAssemblyKernelStub.cs) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) @@ -79,9 +79,9 @@ public bool PartialAssembly { get; private set; } /// - /// Gets or sets the common sections. + /// Gets the common sections. /// - public FailureMechanismSectionList CommonSections { get; set; } + public FailureMechanismSectionList CommonSections { get; private set; } /// /// Gets the common sections used as an input parameter for assembly methods. Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Groups/AssemblyCategoryLimitsKernelStub.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Groups/AssemblyCategoryLimitsKernelStub.cs (.../AssemblyCategoryLimitsKernelStub.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Groups/AssemblyCategoryLimitsKernelStub.cs (.../AssemblyCategoryLimitsKernelStub.cs) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Reflection; using Assembly.Kernel.Exceptions; using Assembly.Kernel.Interfaces; using Assembly.Kernel.Model.AssessmentSection; @@ -85,21 +84,7 @@ private void ThrowException() { - if (ThrowExceptionOnCalculate) - { - throw new Exception("Message", new Exception()); - } - - if (ThrowAssemblyExceptionOnCalculate) - { - const BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Instance; - throw (AssemblyException) Activator.CreateInstance( - typeof(AssemblyException), flags, null, new object[] - { - "entity", - EAssemblyErrors.EmptyResultsList - }, null); - } + AssemblyKernelStubHelper.ThrowException(ThrowExceptionOnCalculate, ThrowAssemblyExceptionOnCalculate, EAssemblyErrors.EmptyResultsList); } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj =================================================================== diff -u -rf6e396e39c2b6794b814e3fe3dfccddf12c00847 -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 --- Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj (.../Riskeer.Common.Data.Test.csproj) (revision f6e396e39c2b6794b814e3fe3dfccddf12c00847) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj (.../Riskeer.Common.Data.Test.csproj) (revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6) @@ -12,7 +12,6 @@ -