Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs =================================================================== diff -u -rd8ba4886ef6d89e57d34a612fa21cd61d656f550 -r2b1d86d311c8de3975d9f3463c71f9d6101b15f5 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision d8ba4886ef6d89e57d34a612fa21cd61d656f550) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 2b1d86d311c8de3975d9f3463c71f9d6101b15f5) @@ -341,7 +341,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; AssessmentSectionAssemblyKernelStub kernel = factory.LastCreatedAssessmentSectionAssemblyKernel; - kernel.AssessmentGradeResult = (EAssessmentGrade) 99; + kernel.FailureMechanismCategoryResult = (EFailureMechanismCategory) 99; var calculator = new AssessmentSectionAssemblyCalculator(factory); @@ -450,7 +450,9 @@ calculator.AssembleAssessmentSection(failureMechanismsWithoutProbability, failureMechanismsWithProbability); // Assert - Assert.AreEqual(failureMechanismsWithoutProbability, kernel.AssemblyResultNoFailureProbability); + FailureMechanismAssemblyResult expectedKernelInputFailureWithoutProbability = + AssessmentSectionAssemblyInputCreator.CreateFailureMechanismAssemblyResult(failureMechanismsWithoutProbability); + Assert.AreEqual(expectedKernelInputFailureWithoutProbability.Category, kernel.AssemblyResultNoFailureProbability); FailureMechanismAssemblyResult actualKernelInputFailureProbability = kernel.AssemblyResultWithFailureProbability; FailureMechanismAssemblyResult expectedKernelInputFailureProbability = @@ -484,7 +486,7 @@ failureMechanismsWithProbability); // Assert - AssessmentSectionAssemblyCategoryGroup expectedAssembly = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(kernel.AssessmentGradeResult); + AssessmentSectionAssemblyCategoryGroup expectedAssembly = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategory(kernel.AssessmentSectionAssemblyResult); Assert.AreEqual(expectedAssembly, assembly); } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs =================================================================== diff -u -r354a7f9f917922dc63ff1f54ffbcc10c88dde45b -r2b1d86d311c8de3975d9f3463c71f9d6101b15f5 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs (.../AssemblyCategoriesCalculatorTest.cs) (revision 354a7f9f917922dc63ff1f54ffbcc10c88dde45b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs (.../AssemblyCategoriesCalculatorTest.cs) (revision 2b1d86d311c8de3975d9f3463c71f9d6101b15f5) @@ -371,7 +371,7 @@ // Setup var random = new Random(21); double normativeNorm = random.NextDouble(); - double failureMechanismN = random.NextDouble(); + double failureMechanismN = random.NextDouble(1, 10); double failureMechanismContribution = random.NextDouble(); using (new AssemblyToolKernelFactoryConfig()) @@ -412,7 +412,7 @@ // Call IEnumerable result = calculator.CalculateGeotechnicalFailureMechanismSectionCategories( random.NextDouble(), - random.NextDouble(), + random.NextDouble(1, 10), random.NextDouble()); // Assert @@ -436,7 +436,7 @@ // Call TestDelegate test = () => calculator.CalculateGeotechnicalFailureMechanismSectionCategories( random.NextDouble(), - random.NextDouble(), + random.NextDouble(1, 10), random.NextDouble()); // Assert @@ -462,7 +462,7 @@ // Call TestDelegate test = () => calculator.CalculateGeotechnicalFailureMechanismSectionCategories( random.NextDouble(), - random.NextDouble(), + random.NextDouble(1, 10), random.NextDouble()); // Assert Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs =================================================================== diff -u -rafbae9605a05f13cb3a54775755c885401aa14c3 -r2b1d86d311c8de3975d9f3463c71f9d6101b15f5 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs (.../AssessmentSectionAssemblyKernelStub.cs) (revision afbae9605a05f13cb3a54775755c885401aa14c3) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs (.../AssessmentSectionAssemblyKernelStub.cs) (revision 2b1d86d311c8de3975d9f3463c71f9d6101b15f5) @@ -39,11 +39,6 @@ public bool? PartialAssembly { get; private set; } /// - /// Gets or sets the assessment section assembly result. - /// - public EAssessmentGrade AssessmentGradeResult { get; set; } - - /// /// Gets or sets the failure mechanism category result /// public EFailureMechanismCategory FailureMechanismCategoryResult { get; set; }