Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -rddad604681c45ff2276b5b75590b8699d6c211d4 -rbadb294faf36a81f38d2364a66bcb25f808be870 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision ddad604681c45ff2276b5b75590b8699d6c211d4) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870) @@ -58,6 +58,40 @@ /// internal static class FailureMechanismEntityReadExtensions { + /// + /// Read the and use the information to update a . + /// + /// The to read into a . + /// 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) + where T : IFailureMechanismEntity + { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + if (failurePath == null) + { + throw new ArgumentNullException(nameof(failurePath)); + } + + 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; + + entity.ReadFailureMechanismSections(failurePath, collector); + ReadAssemblyResult(entity, failurePath); + } + private static void ReadForeshoreProfiles(this FailureMechanismEntity entity, ForeshoreProfileCollection foreshoreProfiles, string foreshoreProfileSourcePath, @@ -73,6 +107,60 @@ } } + /// + /// Read the and use the information to update a . + /// + /// The to read into a . + /// 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) + { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } + + if (collector == null) + { + throw new ArgumentNullException(nameof(collector)); + } + + ReadCommonFailurePathProperties(entity, failureMechanism, collector); + failureMechanism.CalculationsInputComments.Body = entity.CalculationsInputComments; + } + + private static void ReadAssemblyResult(IFailureMechanismEntity entity, IFailureMechanism failurePath) + { + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; + assemblyResult.ProbabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailureMechanismAssemblyResultProbabilityResultType; + if (entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability != null) + { + assemblyResult.ManualFailureMechanismAssemblyProbability = entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability.ToNullAsNaN(); + } + } + + private static void ReadFailureMechanismSections(this IFailureMechanismEntity entity, + IFailureMechanism specificFailurePath, + ReadConversionCollector collector) + { + FailureMechanismSection[] readFailureMechanismSections = entity.FailureMechanismSectionEntities + .Select(failureMechanismSectionEntity => + failureMechanismSectionEntity.Read(collector)) + .ToArray(); + if (readFailureMechanismSections.Any()) + { + specificFailurePath.SetSections(readFailureMechanismSections, entity.FailureMechanismSectionCollectionSourcePath); + } + } + #region Piping /// Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs =================================================================== diff -u -r30ffc25f66edcab5c525ba01d9b587e4d38b20b7 -rbadb294faf36a81f38d2364a66bcb25f808be870 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision 30ffc25f66edcab5c525ba01d9b587e4d38b20b7) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870) @@ -35,70 +35,6 @@ internal static class FailurePathEntityReadExtensions { /// - /// Read the and use the information to update a . - /// - /// The to read into a . - /// 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) - where T : IFailureMechanismEntity - { - if (entity == null) - { - throw new ArgumentNullException(nameof(entity)); - } - - if (failurePath == null) - { - throw new ArgumentNullException(nameof(failurePath)); - } - - 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; - - entity.ReadFailureMechanismSections(failurePath, collector); - ReadAssemblyResult(entity, failurePath); - } - - /// - /// Read the and use the information to update a . - /// - /// The to read into a . - /// The target of the read operation. - /// The object keeping track of read operations. - /// Thrown when any parameter is null. - internal static void ReadCommonFailureMechanismProperties(this FailureMechanismEntity entity, - ICalculatableFailureMechanism failureMechanism, - ReadConversionCollector collector) - { - if (entity == null) - { - throw new ArgumentNullException(nameof(entity)); - } - - if (failureMechanism == null) - { - throw new ArgumentNullException(nameof(failureMechanism)); - } - - if (collector == null) - { - throw new ArgumentNullException(nameof(collector)); - } - - ReadCommonFailurePathProperties(entity, failureMechanism, collector); - failureMechanism.CalculationsInputComments.Body = entity.CalculationsInputComments; - } - - /// /// Reads the and uses the information to create a . /// /// The to create a with. @@ -132,30 +68,6 @@ return specificFailurePath; } - private static void ReadAssemblyResult(IFailureMechanismEntity entity, IFailureMechanism failurePath) - { - FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; - assemblyResult.ProbabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailureMechanismAssemblyResultProbabilityResultType; - if (entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability != null) - { - assemblyResult.ManualFailureMechanismAssemblyProbability = entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability.ToNullAsNaN(); - } - } - - private static void ReadFailureMechanismSections(this IFailureMechanismEntity entity, - IFailureMechanism specificFailurePath, - ReadConversionCollector collector) - { - FailureMechanismSection[] readFailureMechanismSections = entity.FailureMechanismSectionEntities - .Select(failureMechanismSectionEntity => - failureMechanismSectionEntity.Read(collector)) - .ToArray(); - if (readFailureMechanismSections.Any()) - { - specificFailurePath.SetSections(readFailureMechanismSections, entity.FailureMechanismSectionCollectionSourcePath); - } - } - private static void ReadNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(this IFailureMechanismEntity entity, SpecificFailureMechanism specificFailureMechanism, ReadConversionCollector collector) Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -rfb012997017f016679dcaa84eb5229a2c6e7bba2 -rbadb294faf36a81f38d2364a66bcb25f808be870 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision fb012997017f016679dcaa84eb5229a2c6e7bba2) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870) @@ -27,10 +27,12 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; +using Rhino.Mocks; using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; +using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Structures; using Riskeer.Common.Data.TestUtil; using Riskeer.DuneErosion.Data; @@ -72,6 +74,134 @@ return failureMechanismSectionEntity; } + [Test] + public void ReadCommonFailurePathProperties_EntityNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var failureMechanism = mocks.Stub(); + mocks.ReplayAll(); + + // Call + void Call() => ((FailureMechanismEntity) null).ReadCommonFailurePathProperties(failureMechanism, new ReadConversionCollector()); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("entity", exception.ParamName); + mocks.VerifyAll(); + } + + [Test] + public void ReadCommonFailurePathProperties_FailureMechanismNull_ThrowsArgumentNullException() + { + // Setup + var entity = new FailureMechanismEntity(); + + // Call + void Call() => entity.ReadCommonFailurePathProperties(null, new ReadConversionCollector()); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("failurePath", exception.ParamName); + } + + [Test] + public void ReadCommonFailurePathProperties_CollectorNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var failureMechanism = mocks.Stub(); + mocks.ReplayAll(); + + var entity = new FailureMechanismEntity(); + + // Call + void Call() => entity.ReadCommonFailurePathProperties(failureMechanism, null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("collector", exception.ParamName); + mocks.VerifyAll(); + } + + [Test] + [TestCase(true)] + [TestCase(false)] + public void ReadCommonFailurePathProperties_WithoutSectionsSet_SetsFailureMechanism(bool inAssembly) + { + // Setup + var random = new Random(21); + var assemblyResultType = random.NextEnumValue(); + + var entity = new FailureMechanismEntity + { + InAssembly = Convert.ToByte(inAssembly), + InAssemblyInputComments = "Some input text", + InAssemblyOutputComments = "Some output text", + CalculationsInputComments = "Some calculation text", + NotInAssemblyComments = "Really not in assembly", + FailureMechanismAssemblyResultProbabilityResultType = Convert.ToByte(assemblyResultType), + FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability = random.NextDouble() + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new TestCalculatableFailureMechanism(); + + // Call + entity.ReadCommonFailurePathProperties(failureMechanism, collector); + + // Assert + FailureMechanismEntityTestHelper.AssertIFailureMechanismEntityProperties(entity, failureMechanism); + Assert.IsNull(failureMechanism.CalculationsInputComments.Body); + CollectionAssert.IsEmpty(failureMechanism.Sections); + Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); + } + + [Test] + public void ReadCommonFailurePathProperties_WithNullValues_SetsFailureMechanism() + { + // Setup + var entity = new FailureMechanismEntity(); + var collector = new ReadConversionCollector(); + var failureMechanism = new TestCalculatableFailureMechanism(); + + // Call + entity.ReadCommonFailurePathProperties(failureMechanism, collector); + + // Assert + Assert.IsNull(failureMechanism.InAssemblyInputComments.Body); + Assert.IsNull(failureMechanism.InAssemblyOutputComments.Body); + Assert.IsNull(failureMechanism.NotInAssemblyComments.Body); + Assert.IsNull(failureMechanism.CalculationsInputComments.Body); + CollectionAssert.IsEmpty(failureMechanism.Sections); + Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); + + Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability); + } + + [Test] + public void ReadCommonFailurePathProperties_WithSectionsSet_SetsFailureMechanismWithFailureMechanismSections() + { + // Setup + const string filePath = "failureMechanismSections/File/Path"; + var entity = new FailureMechanismEntity + { + FailureMechanismSectionCollectionSourcePath = filePath, + FailureMechanismSectionEntities = + { + CreateSimpleFailureMechanismSectionEntity() + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new TestFailureMechanism(); + + // Call + entity.ReadCommonFailurePathProperties(failureMechanism, collector); + + // Assert + Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count()); + Assert.AreEqual(filePath, failureMechanism.FailureMechanismSectionSourcePath); + } + #region GrassCoverSlipOffInwards [Test] Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs =================================================================== diff -u -r30ffc25f66edcab5c525ba01d9b587e4d38b20b7 -rbadb294faf36a81f38d2364a66bcb25f808be870 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision 30ffc25f66edcab5c525ba01d9b587e4d38b20b7) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision badb294faf36a81f38d2364a66bcb25f808be870) @@ -25,7 +25,6 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; -using Rhino.Mocks; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Storage.Core.DbContext; @@ -39,262 +38,6 @@ public class FailurePathEntityReadExtensionsTest { [Test] - public void ReadCommonFailurePathProperties_EntityNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); - - // Call - void Call() => ((FailureMechanismEntity) null).ReadCommonFailurePathProperties(failureMechanism, new ReadConversionCollector()); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("entity", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - public void ReadCommonFailurePathProperties_FailureMechanismNull_ThrowsArgumentNullException() - { - // Setup - var entity = new FailureMechanismEntity(); - - // Call - void Call() => entity.ReadCommonFailurePathProperties(null, new ReadConversionCollector()); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("failurePath", exception.ParamName); - } - - [Test] - public void ReadCommonFailurePathProperties_CollectorNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); - - var entity = new FailureMechanismEntity(); - - // Call - void Call() => entity.ReadCommonFailurePathProperties(failureMechanism, null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("collector", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - [TestCase(true)] - [TestCase(false)] - public void ReadCommonFailurePathProperties_WithoutSectionsSet_SetsFailureMechanism(bool inAssembly) - { - // Setup - var random = new Random(21); - var assemblyResultType = random.NextEnumValue(); - - var entity = new FailureMechanismEntity - { - InAssembly = Convert.ToByte(inAssembly), - InAssemblyInputComments = "Some input text", - InAssemblyOutputComments = "Some output text", - CalculationsInputComments = "Some calculation text", - NotInAssemblyComments = "Really not in assembly", - FailureMechanismAssemblyResultProbabilityResultType = Convert.ToByte(assemblyResultType), - FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability = random.NextDouble() - }; - var collector = new ReadConversionCollector(); - var failureMechanism = new TestCalculatableFailureMechanism(); - - // Call - entity.ReadCommonFailurePathProperties(failureMechanism, collector); - - // Assert - AssertCommonFailurePathProperties(entity, failureMechanism); - Assert.IsNull(failureMechanism.CalculationsInputComments.Body); - CollectionAssert.IsEmpty(failureMechanism.Sections); - Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); - } - - [Test] - public void ReadCommonFailurePathProperties_WithNullValues_SetsFailureMechanism() - { - // Setup - var entity = new FailureMechanismEntity(); - var collector = new ReadConversionCollector(); - var failureMechanism = new TestCalculatableFailureMechanism(); - - // Call - entity.ReadCommonFailurePathProperties(failureMechanism, collector); - - // Assert - Assert.IsNull(failureMechanism.InAssemblyInputComments.Body); - Assert.IsNull(failureMechanism.InAssemblyOutputComments.Body); - Assert.IsNull(failureMechanism.NotInAssemblyComments.Body); - Assert.IsNull(failureMechanism.CalculationsInputComments.Body); - CollectionAssert.IsEmpty(failureMechanism.Sections); - Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); - - Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability); - } - - [Test] - public void ReadCommonFailurePathProperties_WithSectionsSet_SetsFailureMechanismWithFailureMechanismSections() - { - // Setup - const string filePath = "failureMechanismSections/File/Path"; - var entity = new FailureMechanismEntity - { - FailureMechanismSectionCollectionSourcePath = filePath, - FailureMechanismSectionEntities = - { - CreateSimpleFailureMechanismSectionEntity() - } - }; - var collector = new ReadConversionCollector(); - var failureMechanism = new TestFailureMechanism(); - - // Call - entity.ReadCommonFailurePathProperties(failureMechanism, collector); - - // Assert - Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count()); - Assert.AreEqual(filePath, failureMechanism.FailureMechanismSectionSourcePath); - } - - [Test] - public void ReadCommonFailureMechanismProperties_EntityNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); - - // Call - void Call() => ((FailureMechanismEntity) null).ReadCommonFailureMechanismProperties(failureMechanism, new ReadConversionCollector()); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("entity", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - public void ReadCommonFailureMechanismProperties_FailureMechanismNull_ThrowsArgumentNullException() - { - // Setup - var entity = new FailureMechanismEntity(); - - // Call - void Call() => entity.ReadCommonFailureMechanismProperties(null, new ReadConversionCollector()); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("failureMechanism", exception.ParamName); - } - - [Test] - public void ReadCommonFailureMechanismProperties_CollectorNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); - mocks.ReplayAll(); - - var entity = new FailureMechanismEntity(); - - // Call - void Call() => entity.ReadCommonFailureMechanismProperties(failureMechanism, null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("collector", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - [TestCase(true)] - [TestCase(false)] - public void ReadCommonFailureMechanismProperties_WithoutSectionsSet_SetsFailureMechanism(bool inAssembly) - { - // Setup - var random = new Random(21); - var assemblyResultType = random.NextEnumValue(); - - var entity = new FailureMechanismEntity - { - InAssembly = Convert.ToByte(inAssembly), - InAssemblyInputComments = "Some input text", - InAssemblyOutputComments = "Some output text", - CalculationsInputComments = "Some calculation text", - NotInAssemblyComments = "Really not in assembly", - FailureMechanismAssemblyResultProbabilityResultType = Convert.ToByte(assemblyResultType), - FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability = random.NextDouble() - }; - var collector = new ReadConversionCollector(); - var failureMechanism = new TestCalculatableFailureMechanism(); - - // Call - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - - // Assert - AssertCommonFailurePathProperties(entity, failureMechanism); - Assert.AreEqual(entity.CalculationsInputComments, failureMechanism.CalculationsInputComments.Body); - CollectionAssert.IsEmpty(failureMechanism.Sections); - Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); - } - - [Test] - public void ReadCommonFailureMechanismProperties_WithNullValues_SetsFailureMechanism() - { - // Setup - var entity = new FailureMechanismEntity(); - var collector = new ReadConversionCollector(); - var failureMechanism = new TestCalculatableFailureMechanism(); - - // Call - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - - // Assert - Assert.IsNull(failureMechanism.InAssemblyInputComments.Body); - Assert.IsNull(failureMechanism.InAssemblyOutputComments.Body); - Assert.IsNull(failureMechanism.NotInAssemblyComments.Body); - Assert.IsNull(failureMechanism.CalculationsInputComments.Body); - CollectionAssert.IsEmpty(failureMechanism.Sections); - Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath); - - Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability); - } - - [Test] - public void ReadCommonFailureMechanismProperties_WithSectionsSet_SetsFailureMechanismWithFailureMechanismSections() - { - // Setup - const string filePath = "failureMechanismSections/File/Path"; - var entity = new FailureMechanismEntity - { - FailureMechanismSectionCollectionSourcePath = filePath, - FailureMechanismSectionEntities = - { - CreateSimpleFailureMechanismSectionEntity() - } - }; - var collector = new ReadConversionCollector(); - var failureMechanism = new TestCalculatableFailureMechanism(); - - // Call - entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); - - // Assert - Assert.AreEqual(entity.FailureMechanismSectionEntities.Count, failureMechanism.Sections.Count()); - Assert.AreEqual(filePath, failureMechanism.FailureMechanismSectionSourcePath); - } - - [Test] public void ReadSpecificFailurePath_EntityNull_ThrowArgumentNullException() { // Call @@ -353,7 +96,7 @@ SpecificFailureMechanism specificFailureMechanism = entity.ReadSpecificFailurePath(collector); // Assert - AssertCommonFailurePathProperties(entity, specificFailureMechanism); + FailureMechanismEntityTestHelper.AssertIFailureMechanismEntityProperties(entity, specificFailureMechanism); Assert.AreEqual(entity.Name, specificFailureMechanism.Name); Assert.AreEqual(entity.Code, specificFailureMechanism.Code); @@ -444,21 +187,6 @@ specificFailureMechanism.SectionResults.Single()); } - private static void AssertCommonFailurePathProperties(IFailureMechanismEntity entity, IFailureMechanism failurePath) - { - var inAssembly = Convert.ToBoolean(entity.InAssembly); - - Assert.AreEqual(inAssembly, failurePath.InAssembly); - Assert.AreEqual(entity.InAssemblyInputComments, failurePath.InAssemblyInputComments.Body); - Assert.AreEqual(entity.InAssemblyOutputComments, failurePath.InAssemblyOutputComments.Body); - Assert.AreEqual(entity.NotInAssemblyComments, failurePath.NotInAssemblyComments.Body); - - var probabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailureMechanismAssemblyResultProbabilityResultType; - FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; - Assert.AreEqual(probabilityResultType, assemblyResult.ProbabilityResultType); - Assert.AreEqual(entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability, assemblyResult.ManualFailureMechanismAssemblyProbability); - } - private static FailureMechanismSectionEntity CreateSimpleFailureMechanismSectionEntity() { var dummyPoints = new[] Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/FailureMechanismEntityTestHelper.cs =================================================================== diff -u --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/FailureMechanismEntityTestHelper.cs (revision 0) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/FailureMechanismEntityTestHelper.cs (revision badb294faf36a81f38d2364a66bcb25f808be870) @@ -0,0 +1,34 @@ +using System; +using NUnit.Framework; +using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Storage.Core.DbContext; + +namespace Riskeer.Storage.Core.TestUtil +{ + /// + /// This class contains methods for testing . + /// + public static class FailureMechanismEntityTestHelper + { + /// + /// Asserts the against an . + /// + /// The to assert with. + /// The to assert. + /// Thrown when the properties do not match. + public static void AssertIFailureMechanismEntityProperties(IFailureMechanismEntity entity, IFailureMechanism failureMechanism) + { + var inAssembly = Convert.ToBoolean(entity.InAssembly); + + Assert.AreEqual(inAssembly, failureMechanism.InAssembly); + Assert.AreEqual(entity.InAssemblyInputComments, failureMechanism.InAssemblyInputComments.Body); + Assert.AreEqual(entity.InAssemblyOutputComments, failureMechanism.InAssemblyOutputComments.Body); + Assert.AreEqual(entity.NotInAssemblyComments, failureMechanism.NotInAssemblyComments.Body); + + var probabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailureMechanismAssemblyResultProbabilityResultType; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + Assert.AreEqual(probabilityResultType, assemblyResult.ProbabilityResultType); + Assert.AreEqual(entity.FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability, assemblyResult.ManualFailureMechanismAssemblyProbability); + } + } +} \ No newline at end of file