Fisheye: Tag 9b32336135a84049f0b77296616370691f4cd407 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/Model/Enums/ExportableFailureMechanismType.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9b32336135a84049f0b77296616370691f4cd407 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Model/Enums/ExportableFailureMechanismTypeTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -r6ade88c0cbceb0799e6f48f2a646a3bfebfb00df -r9b32336135a84049f0b77296616370691f4cd407 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 6ade88c0cbceb0799e6f48f2a646a3bfebfb00df) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 9b32336135a84049f0b77296616370691f4cd407) @@ -330,76 +330,58 @@ Assert.AreEqual(17, exportableFailureMechanismCombinedSectionAssemblyResults.Count()); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.Piping, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(0)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverErosionInwards, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(1)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.MacroStabilityInwards, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(2)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.Microstability, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(3)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.StabilityStoneCover, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(4)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.WaveImpactAsphaltCover, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(5)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.WaterPressureAsphaltCover, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(6)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverErosionOutwards, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(7)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverSlipOffOutwards, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(8)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.GrassCoverSlipOffInwards, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(9)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.HeightStructures, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(10)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.ClosingStructures, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(11)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.PipingStructure, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(12)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.StabilityPointStructures, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(13)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.DuneErosion, - ExportableFailureMechanismType.Generic, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(14)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.SpecificFailureMechanisms.First(), - ExportableFailureMechanismType.Specific, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(15)); AssertExportableFailureMechanismCombinedSectionAssemblyResult(assessmentSection.SpecificFailureMechanisms.Last(), - ExportableFailureMechanismType.Specific, exportableFailureMechanismCombinedSectionAssemblyResults.ElementAt(16)); } private static void AssertExportableFailureMechanismCombinedSectionAssemblyResult(IFailureMechanism failureMechanism, - ExportableFailureMechanismType expectedFailureMechanismType, ExportableFailureMechanismCombinedSectionAssemblyResult actualExportableFailureMechanismCombinedSectionAssemblyResult) { Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, actualExportableFailureMechanismCombinedSectionAssemblyResult.AssemblyGroup); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs =================================================================== diff -u -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054 -r9b32336135a84049f0b77296616370691f4cd407 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision 9b32336135a84049f0b77296616370691f4cd407) @@ -27,7 +27,6 @@ using NUnit.Framework; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.IO.Model; -using Riskeer.AssemblyTool.IO.Model.Enums; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Integration.Data; @@ -213,44 +212,43 @@ Assert.IsTrue(failureMechanismCombinedSectionResults.All(result => result.AssemblyMethod == ExportableAssemblyMethodConverter.ConvertTo( expectedSection.FailureMechanismResultsAssemblyMethod))); - AssertSubSection(expectedSection.Piping, "STPH", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.Piping, "STPH", failureMechanismCombinedSectionResults.ElementAt(0)); - AssertSubSection(expectedSection.GrassCoverErosionInwards, "GEKB", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.GrassCoverErosionInwards, "GEKB", failureMechanismCombinedSectionResults.ElementAt(1)); - AssertSubSection(expectedSection.MacroStabilityInwards, "STBI", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.MacroStabilityInwards, "STBI", failureMechanismCombinedSectionResults.ElementAt(2)); - AssertSubSection(expectedSection.Microstability, "STMI", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.Microstability, "STMI", failureMechanismCombinedSectionResults.ElementAt(3)); - AssertSubSection(expectedSection.StabilityStoneCover, "ZST", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.StabilityStoneCover, "ZST", failureMechanismCombinedSectionResults.ElementAt(4)); - AssertSubSection(expectedSection.WaveImpactAsphaltCover, "AGK", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.WaveImpactAsphaltCover, "AGK", failureMechanismCombinedSectionResults.ElementAt(5)); - AssertSubSection(expectedSection.WaterPressureAsphaltCover, "AWO", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.WaterPressureAsphaltCover, "AWO", failureMechanismCombinedSectionResults.ElementAt(6)); - AssertSubSection(expectedSection.GrassCoverErosionOutwards, "GEBU", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.GrassCoverErosionOutwards, "GEBU", failureMechanismCombinedSectionResults.ElementAt(7)); - AssertSubSection(expectedSection.GrassCoverSlipOffOutwards, "GABU", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.GrassCoverSlipOffOutwards, "GABU", failureMechanismCombinedSectionResults.ElementAt(8)); - AssertSubSection(expectedSection.GrassCoverSlipOffInwards, "GABI", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.GrassCoverSlipOffInwards, "GABI", failureMechanismCombinedSectionResults.ElementAt(9)); - AssertSubSection(expectedSection.HeightStructures, "HTKW", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.HeightStructures, "HTKW", failureMechanismCombinedSectionResults.ElementAt(10)); - AssertSubSection(expectedSection.ClosingStructures, "BSKW", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.ClosingStructures, "BSKW", failureMechanismCombinedSectionResults.ElementAt(11)); - AssertSubSection(expectedSection.PipingStructure, "PKW", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.PipingStructure, "PKW", failureMechanismCombinedSectionResults.ElementAt(12)); - AssertSubSection(expectedSection.StabilityPointStructures, "STKWp", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.StabilityPointStructures, "STKWp", failureMechanismCombinedSectionResults.ElementAt(13)); - AssertSubSection(expectedSection.DuneErosion, "DA", ExportableFailureMechanismType.Generic, + AssertSubSection(expectedSection.DuneErosion, "DA", failureMechanismCombinedSectionResults.ElementAt(14)); - AssertSubSection(expectedSection.SpecificFailureMechanisms[0], "Nieuw1", ExportableFailureMechanismType.Specific, + AssertSubSection(expectedSection.SpecificFailureMechanisms[0], "Nieuw1", failureMechanismCombinedSectionResults.ElementAt(15)); - AssertSubSection(expectedSection.SpecificFailureMechanisms[1], "Nieuw2", ExportableFailureMechanismType.Specific, + AssertSubSection(expectedSection.SpecificFailureMechanisms[1], "Nieuw2", failureMechanismCombinedSectionResults.ElementAt(16)); } private static void AssertSubSection(FailureMechanismSectionAssemblyGroup? subSectionGroup, string subSectionCode, - ExportableFailureMechanismType failureMechanismType, ExportableFailureMechanismCombinedSectionAssemblyResult actualResult) { Assert.AreEqual(subSectionGroup, actualResult.AssemblyGroup);