Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs =================================================================== diff -u -rd43c555407dee7411d6f34062e4c3a8c216697c5 -r080697c142dc27ec10228b365fed8e6301c8b8f3 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision d43c555407dee7411d6f34062e4c3a8c216697c5) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision 080697c142dc27ec10228b365fed8e6301c8b8f3) @@ -187,7 +187,6 @@ } [Test] - [Ignore("Fix after implementation is done.")] public void Export_FullyConfiguredAssessmentSectionAndValidAssemblyResults_ReturnsTrueAndCreatesFile() { // Setup Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssemblyFactoryTest.cs =================================================================== diff -u -r962a4d296b77de745274146a6e3e6ffa8e977821 -r080697c142dc27ec10228b365fed8e6301c8b8f3 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssemblyFactoryTest.cs (.../ExportableAssemblyFactoryTest.cs) (revision 962a4d296b77de745274146a6e3e6ffa8e977821) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssemblyFactoryTest.cs (.../ExportableAssemblyFactoryTest.cs) (revision 080697c142dc27ec10228b365fed8e6301c8b8f3) @@ -72,7 +72,7 @@ } private static void AssertExportableAssessmentSection( - AssessmentSection assessmentSection, ExportableAssessmentSection exportableAssessmentSection) + IAssessmentSection assessmentSection, ExportableAssessmentSection exportableAssessmentSection) { Assert.AreEqual(assessmentSection.Name, exportableAssessmentSection.Name); Assert.AreEqual($"Wks.{assessmentSection.Id}", exportableAssessmentSection.Id); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml =================================================================== diff -u -r81a093d27fd1bfa4e9a482e95d39828253082705 -r080697c142dc27ec10228b365fed8e6301c8b8f3 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 81a093d27fd1bfa4e9a482e95d39828253082705) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 080697c142dc27ec10228b365fed8e6301c8b8f3) @@ -1,1095 +1,1330 @@ - - - - 0 0 - 3 4 - - - - - assessmentSectionName - + + + + assessmentSectionName + 0 0 3 4 - - 5 - DKTRJCT - - - 2023 - 2035 - - - BOI-2A-1 - BOI-2B-1 - A+ - 0.14 - VOLLDG - - - GENRK - STPH - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - GEKB - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - STBI - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - STMI - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - ZST - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - AGK - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - AWO - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - GEBU - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - GABU - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - GABI - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - HTKW - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - BSKW - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - PKW - - BOI-1A-1 - 0.1 - VOLLDG - - - - GENRK - STKWp - - BOI-1A-1 - 0.1 - VOLLDG - - - - SPECFK - Specific failure mechanism 1 - - BOI-1A-1 - 0.1 - VOLLDG - - - - SPECFK - Specific failure mechanism 2 - - BOI-1A-1 - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-0A-1 - BOI-0B-1 - +I - 0.1 - VOLLDG - - - - - BOI-3C-1 - +II - VOLLDG - - - BOI-3B-1 - GENRK - STPH - +II - VOLLDG - - - BOI-3B-1 - GENRK - GEKB - +II - VOLLDG - - - BOI-3B-1 - GENRK - STBI - +II - VOLLDG - - - BOI-3B-1 - GENRK - STMI - +II - VOLLDG - - - BOI-3B-1 - GENRK - ZST - +II - VOLLDG - - - BOI-3B-1 - GENRK - AGK - +II - VOLLDG - - - BOI-3B-1 - GENRK - AWO - +II - VOLLDG - - - BOI-3B-1 - GENRK - GEBU - +II - VOLLDG - - - BOI-3B-1 - GENRK - GABU - +II - VOLLDG - - - BOI-3B-1 - GENRK - GABI - +II - VOLLDG - - - BOI-3B-1 - GENRK - HTKW - +II - VOLLDG - - - BOI-3B-1 - GENRK - BSKW - +II - VOLLDG - - - BOI-3B-1 - GENRK - PKW - +II - VOLLDG - - - BOI-3B-1 - GENRK - STKWp - +II - VOLLDG - - - BOI-3B-1 - SPECFK - Specific failure mechanism 1 - +II - VOLLDG - - - BOI-3B-1 - SPECFK - Specific failure mechanism 2 - +II - VOLLDG - - - - - BOI-3C-1 - +III - VOLLDG - - - BOI-3B-1 - GENRK - STPH - +III - VOLLDG - - - BOI-3B-1 - GENRK - GEKB - +III - VOLLDG - - - BOI-3B-1 - GENRK - STBI - +III - VOLLDG - - - BOI-3B-1 - GENRK - STMI - +III - VOLLDG - - - BOI-3B-1 - GENRK - ZST - +III - VOLLDG - - - BOI-3B-1 - GENRK - AGK - +III - VOLLDG - - - BOI-3B-1 - GENRK - AWO - +III - VOLLDG - - - BOI-3B-1 - GENRK - GEBU - +III - VOLLDG - - - BOI-3B-1 - GENRK - GABU - +III - VOLLDG - - - BOI-3B-1 - GENRK - GABI - +III - VOLLDG - - - BOI-3B-1 - GENRK - HTKW - +III - VOLLDG - - - BOI-3B-1 - GENRK - BSKW - +III - VOLLDG - - - BOI-3B-1 - GENRK - PKW - +III - VOLLDG - - - BOI-3B-1 - GENRK - STKWp - +III - VOLLDG - - - BOI-3B-1 - SPECFK - Specific failure mechanism 1 - +III - VOLLDG - - - BOI-3B-1 - SPECFK - Specific failure mechanism 2 - +III - VOLLDG - - - - - - - - - - - - - - - - - - - - - 0 - 11.313708498984761 - + + 5 + Dijktraject + + + + + 2023 + 2035 + + + + + + A+ + BOI-2B-1 + 0.14 + BOI-2A-1 + VOLLDG + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + STPH + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + GEKB + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + STBI + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + STMI + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + ZST + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + AGK + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + AWO + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + GEBU + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + GABU + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + GABI + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + HTKW + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + BSKW + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + PKW + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + STKWp + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + Specific failure mechanism 1 + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + 0.1 + BOI-1A-1 + VOLLDG + + Specific failure mechanism 2 + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +I + BOI-0B-1 + 0.1 + BOI-0A-1 + VOLLDG + + + + + + + +II + BOI-3C-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +II + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3C-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + +III + BOI-3B-1 + VOLLDG + + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 11.313708498984761 - + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + + + + + + -1 -1 7 7 - - 11.313708498984761 - FAALMVK - - - 11.313708498984761 - 22.627416997969522 - + + FAALMVK + 0 + 11.313708498984761 + 11.313708498984761 + + + + + + 7 7 15 15 - - 11.313708498984761 - FAALMVK - - - 0 - 2.5 - - - 0 0 1.5 2 - - - 2.5 - DEELVK - BOI-3A-1 - - - 2.5 - 5 - - - 1.5 2 3 4 - - - 2.5 - DEELVK - BOI-3A-1 - - - \ No newline at end of file + + FAALMVK + 11.313708498984761 + 22.627416997969522 + 11.313708498984761 + + + + \ No newline at end of file