Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs =================================================================== diff -u -r7c20988fe416b2cbc8931f92ca0ce6d93774a8e4 -re12bddac63f27d4d1d8cfa165961bc2d2dc9a37e --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 7c20988fe416b2cbc8931f92ca0ce6d93774a8e4) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision e12bddac63f27d4d1d8cfa165961bc2d2dc9a37e) @@ -69,14 +69,19 @@ Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); Assert.IsNull(calculator.CombinedAssemblyOutput); + Assert.AreEqual((FailureMechanismSectionAssemblyCategoryGroup) 0, calculator.CombinedSimpleAssemblyGroupInput); + Assert.AreEqual((FailureMechanismSectionAssemblyCategoryGroup) 0, calculator.CombinedDetailedAssemblyGroupInput); + Assert.AreEqual((FailureMechanismSectionAssemblyCategoryGroup) 0, calculator.CombinedTailorMadeAssemblyGroupInput); + Assert.IsNull(calculator.CombinedAssemblyCategoryOutput); + Assert.AreEqual(0.0, calculator.ManualAssemblyNInput); Assert.AreEqual(0.0, calculator.ManualAssemblyProbabilityInput); Assert.IsNull(calculator.ManualAssemblyAssemblyOutput); Assert.IsNull(calculator.AssemblyCategoriesInput); } - private AssemblyCategoriesInput CreateAssemblyCategoriesInput() + private static AssemblyCategoriesInput CreateAssemblyCategoriesInput() { var random = new Random(39); return new AssemblyCategoriesInput(random.NextDouble(), @@ -995,8 +1000,6 @@ // Assert Assert.AreSame(simpleAssembly, calculator.CombinedSimpleAssemblyInput); - Assert.IsNull(calculator.CombinedDetailedAssemblyInput); - Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput); } [Test] @@ -1217,8 +1220,6 @@ // Assert Assert.AreEqual(simpleAssembly, calculator.CombinedSimpleAssemblyGroupInput); - Assert.AreEqual((FailureMechanismSectionAssemblyCategoryGroup) 0, calculator.CombinedDetailedAssemblyGroupInput); - Assert.AreEqual((FailureMechanismSectionAssemblyCategoryGroup) 0, calculator.CombinedTailorMadeAssemblyGroupInput); } [Test]