Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs =================================================================== diff -u -rdedc6ef371a0ea008c5c0126e6647b3089922287 -re295e88672c1e508b78ab4832849d457256f4451 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs (.../TestGeneralResultSubMechanismIllustrationPoint.cs) (revision dedc6ef371a0ea008c5c0126e6647b3089922287) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs (.../TestGeneralResultSubMechanismIllustrationPoint.cs) (revision e295e88672c1e508b78ab4832849d457256f4451) @@ -41,7 +41,13 @@ { new Stochast("A", 10.0, 5.0) }, - Enumerable.Empty()) {} + new List + { + new TopLevelSubMechanismIllustrationPoint( + WindDirectionTestFactory.CreateTestWindDirection(), + "closing situation", + new TestSubMechanismIllustrationPoint()) + }) {} /// /// Creates a new instance of Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingProfileSpecificOutputPropertiesTest.cs =================================================================== diff -u -rdedc6ef371a0ea008c5c0126e6647b3089922287 -re295e88672c1e508b78ab4832849d457256f4451 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingProfileSpecificOutputPropertiesTest.cs (.../ProbabilisticSubMechanismPipingProfileSpecificOutputPropertiesTest.cs) (revision dedc6ef371a0ea008c5c0126e6647b3089922287) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingProfileSpecificOutputPropertiesTest.cs (.../ProbabilisticSubMechanismPipingProfileSpecificOutputPropertiesTest.cs) (revision e295e88672c1e508b78ab4832849d457256f4451) @@ -336,19 +336,10 @@ GeneralResult generalResult = output.GeneralResult; + CollectionAssert.AreEqual(generalResult.Stochasts, properties.AlphaValues); + CollectionAssert.AreEqual(generalResult.Stochasts, properties.Durations); + CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(ip => ip.Data)); Assert.AreEqual(generalResult.GoverningWindDirection.Name, properties.WindDirection); - - int nrOfExpectedStochasts = generalResult.Stochasts.Count(); - Assert.AreEqual(nrOfExpectedStochasts, properties.AlphaValues.Length); - Assert.AreEqual(nrOfExpectedStochasts, properties.Durations.Length); - Stochast expectedStochast = generalResult.Stochasts.First(); - Assert.AreEqual(expectedStochast.Alpha, properties.AlphaValues[0].Alpha); - Assert.AreEqual(expectedStochast.Duration, properties.Durations[0].Duration); - - int nrOfExpectedTopLevelIllustrationPoints = generalResult.TopLevelIllustrationPoints.Count(); - Assert.AreEqual(nrOfExpectedTopLevelIllustrationPoints, properties.IllustrationPoints.Length); - - CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(i => i.Data)); } [Test] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingSectionSpecificOutputPropertiesTest.cs =================================================================== diff -u -r46e79a0be9bdc8c879f9ec02b3ea894195da75d9 -re295e88672c1e508b78ab4832849d457256f4451 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingSectionSpecificOutputPropertiesTest.cs (.../ProbabilisticSubMechanismPipingSectionSpecificOutputPropertiesTest.cs) (revision 46e79a0be9bdc8c879f9ec02b3ea894195da75d9) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingSectionSpecificOutputPropertiesTest.cs (.../ProbabilisticSubMechanismPipingSectionSpecificOutputPropertiesTest.cs) (revision e295e88672c1e508b78ab4832849d457256f4451) @@ -179,19 +179,10 @@ GeneralResult generalResult = output.GeneralResult; + CollectionAssert.AreEqual(generalResult.Stochasts, properties.AlphaValues); + CollectionAssert.AreEqual(generalResult.Stochasts, properties.Durations); + CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(ip => ip.Data)); Assert.AreEqual(generalResult.GoverningWindDirection.Name, properties.WindDirection); - - int nrOfExpectedStochasts = generalResult.Stochasts.Count(); - Assert.AreEqual(nrOfExpectedStochasts, properties.AlphaValues.Length); - Assert.AreEqual(nrOfExpectedStochasts, properties.Durations.Length); - Stochast expectedStochast = generalResult.Stochasts.First(); - Assert.AreEqual(expectedStochast.Alpha, properties.AlphaValues[0].Alpha); - Assert.AreEqual(expectedStochast.Duration, properties.Durations[0].Duration); - - int nrOfExpectedTopLevelIllustrationPoints = generalResult.TopLevelIllustrationPoints.Count(); - Assert.AreEqual(nrOfExpectedTopLevelIllustrationPoints, properties.IllustrationPoints.Length); - - CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(i => i.Data)); } [Test]