Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/TopLevelFaultTreeIllustrationPointCreateExtensionsTest.cs =================================================================== diff -u -r57b198a3f80256e02b871d8de11c05d9f2dcf311 -rd64218a12ee9c2fd3ffb32134354f694d77dedbe --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/TopLevelFaultTreeIllustrationPointCreateExtensionsTest.cs (.../TopLevelFaultTreeIllustrationPointCreateExtensionsTest.cs) (revision 57b198a3f80256e02b871d8de11c05d9f2dcf311) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/TopLevelFaultTreeIllustrationPointCreateExtensionsTest.cs (.../TopLevelFaultTreeIllustrationPointCreateExtensionsTest.cs) (revision d64218a12ee9c2fd3ffb32134354f694d77dedbe) @@ -80,8 +80,8 @@ var illustrationPointNode = new IllustrationPointNode(FaultTreeIllustrationPointTestFactory.CreateTestFaultTreeIllustrationPoint()); illustrationPointNode.SetChildren(new[] { - new IllustrationPointNode(new TestSubMechanismIllustrationPoint("0")), - new IllustrationPointNode(new TestSubMechanismIllustrationPoint("1")) + new IllustrationPointNode(new TestSubMechanismIllustrationPoint("Point A")), + new IllustrationPointNode(new TestSubMechanismIllustrationPoint("Point B")) }); var topLevelIllustrationPoint = new TopLevelFaultTreeIllustrationPoint( @@ -105,7 +105,7 @@ for (var i = 0; i < 2; i++) { - var expectedIllustrationPoint = new TestSubMechanismIllustrationPoint(i.ToString()); + var expectedIllustrationPoint = new TestSubMechanismIllustrationPoint(subMechanismIllustrationPointEntities[i].Name); SubMechanismIllustrationPointEntity illustrationPointEntity = subMechanismIllustrationPointEntities[i]; Assert.AreEqual(expectedIllustrationPoint.Name, illustrationPointEntity.Name); Assert.AreEqual(expectedIllustrationPoint.Beta, illustrationPointEntity.Beta, expectedIllustrationPoint.Beta.GetAccuracy()); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/IllustrationPointNodeTest.cs =================================================================== diff -u -rd7f56db6a475e07dd904bd61c0a56346aac4e565 -rd64218a12ee9c2fd3ffb32134354f694d77dedbe --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/IllustrationPointNodeTest.cs (.../IllustrationPointNodeTest.cs) (revision d7f56db6a475e07dd904bd61c0a56346aac4e565) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/IllustrationPointNodeTest.cs (.../IllustrationPointNodeTest.cs) (revision d64218a12ee9c2fd3ffb32134354f694d77dedbe) @@ -131,7 +131,7 @@ } [Test] - public void SetChildren_ChildContainsDifferentStochasts_ThrowArgumentException() + public void SetChildren_ParentDoesNotContainSameStochastsAsChild_ThrowArgumentException() { // Setup var illustrationPointNode = new IllustrationPointNode(new FaultTreeIllustrationPoint("Top", @@ -143,12 +143,10 @@ CombinationType.And)); var childrenToBeAdded = new[] { - new IllustrationPointNode(new FaultTreeIllustrationPoint("A", - 0.0, - new[] - { - new Stochast("Stochast B", 0, 0) - }, CombinationType.Or)), + new IllustrationPointNode(new TestFaultTreeIllustrationPoint(new[] + { + new Stochast("Stochast B", 0, 0) + })), new IllustrationPointNode(new TestFaultTreeIllustrationPoint("B")) }; Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/SubMechanismIllustrationPointTest.cs =================================================================== diff -u -rd7f56db6a475e07dd904bd61c0a56346aac4e565 -rd64218a12ee9c2fd3ffb32134354f694d77dedbe --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/SubMechanismIllustrationPointTest.cs (.../SubMechanismIllustrationPointTest.cs) (revision d7f56db6a475e07dd904bd61c0a56346aac4e565) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/SubMechanismIllustrationPointTest.cs (.../SubMechanismIllustrationPointTest.cs) (revision d64218a12ee9c2fd3ffb32134354f694d77dedbe) @@ -27,6 +27,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Data.TestUtil.IllustrationPoints; namespace Ringtoets.Common.Data.Test.IllustrationPoints { @@ -127,10 +128,7 @@ }; // Call - TestDelegate test = () => new SubMechanismIllustrationPoint("Point A", - random.NextDouble(), - stochasts, - Enumerable.Empty()); + TestDelegate test = () => new TestSubMechanismIllustrationPoint(stochasts); // Assert const string expectedMessage = "Een of meerdere stochasten hebben dezelfde naam.";