Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs =================================================================== diff -u -rc94bdfa13102538f2eb1957e90daae7b9867846a -r6dc082582f2f24cbc09d9fec980d9c8593ca3d2e --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision c94bdfa13102538f2eb1957e90daae7b9867846a) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision 6dc082582f2f24cbc09d9fec980d9c8593ca3d2e) @@ -21,6 +21,7 @@ using System; using System.IO; +using System.Linq; using Core.Common.Base.Geometry; using Core.Common.Base.IO; using Core.Common.TestUtil; @@ -31,6 +32,7 @@ using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssemblyTool; using Riskeer.Common.Data.AssessmentSection; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data; using Riskeer.Integration.IO.Exporters; @@ -143,7 +145,7 @@ string folderPath = TestHelper.GetScratchPadPath(nameof(Export_FullyConfiguredAssessmentSectionAndValidAssemblyResults_ReturnsTrueAndCreatesFile)); Directory.CreateDirectory(folderPath); string filePath = Path.Combine(folderPath, "actualAssembly.gml"); - + AssessmentSection assessmentSection = CreateConfiguredAssessmentSection(); var exporter = new AssemblyExporter(assessmentSection, filePath); @@ -153,7 +155,7 @@ { var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; - assessmentSectionAssemblyCalculator.CombinedFailureMechanismSectionAssemblyOutput = new CombinedFailureMechanismSectionAssembly[0]; + assessmentSectionAssemblyCalculator.CombinedFailureMechanismSectionAssemblyOutput = Array.Empty(); try { @@ -216,6 +218,18 @@ new Point2D(2, 2) }); + assessmentSection.SpecificFailurePaths.AddRange(new[] + { + new SpecificFailurePath + { + Code = "NIEUW1" + }, + new SpecificFailurePath + { + Code = "NIEUW2" + } + }); + FailureMechanismTestHelper.AddSections(assessmentSection.Piping, 2); FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityInwards, 2); FailureMechanismTestHelper.AddSections(assessmentSection.GrassCoverErosionInwards, 2); @@ -234,6 +248,9 @@ FailureMechanismTestHelper.AddSections(assessmentSection.PipingStructure, 2); FailureMechanismTestHelper.AddSections(assessmentSection.WaterPressureAsphaltCover, 2); + FailureMechanismTestHelper.AddSections(assessmentSection.SpecificFailurePaths.First(), 2); + FailureMechanismTestHelper.AddSections(assessmentSection.SpecificFailurePaths.Last(), 2); + return assessmentSection; } } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml =================================================================== diff -u -r909984cc52c503677a37fd9772aa8da9f8b45846 -r6dc082582f2f24cbc09d9fec980d9c8593ca3d2e --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 909984cc52c503677a37fd9772aa8da9f8b45846) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 6dc082582f2f24cbc09d9fec980d9c8593ca3d2e) @@ -155,6 +155,24 @@ VOLLDG + + SPECFK + NIEUW1 + + WBI-1B-1 + 0 + VOLLDG + + + + SPECFK + NIEUW2 + + WBI-1B-1 + 0 + VOLLDG + + WBI-0A-2 @@ -379,6 +397,38 @@ VOLLDG + + + WBI-0A-2 + +I + 0.1 + VOLLDG + + + + + WBI-0A-2 + +I + 0.1 + VOLLDG + + + + + WBI-0A-2 + +I + 0.1 + VOLLDG + + + + + WBI-0A-2 + +I + 0.1 + VOLLDG + + @@ -394,6 +444,8 @@ + + 0 11.313708498984761 @@ -702,5 +754,49 @@ 11.313708498984761 FAALMVK + + 0 + 11.313708498984761 + + + -1 -1 7 7 + + + 11.313708498984761 + FAALMVK + + + 11.313708498984761 + 22.627416997969522 + + + 7 7 15 15 + + + 11.313708498984761 + FAALMVK + + + 0 + 11.313708498984761 + + + -1 -1 7 7 + + + 11.313708498984761 + FAALMVK + + + 11.313708498984761 + 22.627416997969522 + + + 7 7 15 15 + + + 11.313708498984761 + FAALMVK + \ No newline at end of file