Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAssessmentSectionTest.cs =================================================================== diff -u -ra5a1867560f3705d7037a951c9c1a7f9e817a0a6 -r3293cb26e7540dc2e61becd7eda453e234d30664 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAssessmentSectionTest.cs (.../ExportableAssessmentSectionTest.cs) (revision a5a1867560f3705d7037a951c9c1a7f9e817a0a6) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAssessmentSectionTest.cs (.../ExportableAssessmentSectionTest.cs) (revision 3293cb26e7540dc2e61becd7eda453e234d30664) @@ -48,8 +48,8 @@ TestDelegate call = () => new ExportableAssessmentSection(null, geometry, CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -72,8 +72,8 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, null, CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -97,8 +97,8 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, null, - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -122,7 +122,7 @@ geometry, CreateAssessmentSectionAssembly(), null, - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -146,7 +146,7 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), null, failureMechanismsWithProbability, failureMechanismsWithoutProbability, @@ -169,8 +169,8 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), null, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -191,8 +191,8 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, null, CreateCombinedSectionAssemblyCollection()); @@ -216,8 +216,8 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, null); @@ -235,8 +235,8 @@ // Setup IEnumerable geometry = Enumerable.Empty(); ExportableAssessmentSectionAssemblyResult assessmentSectionAssembly = CreateAssessmentSectionAssembly(); - ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyResultWithProbability = ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(); - ExportableFailureMechanismAssemblyResult failureMechanismAssemblyResultWithoutProbability = ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(); + ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyResultWithProbability = ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(); + ExportableFailureMechanismAssemblyResult failureMechanismAssemblyResultWithoutProbability = ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(); IEnumerable> failureMechanismsWithProbability = Enumerable.Empty>(); IEnumerable> failureMechanismsWithoutProbability = Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs =================================================================== diff -u -ra5a1867560f3705d7037a951c9c1a7f9e817a0a6 -r3293cb26e7540dc2e61becd7eda453e234d30664 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision a5a1867560f3705d7037a951c9c1a7f9e817a0a6) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 3293cb26e7540dc2e61becd7eda453e234d30664) @@ -63,7 +63,7 @@ // Call TestDelegate call = () => new ExportableFailureMechanism( - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), null, sectionAssemblyResults, code, group); // Assert @@ -82,7 +82,7 @@ // Call TestDelegate call = () => new ExportableFailureMechanism( - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), sections, null, code, group); // Assert @@ -96,7 +96,7 @@ // Setup var random = new Random(21); ExportableFailureMechanismAssemblyResult failureMechanismAssembly = - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(); + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(); IEnumerable sections = Enumerable.Empty(); IEnumerable sectionAssemblyResults = Enumerable.Empty(); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil.Test/ExportableFailureMechanismAssemblyResultTestFactoryTest.cs =================================================================== diff -u -ra5a1867560f3705d7037a951c9c1a7f9e817a0a6 -r3293cb26e7540dc2e61becd7eda453e234d30664 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil.Test/ExportableFailureMechanismAssemblyResultTestFactoryTest.cs (.../ExportableFailureMechanismAssemblyResultTestFactoryTest.cs) (revision a5a1867560f3705d7037a951c9c1a7f9e817a0a6) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil.Test/ExportableFailureMechanismAssemblyResultTestFactoryTest.cs (.../ExportableFailureMechanismAssemblyResultTestFactoryTest.cs) (revision 3293cb26e7540dc2e61becd7eda453e234d30664) @@ -29,11 +29,11 @@ public class ExportableFailureMechanismAssemblyResultTestFactoryTest { [Test] - public void CreateFailureMechanismAssemblyResultWithProbability_Always_ReturnsFailureMechanismAssemblyResultWithProbability() + public void CreateResultWithProbability_Always_ReturnsFailureMechanismAssemblyResultWithProbability() { // Call ExportableFailureMechanismAssemblyResultWithProbability result = - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithProbability(); + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(); // Assert Assert.AreEqual(0.75, result.Probability); @@ -42,11 +42,11 @@ } [Test] - public void CreateFailureMechanismAssemblyResultWithoutProbability_Always_ReturnsFailureMechanismAssemblyResultWithProbability() + public void CreateResultWithoutProbability_Always_ReturnsFailureMechanismAssemblyResultWithProbability() { // Call - ExportableFailureMechanismAssemblyResult result = - ExportableFailureMechanismAssemblyResultTestFactory.CreateFailureMechanismAssemblyResultWithoutProbability(); + ExportableFailureMechanismAssemblyResult result = + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(); // Assert Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.IVt, result.AssemblyCategory); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismAssemblyResultTestFactory.cs =================================================================== diff -u -ra5a1867560f3705d7037a951c9c1a7f9e817a0a6 -r3293cb26e7540dc2e61becd7eda453e234d30664 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismAssemblyResultTestFactory.cs (.../ExportableFailureMechanismAssemblyResultTestFactory.cs) (revision a5a1867560f3705d7037a951c9c1a7f9e817a0a6) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismAssemblyResultTestFactory.cs (.../ExportableFailureMechanismAssemblyResultTestFactory.cs) (revision 3293cb26e7540dc2e61becd7eda453e234d30664) @@ -34,7 +34,7 @@ /// Creates a default instance of /// /// An instance of . - public static ExportableFailureMechanismAssemblyResult CreateFailureMechanismAssemblyResultWithoutProbability() + public static ExportableFailureMechanismAssemblyResult CreateResultWithoutProbability() { return new ExportableFailureMechanismAssemblyResult(ExportableAssemblyMethod.WBI1A1, FailureMechanismAssemblyCategoryGroup.IVt); @@ -44,7 +44,7 @@ /// Creates a default instance of /// /// An instance of . - public static ExportableFailureMechanismAssemblyResultWithProbability CreateFailureMechanismAssemblyResultWithProbability() + public static ExportableFailureMechanismAssemblyResultWithProbability CreateResultWithProbability() { return new ExportableFailureMechanismAssemblyResultWithProbability(ExportableAssemblyMethod.WBI1B1, FailureMechanismAssemblyCategoryGroup.IIt,