Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -raa83aff71e44c9c34e7d846b305da616b3ef0db0
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs (.../FailureMechanismSectionReplaceStrategy.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionReplaceStrategy.cs (.../FailureMechanismSectionReplaceStrategy.cs) (revision aa83aff71e44c9c34e7d846b305da616b3ef0db0)
@@ -23,6 +23,7 @@
using System.Collections.Generic;
using Riskeer.Common.Data.Exceptions;
using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
namespace Riskeer.Common.IO.FileImporters
{
@@ -32,22 +33,22 @@
///
public class FailureMechanismSectionReplaceStrategy : IFailureMechanismSectionUpdateStrategy
{
- private readonly IFailureMechanism failureMechanism;
+ private readonly IFailurePath failurePath;
///
/// Creates a new instance of .
///
- /// The to set the sections to.
- /// Thrown when
+ /// The to set the sections to.
+ /// Thrown when
/// is null.
- public FailureMechanismSectionReplaceStrategy(IFailureMechanism failureMechanism)
+ public FailureMechanismSectionReplaceStrategy(IFailurePath failurePath)
{
- if (failureMechanism == null)
+ if (failurePath == null)
{
- throw new ArgumentNullException(nameof(failureMechanism));
+ throw new ArgumentNullException(nameof(failurePath));
}
- this.failureMechanism = failureMechanism;
+ this.failurePath = failurePath;
}
public void UpdateSectionsWithImportedData(IEnumerable importedFailureMechanismSections,
@@ -65,7 +66,7 @@
try
{
- failureMechanism.SetSections(importedFailureMechanismSections, sourcePath);
+ failurePath.SetSections(importedFailureMechanismSections, sourcePath);
}
catch (ArgumentException e)
{
Index: Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -raa83aff71e44c9c34e7d846b305da616b3ef0db0
--- Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision aa83aff71e44c9c34e7d846b305da616b3ef0db0)
@@ -27,16 +27,17 @@
using Core.Common.IO.Readers;
using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
using Riskeer.Common.IO.FileImporters.MessageProviders;
using Riskeer.Common.IO.Properties;
namespace Riskeer.Common.IO.FileImporters
{
///
/// Imports instances from a shapefile that contains
- /// one or more polylines and stores them in a .
+ /// one or more polylines and stores them in a .
///
- public class FailureMechanismSectionsImporter : FileImporterBase
+ public class FailureMechanismSectionsImporter : FileImporterBase
{
///
/// The snapping tolerance in meters.
@@ -55,15 +56,15 @@
///
/// Initializes a new instance of the class.
///
- /// The failure mechanism to update.
+ /// The failure path to update.
/// The reference line used to check correspondence with.
/// The path to the file to import from.
/// The strategy to update the failure mechanism sections
/// with the imported data.
/// The message provider to provide the messages during the importer action.
/// Thrown when any input argument is null.
///
- public FailureMechanismSectionsImporter(IFailureMechanism importTarget,
+ public FailureMechanismSectionsImporter(IFailurePath importTarget,
ReferenceLine referenceLine,
string filePath,
IFailureMechanismSectionUpdateStrategy failureMechanismSectionUpdateStrategy,
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionReplaceStrategyTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -raa83aff71e44c9c34e7d846b305da616b3ef0db0
--- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionReplaceStrategyTest.cs (.../FailureMechanismSectionReplaceStrategyTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionReplaceStrategyTest.cs (.../FailureMechanismSectionReplaceStrategyTest.cs) (revision aa83aff71e44c9c34e7d846b305da616b3ef0db0)
@@ -28,6 +28,7 @@
using Rhino.Mocks;
using Riskeer.Common.Data.Exceptions;
using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Data.FailurePath;
using Riskeer.Common.Data.TestUtil;
using Riskeer.Common.IO.FileImporters;
@@ -37,26 +38,26 @@
public class FailureMechanismSectionReplaceStrategyTest
{
[Test]
- public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+ public void Constructor_FailurePathNull_ThrowsArgumentNullException()
{
// Call
TestDelegate call = () => new FailureMechanismSectionReplaceStrategy(null);
// Assert
string paramName = Assert.Throws(call).ParamName;
- Assert.AreEqual("failureMechanism", paramName);
+ Assert.AreEqual("failurePath", paramName);
}
[Test]
public void Constructor_ExpectedValues()
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
mocks.ReplayAll();
// Call
- var importer = new FailureMechanismSectionReplaceStrategy(failureMechanism);
+ var importer = new FailureMechanismSectionReplaceStrategy(failurePath);
// Assert
Assert.IsInstanceOf(importer);
@@ -68,11 +69,11 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
mocks.ReplayAll();
// Call
- TestDelegate call = () => new FailureMechanismSectionReplaceStrategy(failureMechanism).UpdateSectionsWithImportedData(null, "");
+ TestDelegate call = () => new FailureMechanismSectionReplaceStrategy(failurePath).UpdateSectionsWithImportedData(null, "");
// Assert
string paramName = Assert.Throws(call).ParamName;
@@ -85,10 +86,10 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
mocks.ReplayAll();
- var failureMechanismSectionReplaceStrategy = new FailureMechanismSectionReplaceStrategy(failureMechanism);
+ var failureMechanismSectionReplaceStrategy = new FailureMechanismSectionReplaceStrategy(failurePath);
// Call
TestDelegate call = () => failureMechanismSectionReplaceStrategy.UpdateSectionsWithImportedData(
@@ -104,8 +105,8 @@
public void UpdateSectionsWithImportedData_WithValidData_SetsSectionsToFailureMechanism()
{
// Setup
- var failureMechanism = new TestFailureMechanism();
- var failureMechanismSectionReplaceStrategy = new FailureMechanismSectionReplaceStrategy(failureMechanism);
+ var failurePath = new SpecificFailurePath();
+ var failureMechanismSectionReplaceStrategy = new FailureMechanismSectionReplaceStrategy(failurePath);
string sourcePath = TestHelper.GetScratchPadPath();
FailureMechanismSection[] sections =
{
@@ -116,8 +117,8 @@
failureMechanismSectionReplaceStrategy.UpdateSectionsWithImportedData(sections, sourcePath);
// Assert
- Assert.AreEqual(sourcePath, failureMechanism.FailureMechanismSectionSourcePath);
- Assert.AreEqual(sections.Single(), failureMechanism.Sections.Single());
+ Assert.AreEqual(sourcePath, failurePath.FailureMechanismSectionSourcePath);
+ Assert.AreEqual(sections.Single(), failurePath.Sections.Single());
}
[Test]
@@ -126,7 +127,7 @@
// Setup
string sourcePath = TestHelper.GetScratchPadPath();
- var failureMechanism = new TestFailureMechanism();
+ var failurePath = new SpecificFailurePath();
FailureMechanismSection failureMechanismSection1 = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
{
new Point2D(0.0, 0.0),
@@ -138,7 +139,7 @@
new Point2D(15.0, 15.0)
});
- var failureMechanismSectionReplaceStrategy = new FailureMechanismSectionReplaceStrategy(failureMechanism);
+ var failureMechanismSectionReplaceStrategy = new FailureMechanismSectionReplaceStrategy(failurePath);
FailureMechanismSection[] sections =
{
@@ -162,7 +163,7 @@
const string oldSourcePath = "old/path";
string sourcePath = TestHelper.GetScratchPadPath();
- var failureMechanism = new TestFailureMechanism();
+ var failureMechanism = new SpecificFailurePath();
failureMechanism.SetSections(new[]
{
FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -raa83aff71e44c9c34e7d846b305da616b3ef0db0
--- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision aa83aff71e44c9c34e7d846b305da616b3ef0db0)
@@ -31,7 +31,7 @@
using Rhino.Mocks;
using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.TestUtil;
+using Riskeer.Common.Data.FailurePath;
using Riskeer.Common.IO.FileImporters;
using Riskeer.Common.IO.FileImporters.MessageProviders;
using Riskeer.Common.IO.ReferenceLines;
@@ -52,13 +52,13 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.Stub();
var messageProvider = mocks.StrictMock();
mocks.ReplayAll();
// Call
- void Call() => new FailureMechanismSectionsImporter(failureMechanism, null, "", updateStrategy, messageProvider);
+ void Call() => new FailureMechanismSectionsImporter(failurePath, null, "", updateStrategy, messageProvider);
// Assert
var exception = Assert.Throws(Call);
@@ -71,12 +71,12 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var messageProvider = mocks.StrictMock();
mocks.ReplayAll();
// Call
- void Call() => new FailureMechanismSectionsImporter(failureMechanism, new ReferenceLine(), "", null, messageProvider);
+ void Call() => new FailureMechanismSectionsImporter(failurePath, new ReferenceLine(), "", null, messageProvider);
// Assert
var exception = Assert.Throws(Call);
@@ -89,12 +89,12 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.Stub();
mocks.ReplayAll();
// Call
- void Call() => new FailureMechanismSectionsImporter(failureMechanism, new ReferenceLine(), "", updateStrategy, null);
+ void Call() => new FailureMechanismSectionsImporter(failurePath, new ReferenceLine(), "", updateStrategy, null);
// Assert
var exception = Assert.Throws(Call);
@@ -107,18 +107,18 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.Stub();
var messageProvider = mocks.StrictMock();
mocks.ReplayAll();
var referenceLine = new ReferenceLine();
// Call
- var importer = new FailureMechanismSectionsImporter(failureMechanism, referenceLine, "", updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, referenceLine, "", updateStrategy, messageProvider);
// Assert
- Assert.IsInstanceOf>(importer);
+ Assert.IsInstanceOf>(importer);
mocks.VerifyAll();
}
@@ -135,7 +135,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
updateStrategy.Expect(us => us.UpdateSectionsWithImportedData(null, null))
.IgnoreArguments()
@@ -149,7 +149,7 @@
var messageProvider = mocks.Stub();
mocks.ReplayAll();
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
bool importSuccessful = importer.Import();
@@ -176,7 +176,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
updateStrategy.Expect(us => us.UpdateSectionsWithImportedData(null, null))
.IgnoreArguments()
@@ -190,7 +190,7 @@
var messageProvider = mocks.Stub();
mocks.ReplayAll();
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
bool importSuccessful = importer.Import();
@@ -205,7 +205,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.Stub();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetAddDataToModelProgressText()).Return(expectedAddDataToModelProgressText);
@@ -220,7 +220,7 @@
var progressChangeNotifications = new List();
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
// Call
@@ -245,7 +245,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -257,7 +257,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -276,7 +276,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -288,7 +288,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -307,7 +307,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -320,7 +320,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -340,7 +340,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -354,7 +354,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -375,7 +375,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -389,7 +389,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -408,7 +408,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -421,7 +421,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -439,7 +439,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -452,7 +452,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -470,7 +470,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetUpdateDataFailedLogMessageText(sectionsTypeDescriptor)).Return(expectedUpdateDataFailedText);
@@ -483,7 +483,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -501,15 +501,15 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
mocks.ReplayAll();
string sectionsFilePath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO,
Path.Combine("FailureMechanismSections", "vakindeling_Empty_Name_Value.shp"));
- var importer = new FailureMechanismSectionsImporter(failureMechanism, new ReferenceLine(), sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, new ReferenceLine(), sectionsFilePath, updateStrategy, messageProvider);
// Call
var importSuccessful = true;
@@ -527,7 +527,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetCancelledLogMessageText(sectionsTypeDescriptor)).Return(expectedCancelledText);
@@ -540,7 +540,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
importer.SetProgressChanged((description, step, steps) =>
{
if (description.Contains("Inlezen vakindeling."))
@@ -565,7 +565,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
var messageProvider = mocks.StrictMock();
messageProvider.Expect(mp => mp.GetCancelledLogMessageText(sectionsTypeDescriptor)).Return(expectedCancelledText);
@@ -578,7 +578,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
importer.SetProgressChanged((description, step, steps) =>
{
if (description.Contains("Valideren ingelezen vakindeling."))
@@ -603,7 +603,7 @@
{
// Setup
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
updateStrategy.Expect(us => us.UpdateSectionsWithImportedData(null, null))
.IgnoreArguments()
@@ -619,7 +619,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
importer.SetProgressChanged((description, step, steps) =>
{
if (description.Contains(expectedAddDataToModelProgressText))
@@ -651,7 +651,7 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
var mocks = new MockRepository();
- var failureMechanism = mocks.Stub();
+ var failurePath = mocks.Stub();
var updateStrategy = mocks.StrictMock();
updateStrategy.Expect(us => us.UpdateSectionsWithImportedData(null, null))
.IgnoreArguments()
@@ -665,7 +665,7 @@
var messageProvider = mocks.Stub();
mocks.ReplayAll();
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var importer = new FailureMechanismSectionsImporter(failurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
importer.SetProgressChanged((description, step, steps) => importer.Cancel());
Assert.IsFalse(importer.Import());
@@ -702,11 +702,11 @@
ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath);
- var failureMechanism = new TestFailureMechanism();
- var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
+ var specificFailurePath = new SpecificFailurePath();
+ var importer = new FailureMechanismSectionsImporter(specificFailurePath, importReferenceLine, sectionsFilePath, updateStrategy, messageProvider);
importer.Import();
- failureMechanism.SectionResults.Attach(observable);
+ specificFailurePath.Attach(observable);
// Call
importer.DoPostImport();