Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rbadb294faf36a81f38d2364a66bcb25f808be870 -re58fd3d0920465fa2d6ee49dab42f0de4f6f13a5
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision e58fd3d0920465fa2d6ee49dab42f0de4f6f13a5)
@@ -62,34 +62,36 @@
/// Read the and use the information to update a .
///
/// The to read into a .
- /// The target of the read operation.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// Thrown when any parameter is null.
- internal static void ReadCommonFailurePathProperties(this T entity, IFailureMechanism failurePath, ReadConversionCollector collector)
+ internal static void ReadCommonFailureMechanismProperties(this T entity,
+ IFailureMechanism failureMechanism,
+ ReadConversionCollector collector)
where T : IFailureMechanismEntity
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
- if (failurePath == null)
+ if (failureMechanism == null)
{
- throw new ArgumentNullException(nameof(failurePath));
+ throw new ArgumentNullException(nameof(failureMechanism));
}
if (collector == null)
{
throw new ArgumentNullException(nameof(collector));
}
- failurePath.InAssembly = Convert.ToBoolean(entity.InAssembly);
- failurePath.InAssemblyInputComments.Body = entity.InAssemblyInputComments;
- failurePath.InAssemblyOutputComments.Body = entity.InAssemblyOutputComments;
- failurePath.NotInAssemblyComments.Body = entity.NotInAssemblyComments;
+ failureMechanism.InAssembly = Convert.ToBoolean(entity.InAssembly);
+ failureMechanism.InAssemblyInputComments.Body = entity.InAssemblyInputComments;
+ failureMechanism.InAssemblyOutputComments.Body = entity.InAssemblyOutputComments;
+ failureMechanism.NotInAssemblyComments.Body = entity.NotInAssemblyComments;
- entity.ReadFailureMechanismSections(failurePath, collector);
- ReadAssemblyResult(entity, failurePath);
+ entity.ReadFailureMechanismSections(failureMechanism, collector);
+ ReadAssemblyResult(entity, failureMechanism);
}
private static void ReadForeshoreProfiles(this FailureMechanismEntity entity,
@@ -114,9 +116,9 @@
/// The target of the read operation.
/// The object keeping track of read operations.
/// Thrown when any parameter is null.
- private static void ReadCommonFailureMechanismProperties(this FailureMechanismEntity entity,
- ICalculatableFailureMechanism failureMechanism,
- ReadConversionCollector collector)
+ private static void ReadCommonCalculatableFailureMechanismProperties(this FailureMechanismEntity entity,
+ ICalculatableFailureMechanism failureMechanism,
+ ReadConversionCollector collector)
{
if (entity == null)
{
@@ -133,13 +135,13 @@
throw new ArgumentNullException(nameof(collector));
}
- ReadCommonFailurePathProperties(entity, failureMechanism, collector);
+ ReadCommonFailureMechanismProperties(entity, failureMechanism, collector);
failureMechanism.CalculationsInputComments.Body = entity.CalculationsInputComments;
}
- private static void ReadAssemblyResult(IFailureMechanismEntity entity, IFailureMechanism failurePath)
+ private static void ReadAssemblyResult(IFailureMechanismEntity entity, IFailureMechanism failureMechanism)
{
- FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
+ FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
assemblyResult.ProbabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailureMechanismAssemblyResultProbabilityResultType;
if (entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability != null)
{
@@ -148,7 +150,7 @@
}
private static void ReadFailureMechanismSections(this IFailureMechanismEntity entity,
- IFailureMechanism specificFailurePath,
+ IFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
FailureMechanismSection[] readFailureMechanismSections = entity.FailureMechanismSectionEntities
@@ -157,7 +159,7 @@
.ToArray();
if (readFailureMechanismSections.Any())
{
- specificFailurePath.SetSections(readFailureMechanismSections, entity.FailureMechanismSectionCollectionSourcePath);
+ failureMechanism.SetSections(readFailureMechanismSections, entity.FailureMechanismSectionCollectionSourcePath);
}
}
@@ -190,7 +192,7 @@
throw new ArgumentNullException(nameof(collector));
}
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
PipingFailureMechanismMetaEntity metaEntity = entity.PipingFailureMechanismMetaEntities.Single();
metaEntity.ReadProbabilityAssessmentInput(failureMechanism.PipingProbabilityAssessmentInput);
@@ -275,7 +277,7 @@
GrassCoverErosionInwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadGeneralGrassCoverErosionInwardsCalculationInput(failureMechanism.GeneralInput);
entity.ReadDikeProfiles(failureMechanism.DikeProfiles, collector);
ReadGrassCoverErosionInwardsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, collector);
@@ -344,7 +346,7 @@
ReadConversionCollector collector)
{
HeightStructuresFailureMechanismMetaEntity metaEntity = entity.HeightStructuresFailureMechanismMetaEntities.Single();
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadHeightStructuresMechanismSectionResults(failureMechanism, collector);
entity.ReadForeshoreProfiles(failureMechanism.ForeshoreProfiles, metaEntity.ForeshoreProfileCollectionSourcePath, collector);
entity.ReadHeightStructures(failureMechanism.HeightStructures, metaEntity.HeightStructureCollectionSourcePath, collector);
@@ -411,7 +413,7 @@
WaterPressureAsphaltCoverFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
entity.ReadWaterPressureAsphaltCoverMechanismSectionResults(failureMechanism, collector);
entity.ReadWaterPressureAsphaltCoverGeneralInput(failureMechanism.GeneralInput);
}
@@ -449,7 +451,7 @@
ClosingStructuresFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadClosingStructuresMechanismSectionResults(failureMechanism, collector);
ClosingStructuresFailureMechanismMetaEntity metaEntity = entity.ClosingStructuresFailureMechanismMetaEntities.Single();
@@ -540,7 +542,7 @@
throw new ArgumentNullException(nameof(collector));
}
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
MacroStabilityInwardsFailureMechanismMetaEntity metaEntity = entity.MacroStabilityInwardsFailureMechanismMetaEntities.Single();
metaEntity.ReadProbabilityAssessmentInput(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput);
@@ -608,7 +610,7 @@
WaveImpactAsphaltCoverFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadWaveImpactAsphaltCoverMechanismSectionResults(failureMechanism, collector);
WaveImpactAsphaltCoverFailureMechanismMetaEntity metaEntity = entity.WaveImpactAsphaltCoverFailureMechanismMetaEntities.Single();
@@ -662,7 +664,7 @@
GrassCoverErosionOutwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadGeneralGrassCoverErosionOutwardsCalculationInput(failureMechanism.GeneralInput);
entity.ReadGrassCoverErosionOutwardsMechanismSectionResults(failureMechanism, collector);
@@ -724,7 +726,7 @@
GrassCoverSlipOffInwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
entity.ReadGrassCoverSlipOffInwardsMechanismSectionResults(failureMechanism, collector);
entity.ReadGrassCoverSlipOffInwardsGeneralInput(failureMechanism.GeneralInput);
}
@@ -761,7 +763,7 @@
GrassCoverSlipOffOutwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
entity.ReadGrassCoverSlipOffOutwardsMechanismSectionResults(failureMechanism, collector);
entity.ReadGrassCoverSlipOffOutwardsGeneralInput(failureMechanism.GeneralInput);
}
@@ -798,7 +800,7 @@
MicrostabilityFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
entity.ReadMicrostabilityMechanismSectionResults(failureMechanism, collector);
entity.ReadMicrostabilityGeneralInput(failureMechanism.GeneralInput);
}
@@ -851,7 +853,7 @@
throw new ArgumentNullException(nameof(collector));
}
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
entity.ReadPipingStructureMechanismSectionResults(failureMechanism, collector);
failureMechanism.GeneralInput.N = (RoundedDouble) entity.PipingStructureFailureMechanismMetaEntities.Single().N;
@@ -884,7 +886,7 @@
DuneErosionFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
failureMechanism.CalculationsInputComments.Body = entity.CalculationsInputComments;
entity.ReadDuneErosionMechanismSectionResults(failureMechanism, collector);
@@ -953,7 +955,7 @@
StabilityStoneCoverFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadStabilityStoneCoverMechanismSectionResults(failureMechanism, collector);
StabilityStoneCoverFailureMechanismMetaEntity metaEntity =
@@ -1013,7 +1015,7 @@
StabilityPointStructuresFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
+ entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
entity.ReadStabilityPointStructuresMechanismSectionResults(failureMechanism, collector);
StabilityPointStructuresFailureMechanismMetaEntity metaEntity =
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs
===================================================================
diff -u -rbadb294faf36a81f38d2364a66bcb25f808be870 -re58fd3d0920465fa2d6ee49dab42f0de4f6f13a5
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision e58fd3d0920465fa2d6ee49dab42f0de4f6f13a5)
@@ -63,7 +63,7 @@
ApplyLengthEffectInSection = Convert.ToBoolean(entity.ApplyLengthEffectInSection)
}
};
- entity.ReadCommonFailurePathProperties(specificFailurePath, collector);
+ entity.ReadCommonFailureMechanismProperties(specificFailurePath, collector);
ReadNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(entity, specificFailurePath, collector);
return specificFailurePath;
}
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -rbadb294faf36a81f38d2364a66bcb25f808be870 -re58fd3d0920465fa2d6ee49dab42f0de4f6f13a5
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision e58fd3d0920465fa2d6ee49dab42f0de4f6f13a5)
@@ -75,15 +75,15 @@
}
[Test]
- public void ReadCommonFailurePathProperties_EntityNull_ThrowsArgumentNullException()
+ public void ReadCommonFailureMechanismProperties_EntityNull_ThrowsArgumentNullException()
{
// Setup
var mocks = new MockRepository();
var failureMechanism = mocks.Stub();
mocks.ReplayAll();
// Call
- void Call() => ((FailureMechanismEntity) null).ReadCommonFailurePathProperties(failureMechanism, new ReadConversionCollector());
+ void Call() => ((FailureMechanismEntity) null).ReadCommonFailureMechanismProperties(failureMechanism, new ReadConversionCollector());
// Assert
var exception = Assert.Throws(Call);
@@ -92,21 +92,21 @@
}
[Test]
- public void ReadCommonFailurePathProperties_FailureMechanismNull_ThrowsArgumentNullException()
+ public void ReadCommonFailureMechanismProperties_FailureMechanismNull_ThrowsArgumentNullException()
{
// Setup
var entity = new FailureMechanismEntity();
// Call
- void Call() => entity.ReadCommonFailurePathProperties(null, new ReadConversionCollector());
+ void Call() => entity.ReadCommonFailureMechanismProperties(null, new ReadConversionCollector());
// Assert
var exception = Assert.Throws(Call);
- Assert.AreEqual("failurePath", exception.ParamName);
+ Assert.AreEqual("failureMechanism", exception.ParamName);
}
[Test]
- public void ReadCommonFailurePathProperties_CollectorNull_ThrowsArgumentNullException()
+ public void ReadCommonFailureMechanismProperties_CollectorNull_ThrowsArgumentNullException()
{
// Setup
var mocks = new MockRepository();
@@ -116,7 +116,7 @@
var entity = new FailureMechanismEntity();
// Call
- void Call() => entity.ReadCommonFailurePathProperties(failureMechanism, null);
+ void Call() => entity.ReadCommonFailureMechanismProperties(failureMechanism, null);
// Assert
var exception = Assert.Throws(Call);
@@ -127,7 +127,7 @@
[Test]
[TestCase(true)]
[TestCase(false)]
- public void ReadCommonFailurePathProperties_WithoutSectionsSet_SetsFailureMechanism(bool inAssembly)
+ public void ReadCommonFailureMechanismProperties_WithoutSectionsSet_SetsFailureMechanism(bool inAssembly)
{
// Setup
var random = new Random(21);
@@ -147,7 +147,7 @@
var failureMechanism = new TestCalculatableFailureMechanism();
// Call
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
// Assert
FailureMechanismEntityTestHelper.AssertIFailureMechanismEntityProperties(entity, failureMechanism);
@@ -157,15 +157,15 @@
}
[Test]
- public void ReadCommonFailurePathProperties_WithNullValues_SetsFailureMechanism()
+ public void ReadCommonFailureMechanismProperties_WithNullValues_SetsFailureMechanism()
{
// Setup
var entity = new FailureMechanismEntity();
var collector = new ReadConversionCollector();
var failureMechanism = new TestCalculatableFailureMechanism();
// Call
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
// Assert
Assert.IsNull(failureMechanism.InAssemblyInputComments.Body);
@@ -179,7 +179,7 @@
}
[Test]
- public void ReadCommonFailurePathProperties_WithSectionsSet_SetsFailureMechanismWithFailureMechanismSections()
+ public void ReadCommonFailureMechanismProperties_WithSectionsSet_SetsFailureMechanismWithFailureMechanismSections()
{
// Setup
const string filePath = "failureMechanismSections/File/Path";
@@ -195,7 +195,7 @@
var failureMechanism = new TestFailureMechanism();
// Call
- entity.ReadCommonFailurePathProperties(failureMechanism, collector);
+ entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
// Assert
Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count());