Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismTestHelper.cs =================================================================== diff -u -r167fd66fa9378da0a15ff7c6d2646fbe7ddabe06 -r82aab1c68efae9260d4ec3e5121d3b5d9cb0d805 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismTestHelper.cs (.../ExportableFailureMechanismTestHelper.cs) (revision 167fd66fa9378da0a15ff7c6d2646fbe7ddabe06) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismTestHelper.cs (.../ExportableFailureMechanismTestHelper.cs) (revision 82aab1c68efae9260d4ec3e5121d3b5d9cb0d805) @@ -36,29 +36,31 @@ /// /// Asserts a default failure mechanism that contains assembly results with a probability. /// - /// The expected geometry of the section it contains. - /// The expected . - /// The expected . - /// The expected which is used + /// The expected geometry of the section it contains. + /// The expected . + /// The expected . + /// The expected which is used /// to generate a failure mechanism assembly result. /// The to assert. /// Thrown when: /// - /// The geometry defined by does not match with the section contained in . + /// The geometry defined by does not match with the section contained in + /// . /// The values in do not match with - /// , or . + /// , + /// or . /// - public static void AssertDefaultFailureMechanismWithProbability(IEnumerable geometry, - ExportableFailureMechanismType failureMechanismCode, - ExportableFailureMechanismGroup group, - ExportableAssemblyMethod failureMechanismAssemblyMethod, + public static void AssertDefaultFailureMechanismWithProbability(IEnumerable expectedGeometry, + ExportableFailureMechanismType expectedFailureMechanismCode, + ExportableFailureMechanismGroup expectedGroup, + ExportableAssemblyMethod expectedFailureMechanismAssemblyMethod, ExportableFailureMechanism exportableFailureMechanism) { - Assert.AreEqual(group, exportableFailureMechanism.Group); - Assert.AreEqual(failureMechanismCode, exportableFailureMechanism.Code); + Assert.AreEqual(expectedGroup, exportableFailureMechanism.Group); + Assert.AreEqual(expectedFailureMechanismCode, exportableFailureMechanism.Code); ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyResult = exportableFailureMechanism.FailureMechanismAssembly; - Assert.AreEqual(failureMechanismAssemblyMethod, failureMechanismAssemblyResult.AssemblyMethod); + Assert.AreEqual(expectedFailureMechanismAssemblyMethod, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); @@ -70,37 +72,39 @@ Assert.AreEqual(0, combinedAssembly.Probability); ExportableFailureMechanismSection failureMechanismSection = exportableFailureMechanismSectionAssembly.FailureMechanismSection; - Assert.AreSame(geometry, failureMechanismSection.Geometry); + Assert.AreSame(expectedGeometry, failureMechanismSection.Geometry); Assert.AreEqual(0, failureMechanismSection.StartDistance); - Assert.AreEqual(Math2D.Length(geometry), failureMechanismSection.EndDistance); + Assert.AreEqual(Math2D.Length(expectedGeometry), failureMechanismSection.EndDistance); } /// /// Asserts a default failure mechanism that contains assembly results without a probability. /// - /// The expected geometry of the section it contains. - /// The expected . - /// The expected . - /// The expected which is used + /// The expected geometry of the section it contains. + /// The expected . + /// The expected . + /// The expected which is used /// to generate a failure mechanism assembly result. /// The to assert. /// Thrown when: /// - /// The geometry defined by does not match with the section contained in . + /// The geometry defined by does not match with the section contained in + /// . /// The values in do not match with - /// , or . + /// , + /// or . /// - public static void AssertDefaultFailureMechanismWithoutProbability(IEnumerable geometry, - ExportableFailureMechanismType failureMechanismCode, - ExportableFailureMechanismGroup group, - ExportableAssemblyMethod failureMechanismAssemblyMethod, + public static void AssertDefaultFailureMechanismWithoutProbability(IEnumerable expectedGeometry, + ExportableFailureMechanismType expectedFailureMechanismCode, + ExportableFailureMechanismGroup expectedGroup, + ExportableAssemblyMethod expectedFailureMechanismAssemblyMethod, ExportableFailureMechanism exportableFailureMechanism) { - Assert.AreEqual(group, exportableFailureMechanism.Group); - Assert.AreEqual(failureMechanismCode, exportableFailureMechanism.Code); + Assert.AreEqual(expectedGroup, exportableFailureMechanism.Group); + Assert.AreEqual(expectedFailureMechanismCode, exportableFailureMechanism.Code); ExportableFailureMechanismAssemblyResult failureMechanismAssemblyResult = exportableFailureMechanism.FailureMechanismAssembly; - Assert.AreEqual(failureMechanismAssemblyMethod, failureMechanismAssemblyResult.AssemblyMethod); + Assert.AreEqual(expectedFailureMechanismAssemblyMethod, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); var exportableFailureMechanismSectionAssembly = @@ -110,9 +114,9 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, combinedAssembly.AssemblyCategory); ExportableFailureMechanismSection failureMechanismSection = exportableFailureMechanismSectionAssembly.FailureMechanismSection; - Assert.AreSame(geometry, failureMechanismSection.Geometry); + Assert.AreSame(expectedGeometry, failureMechanismSection.Geometry); Assert.AreEqual(0, failureMechanismSection.StartDistance); - Assert.AreEqual(Math2D.Length(geometry), failureMechanismSection.EndDistance); + Assert.AreEqual(Math2D.Length(expectedGeometry), failureMechanismSection.EndDistance); } } } \ No newline at end of file