Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/IllustrationPoints/TestSubMechanismIllustrationPointStochastTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/IllustrationPoints/TestSubMechanismIllustrationPointStochastTest.cs (.../TestSubMechanismIllustrationPointStochastTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/IllustrationPoints/TestSubMechanismIllustrationPointStochastTest.cs (.../TestSubMechanismIllustrationPointStochastTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -39,6 +39,7 @@ // Assert Assert.AreEqual(name, stochast.Name); + Assert.AreEqual("[-]", stochast.Unit); Assert.AreEqual(alpha, stochast.Alpha); Assert.AreEqual(1, stochast.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(3, stochast.Realization, stochast.Realization.GetAccuracy()); Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/IllustrationPoints/TestSubMechanismIllustrationPointTest.cs =================================================================== diff -u -r152fb1318408421028233c1e66c0b706dcb951a7 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/IllustrationPoints/TestSubMechanismIllustrationPointTest.cs (.../TestSubMechanismIllustrationPointTest.cs) (revision 152fb1318408421028233c1e66c0b706dcb951a7) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/IllustrationPoints/TestSubMechanismIllustrationPointTest.cs (.../TestSubMechanismIllustrationPointTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -82,6 +82,7 @@ CollectionAssert.IsNotEmpty(illustrationPoint.Stochasts); Assert.AreEqual("Stochast A", illustrationPoint.Stochasts.First().Name); + Assert.AreEqual("[-]", illustrationPoint.Stochasts.First().Unit); Assert.AreEqual(3.0, illustrationPoint.Stochasts.First().Duration); Assert.AreEqual(0.5, illustrationPoint.Stochasts.First().Alpha); Assert.AreEqual(12.0, illustrationPoint.Stochasts.First().Realization); Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs =================================================================== diff -u -r654b5e06e3a5e8cd121092ca40e1e1b405ddbce4 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs (.../CommonCloneAssert.cs) (revision 654b5e06e3a5e8cd121092ca40e1e1b405ddbce4) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs (.../CommonCloneAssert.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -101,6 +101,7 @@ public static void AreClones(SubMechanismIllustrationPointStochast original, SubMechanismIllustrationPointStochast clone) { AreClones((Stochast) original, clone); + Assert.AreEqual(original.Unit, clone.Unit); Assert.AreEqual(original.Realization, clone.Realization); } @@ -157,6 +158,7 @@ public static void AreClones(IllustrationPointResult original, IllustrationPointResult clone) { Assert.AreEqual(original.Description, clone.Description); + Assert.AreEqual(original.Unit, clone.Unit); Assert.AreEqual(original.Value, clone.Value); } Index: Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs =================================================================== diff -u -rd161a5b9260940094e6769288e3966d3a268768a -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs (.../StochastConverterTest.cs) (revision d161a5b9260940094e6769288e3966d3a268768a) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs (.../StochastConverterTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -96,7 +96,6 @@ Assert.AreEqual(duration, stochast.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(hydraRingStochast.Name, stochast.Name); Assert.AreEqual(hydraRingStochast.Unit, stochast.Unit); - Assert.AreEqual(hydraRingStochast.Unit, stochast.Unit); Assert.AreEqual(hydraRingStochast.Realization, stochast.Realization, stochast.Realization.GetAccuracy()); } } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/IllustrationPoints/IllustrationPointResultCreateExtensions.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/IllustrationPoints/IllustrationPointResultCreateExtensions.cs (.../IllustrationPointResultCreateExtensions.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/IllustrationPoints/IllustrationPointResultCreateExtensions.cs (.../IllustrationPointResultCreateExtensions.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -54,7 +54,6 @@ var entity = new IllustrationPointResultEntity { Description = illustrationPointResult.Description.DeepClone(), - Unit = illustrationPointResult.Unit, Value = illustrationPointResult.Value, Order = order }; Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/IllustrationPoints/SubMechanismIllustrationPointStochastCreateExtensions.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/IllustrationPoints/SubMechanismIllustrationPointStochastCreateExtensions.cs (.../SubMechanismIllustrationPointStochastCreateExtensions.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/IllustrationPoints/SubMechanismIllustrationPointStochastCreateExtensions.cs (.../SubMechanismIllustrationPointStochastCreateExtensions.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -52,7 +52,6 @@ var entity = new SubMechanismIllustrationPointStochastEntity { Name = subMechanismIllustrationPointStochast.Name.DeepClone(), - Unit = subMechanismIllustrationPointStochast.Unit, Alpha = subMechanismIllustrationPointStochast.Alpha, Duration = subMechanismIllustrationPointStochast.Duration, Realization = subMechanismIllustrationPointStochast.Realization, Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/IllustrationPointResultEntity.cs =================================================================== diff -u -r5c315c32bf6e74d2e9af5b97c961ae7f173a9e28 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/IllustrationPointResultEntity.cs (.../IllustrationPointResultEntity.cs) (revision 5c315c32bf6e74d2e9af5b97c961ae7f173a9e28) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/IllustrationPointResultEntity.cs (.../IllustrationPointResultEntity.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -35,7 +35,6 @@ public long IllustrationPointResultEntityId { get; set; } public long SubMechanismIllustrationPointEntityId { get; set; } public string Description { get; set; } - public string Unit { get; set; } public double Value { get; set; } public int Order { get; set; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/SubMechanismIllustrationPointStochastEntity.cs =================================================================== diff -u -r152fb1318408421028233c1e66c0b706dcb951a7 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/SubMechanismIllustrationPointStochastEntity.cs (.../SubMechanismIllustrationPointStochastEntity.cs) (revision 152fb1318408421028233c1e66c0b706dcb951a7) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/SubMechanismIllustrationPointStochastEntity.cs (.../SubMechanismIllustrationPointStochastEntity.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -35,7 +35,6 @@ public long SubMechanismIllustrationPointStochastEntityId { get; set; } public long SubMechanismIllustrationPointEntityId { get; set; } public string Name { get; set; } - public string Unit { get; set; } public double Duration { get; set; } public double Alpha { get; set; } public double Realization { get; set; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensions.cs =================================================================== diff -u -r5c315c32bf6e74d2e9af5b97c961ae7f173a9e28 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensions.cs (.../IllustrationPointResultEntityReadExtensions.cs) (revision 5c315c32bf6e74d2e9af5b97c961ae7f173a9e28) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensions.cs (.../IllustrationPointResultEntityReadExtensions.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -47,7 +47,7 @@ } return new IllustrationPointResult(entity.Description, - entity.Unit, + string.Empty, entity.Value); } } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/IllustrationPoints/SubMechanismIllustrationPointStochastEntityReadExtensions.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/IllustrationPoints/SubMechanismIllustrationPointStochastEntityReadExtensions.cs (.../SubMechanismIllustrationPointStochastEntityReadExtensions.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/IllustrationPoints/SubMechanismIllustrationPointStochastEntityReadExtensions.cs (.../SubMechanismIllustrationPointStochastEntityReadExtensions.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -47,7 +47,7 @@ } return new SubMechanismIllustrationPointStochast(entity.Name, - entity.Unit, + string.Empty, entity.Duration, entity.Alpha, entity.Realization); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/IllustrationPointResultCreateExtensionsTest.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/IllustrationPointResultCreateExtensionsTest.cs (.../IllustrationPointResultCreateExtensionsTest.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/IllustrationPointResultCreateExtensionsTest.cs (.../IllustrationPointResultCreateExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -59,7 +59,6 @@ // Assert TestHelper.AssertAreEqualButNotSame(illustrationPointResult.Description, entity.Description); - Assert.AreEqual(illustrationPointResult.Unit, entity.Unit); Assert.AreEqual(illustrationPointResult.Value, entity.Value, illustrationPointResult.Value.GetAccuracy()); Assert.AreEqual(order, entity.Order); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs (.../SubMechanismIllustrationPointCreateExtensionsTest.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs (.../SubMechanismIllustrationPointCreateExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -107,7 +107,6 @@ SubMechanismIllustrationPointStochastEntity stochastEntity = stochastEntities[i]; TestHelper.AssertAreEqualButNotSame(stochast.Name, stochastEntity.Name); - Assert.AreEqual(stochast.Unit, stochastEntity.Unit); Assert.AreEqual(stochast.Duration, stochastEntity.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(stochast.Alpha, stochastEntity.Alpha, stochast.Alpha.GetAccuracy()); Assert.AreEqual(stochast.Realization, stochastEntity.Realization, stochast.Realization.GetAccuracy()); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/SubMechanismIllustrationPointStochastCreateExtensionsTest.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/SubMechanismIllustrationPointStochastCreateExtensionsTest.cs (.../SubMechanismIllustrationPointStochastCreateExtensionsTest.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/IllustrationPoints/SubMechanismIllustrationPointStochastCreateExtensionsTest.cs (.../SubMechanismIllustrationPointStochastCreateExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -61,7 +61,6 @@ // Assert TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); - Assert.AreEqual(stochast.Unit, entity.Unit); Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(stochast.Realization, entity.Realization, stochast.Realization.GetAccuracy()); Assert.AreEqual(order, entity.Order); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/FaultTreeIllustrationPointEntityReadExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/FaultTreeIllustrationPointEntityReadExtensionsTest.cs (.../FaultTreeIllustrationPointEntityReadExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/FaultTreeIllustrationPointEntityReadExtensionsTest.cs (.../FaultTreeIllustrationPointEntityReadExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -38,10 +38,10 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((FaultTreeIllustrationPointEntity) null).Read(); + void Call() => ((FaultTreeIllustrationPointEntity) null).Read(); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensionsTest.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensionsTest.cs (.../IllustrationPointResultEntityReadExtensionsTest.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensionsTest.cs (.../IllustrationPointResultEntityReadExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -50,7 +50,6 @@ var entity = new IllustrationPointResultEntity { Description = "Description", - Unit = "kN", Value = random.NextDouble() }; @@ -59,7 +58,6 @@ // Assert Assert.AreEqual(entity.Description, illustrationPointResult.Description); - Assert.AreEqual(entity.Unit, illustrationPointResult.Unit); Assert.AreEqual(entity.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); } } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/SubMechanismIllustrationPointEntityReadExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/SubMechanismIllustrationPointEntityReadExtensionsTest.cs (.../SubMechanismIllustrationPointEntityReadExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/SubMechanismIllustrationPointEntityReadExtensionsTest.cs (.../SubMechanismIllustrationPointEntityReadExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -36,10 +36,10 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((SubMechanismIllustrationPointEntity) null).Read(); + void Call() => ((SubMechanismIllustrationPointEntity) null).Read(); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/SubMechanismIllustrationPointStochastEntityReadExtensionsTest.cs =================================================================== diff -u -rd8d04257736716c85f30639042dd8f114117a338 -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/SubMechanismIllustrationPointStochastEntityReadExtensionsTest.cs (.../SubMechanismIllustrationPointStochastEntityReadExtensionsTest.cs) (revision d8d04257736716c85f30639042dd8f114117a338) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/IllustrationPoints/SubMechanismIllustrationPointStochastEntityReadExtensionsTest.cs (.../SubMechanismIllustrationPointStochastEntityReadExtensionsTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -50,7 +50,6 @@ var entity = new SubMechanismIllustrationPointStochastEntity { Name = "Description", - Unit = "kN", Alpha = random.NextDouble(), Duration = random.NextDouble(), Realization = random.NextDouble() @@ -61,7 +60,6 @@ // Assert Assert.AreEqual(entity.Name, illustrationPointResult.Name); - Assert.AreEqual(entity.Unit, illustrationPointResult.Unit); Assert.AreEqual(entity.Alpha, illustrationPointResult.Alpha, illustrationPointResult.Alpha.GetAccuracy()); Assert.AreEqual(entity.Duration, illustrationPointResult.Duration, illustrationPointResult.Duration.GetAccuracy()); Assert.AreEqual(entity.Realization, illustrationPointResult.Realization, illustrationPointResult.Realization.GetAccuracy()); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs =================================================================== diff -u -r45b086eb3cf98eab503badfb774888396838e8ba -r4adb93fc61a7f7c3b173f47dd70f261426dee266 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs (.../RiskeerProjectTestHelperTest.cs) (revision 45b086eb3cf98eab503badfb774888396838e8ba) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs (.../RiskeerProjectTestHelperTest.cs) (revision 4adb93fc61a7f7c3b173f47dd70f261426dee266) @@ -744,12 +744,14 @@ SubMechanismIllustrationPointStochast illustrationPointStochast = illustrationPoint.Stochasts.Single(); Assert.AreEqual("Name of a stochast", illustrationPointStochast.Name); + Assert.AreEqual(string.Empty, illustrationPointStochast.Unit); Assert.AreEqual(10, illustrationPointStochast.Duration, illustrationPointStochast.Duration.GetAccuracy()); Assert.AreEqual(9, illustrationPointStochast.Alpha, illustrationPointStochast.Alpha.GetAccuracy()); Assert.AreEqual(8, illustrationPointStochast.Realization, illustrationPointStochast.Realization.GetAccuracy()); IllustrationPointResult illustrationPointResult = illustrationPoint.IllustrationPointResults.Single(); Assert.AreEqual("Description of result", illustrationPointResult.Description); + Assert.AreEqual(string.Empty, illustrationPointResult.Unit); Assert.AreEqual(5, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); }