Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -96,7 +96,7 @@ /// /// Gets the collection of specific failure paths within the assessment section. /// - ObservableList SpecificFailurePaths { get; } + ObservableList SpecificFailurePaths { get; } /// /// Gets the failure mechanisms corresponding to the assessment section. Fisheye: Tag 845041f8d183805331dc7b6e2e7e43be076526d7 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailurePath.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 845041f8d183805331dc7b6e2e7e43be076526d7 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/SpecificFailureMechanismTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/SpecificFailurePathTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -70,7 +70,7 @@ waterLevelCalculationsForSignalingNorm = new ObservableList(); waterLevelCalculationsForLowerLimitNorm = new ObservableList(); - SpecificFailurePaths = new ObservableList(); + SpecificFailurePaths = new ObservableList(); } public string Id { get; } @@ -109,7 +109,7 @@ public ObservableList WaveHeightCalculationsForUserDefinedTargetProbabilities { get; } - public ObservableList SpecificFailurePaths { get; } + public ObservableList SpecificFailurePaths { get; } /// /// Sets the hydraulic boundary locations on the assessment section stub. Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs (.../ShouldCloseViewWithFailurePathTester.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithFailurePathTester.cs (.../ShouldCloseViewWithFailurePathTester.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -41,7 +41,7 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Enumerable.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failurePath = new TestFailurePath(); @@ -69,7 +69,7 @@ { failureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); using (IView view = GetView(failureMechanism)) @@ -97,7 +97,7 @@ { failureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); using (IView view = GetView(otherFailureMechanism)) @@ -154,12 +154,12 @@ public void ShouldCloseMethod_ViewCorrespondingToRemovedAssessmentSectionAndSpecificFailurePath_ReturnsTrue() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Enumerable.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList { failurePath }); Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -158,7 +158,7 @@ inputs.Add(CreateCombinedSections(duneErosionFailureMechanism.SectionResults, assessmentSection, DuneErosionAssemblyFunc)); } - foreach (SpecificFailurePath specificFailurePath in assessmentSection.SpecificFailurePaths) + foreach (SpecificFailureMechanism specificFailurePath in assessmentSection.SpecificFailurePaths) { if (failureMechanisms.Contains(specificFailurePath)) { Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -88,7 +88,7 @@ HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - SpecificFailurePaths = new ObservableList(); + SpecificFailurePaths = new ObservableList(); WaterLevelCalculationsForUserDefinedTargetProbabilities = new ObservableList(); WaveHeightCalculationsForUserDefinedTargetProbabilities = new ObservableList(); @@ -195,7 +195,7 @@ public ObservableList WaveHeightCalculationsForUserDefinedTargetProbabilities { get; } - public ObservableList SpecificFailurePaths { get; } + public ObservableList SpecificFailurePaths { get; } public string Id { get; set; } Index: Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -153,7 +153,7 @@ /// /// Gets the collection of specific failure paths that should be merged. /// - public IEnumerable MergeSpecificFailurePaths { get; } + public IEnumerable MergeSpecificFailurePaths { get; } /// /// Container for properties for constructing an . @@ -238,7 +238,7 @@ /// /// Gets the list of specific failure paths that should be merged. /// - public List MergeSpecificFailurePaths { get; } = new List(); + public List MergeSpecificFailurePaths { get; } = new List(); } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -r992e185be6cbeb2713e0275483a1674a0f9e325a -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 992e185be6cbeb2713e0275483a1674a0f9e325a) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -137,11 +137,11 @@ return failurePathMergeDataRows.Any(row => row.FailurePath is TFailureMechanism && row.IsSelected); } - private IEnumerable GetSelectedSpecificFailurePathsToMerge() + private IEnumerable GetSelectedSpecificFailurePathsToMerge() { - return failurePathMergeDataRows.Where(row => row.IsSelected && row.FailurePath is SpecificFailurePath) + return failurePathMergeDataRows.Where(row => row.IsSelected && row.FailurePath is SpecificFailureMechanism) .Select(row => row.FailurePath) - .Cast() + .Cast() .ToArray(); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs (.../AssessmentSectionResultObserver.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -235,7 +235,7 @@ private void CreateFailurePathObservers() { - IEnumerable observers = assessmentSection.SpecificFailurePaths.Select(CreateFailureMechanismObserver observers = assessmentSection.SpecificFailurePaths.Select(CreateFailureMechanismObserver); specificFailurePathObservers.AddRange(observers); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathContext.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathContext.cs (.../SpecificFailurePathContext.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathContext.cs (.../SpecificFailurePathContext.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -28,17 +28,17 @@ namespace Riskeer.Integration.Forms.PresentationObjects { /// - /// This class is a presentation object for a instance. + /// This class is a presentation object for a instance. /// - public class SpecificFailurePathContext : ObservableWrappedObjectContextBase, IFailureMechanismContext + public class SpecificFailurePathContext : ObservableWrappedObjectContextBase, IFailureMechanismContext { /// /// Initializes a new instance of the class. /// /// The failure failure path. /// The parent of . /// Thrown when any input argument is null. - public SpecificFailurePathContext(SpecificFailurePath wrappedFailurePath, IAssessmentSection parent) : base(wrappedFailurePath) + public SpecificFailurePathContext(SpecificFailureMechanism wrappedFailurePath, IAssessmentSection parent) : base(wrappedFailurePath) { if (parent == null) { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathSectionResultContext.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathSectionResultContext.cs (.../SpecificFailurePathSectionResultContext.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathSectionResultContext.cs (.../SpecificFailurePathSectionResultContext.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -29,7 +29,7 @@ { /// /// This class is a presentation object for a collection of - /// for the . + /// for the . /// public class SpecificFailurePathSectionResultContext : FailureMechanismSectionResultContext { @@ -38,12 +38,12 @@ /// /// The /// of to wrap. - /// The + /// The /// the belongs to. /// The assessment section the section results belongs to. /// Thrown when any parameter is null. public SpecificFailurePathSectionResultContext(IObservableEnumerable wrappedSectionResults, - SpecificFailurePath failurePath, IAssessmentSection assessmentSection) - : base(wrappedSectionResults, failurePath, assessmentSection) {} + SpecificFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + : base(wrappedSectionResults, failureMechanism, assessmentSection) {} } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathSectionsContext.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathSectionsContext.cs (.../SpecificFailurePathSectionsContext.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathSectionsContext.cs (.../SpecificFailurePathSectionsContext.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -27,17 +27,17 @@ namespace Riskeer.Integration.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class SpecificFailurePathSectionsContext : FailureMechanismSectionsContext { /// /// Initializes a new instance of the class. /// - /// The to wrap. + /// The to wrap. /// The owning assessment section of . /// Thrown when any input argument is null. - public SpecificFailurePathSectionsContext(SpecificFailurePath wrappedData, IAssessmentSection assessmentSection) + public SpecificFailurePathSectionsContext(SpecificFailureMechanism wrappedData, IAssessmentSection assessmentSection) : base(wrappedData, assessmentSection) {} } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathsContext.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathsContext.cs (.../SpecificFailurePathsContext.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/SpecificFailurePathsContext.cs (.../SpecificFailurePathsContext.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -30,15 +30,15 @@ /// /// Presentation object for a collection of specific failure paths. /// - public class SpecificFailurePathsContext : ObservableWrappedObjectContextBase> + public class SpecificFailurePathsContext : ObservableWrappedObjectContextBase> { /// /// Initializes a new instance of . /// - /// The collection of to wrap. + /// The collection of to wrap. /// The owning assessment section of . /// Thrown when any argument is null. - public SpecificFailurePathsContext(ObservableList wrappedData, IAssessmentSection assessmentSection) + public SpecificFailurePathsContext(ObservableList wrappedData, IAssessmentSection assessmentSection) : base(wrappedData) { if (assessmentSection == null) Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs (.../SpecificFailurePathProperties.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs (.../SpecificFailurePathProperties.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -31,9 +31,9 @@ namespace Riskeer.Integration.Forms.PropertyClasses { /// - /// Object properties class for . + /// Object properties class for . /// - public class SpecificFailurePathProperties : ObjectProperties + public class SpecificFailurePathProperties : ObjectProperties { private const int namePropertyIndex = 1; private const int codePropertyIndex = 2; @@ -46,7 +46,7 @@ /// /// The instance to show the properties of. /// Thrown when is null. - public SpecificFailurePathProperties(SpecificFailurePath data) + public SpecificFailurePathProperties(SpecificFailureMechanism data) { if (data == null) { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -214,7 +214,7 @@ private void SetSpecificFailurePathTextBoxColumns() { - foreach (SpecificFailurePath specificFailurePath in AssessmentSection.SpecificFailurePaths) + foreach (SpecificFailureMechanism specificFailurePath in AssessmentSection.SpecificFailurePaths) { dataGridViewControl.AddTextBoxColumn(string.Empty, specificFailurePath.Code, Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SpecificFailurePathView.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SpecificFailurePathView.cs (.../SpecificFailurePathView.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/SpecificFailurePathView.cs (.../SpecificFailurePathView.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -34,11 +34,11 @@ namespace Riskeer.Integration.Forms.Views { /// - /// View for . + /// View for . /// public partial class SpecificFailurePathView : CloseForFailurePathView, IMapView { - private readonly SpecificFailurePath failurePath; + private readonly SpecificFailureMechanism failureMechanism; private readonly IAssessmentSection assessmentSection; private MapDataCollection failurePathMapDataCollection; @@ -58,10 +58,10 @@ /// /// Creates a new instance of . /// - /// The to show the data for. + /// The to show the data for. /// The assessment section to show the data for. /// Thrown when any parameter is null. - public SpecificFailurePathView(SpecificFailurePath failurePath, IAssessmentSection assessmentSection) : base(failurePath) + public SpecificFailurePathView(SpecificFailureMechanism failureMechanism, IAssessmentSection assessmentSection) : base(failureMechanism) { if (assessmentSection == null) { @@ -70,7 +70,7 @@ InitializeComponent(); - this.failurePath = failurePath; + this.failureMechanism = failureMechanism; this.assessmentSection = assessmentSection; } @@ -120,7 +120,7 @@ failurePathObserver = new Observer(UpdateFailurePathMapData) { - Observable = failurePath + Observable = failureMechanism }; } @@ -135,7 +135,7 @@ private void CreateMapData() { - failurePathMapDataCollection = new MapDataCollection(failurePath.Name); + failurePathMapDataCollection = new MapDataCollection(failureMechanism.Name); hydraulicBoundaryLocationsMapLayer = new HydraulicBoundaryLocationsMapLayer(assessmentSection); referenceLineMapData = RiskeerMapDataFactory.CreateReferenceLineMapData(); @@ -184,13 +184,13 @@ private void UpdateFailurePathMapDataCollectionData() { - failurePathMapDataCollection.Name = failurePath.Name; + failurePathMapDataCollection.Name = failureMechanism.Name; failurePathMapDataCollection.NotifyObservers(); } private void SetSectionsMapData() { - IEnumerable failureMechanismSections = failurePath.Sections.ToArray(); + IEnumerable failureMechanismSections = failureMechanism.Sections.ToArray(); sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -164,9 +164,9 @@ exportableFailureMechanisms, assessmentSection.WaterPressureAsphaltCover, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism, FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Generic); - foreach (SpecificFailurePath specificFailurePath in assessmentSection.SpecificFailurePaths) + foreach (SpecificFailureMechanism specificFailurePath in assessmentSection.SpecificFailurePaths) { - AddFailureMechanismWhenInAssembly( + AddFailureMechanismWhenInAssembly( exportableFailureMechanisms, specificFailurePath, assessmentSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism, FailureMechanismAssemblyFactory.AssembleSection, ExportableFailureMechanismType.Specific); } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs (.../ExportableCombinedSectionAssemblyFactory.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -113,10 +113,10 @@ if (specificFailurePathAssemblyResult.HasValue) { - SpecificFailurePath specificFailurePath = assessmentSection.SpecificFailurePaths.ElementAt(i); + SpecificFailureMechanism specificFailureMechanism = assessmentSection.SpecificFailurePaths.ElementAt(i); exportableAssemblyResults.Add(CreateExportableFailureMechanismCombinedSectionAssemblyResult( specificFailurePathAssemblyResult.Value, ExportableFailureMechanismType.Specific, - specificFailurePath.Code)); + specificFailureMechanism.Code)); } } Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -r992e185be6cbeb2713e0275483a1674a0f9e325a -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 992e185be6cbeb2713e0275483a1674a0f9e325a) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -100,9 +100,9 @@ changedObjects.ForEachElementDo(co => co.NotifyObservers()); } - private static void LogMergeMessage(SpecificFailurePath failurePath) + private static void LogMergeMessage(SpecificFailureMechanism failureMechanism) { - log.InfoFormat(Resources.AssessmentSectionMergeHandler_TryMergeFailureMechanism_FailureMechanism_0_added, failurePath.Name); + log.InfoFormat(Resources.AssessmentSectionMergeHandler_TryMergeFailureMechanism_FailureMechanism_0_added, failureMechanism.Name); } private static void LogMergeMessage(IFailureMechanism failureMechanism) @@ -112,7 +112,7 @@ #region FailurePaths - private static void MergeSpecificFailurePaths(AssessmentSection targetAssessmentSection, IEnumerable mergeFailurePaths) + private static void MergeSpecificFailurePaths(AssessmentSection targetAssessmentSection, IEnumerable mergeFailurePaths) { if (mergeFailurePaths.Any()) { Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -430,7 +430,7 @@ yield return CreateFailureMechanismResultViewInfo(fm => fm.GeneralInput.ApplyLengthEffectInSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism); - yield return CreateFailureMechanismResultViewInfo(fp => fp.GeneralInput.ApplyLengthEffectInSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism); + yield return CreateFailureMechanismResultViewInfo(fp => fp.GeneralInput.ApplyLengthEffectInSection, FailureMechanismAssemblyFactory.AssembleFailureMechanism); yield return new RiskeerViewInfo(() => Gui) { @@ -688,7 +688,7 @@ new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategy()); yield return RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - SpecificFailurePathSectionsContext, SpecificFailurePath, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>( + SpecificFailurePathSectionsContext, SpecificFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>( new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategy()); } @@ -1914,8 +1914,8 @@ private static void AddSpecificFailurePath(SpecificFailurePathsContext nodeData) { - ObservableList failurePaths = nodeData.WrappedData; - var newFailurePath = new SpecificFailurePath + ObservableList failurePaths = nodeData.WrappedData; + var newFailurePath = new SpecificFailureMechanism { Name = NamingHelper.GetUniqueName(failurePaths, RiskeerCommonDataResources.SpecificFailurePath_DefaultName, @@ -1974,7 +1974,7 @@ private static void SpecificFailurePathContextOnNodeRemoved(SpecificFailurePathContext nodeData, object parentNodeData) { var specificFailurePathsContext = (SpecificFailurePathsContext) parentNodeData; - ObservableList failurePaths = specificFailurePathsContext.WrappedData; + ObservableList failurePaths = specificFailurePathsContext.WrappedData; failurePaths.Remove(nodeData.WrappedData); failurePaths.NotifyObservers(); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -300,8 +300,8 @@ { var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()); - IEnumerable failurePaths = Enumerable.Repeat(new SpecificFailurePath(), random.Next(1, 10)) - .ToArray(); + IEnumerable failurePaths = Enumerable.Repeat(new SpecificFailureMechanism(), random.Next(1, 10)) + .ToArray(); assessmentSection.SpecificFailurePaths.AddRange(failurePaths); return assessmentSection; } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -199,7 +199,7 @@ yield return new TestCaseData(assessmentSection, assessmentSection.PipingStructure); yield return new TestCaseData(assessmentSection, assessmentSection.StabilityPointStructures); yield return new TestCaseData(assessmentSection, assessmentSection.DuneErosion); - foreach (SpecificFailurePath specificFailurePath in assessmentSection.SpecificFailurePaths) + foreach (SpecificFailureMechanism specificFailurePath in assessmentSection.SpecificFailurePaths) { yield return new TestCaseData(assessmentSection, specificFailurePath); } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -84,7 +84,7 @@ // Setup var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() .Concat(assessmentSection.SpecificFailurePaths) .Where(fm => fm.InAssembly) @@ -131,7 +131,7 @@ Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.StabilityPointStructures]), results[i].StabilityPointStructures); Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.DuneErosion]), results[i].DuneErosion); Assert.AreEqual(assessmentSection.SpecificFailurePaths.Count, results[i].SpecificFailurePaths.Length); - foreach (SpecificFailurePath specificFailurePath in assessmentSection.SpecificFailurePaths) + foreach (SpecificFailureMechanism specificFailurePath in assessmentSection.SpecificFailurePaths) { Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[specificFailurePath]), results[i].SpecificFailurePaths.Single()); } @@ -144,7 +144,7 @@ // Setup var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() .Concat(assessmentSection.SpecificFailurePaths) .Where(fm => fm.InAssembly) Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -373,7 +373,7 @@ private static void AssertFailurePathRows(AssessmentSection expectedAssessmentSection, DataGridViewRowCollection rows) { int offset = expectedAssessmentSection.GetFailureMechanisms().Count(); - ObservableList failurePaths = expectedAssessmentSection.SpecificFailurePaths; + ObservableList failurePaths = expectedAssessmentSection.SpecificFailurePaths; for (int i = 0; i < failurePaths.Count; i++) { AssertDataGridViewRow(failurePaths[i], rows[i + offset].Cells); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -148,7 +148,7 @@ public void GivenAssessmentSectionResultObserverWithAttachedObserver_WhenSpecificFailurePathInCollectionNotified_ThenAttachedObserverNotified() { // Given - var specificFailurePath = new SpecificFailurePath(); + var specificFailurePath = new SpecificFailureMechanism(); AssessmentSection assessmentSection = CreateAssessmentSection(); assessmentSection.SpecificFailurePaths.Add(specificFailurePath); @@ -183,7 +183,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var specificFailurePath = new SpecificFailurePath(); + var specificFailurePath = new SpecificFailureMechanism(); assessmentSection.SpecificFailurePaths.Add(specificFailurePath); assessmentSection.SpecificFailurePaths.NotifyObservers(); resultObserver.Attach(observer); @@ -200,12 +200,12 @@ public void GivenAssessmentSectionResultObserverWithAttachedObserver_WhenSpecificFailurePathRemovedAndNotified_ThenAttachedObserverNotNotified() { // Given - var failurePathToRemove = new SpecificFailurePath(); + var failurePathToRemove = new SpecificFailureMechanism(); AssessmentSection assessmentSection = CreateAssessmentSection(); assessmentSection.SpecificFailurePaths.AddRange(new[] { failurePathToRemove, - new SpecificFailurePath() + new SpecificFailureMechanism() }); using (var resultObserver = new AssessmentSectionResultObserver(assessmentSection)) Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathContextTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathContextTest.cs (.../SpecificFailurePathContextTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathContextTest.cs (.../SpecificFailurePathContextTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -41,14 +41,14 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); // Call var context = new SpecificFailurePathContext(failurePath, assessmentSection); // Assert - Assert.IsInstanceOf>(context); - Assert.IsInstanceOf>(context); + Assert.IsInstanceOf>(context); + Assert.IsInstanceOf>(context); Assert.AreSame(assessmentSection, context.Parent); Assert.AreSame(failurePath, context.WrappedData); mocks.VerifyAll(); @@ -58,7 +58,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); // Call void Call() => new SpecificFailurePathContext(failurePath, null); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathSectionResultContextTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathSectionResultContextTest.cs (.../SpecificFailurePathSectionResultContextTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathSectionResultContextTest.cs (.../SpecificFailurePathSectionResultContextTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -39,7 +39,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); // Call var context = new SpecificFailurePathSectionResultContext(failurePath.SectionResults, failurePath, assessmentSection); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathSectionsContextTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathSectionsContextTest.cs (.../SpecificFailurePathSectionsContextTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathSectionsContextTest.cs (.../SpecificFailurePathSectionsContextTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -39,7 +39,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); // Call var context = new SpecificFailurePathSectionsContext(failurePath, assessmentSection); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathsContextTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathsContextTest.cs (.../SpecificFailurePathsContextTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PresentationObjects/SpecificFailurePathsContextTest.cs (.../SpecificFailurePathsContextTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -41,13 +41,13 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); // Call var context = new SpecificFailurePathsContext(failurePaths, assessmentSection); // Assert - Assert.IsInstanceOf>>(context); + Assert.IsInstanceOf>>(context); Assert.AreSame(assessmentSection, context.AssessmentSection); Assert.AreSame(failurePaths, context.WrappedData); mocks.VerifyAll(); @@ -57,7 +57,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); // Call void Call() => new SpecificFailurePathsContext(failurePaths, null); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/SpecificFailurePathPropertiesTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/SpecificFailurePathPropertiesTest.cs (.../SpecificFailurePathPropertiesTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/SpecificFailurePathPropertiesTest.cs (.../SpecificFailurePathPropertiesTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -59,7 +59,7 @@ { // Setup var random = new Random(21); - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = random.NextBoolean(), GeneralInput = @@ -72,7 +72,7 @@ var properties = new SpecificFailurePathProperties(failurePath); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreEqual(failurePath.Name, properties.Name); Assert.AreEqual(failurePath.Code, properties.Code); Assert.AreEqual(failurePath.InAssembly, properties.InAssembly); @@ -87,7 +87,7 @@ public void Constructor_InAssemblyTrue_PropertiesHaveExpectedAttributesValues() { // Setup - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = true }; @@ -138,7 +138,7 @@ public void Constructor_InAssemblyFalse_PropertiesHaveExpectedAttributesValues() { // Setup - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = false }; @@ -183,7 +183,7 @@ mocks.ReplayAll(); var random = new Random(21); - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = random.NextBoolean() }; @@ -223,7 +223,7 @@ var observer = mocks.StrictMock(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); failurePath.Attach(observer); var properties = new SpecificFailurePathProperties(failurePath); @@ -247,7 +247,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); failureMechanism.Attach(observer); var properties = new SpecificFailurePathProperties(failureMechanism); @@ -266,7 +266,7 @@ public void DynamicVisibleValidationMethod_DependingOnInAssembly_ReturnExpectedVisibility(bool inAssembly) { // Setup - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = inAssembly }; Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -202,7 +202,7 @@ // When const string testCode = "TestCode"; - var specificFailurePath = new SpecificFailurePath + var specificFailurePath = new SpecificFailureMechanism { Code = testCode }; @@ -226,7 +226,7 @@ // Given var random = new Random(21); const string code = "TestCode"; - var failureMechanismToRemove = new SpecificFailurePath + var failureMechanismToRemove = new SpecificFailureMechanism { Code = code }; Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -326,7 +326,7 @@ public void GivenFormWithAssemblyResultTotalView_WhenSpecificFailurePathNotifiesObservers_ThenRefreshButtonEnabledAndWarningSet() { // Given - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); AssessmentSection assessmentSection = CreateAssessmentSection(); assessmentSection.SpecificFailurePaths.Add(failurePath); @@ -479,8 +479,8 @@ AssertFailureMechanismRows(view.AssessmentSection, calculator.AssemblyResult, rows); // When - ObservableList specificFailurePaths = assessmentSection.SpecificFailurePaths; - specificFailurePaths.Add(new SpecificFailurePath()); + ObservableList specificFailurePaths = assessmentSection.SpecificFailurePaths; + specificFailurePaths.Add(new SpecificFailureMechanism()); specificFailurePaths.NotifyObservers(); ButtonTester buttonTester = GetRefreshAssemblyResultButtonTester(); @@ -513,9 +513,9 @@ AssertFailureMechanismRows(view.AssessmentSection, calculator.AssemblyResult, rows); // When - ObservableList specificFailurePaths = assessmentSection.SpecificFailurePaths; - SpecificFailurePath failurePathToRemove = specificFailurePaths.Last(); - specificFailurePaths.Remove(failurePathToRemove); + ObservableList specificFailurePaths = assessmentSection.SpecificFailurePaths; + SpecificFailureMechanism failureMechanismToRemove = specificFailurePaths.Last(); + specificFailurePaths.Remove(failureMechanismToRemove); specificFailurePaths.NotifyObservers(); ButtonTester buttonTester = GetRefreshAssemblyResultButtonTester(); @@ -532,8 +532,8 @@ var assessmentSection = new AssessmentSection(new Random(21).NextEnumValue()); assessmentSection.SpecificFailurePaths.AddRange(new[] { - new SpecificFailurePath(), - new SpecificFailurePath() + new SpecificFailureMechanism(), + new SpecificFailureMechanism() }); return assessmentSection; } @@ -661,8 +661,8 @@ int startIndexFailurePathRow = 15; for (int i = startIndexFailurePathRow; i < nrOfExpectedRows; i++) { - SpecificFailurePath specificFailurePath = assessmentSection.SpecificFailurePaths[i - startIndexFailurePathRow]; - AssertAssemblyCells(specificFailurePath, assemblyOutput, rows[i].Cells); + SpecificFailureMechanism specificFailureMechanism = assessmentSection.SpecificFailurePaths[i - startIndexFailurePathRow]; + AssertAssemblyCells(specificFailureMechanism, assemblyOutput, rows[i].Cells); } } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/SpecificFailurePathViewTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/SpecificFailurePathViewTest.cs (.../SpecificFailurePathViewTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/SpecificFailurePathViewTest.cs (.../SpecificFailurePathViewTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -69,7 +69,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => new SpecificFailurePathView(new SpecificFailurePath(), null); + void Call() => new SpecificFailurePathView(new SpecificFailureMechanism(), null); // Assert Assert.That(Call, Throws.TypeOf() @@ -83,7 +83,7 @@ { // Setup var assessmentSection = new AssessmentSectionStub(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); // Call SpecificFailurePathView view = CreateView(failurePath, assessmentSection); @@ -129,7 +129,7 @@ new Point2D(4.0, 4.0), new Point2D(6.0, 4.0) }; - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); FailureMechanismTestHelper.SetSections(failurePath, new[] { new FailureMechanismSection("A", geometryPoints.Take(2)), @@ -166,7 +166,7 @@ mocks.ReplayAll(); var assessmentSection = new AssessmentSectionStub(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); SpecificFailurePathView view = CreateView(failurePath, assessmentSection); MapDataCollection mapData = view.Map.Data; @@ -201,7 +201,7 @@ ReferenceLine = referenceLine }; - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); SpecificFailurePathView view = CreateView(failurePath, assessmentSection); IEnumerable mapDataCollection = view.Map.Data.Collection; @@ -234,7 +234,7 @@ { // Given var assessmentSection = new AssessmentSectionStub(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); SpecificFailurePathView view = CreateView(failurePath, assessmentSection); @@ -279,7 +279,7 @@ const int updatedHydraulicBoundaryLocationsLayerIndex = hydraulicBoundaryLocationsIndex - 1; var assessmentSection = new AssessmentSectionStub(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); SpecificFailurePathView view = CreateView(failurePath, assessmentSection); @@ -322,19 +322,19 @@ Assert.AreEqual("Hydraulische belastingen", actualHydraulicBoundaryLocationsData.Name); } - private SpecificFailurePathView CreateView(SpecificFailurePath failurePath, IAssessmentSection assessmentSection) + private SpecificFailurePathView CreateView(SpecificFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - var view = new SpecificFailurePathView(failurePath, assessmentSection); + var view = new SpecificFailurePathView(failureMechanism, assessmentSection); testForm.Controls.Add(view); testForm.Show(); return view; } - private static void AssertEmptyMapData(SpecificFailurePath failurePath, MapDataCollection mapDataCollection) + private static void AssertEmptyMapData(SpecificFailureMechanism failureMechanism, MapDataCollection mapDataCollection) { - Assert.AreEqual(failurePath.Name, mapDataCollection.Name); + Assert.AreEqual(failureMechanism.Name, mapDataCollection.Name); List mapDataList = mapDataCollection.Collection.ToList(); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/AssemblyExporterTest.cs (.../AssemblyExporterTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -243,11 +243,11 @@ assessmentSection.SpecificFailurePaths.AddRange(new[] { - new SpecificFailurePath + new SpecificFailureMechanism { Code = "NIEUW1" }, - new SpecificFailurePath + new SpecificFailureMechanism { Code = "NIEUW2" } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -64,8 +64,8 @@ }; ReferenceLineTestFactory.SetReferenceLineGeometry(assessmentSection.ReferenceLine); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); FailureMechanismTestHelper.AddSections(assessmentSection.Piping, random.Next(1, 10)); FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityInwards, random.Next(1, 10)); @@ -124,8 +124,8 @@ }; ReferenceLineTestFactory.SetReferenceLineGeometry(assessmentSection.ReferenceLine); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); FailureMechanismTestHelper.AddSections(assessmentSection.Piping, random.Next(1, 10)); FailureMechanismTestHelper.AddSections(assessmentSection.MacroStabilityInwards, random.Next(1, 10)); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs (.../ExportableCombinedSectionAssemblyFactoryTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -78,11 +78,11 @@ assessmentSection.SpecificFailurePaths.AddRange(new[] { - new SpecificFailurePath + new SpecificFailureMechanism { Code = "Nieuw1" }, - new SpecificFailurePath + new SpecificFailureMechanism { Code = "Nieuw2" } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs (.../ReferenceLineUpdateHandlerTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -349,11 +349,11 @@ CollectionAssert.AreEqual(referenceLine.Points, assessmentSection.ReferenceLine.Points); - SpecificFailurePath failurePath = assessmentSection.SpecificFailurePaths.First(); - CollectionAssert.IsEmpty(failurePath.Sections); - CollectionAssert.IsEmpty(failurePath.SectionResults); - CollectionAssert.Contains(observables, failurePath); - CollectionAssert.Contains(observables, failurePath.SectionResults); + SpecificFailureMechanism failureMechanism = assessmentSection.SpecificFailurePaths.First(); + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); + CollectionAssert.Contains(observables, failureMechanism); + CollectionAssert.Contains(observables, failureMechanism.SectionResults); mocks.VerifyAll(); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -230,15 +230,15 @@ { SpecificFailurePaths = { - new SpecificFailurePath() + new SpecificFailureMechanism() } }; IFailureMechanism[] originalFailurePaths = targetAssessmentSection.SpecificFailurePaths.ToArray(); var failurePathsToMerge = new[] { - new SpecificFailurePath(), - new SpecificFailurePath() + new SpecificFailureMechanism(), + new SpecificFailureMechanism() }; var sourceAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); sourceAssessmentSection.SpecificFailurePaths.AddRange(failurePathsToMerge); @@ -264,15 +264,15 @@ { SpecificFailurePaths = { - new SpecificFailurePath() + new SpecificFailureMechanism() } }; IFailureMechanism[] originalFailurePaths = targetAssessmentSection.SpecificFailurePaths.ToArray(); var failurePathsToMerge = new[] { - new SpecificFailurePath(), - new SpecificFailurePath() + new SpecificFailureMechanism(), + new SpecificFailureMechanism() }; var sourceAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); sourceAssessmentSection.SpecificFailurePaths.AddRange(failurePathsToMerge); @@ -295,8 +295,8 @@ var failurePathsToMerge = new[] { - new SpecificFailurePath(), - new SpecificFailurePath() + new SpecificFailureMechanism(), + new SpecificFailureMechanism() }; var sourceAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -321,17 +321,17 @@ { SpecificFailurePaths = { - new SpecificFailurePath() + new SpecificFailureMechanism() } }; var failurePathsToMerge = new[] { - new SpecificFailurePath + new SpecificFailureMechanism { Name = "Path 1" }, - new SpecificFailurePath + new SpecificFailureMechanism { Name = "Path 2" } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/SpecificFailurePathPropertyInfoTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/SpecificFailurePathPropertyInfoTest.cs (.../SpecificFailurePathPropertyInfoTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/SpecificFailurePathPropertyInfoTest.cs (.../SpecificFailurePathPropertyInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -66,7 +66,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathContext(failurePath, assessmentSection); // Call Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -465,7 +465,7 @@ viewInfos, typeof(SpecificFailurePathSectionResultContext), typeof(IObservableEnumerable), - typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); + typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); PluginTestHelper.AssertViewInfoDefined( viewInfos, @@ -739,7 +739,7 @@ SetPlugins(gui); gui.Run(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { SpecificFailurePaths = Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/SpecificFailurePathContextTreeNodeInfoTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/SpecificFailurePathContextTreeNodeInfoTest.cs (.../SpecificFailurePathContextTreeNodeInfoTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/SpecificFailurePathContextTreeNodeInfoTest.cs (.../SpecificFailurePathContextTreeNodeInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -94,7 +94,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var failureMechanismContext = new SpecificFailurePathContext(failurePath, assessmentSection); // Call @@ -124,7 +124,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathContext(failurePath, assessmentSection); // Call @@ -169,7 +169,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); failurePath.Attach(observer); var context = new SpecificFailurePathContext(failurePath, assessmentSection); @@ -205,10 +205,10 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathContext(failurePath, assessmentSection); - var failurePaths = new ObservableList + var failurePaths = new ObservableList { failurePath }; @@ -229,7 +229,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var specificFailurePath = new SpecificFailurePath(); + var specificFailurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathContext(specificFailurePath, assessmentSection); // Call @@ -271,7 +271,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = false }; @@ -293,7 +293,7 @@ // Setup using (var treeView = new TreeViewControl()) { - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = mocks.Stub(); var context = new SpecificFailurePathContext(failurePath, assessmentSection); @@ -333,7 +333,7 @@ public void ContextMenuStrip_FailurePathInAssemblyFalse_CallsContextMenuBuilderMethods() { // Setup - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = false }; @@ -374,11 +374,11 @@ [TestFixture] public class SpecificFailurePathContextInAssemblyTreeNodeInfoTest - : FailurePathInAssemblyTreeNodeInfoTestFixtureBase + : FailurePathInAssemblyTreeNodeInfoTestFixtureBase { public SpecificFailurePathContextInAssemblyTreeNodeInfoTest() : base(2, 0) {} - protected override SpecificFailurePathContext CreateFailureMechanismContext(SpecificFailurePath failureMechanism, + protected override SpecificFailurePathContext CreateFailureMechanismContext(SpecificFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { return new SpecificFailurePathContext(failureMechanism, assessmentSection); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/SpecificFailurePathsContextTreeNodeInfoTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/SpecificFailurePathsContextTreeNodeInfoTest.cs (.../SpecificFailurePathsContextTreeNodeInfoTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/SpecificFailurePathsContextTreeNodeInfoTest.cs (.../SpecificFailurePathsContextTreeNodeInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -96,7 +96,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var failureMechanismContext = new SpecificFailurePathsContext(failurePaths, assessmentSection); // Call @@ -138,7 +138,7 @@ // Setup using (var treeView = new TreeViewControl()) { - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var assessmentSection = mocks.Stub(); var context = new SpecificFailurePathsContext(failurePaths, assessmentSection); @@ -172,7 +172,7 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var assessmentSection = mocks.Stub(); var context = new SpecificFailurePathsContext(failurePaths, assessmentSection); @@ -205,7 +205,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var assessmentSection = mocks.Stub(); var context = new SpecificFailurePathsContext(failurePaths, assessmentSection); @@ -228,7 +228,7 @@ // Assert Assert.AreEqual(1, failurePaths.Count); IFailureMechanism addedItem = failurePaths.Single(); - Assert.IsInstanceOf(addedItem); + Assert.IsInstanceOf(addedItem); Assert.AreEqual("Nieuw faalmechanisme", addedItem.Name); } } @@ -241,9 +241,9 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var failurePaths = new ObservableList + var failurePaths = new ObservableList { - new SpecificFailurePath + new SpecificFailureMechanism { Name = "Nieuw faalmechanisme" } @@ -270,7 +270,7 @@ // Then Assert.AreEqual(2, failurePaths.Count); IFailureMechanism addedItem = failurePaths.Last(); - Assert.IsInstanceOf(addedItem); + Assert.IsInstanceOf(addedItem); Assert.AreEqual("Nieuw faalmechanisme (1)", addedItem.Name); } } @@ -283,7 +283,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var targetData = new SpecificFailurePathsContext(failurePaths, assessmentSection); // Call @@ -300,10 +300,10 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var targetData = new SpecificFailurePathsContext(failurePaths, assessmentSection); - var draggedData = new SpecificFailurePathContext(new SpecificFailurePath(), assessmentSection); + var draggedData = new SpecificFailurePathContext(new SpecificFailureMechanism(), assessmentSection); // Call bool canInsert = info.CanInsert(draggedData, targetData); @@ -319,8 +319,8 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); - var failurePaths = new ObservableList + var failurePath = new SpecificFailureMechanism(); + var failurePaths = new ObservableList { failurePath }; @@ -342,7 +342,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var targetData = new SpecificFailurePathsContext(failurePaths, assessmentSection); // Call @@ -359,10 +359,10 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var targetData = new SpecificFailurePathsContext(failurePaths, assessmentSection); - var draggedData = new SpecificFailurePathContext(new SpecificFailurePath(), assessmentSection); + var draggedData = new SpecificFailurePathContext(new SpecificFailureMechanism(), assessmentSection); // Call bool canDrop = info.CanDrop(draggedData, targetData); @@ -378,8 +378,8 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); - var failurePaths = new ObservableList + var failurePath = new SpecificFailureMechanism(); + var failurePaths = new ObservableList { failurePath }; @@ -403,9 +403,9 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var unmovedFailurePath = new SpecificFailurePath(); - var movedFailurePath = new SpecificFailurePath(); - var failurePaths = new ObservableList + var unmovedFailurePath = new SpecificFailureMechanism(); + var movedFailurePath = new SpecificFailureMechanism(); + var failurePaths = new ObservableList { unmovedFailurePath, movedFailurePath @@ -433,7 +433,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePaths = new ObservableList(); + var failurePaths = new ObservableList(); var context = new SpecificFailurePathsContext(failurePaths, assessmentSection); // Call @@ -450,8 +450,8 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); - var failurePaths = new ObservableList + var failurePath = new SpecificFailureMechanism(); + var failurePaths = new ObservableList { failurePath }; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/SpecificFailurePathSectionsContextUpdateInfoTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/SpecificFailurePathSectionsContextUpdateInfoTest.cs (.../SpecificFailurePathSectionsContextUpdateInfoTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/SpecificFailurePathSectionsContextUpdateInfoTest.cs (.../SpecificFailurePathSectionsContextUpdateInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -26,7 +26,7 @@ assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var importTarget = new SpecificFailurePathSectionsContext(failurePath, assessmentSection); using (var plugin = new RiskeerPlugin()) @@ -99,7 +99,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); failurePath.SetSections(Enumerable.Empty(), "path"); @@ -127,7 +127,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathSectionsContext(failurePath, assessmentSection); using (var plugin = new RiskeerPlugin()) @@ -169,7 +169,7 @@ mocks.ReplayAll(); const string expectedFilePath = "path"; - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); failurePath.SetSections(Enumerable.Empty(), expectedFilePath); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs (.../CommentViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -138,7 +138,7 @@ { // Setup var deletedAssessmentSection = mocks.Stub(); - deletedAssessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList()); + deletedAssessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList()); deletedAssessmentSection.Stub(s => s.GetFailureMechanisms()).Return(Enumerable.Empty()); deletedAssessmentSection.Stub(s => s.Comments).Return(new Comment()); @@ -216,7 +216,7 @@ failureMechanism.Stub(fm => fm.CalculationsInputComments).Return(new Comment()); var assessmentSection = mocks.Stub(); - assessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList()); assessmentSection.Stub(s => s.GetFailureMechanisms()).Return(new[] { failureMechanism @@ -259,7 +259,7 @@ deletedFailureMechanism.Stub(fm => fm.CalculationsInputComments).Return(new Comment()); var deletedAssessmentSection = mocks.Stub(); - deletedAssessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList()); + deletedAssessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList()); deletedAssessmentSection.Stub(s => s.GetFailureMechanisms()).Return(new[] { deletedFailureMechanism @@ -462,9 +462,9 @@ var deletedAssessmentSection = mocks.Stub(); deletedAssessmentSection.Stub(s => s.GetFailureMechanisms()).Return(Enumerable.Empty()); - deletedAssessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList + deletedAssessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList { - new SpecificFailurePath() + new SpecificFailureMechanism() }); deletedAssessmentSection.Stub(s => s.Comments).Return(new Comment()); mocks.ReplayAll(); @@ -486,14 +486,14 @@ [Test] [TestCaseSource(nameof(GetFailurePathCommentTestCases))] - public void CloseForData_ViewDataIsFailurePathCommentOfDeletedAssessmentSection_ReturnTrue(Func getCommentFunc) + public void CloseForData_ViewDataIsFailurePathCommentOfDeletedAssessmentSection_ReturnTrue(Func getCommentFunc) { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(s => s.GetFailureMechanisms()).Return(Enumerable.Empty()); - assessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList + assessmentSection.Stub(s => s.SpecificFailurePaths).Return(new ObservableList { failurePath }); @@ -701,9 +701,9 @@ private static IEnumerable GetFailurePathCommentTestCases() { - yield return new TestCaseData(new Func(fp => fp.InAssemblyInputComments)); - yield return new TestCaseData(new Func(fp => fp.InAssemblyOutputComments)); - yield return new TestCaseData(new Func(fp => fp.NotInAssemblyComments)); + yield return new TestCaseData(new Func(fp => fp.InAssemblyInputComments)); + yield return new TestCaseData(new Func(fp => fp.InAssemblyOutputComments)); + yield return new TestCaseData(new Func(fp => fp.NotInAssemblyComments)); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismResultViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -99,7 +99,7 @@ // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); @@ -130,7 +130,7 @@ { otherFailureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismResultViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -99,7 +99,7 @@ // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism(); @@ -129,7 +129,7 @@ { otherFailureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs (.../MicrostabilityFailureMechanismResultViewInfoTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismResultViewInfoTest.cs (.../MicrostabilityFailureMechanismResultViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -98,7 +98,7 @@ // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new MicrostabilityFailureMechanism(); @@ -129,7 +129,7 @@ { otherFailureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new MicrostabilityFailureMechanism(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs (.../PipingStructureFailureMechanismResultViewInfoTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismResultViewInfoTest.cs (.../PipingStructureFailureMechanismResultViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -98,7 +98,7 @@ // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new PipingStructureFailureMechanism(); @@ -125,7 +125,7 @@ { otherFailureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new PipingStructureFailureMechanism(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathResultViewInfoTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathResultViewInfoTest.cs (.../SpecificFailurePathResultViewInfoTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathResultViewInfoTest.cs (.../SpecificFailurePathResultViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -46,7 +46,7 @@ { mocks = new MockRepository(); plugin = new RiskeerPlugin(); - info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); + info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView)); } [TearDown] @@ -70,7 +70,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); var context = new SpecificFailurePathSectionResultContext( failureMechanism.SectionResults, failureMechanism, assessmentSection); @@ -98,12 +98,12 @@ // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Array.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); - using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN, fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) @@ -122,19 +122,19 @@ public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var otherFailureMechanism = new SpecificFailurePath(); + var otherFailureMechanism = new SpecificFailureMechanism(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Array.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList { otherFailureMechanism }); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); - using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN, fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) @@ -153,17 +153,17 @@ public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(Array.Empty()); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList { failureMechanism }); mocks.ReplayAll(); - using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN, fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) @@ -185,10 +185,10 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); var failurePathContext = new SpecificFailurePathContext(failureMechanism, assessmentSection); - using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN, fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) @@ -210,10 +210,10 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); - var failurePathContext = new SpecificFailurePathContext(new SpecificFailurePath(), assessmentSection); + var failureMechanism = new SpecificFailureMechanism(); + var failurePathContext = new SpecificFailurePathContext(new SpecificFailureMechanism(), assessmentSection); - using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( + using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView( failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, ass) => double.NaN, fm => true, sr => FailureMechanismSectionAssemblyResultTestFactory.CreateFailureMechanismSectionAssemblyResult())) @@ -235,15 +235,15 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failureMechanism = new SpecificFailurePath(); + var failureMechanism = new SpecificFailureMechanism(); var context = new SpecificFailurePathSectionResultContext( failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call IView view = info.CreateInstance(context); // Assert - Assert.IsInstanceOf>(view); + Assert.IsInstanceOf>(view); mocks.VerifyAll(); } } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathViewInfoTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathViewInfoTest.cs (.../SpecificFailurePathViewInfoTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/SpecificFailurePathViewInfoTest.cs (.../SpecificFailurePathViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -70,7 +70,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathContext(failurePath, assessmentSection); // Call @@ -86,7 +86,7 @@ { // Setup var assessmentSection = new AssessmentSectionStub(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var context = new SpecificFailurePathContext(failurePath, assessmentSection); using (var testForm = new Form()) @@ -109,7 +109,7 @@ { // Setup var assessmentSection = new AssessmentSectionStub(); - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { InAssembly = inAssembly }; @@ -127,11 +127,11 @@ { // Setup var otherAssessmentSection = mocks.Stub(); - otherAssessmentSection.Stub(ass => ass.SpecificFailurePaths).Return(new ObservableList()); + otherAssessmentSection.Stub(ass => ass.SpecificFailurePaths).Return(new ObservableList()); otherAssessmentSection.Stub(ass => ass.GetFailureMechanisms()).Return(Enumerable.Empty()); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var view = new SpecificFailurePathView(failurePath, assessmentSection); @@ -147,7 +147,7 @@ public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSectionStub { SpecificFailurePaths = @@ -172,11 +172,11 @@ var otherAssessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var view = new SpecificFailurePathView(failurePath, assessmentSection); - var context = new SpecificFailurePathContext(new SpecificFailurePath(), otherAssessmentSection); + var context = new SpecificFailurePathContext(new SpecificFailureMechanism(), otherAssessmentSection); // Call bool closeForData = info.CloseForData(view, context); @@ -190,7 +190,7 @@ public void CloseForData_ViewCorrespondingToRemovedContext_ReturnsTrue() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var view = new SpecificFailurePathView(failurePath, assessmentSection); @@ -208,12 +208,12 @@ public void CloseForData_ViewNotCorrespondingToFailurePath_ReturnsFalse() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var view = new SpecificFailurePathView(failurePath, assessmentSection); // Call - bool closeForData = info.CloseForData(view, new SpecificFailurePath()); + bool closeForData = info.CloseForData(view, new SpecificFailureMechanism()); // Assert Assert.IsFalse(closeForData); @@ -224,7 +224,7 @@ public void CloseForData_ViewCorrespondingToRemovedFailurePath_ReturnsTrue() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var view = new SpecificFailurePathView(failurePath, assessmentSection); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r1656dcdbad8f28c0a84ec6636efe0004c62029d2 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 1656dcdbad8f28c0a84ec6636efe0004c62029d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismResultViewInfoTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -99,7 +99,7 @@ // Setup var assessmentSection = mocks.Stub(); assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); @@ -130,7 +130,7 @@ { otherFailureMechanism }); - assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); + assessmentSection.Stub(asm => asm.SpecificFailurePaths).Return(new ObservableList()); mocks.ReplayAll(); var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -1034,9 +1034,9 @@ CollectionAssert.IsEmpty(pipingStructureFailureMechanism.Sections); CollectionAssert.IsEmpty(pipingStructureFailureMechanism.SectionResults); - SpecificFailurePath specificFailurePath = assessmentSection.SpecificFailurePaths.First(); - CollectionAssert.IsEmpty(specificFailurePath.Sections); - CollectionAssert.IsEmpty(specificFailurePath.SectionResults); + SpecificFailureMechanism specificFailureMechanism = assessmentSection.SpecificFailurePaths.First(); + CollectionAssert.IsEmpty(specificFailureMechanism.Sections); + CollectionAssert.IsEmpty(specificFailureMechanism.SectionResults); } [Test] @@ -1747,9 +1747,9 @@ CollectionAssert.Contains(changedObjects, pipingStructureFailureMechanism); CollectionAssert.Contains(changedObjects, pipingStructureFailureMechanism.SectionResults); - SpecificFailurePath failurePath = assessmentSection.SpecificFailurePaths.First(); - CollectionAssert.Contains(changedObjects, failurePath); - CollectionAssert.Contains(changedObjects, failurePath.SectionResults); + SpecificFailureMechanism failureMechanism = assessmentSection.SpecificFailurePaths.First(); + CollectionAssert.Contains(changedObjects, failureMechanism); + CollectionAssert.Contains(changedObjects, failureMechanism.SectionResults); } private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(AssessmentSection assessmentSection) Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -126,7 +126,7 @@ SetFullyConfiguredFailureMechanism(assessmentSection.PipingStructure); SetFullyConfiguredFailureMechanism(assessmentSection.WaterPressureAsphaltCover); - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); SetFullyConfiguredFailureMechanism(failurePath); assessmentSection.SpecificFailurePaths.Add(failurePath); @@ -146,13 +146,13 @@ public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsAndFailurePaths( AssessmentSectionComposition composition = AssessmentSectionComposition.Dike) { - var failurePaths = new List + var failurePaths = new List { - new SpecificFailurePath + new SpecificFailureMechanism { Name = "Path 1" }, - new SpecificFailurePath + new SpecificFailureMechanism { Name = "Path 2" } @@ -307,10 +307,10 @@ AddFailureMechanismSections(failureMechanisms.ElementAt(i), i); } - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); - assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailureMechanism()); - ObservableList specificFailurePaths = assessmentSection.SpecificFailurePaths; + ObservableList specificFailurePaths = assessmentSection.SpecificFailurePaths; for (var i = 0; i < specificFailurePaths.Count; i++) { AddFailureMechanismSections(specificFailurePaths.ElementAt(i), i); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -109,7 +109,7 @@ private static void AddSpecificFailurePathEntities(AssessmentSection section, AssessmentSectionEntity entity, PersistenceRegistry registry) { var i = 0; - foreach (SpecificFailurePath failurePath in section.SpecificFailurePaths) + foreach (SpecificFailureMechanism failurePath in section.SpecificFailurePaths) { entity.SpecificFailurePathEntities.Add(failurePath.Create(registry, i++)); } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs =================================================================== diff -u -r3234a1e938a7c8046e8d8694eaea1cf7456206e6 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs (.../FailurePathCreateExtensions.cs) (revision 3234a1e938a7c8046e8d8694eaea1cf7456206e6) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs (.../FailurePathCreateExtensions.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -76,27 +76,27 @@ } /// - /// Creates a based on the information of the . + /// Creates a based on the information of the . /// - /// The structure to create a database entity for. + /// The structure to create a database entity for. /// The object keeping track of create operations. - /// The index at which resides within its parent. + /// The index at which resides within its parent. /// A new . /// Thrown when is null. - internal static SpecificFailurePathEntity Create(this SpecificFailurePath specificFailurePath, PersistenceRegistry registry, int order) + internal static SpecificFailurePathEntity Create(this SpecificFailureMechanism specificFailureMechanism, PersistenceRegistry registry, int order) { if (registry == null) { throw new ArgumentNullException(nameof(registry)); } - var entity = Create(specificFailurePath, registry); - AddEntitiesForSectionResults(specificFailurePath.SectionResults, registry); - entity.Name = specificFailurePath.Name.DeepClone(); - entity.Code = specificFailurePath.Code.DeepClone(); + var entity = Create(specificFailureMechanism, registry); + AddEntitiesForSectionResults(specificFailureMechanism.SectionResults, registry); + entity.Name = specificFailureMechanism.Name.DeepClone(); + entity.Code = specificFailureMechanism.Code.DeepClone(); entity.Order = order; - entity.N = specificFailurePath.GeneralInput.N; - entity.ApplyLengthEffectInSection = Convert.ToByte(specificFailurePath.GeneralInput.ApplyLengthEffectInSection); + entity.N = specificFailureMechanism.GeneralInput.N; + entity.ApplyLengthEffectInSection = Convert.ToByte(specificFailureMechanism.GeneralInput.ApplyLengthEffectInSection); return entity; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs =================================================================== diff -u -r3234a1e938a7c8046e8d8694eaea1cf7456206e6 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision 3234a1e938a7c8046e8d8694eaea1cf7456206e6) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -99,12 +99,12 @@ } /// - /// Reads the and uses the information to create a . + /// Reads the and uses the information to create a . /// - /// The to create a with. + /// The to create a with. /// The object keeping track of read operations. /// Thrown when any argument is null. - internal static SpecificFailurePath ReadSpecificFailurePath(this SpecificFailurePathEntity entity, + internal static SpecificFailureMechanism ReadSpecificFailurePath(this SpecificFailurePathEntity entity, ReadConversionCollector collector) { if (entity == null) @@ -117,7 +117,7 @@ throw new ArgumentNullException(nameof(collector)); } - var specificFailurePath = new SpecificFailurePath + var specificFailurePath = new SpecificFailureMechanism { Name = entity.Name, Code = entity.Code, @@ -157,14 +157,14 @@ } private static void ReadNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(this IFailureMechanismEntity entity, - SpecificFailurePath specificFailurePath, + SpecificFailureMechanism specificFailureMechanism, ReadConversionCollector collector) { foreach (NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities)) { FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - NonAdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult = specificFailurePath.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + NonAdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult = specificFailureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(sectionResult); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -50,10 +50,10 @@ var assessmentSection = new AssessmentSection(assessmentSectionComposition); // Call - TestDelegate test = () => assessmentSection.Create(null); + void Call() => assessmentSection.Create(null); // Assert - string parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(Call).ParamName; Assert.AreEqual("registry", parameterName); } @@ -76,8 +76,8 @@ const bool isVisible = true; const BackgroundDataType backgroundType = BackgroundDataType.Wmts; var normativeNorm = random.NextEnumValue(); - IEnumerable specificFailurePaths = Enumerable.Repeat(new SpecificFailurePath(), random.Next(1, 10)) - .ToArray(); + IEnumerable specificFailurePaths = Enumerable.Repeat(new SpecificFailureMechanism(), random.Next(1, 10)) + .ToArray(); var assessmentSection = new AssessmentSection(assessmentSectionComposition) { Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -355,7 +355,7 @@ public void CreateForFailurePath_RegistryNull_ThrowsArgumentNullException() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); // Call void Call() => failurePath.Create(null, 0); @@ -372,7 +372,7 @@ var random = new Random(21); int order = random.Next(); - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { GeneralInput = { @@ -415,7 +415,7 @@ public void CreateForFailurePath_WithNaNValues_ReturnExpectedEntity() { // Setup - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); var registry = new PersistenceRegistry(); // Precondition @@ -434,7 +434,7 @@ { // Setup const string specificFailurePathSectionsSourcePath = "File\\Path"; - var failurePath = new SpecificFailurePath(); + var failurePath = new SpecificFailureMechanism(); failurePath.SetSections(new[] { @@ -466,7 +466,7 @@ public void CreateForFailurePath_StringPropertiesDoNotShareReference() { // Setup - var failurePath = new SpecificFailurePath + var failurePath = new SpecificFailureMechanism { Name = "Just a Name", Code = "FAALMECHANISME", Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -692,7 +692,7 @@ #region SpecificFailurePaths - private static void AssertSpecificFailurePath(SpecificFailurePath expected, SpecificFailurePath actual) + private static void AssertSpecificFailurePath(SpecificFailureMechanism expected, SpecificFailureMechanism actual) { Assert.AreEqual(expected.Name, actual.Name); Assert.AreEqual(expected.InAssembly, actual.InAssembly); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -1049,7 +1049,7 @@ AssessmentSection section = entity.Read(collector); // Assert - SpecificFailurePath specificFailurePath1 = section.SpecificFailurePaths[0]; + SpecificFailureMechanism specificFailurePath1 = section.SpecificFailurePaths[0]; Assert.IsNotNull(specificFailurePath1); Assert.AreEqual(name1, specificFailurePath1.Name); Assert.AreEqual(inAssembly1, specificFailurePath1.InAssembly); @@ -1059,7 +1059,7 @@ Assert.AreEqual(n1, specificFailurePath1.GeneralInput.N, specificFailurePath1.GeneralInput.N.GetAccuracy()); Assert.IsNull(specificFailurePath1.FailureMechanismSectionSourcePath); - SpecificFailurePath specificFailurePath2 = section.SpecificFailurePaths[1]; + SpecificFailureMechanism specificFailurePath2 = section.SpecificFailurePaths[1]; Assert.IsNotNull(specificFailurePath2); Assert.AreEqual(name2, specificFailurePath2.Name); Assert.AreEqual(inAssembly2, specificFailurePath2.InAssembly); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs =================================================================== diff -u -r3234a1e938a7c8046e8d8694eaea1cf7456206e6 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision 3234a1e938a7c8046e8d8694eaea1cf7456206e6) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -350,18 +350,18 @@ var collector = new ReadConversionCollector(); // Call - SpecificFailurePath specificFailurePath = entity.ReadSpecificFailurePath(collector); + SpecificFailureMechanism specificFailureMechanism = entity.ReadSpecificFailurePath(collector); // Assert - AssertCommonFailurePathProperties(entity, specificFailurePath); + AssertCommonFailurePathProperties(entity, specificFailureMechanism); - Assert.AreEqual(entity.Name, specificFailurePath.Name); - Assert.AreEqual(entity.Code, specificFailurePath.Code); - Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailurePath.Sections.Count()); - Assert.AreEqual(filePath, specificFailurePath.FailureMechanismSectionSourcePath); + Assert.AreEqual(entity.Name, specificFailureMechanism.Name); + Assert.AreEqual(entity.Code, specificFailureMechanism.Code); + Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailureMechanism.Sections.Count()); + Assert.AreEqual(filePath, specificFailureMechanism.FailureMechanismSectionSourcePath); - Assert.AreEqual(entity.N, specificFailurePath.GeneralInput.N, specificFailurePath.GeneralInput.N.GetAccuracy()); - Assert.AreEqual(Convert.ToBoolean(entity.ApplyLengthEffectInSection), specificFailurePath.GeneralInput.ApplyLengthEffectInSection); + Assert.AreEqual(entity.N, specificFailureMechanism.GeneralInput.N, specificFailureMechanism.GeneralInput.N.GetAccuracy()); + Assert.AreEqual(Convert.ToBoolean(entity.ApplyLengthEffectInSection), specificFailureMechanism.GeneralInput.ApplyLengthEffectInSection); } [Test] @@ -375,10 +375,10 @@ var collector = new ReadConversionCollector(); // Call - SpecificFailurePath specificFailurePath = entity.ReadSpecificFailurePath(collector); + SpecificFailureMechanism specificFailureMechanism = entity.ReadSpecificFailurePath(collector); // Assert - FailurePathAssemblyResult assemblyResult = specificFailurePath.AssemblyResult; + FailurePathAssemblyResult assemblyResult = specificFailureMechanism.AssemblyResult; Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability); } @@ -394,11 +394,11 @@ var collector = new ReadConversionCollector(); // Call - SpecificFailurePath specificFailurePath = entity.ReadSpecificFailurePath(collector); + SpecificFailureMechanism specificFailureMechanism = entity.ReadSpecificFailurePath(collector); // Assert - Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailurePath.Sections.Count()); - Assert.IsNull(specificFailurePath.FailureMechanismSectionSourcePath); + Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailureMechanism.Sections.Count()); + Assert.IsNull(specificFailureMechanism.FailureMechanismSectionSourcePath); } [Test] @@ -432,16 +432,16 @@ var collector = new ReadConversionCollector(); // Call - SpecificFailurePath specificFailurePath = entity.ReadSpecificFailurePath(collector); + SpecificFailureMechanism specificFailureMechanism = entity.ReadSpecificFailurePath(collector); // Assert - Assert.AreEqual(filePath, specificFailurePath.FailureMechanismSectionSourcePath); - Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailurePath.Sections.Count()); + Assert.AreEqual(filePath, specificFailureMechanism.FailureMechanismSectionSourcePath); + Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, specificFailureMechanism.Sections.Count()); SectionResultTestHelper.AssertSectionResult(entity.FailureMechanismSectionEntities .SelectMany(fms => fms.NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntities) .Single(), - specificFailurePath.SectionResults.Single()); + specificFailureMechanism.SectionResults.Single()); } private static void AssertCommonFailurePathProperties(IFailureMechanismEntity entity, IFailureMechanism failurePath) Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) @@ -216,8 +216,8 @@ SetFailurePathAssemblyResults(fm, i++); }); - IEnumerable failurePaths = Enumerable.Repeat(new SpecificFailurePath(), random.Next(1, 10)) - .ToArray(); + IEnumerable failurePaths = Enumerable.Repeat(new SpecificFailureMechanism(), random.Next(1, 10)) + .ToArray(); SetSpecificFailurePaths(failurePaths); assessmentSection.SpecificFailurePaths.AddRange(failurePaths); assessmentSection.SpecificFailurePaths.ForEach(SetComments); @@ -534,10 +534,10 @@ #region Specific FailurePath - private static void SetSpecificFailurePaths(IEnumerable specificFailurePaths) + private static void SetSpecificFailurePaths(IEnumerable specificFailurePaths) { var i = 0; - foreach (SpecificFailurePath failurePath in specificFailurePaths) + foreach (SpecificFailureMechanism failurePath in specificFailurePaths) { var random = new Random(i); failurePath.GeneralInput.N = random.NextRoundedDouble(1, 20); @@ -1660,11 +1660,11 @@ new Point3D(5.8, 6.0, -2.3), // Dike toe at river new Point3D(5.6, 6.0, 3.4), new Point3D(4.2, 6.0, 3.5), - new Point3D(4.0, 6.0, 0.5), // Dike toe at polder - new Point3D(3.8, 6.0, 0.5), // Ditch dike side - new Point3D(3.6, 6.0, 0.2), // Bottom ditch dike side + new Point3D(4.0, 6.0, 0.5), // Dike toe at polder + new Point3D(3.8, 6.0, 0.5), // Ditch dike side + new Point3D(3.6, 6.0, 0.2), // Bottom ditch dike side new Point3D(3.4, 6.0, 0.25), // Bottom ditch polder side - new Point3D(3.2, 6.0, 0.5), // Ditch polder side + new Point3D(3.2, 6.0, 0.5), // Ditch polder side new Point3D(3.0, 6.0, 0.5) }; surfaceLine.SetGeometry(geometryPoints);