Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs =================================================================== diff -u -r9a64bbb28b8179b5894b4bbaf418330a974bf36b -rd770e9f1f1bb2a8422acd775f573429a0d2b5814 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs (.../AssemblyCategoriesCalculatorStubTest.cs) (revision 9a64bbb28b8179b5894b4bbaf418330a974bf36b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs (.../AssemblyCategoriesCalculatorStubTest.cs) (revision d770e9f1f1bb2a8422acd775f573429a0d2b5814) @@ -140,7 +140,7 @@ var calculator = new AssemblyCategoriesCalculatorStub(); // Call - FailureMechanismSectionAssemblyCategory[] result = calculator.CalculateFailureMechanismSectionCategories(new AssemblyCategoriesInput(0, 0, 0, 0)).ToArray(); + FailureMechanismSectionAssemblyCategory[] result = calculator.CalculateFailureMechanismSectionCategories(CreateAssemblyCategoriesInput()).ToArray(); // Assert Assert.AreEqual(3, result.Length); @@ -181,11 +181,7 @@ assemblyCategoriesInput); // Assert - AssemblyCategoriesInput actualAssemblyCategoriesInput = calculator.AssemblyCategoriesInput; - Assert.AreEqual(assemblyCategoriesInput.SignalingNorm, actualAssemblyCategoriesInput.SignalingNorm); - Assert.AreEqual(assemblyCategoriesInput.LowerLimitNorm, actualAssemblyCategoriesInput.LowerLimitNorm); - Assert.AreEqual(assemblyCategoriesInput.FailureMechanismContribution, actualAssemblyCategoriesInput.FailureMechanismContribution); - Assert.AreEqual(assemblyCategoriesInput.N, actualAssemblyCategoriesInput.N); + Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput); } [Test] @@ -198,7 +194,7 @@ }; // Call - TestDelegate test = () => calculator.CalculateFailureMechanismSectionCategories(new AssemblyCategoriesInput(0, 0, 0, 0)); + TestDelegate test = () => calculator.CalculateFailureMechanismSectionCategories(CreateAssemblyCategoriesInput()); // Assert var exception = Assert.Throws(test); @@ -214,7 +210,7 @@ // Call FailureMechanismSectionAssemblyCategory[] result = calculator.CalculateGeotechnicFailureMechanismSectionCategories( - new AssemblyCategoriesInput(0, 0, 0, 0)).ToArray(); + CreateAssemblyCategoriesInput()).ToArray(); // Assert Assert.AreEqual(3, result.Length); @@ -255,11 +251,7 @@ assemblyCategoriesInput); // Assert - AssemblyCategoriesInput actualAssemblyCategoriesInput = calculator.AssemblyCategoriesInput; - Assert.AreEqual(assemblyCategoriesInput.SignalingNorm, actualAssemblyCategoriesInput.SignalingNorm); - Assert.AreEqual(assemblyCategoriesInput.LowerLimitNorm, actualAssemblyCategoriesInput.LowerLimitNorm); - Assert.AreEqual(assemblyCategoriesInput.FailureMechanismContribution, actualAssemblyCategoriesInput.FailureMechanismContribution); - Assert.AreEqual(assemblyCategoriesInput.N, actualAssemblyCategoriesInput.N); + Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput); } [Test] @@ -272,12 +264,17 @@ }; // Call - TestDelegate test = () => calculator.CalculateGeotechnicFailureMechanismSectionCategories(new AssemblyCategoriesInput(0, 0, 0, 0)); + TestDelegate test = () => calculator.CalculateGeotechnicFailureMechanismSectionCategories(CreateAssemblyCategoriesInput()); // Assert var exception = Assert.Throws(test); Assert.AreEqual("Message", exception.Message); Assert.IsNotNull(exception.InnerException); } + + private static AssemblyCategoriesInput CreateAssemblyCategoriesInput() + { + return new AssemblyCategoriesInput(0, 0, 0, 0); + } } } \ No newline at end of file