Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs =================================================================== diff -u -r0f49dd029445f0da5c81765797ef78147e5aa1e9 -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs (.../RiskeerPluginHelper.cs) (revision 0f49dd029445f0da5c81765797ef78147e5aa1e9) +++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs (.../RiskeerPluginHelper.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -76,9 +76,9 @@ { var failureMechanism = removedObject as IFailureMechanism; - if (removedObject is IFailureMechanismContext failurePathContext) + if (removedObject is IFailureMechanismContext failureMechanismContext) { - failureMechanism = failurePathContext.WrappedData; + failureMechanism = failureMechanismContext.WrappedData; } if (removedObject is IAssessmentSection assessmentSection) @@ -99,22 +99,22 @@ /// Whether the view should be closed. public static bool ShouldCloseForFailurePathView(CloseForFailurePathView view, object removedObject) { - var failurePath = removedObject as IFailureMechanism; + var failureMechanism = removedObject as IFailureMechanism; - if (removedObject is IFailureMechanismContext failurePathContext) + if (removedObject is IFailureMechanismContext failureMechanismContext) { - failurePath = failurePathContext.WrappedData; + failureMechanism = failureMechanismContext.WrappedData; } if (removedObject is IAssessmentSection assessmentSection) { - failurePath = assessmentSection.GetFailureMechanisms() - .FirstOrDefault(fm => fm == view.FailurePath) - ?? assessmentSection.SpecificFailurePaths - .FirstOrDefault(fp => fp == view.FailurePath); + failureMechanism = assessmentSection.GetFailureMechanisms() + .FirstOrDefault(fm => fm == view.FailurePath) + ?? assessmentSection.SpecificFailurePaths + .FirstOrDefault(fp => fp == view.FailurePath); } - return failurePath != null && ReferenceEquals(view.FailurePath, failurePath); + return failureMechanism != null && ReferenceEquals(view.FailurePath, failureMechanism); } private static IEnumerable GetCalculationsFromFailureMechanisms(object o) Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs =================================================================== diff -u -rba639d608bbfcd02a294acfa6c428d41f2e627ce -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -115,89 +115,89 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); mocks.ReplayAll(); // Call void Call() => AssemblyToolHelper.AssemblyFailureMechanism( - failurePath, null, double.NaN); + failureMechanism, null, double.NaN); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("performSectionAssemblyFunc", exception.ParamName); } [Test] - public void AssembleFailureMechanism_WithFailurePathInAssemblyFalse_ReturnsNaN() + public void AssembleFailureMechanism_WithFailureMechanismInAssemblyFalse_ReturnsNaN() { // Setup var random = new Random(21); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); mocks.ReplayAll(); - failurePath.InAssembly = false; + failureMechanism.InAssembly = false; // Call double assemblyResult = AssemblyToolHelper.AssemblyFailureMechanism( - failurePath, sr => null, random.NextDouble()); + failureMechanism, sr => null, random.NextDouble()); // Assert Assert.IsNaN(assemblyResult); mocks.VerifyAll(); } [Test] - public void AssembleFailureMechanism_WithFailurePathInAssemblyAndProbabilityResultTypeManual_ReturnsExpectedAssemblyResult() + public void AssembleFailureMechanism_WithFailureMechanismInAssemblyAndProbabilityResultTypeManual_ReturnsExpectedAssemblyResult() { // Setup var random = new Random(21); double expectedAssemblyResult = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); - failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailureMechanismAssemblyResult - { - ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual, - ManualFailureMechanismAssemblyProbability = expectedAssemblyResult - }); + var failureMechanism = mocks.Stub>(); + failureMechanism.Stub(fp => fp.AssemblyResult) + .Return(new FailureMechanismAssemblyResult + { + ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual, + ManualFailureMechanismAssemblyProbability = expectedAssemblyResult + }); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; // Call - double assemblyResult = AssemblyToolHelper.AssemblyFailureMechanism(failurePath, sr => null, double.NaN); + double assemblyResult = AssemblyToolHelper.AssemblyFailureMechanism(failureMechanism, sr => null, double.NaN); // Assert Assert.AreEqual(expectedAssemblyResult, assemblyResult); mocks.VerifyAll(); } [Test] - public void AssembleFailureMechanism_WithFailurePathInAssemblyAndProbabilityResultTypeAutomatic_InputCorrectlySetOnCalculator() + public void AssembleFailureMechanism_WithFailureMechanismInAssemblyAndProbabilityResultTypeAutomatic_InputCorrectlySetOnCalculator() { // Setup var random = new Random(21); double failureMechanismN = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); - failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailureMechanismAssemblyResult - { - ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, - ManualFailureMechanismAssemblyProbability = double.NaN - }); - failurePath.Stub(fp => fp.SectionResults) - .Return(new ObservableList - { - new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }); + var failureMechanism = mocks.Stub>(); + failureMechanism.Stub(fp => fp.AssemblyResult) + .Return(new FailureMechanismAssemblyResult + { + ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, + ManualFailureMechanismAssemblyProbability = double.NaN + }); + failureMechanism.Stub(fp => fp.SectionResults) + .Return(new ObservableList + { + new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + }); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; using (new AssemblyToolCalculatorFactoryConfig()) { @@ -206,7 +206,7 @@ random.NextEnumValue()); // Call - AssemblyToolHelper.AssemblyFailureMechanism(failurePath, sr => failureMechanismSectionAssemblyResult, failureMechanismN); + AssemblyToolHelper.AssemblyFailureMechanism(failureMechanism, sr => failureMechanismSectionAssemblyResult, failureMechanismN); // Assert var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; @@ -223,33 +223,33 @@ } [Test] - public void AssembleFailureMechanism_WithFailurePathInAssemblyAndProbabilityResultTypeAutomaticAndFailureMechanismSectionAssemblyThrowsException_InputCorrectlySetOnCalculator() + public void AssembleFailureMechanism_WithFailureMechanismInAssemblyAndProbabilityResultTypeAutomaticAndFailureMechanismSectionAssemblyThrowsException_InputCorrectlySetOnCalculator() { // Setup var random = new Random(21); double failureMechanismN = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); - failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailureMechanismAssemblyResult - { - ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, - ManualFailureMechanismAssemblyProbability = double.NaN - }); - failurePath.Stub(fp => fp.SectionResults) - .Return(new ObservableList - { - new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }); + var failureMechanism = mocks.Stub>(); + failureMechanism.Stub(fp => fp.AssemblyResult) + .Return(new FailureMechanismAssemblyResult + { + ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, + ManualFailureMechanismAssemblyProbability = double.NaN + }); + failureMechanism.Stub(fp => fp.SectionResults) + .Return(new ObservableList + { + new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + }); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; using (new AssemblyToolCalculatorFactoryConfig()) { // Call - AssemblyToolHelper.AssemblyFailureMechanism(failurePath, sr => throw new AssemblyException(), failureMechanismN); + AssemblyToolHelper.AssemblyFailureMechanism(failureMechanism, sr => throw new AssemblyException(), failureMechanismN); // Assert var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; @@ -264,28 +264,28 @@ } [Test] - public void AssembleFailureMechanism_WithFailurePathInAssemblyAndProbabilityResultTypeAutomatic_ReturnsExpectedAssemblyResult() + public void AssembleFailureMechanism_WithFailureMechanismInAssemblyAndProbabilityResultTypeAutomatic_ReturnsExpectedAssemblyResult() { // Setup var random = new Random(21); double expectedAssemblyResult = random.NextDouble(); var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); - failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailureMechanismAssemblyResult - { - ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, - ManualFailureMechanismAssemblyProbability = double.NaN - }); - failurePath.Stub(fp => fp.SectionResults) - .Return(new ObservableList - { - new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }); + var failureMechanism = mocks.Stub>(); + failureMechanism.Stub(fp => fp.AssemblyResult) + .Return(new FailureMechanismAssemblyResult + { + ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, + ManualFailureMechanismAssemblyProbability = double.NaN + }); + failureMechanism.Stub(fp => fp.SectionResults) + .Return(new ObservableList + { + new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + }); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; using (new AssemblyToolCalculatorFactoryConfig()) { @@ -294,7 +294,7 @@ failureMechanismAssemblyCalculator.AssemblyResult = expectedAssemblyResult; // Call - double assemblyResult = AssemblyToolHelper.AssemblyFailureMechanism(failurePath, sr => null, double.NaN); + double assemblyResult = AssemblyToolHelper.AssemblyFailureMechanism(failureMechanism, sr => null, double.NaN); // Assert Assert.AreEqual(expectedAssemblyResult, assemblyResult); @@ -304,25 +304,25 @@ } [Test] - public void AssembleFailureMechanism_WithFailurePathInAssemblyAndProbabilityResultTypeAutomaticAndFailureMechanismAssemblyThrowsException_ThrowsAssemblyException() + public void AssembleFailureMechanism_WithFailureMechanismInAssemblyAndProbabilityResultTypeAutomaticAndFailureMechanismAssemblyThrowsException_ThrowsAssemblyException() { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); - failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailureMechanismAssemblyResult - { - ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, - ManualFailureMechanismAssemblyProbability = double.NaN - }); - failurePath.Stub(fp => fp.SectionResults) - .Return(new ObservableList - { - new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) - }); + var failureMechanism = mocks.Stub>(); + failureMechanism.Stub(fp => fp.AssemblyResult) + .Return(new FailureMechanismAssemblyResult + { + ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic, + ManualFailureMechanismAssemblyProbability = double.NaN + }); + failureMechanism.Stub(fp => fp.SectionResults) + .Return(new ObservableList + { + new TestFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + }); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; using (new AssemblyToolCalculatorFactoryConfig()) { @@ -331,7 +331,7 @@ failureMechanismAssemblyCalculator.ThrowExceptionOnCalculate = true; // Call - void Call() => AssemblyToolHelper.AssemblyFailureMechanism(failurePath, sr => null, double.NaN); + void Call() => AssemblyToolHelper.AssemblyFailureMechanism(failureMechanism, sr => null, double.NaN); // Assert var exception = Assert.Throws(Call); Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs (.../FailureMechanismTestHelper.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs (.../FailureMechanismTestHelper.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -35,14 +35,14 @@ /// Sets a collection of to /// with an empty source path. /// - /// The failure path to set the sections to. + /// The failure mechanism to set the sections to. /// The sections to set. /// Thrown when is null. /// Thrown when contains elements that /// are not properly connected. - public static void SetSections(IFailureMechanism failurePath, IEnumerable sections) + public static void SetSections(IFailureMechanism failureMechanism, IEnumerable sections) { - failurePath.SetSections(sections, string.Empty); + failureMechanism.SetSections(sections, string.Empty); } /// Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismSectionsContextTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismSectionsContextTest.cs (.../FailureMechanismSectionsContextTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismSectionsContextTest.cs (.../FailureMechanismSectionsContextTest.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -54,16 +54,16 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var failurePath = mocks.Stub>(); - failurePath.Stub(fm => fm.Sections).Return(sectionsSequence); + var failureMechanism = mocks.Stub>(); + failureMechanism.Stub(fm => fm.Sections).Return(sectionsSequence); mocks.ReplayAll(); // Call - var context = new FailureMechanismSectionsContext(failurePath, assessmentSection); + var context = new FailureMechanismSectionsContext(failureMechanism, assessmentSection); // Assert Assert.IsInstanceOf>>(context); - Assert.AreSame(failurePath, context.WrappedData); + Assert.AreSame(failureMechanism, context.WrappedData); Assert.AreSame(assessmentSection, context.AssessmentSection); mocks.VerifyAll(); } @@ -73,11 +73,11 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub>(); + var failureMechanism = mocks.Stub>(); mocks.ReplayAll(); // Call - void Call() => new FailureMechanismSectionsContext(failurePath, null); + void Call() => new FailureMechanismSectionsContext(failureMechanism, null); // Assert Assert.Throws(Call); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/FailureMechanismSectionsPropertiesTest.cs =================================================================== diff -u -re52a2b934228724b12e794fc38b91c69400bfabc -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/FailureMechanismSectionsPropertiesTest.cs (.../FailureMechanismSectionsPropertiesTest.cs) (revision e52a2b934228724b12e794fc38b91c69400bfabc) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/FailureMechanismSectionsPropertiesTest.cs (.../FailureMechanismSectionsPropertiesTest.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -96,11 +96,11 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); mocks.ReplayAll(); // Call - using (var properties = new FailureMechanismSectionsProperties(failurePath)) + using (var properties = new FailureMechanismSectionsProperties(failureMechanism)) { // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs =================================================================== diff -u -r0f49dd029445f0da5c81765797ef78147e5aa1e9 -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision 0f49dd029445f0da5c81765797ef78147e5aa1e9) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -327,10 +327,10 @@ var exportCommandHandler = mocks.StrictMock(); var updateCommandHandler = mocks.StrictMock(); var viewCommands = mocks.StrictMock(); - var failurePath = mocks.StrictMock(); - failurePath.Expect(fm => fm.InAssembly).Return(inAssembly); - var failurePathContext = mocks.StrictMock>(); - failurePathContext.Expect(fmc => fmc.WrappedData).Return(failurePath); + var failureMechanism = mocks.StrictMock(); + failureMechanism.Expect(fm => fm.InAssembly).Return(inAssembly); + var failureMechanismContext = mocks.StrictMock>(); + failureMechanismContext.Expect(fmc => fmc.WrappedData).Return(failureMechanism); mocks.ReplayAll(); using (var treeViewControl = new TreeViewControl()) @@ -340,12 +340,12 @@ exportCommandHandler, updateCommandHandler, viewCommands, - failurePath, + failureMechanism, treeViewControl); var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder); // Call - ContextMenuStrip result = riskeerContextMenuBuilder.AddToggleInAssemblyOfFailurePathItem(failurePathContext, null).Build(); + ContextMenuStrip result = riskeerContextMenuBuilder.AddToggleInAssemblyOfFailurePathItem(failureMechanismContext, null).Build(); // Assert Assert.IsInstanceOf(result); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs =================================================================== diff -u -r0f49dd029445f0da5c81765797ef78147e5aa1e9 -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs (.../RiskeerContextMenuItemFactoryTest.cs) (revision 0f49dd029445f0da5c81765797ef78147e5aa1e9) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs (.../RiskeerContextMenuItemFactoryTest.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -449,14 +449,14 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.StrictMock(); - failurePath.Expect(fp => fp.InAssembly).Return(inAssembly); - var failurePathContext = mocks.StrictMock>(); - failurePathContext.Expect(fpc => fpc.WrappedData).Return(failurePath); + var failureMechanism = mocks.StrictMock(); + failureMechanism.Expect(fp => fp.InAssembly).Return(inAssembly); + var failureMechanismContext = mocks.StrictMock>(); + failureMechanismContext.Expect(fpc => fpc.WrappedData).Return(failureMechanism); mocks.ReplayAll(); // Call - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleInAssemblyOfFailurePathItem(failurePathContext, null); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleInAssemblyOfFailurePathItem(failureMechanismContext, null); // Assert Assert.AreEqual("I&n assemblage", toolStripItem.Text); @@ -474,17 +474,17 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.StrictMock(); - failurePath.Expect(fp => fp.InAssembly).Return(inAssembly); - failurePath.Expect(fp => fp.InAssembly).SetPropertyWithArgument(!inAssembly); - failurePath.Expect(fp => fp.NotifyObservers()); + var failureMechanism = mocks.StrictMock(); + failureMechanism.Expect(fp => fp.InAssembly).Return(inAssembly); + failureMechanism.Expect(fp => fp.InAssembly).SetPropertyWithArgument(!inAssembly); + failureMechanism.Expect(fp => fp.NotifyObservers()); - var failurePathContext = mocks.StrictMock>(); - failurePathContext.Stub(fmc => fmc.WrappedData).Return(failurePath); + var failureMechanismContext = mocks.StrictMock>(); + failureMechanismContext.Stub(fmc => fmc.WrappedData).Return(failureMechanism); mocks.ReplayAll(); var actionCounter = 0; - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleInAssemblyOfFailurePathItem(failurePathContext, context => actionCounter++); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreateToggleInAssemblyOfFailurePathItem(failureMechanismContext, context => actionCounter++); // Call toolStripItem.PerformClick(); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs =================================================================== diff -u -r0f49dd029445f0da5c81765797ef78147e5aa1e9 -re90ef0cf631a48a620ce0c377094c5cab49d057b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs (.../RiskeerTreeNodeInfoFactoryTest.cs) (revision 0f49dd029445f0da5c81765797ef78147e5aa1e9) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerTreeNodeInfoFactoryTest.cs (.../RiskeerTreeNodeInfoFactoryTest.cs) (revision e90ef0cf631a48a620ce0c377094c5cab49d057b) @@ -840,10 +840,10 @@ const string name = "A"; var mocks = new MockRepository(); - var failurePath = mocks.Stub(); - failurePath.Stub(fm => fm.Name).Return(name); + var failureMechanism = mocks.Stub(); + failureMechanism.Stub(fm => fm.Name).Return(name); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); mocks.ReplayAll(); TreeNodeInfo> treeNodeInfo = @@ -876,12 +876,12 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; TreeNodeInfo> treeNodeInfo = RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo>(null, null, null, null); @@ -899,12 +899,12 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); mocks.ReplayAll(); - failurePath.InAssembly = false; + failureMechanism.InAssembly = false; TreeNodeInfo> treeNodeInfo = RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo>(null, null, null, null); @@ -922,12 +922,12 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; object[] resultInAssembly = { @@ -960,12 +960,12 @@ { // Setup var mocks = new MockRepository(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); mocks.ReplayAll(); - failurePath.InAssembly = false; + failureMechanism.InAssembly = false; object[] resultInAssembly = { @@ -1003,13 +1003,13 @@ { var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); context.Stub(c => c.Parent).Return(assessmentSection); mocks.ReplayAll(); - failurePath.InAssembly = true; + failureMechanism.InAssembly = true; TreeNodeInfo> treeNodeInfo = RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo>( @@ -1053,13 +1053,13 @@ { var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var failurePath = mocks.Stub(); + var failureMechanism = mocks.Stub(); var context = mocks.Stub>(); - context.Stub(c => c.WrappedData).Return(failurePath); + context.Stub(c => c.WrappedData).Return(failureMechanism); context.Stub(c => c.Parent).Return(assessmentSection); mocks.ReplayAll(); - failurePath.InAssembly = false; + failureMechanism.InAssembly = false; TreeNodeInfo> treeNodeInfo = RiskeerTreeNodeInfoFactory.CreateFailurePathContextTreeNodeInfo>(