Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs =================================================================== diff -u -r0021d57d71421c62a6475e9c5be470babd7463ec -rf5292d182348de2ddb7760b7e3f27b0f9cfc9177 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision 0021d57d71421c62a6475e9c5be470babd7463ec) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision f5292d182348de2ddb7760b7e3f27b0f9cfc9177) @@ -13,6 +13,7 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; +using Ringtoets.Integration.IO.TestUtil; using Ringtoets.Piping.Data; namespace Ringtoets.Integration.IO.Test.Factories @@ -76,7 +77,7 @@ Assert.AreEqual(ExportableFailureMechanismType.STPH, assemblyResult.Code); Assert.AreEqual(ExportableFailureMechanismGroup.Group2, assemblyResult.Group); - AssertExportableFailureMechanismSections(failureMechanism.Sections, assemblyResult.Sections); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, assemblyResult.Sections); AssertExportablePipingFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, @@ -86,28 +87,6 @@ } } - private static void AssertExportableFailureMechanismSections(IEnumerable expectedSections, - IEnumerable actualSections) - { - int expectedNrOfSections = expectedSections.Count(); - Assert.AreEqual(expectedNrOfSections, actualSections.Count()); - for (var i = 0; i < expectedNrOfSections; i++) - { - FailureMechanismSection expectedSection = expectedSections.ElementAt(i); - ExportableFailureMechanismSection actualSection = actualSections.ElementAt(i); - - AssertExportableFailureMechanismSection(expectedSection, actualSection); - } - } - - private static void AssertExportableFailureMechanismSection(FailureMechanismSection expectedSection, - ExportableFailureMechanismSection actualSection) - { - Assert.IsNaN(actualSection.StartDistance); - Assert.IsNaN(actualSection.EndDistance); - CollectionAssert.AreEqual(expectedSection.Points, actualSection.Geometry); - } - private static void AssertExportablePipingFailureMechanismSectionResults(FailureMechanismSectionAssembly expectedSimpleAssembly, FailureMechanismSectionAssembly expectedDetailedAssembly, FailureMechanismSectionAssembly expectedTailorMadeAssembly, @@ -141,25 +120,21 @@ { Assert.AreSame(expectedSection, actualResult.FailureMechanismSection); - ExportableSectionAssemblyResultWithProbability actualSimpleAssembly = actualResult.SimpleAssembly; - Assert.AreEqual(ExportableAssemblyMethod.WBI0E1, actualSimpleAssembly.AssemblyMethod); - Assert.AreEqual(expectedSimpleAssembly.Group, actualSimpleAssembly.AssemblyCategory); - Assert.AreEqual(expectedSimpleAssembly.Probability, actualSimpleAssembly.Probability); + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSimpleAssembly, + ExportableAssemblyMethod.WBI0E1, + actualResult.SimpleAssembly); - ExportableSectionAssemblyResultWithProbability actualDetailedAssembly = actualResult.DetailedAssembly; - Assert.AreEqual(ExportableAssemblyMethod.WBI0G5, actualDetailedAssembly.AssemblyMethod); - Assert.AreEqual(expectedDetailedAssembly.Group, actualDetailedAssembly.AssemblyCategory); - Assert.AreEqual(expectedDetailedAssembly.Probability, actualDetailedAssembly.Probability); + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedDetailedAssembly, + ExportableAssemblyMethod.WBI0G5, + actualResult.DetailedAssembly); - ExportableSectionAssemblyResultWithProbability actualTailorMadeAssembly = actualResult.TailorMadeAssembly; - Assert.AreEqual(ExportableAssemblyMethod.WBI0T5, actualTailorMadeAssembly.AssemblyMethod); - Assert.AreEqual(expectedTailorMadeAssembly.Group, actualTailorMadeAssembly.AssemblyCategory); - Assert.AreEqual(expectedTailorMadeAssembly.Probability, actualTailorMadeAssembly.Probability); + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedTailorMadeAssembly, + ExportableAssemblyMethod.WBI0T5, + actualResult.TailorMadeAssembly); - ExportableSectionAssemblyResultWithProbability actualCombinedResult = actualResult.CombinedAssembly; - Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, actualCombinedResult.AssemblyMethod); - Assert.AreEqual(expectedCombinedAssembly.Group, actualCombinedResult.AssemblyCategory); - Assert.AreEqual(expectedCombinedAssembly.Probability, actualCombinedResult.Probability); + ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedCombinedAssembly, + ExportableAssemblyMethod.WBI1B1, + actualResult.CombinedAssembly); } private static void AddFailureMechanismSections(IFailureMechanism failureMechanism) Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismSectionTestHelper.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismSectionTestHelper.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableFailureMechanismSectionTestHelper.cs (revision f5292d182348de2ddb7760b7e3f27b0f9cfc9177) @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using System.Linq; +using NUnit.Framework; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Integration.IO.Assembly; + +namespace Ringtoets.Integration.IO.TestUtil +{ + /// + /// Helper class to assert + /// + public static class ExportableFailureMechanismSectionTestHelper + { + /// + /// Asserts a collection of + /// against a collection of . + /// + /// The expected . + /// The actual to assert against. + /// Thrown when: + /// + /// The number of sections between and + /// do not match. + /// The geometry of any the sections are not equal. + /// + public static void AssertExportableFailureMechanismSections(IEnumerable expectedSections, + IEnumerable actualSections) + { + int expectedNrOfSections = expectedSections.Count(); + Assert.AreEqual(expectedNrOfSections, actualSections.Count()); + for (var i = 0; i < expectedNrOfSections; i++) + { + FailureMechanismSection expectedSection = expectedSections.ElementAt(i); + ExportableFailureMechanismSection actualSection = actualSections.ElementAt(i); + + AssertExportableFailureMechanismSection(expectedSection, actualSection); + } + } + + private static void AssertExportableFailureMechanismSection(FailureMechanismSection expectedSection, + ExportableFailureMechanismSection actualSection) + { + Assert.IsNaN(actualSection.StartDistance); + Assert.IsNaN(actualSection.EndDistance); + CollectionAssert.AreEqual(expectedSection.Points, actualSection.Geometry); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableSectionAssemblyResultTestHelper.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableSectionAssemblyResultTestHelper.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/ExportableSectionAssemblyResultTestHelper.cs (revision f5292d182348de2ddb7760b7e3f27b0f9cfc9177) @@ -0,0 +1,29 @@ +using NUnit.Framework; +using Ringtoets.AssemblyTool.Data; +using Ringtoets.Integration.IO.Assembly; + +namespace Ringtoets.Integration.IO.TestUtil +{ + /// + /// Helper class to assert + /// + public static class ExportableSectionAssemblyResultTestHelper + { + /// + /// Asserts a + /// against the assembly result and the method which was used to generate the result. + /// + /// The expected . + /// The which was + /// used to generate the result. + /// The to assert. + public static void AssertExportableSectionAssemblyResult(FailureMechanismSectionAssembly assemblyResult, + ExportableAssemblyMethod assemblyMethod, + ExportableSectionAssemblyResultWithProbability exportableSectionAssemblyResult) + { + Assert.AreEqual(assemblyMethod, exportableSectionAssemblyResult.AssemblyMethod); + Assert.AreEqual(assemblyResult.Group, exportableSectionAssemblyResult.AssemblyCategory); + Assert.AreEqual(assemblyResult.Probability, exportableSectionAssemblyResult.Probability); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/Ringtoets.Integration.IO.TestUtil.csproj =================================================================== diff -u -rb2c1971e9e3264afd7b55e68f0de2ca589e3f750 -rf5292d182348de2ddb7760b7e3f27b0f9cfc9177 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/Ringtoets.Integration.IO.TestUtil.csproj (.../Ringtoets.Integration.IO.TestUtil.csproj) (revision b2c1971e9e3264afd7b55e68f0de2ca589e3f750) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/Ringtoets.Integration.IO.TestUtil.csproj (.../Ringtoets.Integration.IO.TestUtil.csproj) (revision f5292d182348de2ddb7760b7e3f27b0f9cfc9177) @@ -7,18 +7,24 @@ + + ..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll + + + Copying.licenseheader + @@ -29,6 +35,10 @@ {420ED9C3-0C33-47EA-B893-121A9C0DB4F1} Ringtoets.AssemblyTool.Data + + {D4200F43-3F72-4F42-AF0A-8CED416A38EC} + Ringtoets.Common.Data + {D693D18E-C257-4FDE-96BC-F6E6FB043ECF} Ringtoets.Integration.IO Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/packages.config =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/packages.config (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/packages.config (revision f5292d182348de2ddb7760b7e3f27b0f9cfc9177) @@ -0,0 +1,4 @@ + + + + \ No newline at end of file