Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -rd6fe8399e8398224cf1bda9259052232d85b85a4 -r1585e15381fe198a0d592e70e80b1332b9b74cca --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision d6fe8399e8398224cf1bda9259052232d85b85a4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 1585e15381fe198a0d592e70e80b1332b9b74cca) @@ -236,12 +236,17 @@ Assert.AreEqual(3, failureMechanism.CalculationsGroup.Children.Count); var firstCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[0]; - Assert.AreEqual(1, firstCalculationGroup.Children.Count); + Assert.AreEqual(2, firstCalculationGroup.Children.Count); var calculationWithOutput = (StructuresCalculation) firstCalculationGroup.Children[0]; Assert.IsTrue(calculationWithOutput.HasOutput); - Assert.IsTrue(calculationWithOutput.Output.HasGeneralResult); + Assert.IsFalse(calculationWithOutput.Output.HasGeneralResult); + var calculationGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationGeneralResult.HasOutput); + Assert.IsTrue(calculationGeneralResult.Output.HasGeneralResult); + AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationGeneralResult.Output.GeneralResult); + var secondCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[1]; Assert.AreEqual(0, secondCalculationGroup.Children.Count); var calculationWithoutOutput = (StructuresCalculation) failureMechanism.CalculationsGroup.Children[2]; @@ -261,19 +266,24 @@ Assert.AreEqual(3, failureMechanism.CalculationsGroup.Children.Count); var firstCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[0]; - Assert.AreEqual(1, firstCalculationGroup.Children.Count); + Assert.AreEqual(2, firstCalculationGroup.Children.Count); var calculationWithOutput = (StructuresCalculation) firstCalculationGroup.Children[0]; Assert.IsTrue(calculationWithOutput.HasOutput); - Assert.IsTrue(calculationWithOutput.Output.HasGeneralResult); + Assert.IsFalse(calculationWithOutput.Output.HasGeneralResult); + var calculationGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationGeneralResult.HasOutput); + Assert.IsTrue(calculationGeneralResult.Output.HasGeneralResult); + AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationGeneralResult.Output.GeneralResult); + + ClosingStructuresFailureMechanismSectionResult firstSectionResult = failureMechanism.SectionResults.First(); + Assert.AreSame(calculationWithOutput, firstSectionResult.Calculation); + var secondCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[1]; Assert.AreEqual(0, secondCalculationGroup.Children.Count); var calculationWithoutOutput = (StructuresCalculation) failureMechanism.CalculationsGroup.Children[2]; Assert.IsFalse(calculationWithoutOutput.HasOutput); - - ClosingStructuresFailureMechanismSectionResult firstSectionResult = failureMechanism.SectionResults.First(); - Assert.AreSame(calculationWithOutput, firstSectionResult.Calculation); } private static void AssertDuneErosionFailureMechanism(AssessmentSection assessmentSection) @@ -305,12 +315,17 @@ Assert.AreEqual(3, failureMechanism.CalculationsGroup.Children.Count); var firstCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[0]; - Assert.AreEqual(1, firstCalculationGroup.Children.Count); + Assert.AreEqual(2, firstCalculationGroup.Children.Count); var calculationWithOutput = (StructuresCalculation) firstCalculationGroup.Children[0]; Assert.IsTrue(calculationWithOutput.HasOutput); - Assert.IsTrue(calculationWithOutput.Output.HasGeneralResult); + Assert.IsFalse(calculationWithOutput.Output.HasGeneralResult); + var calculationGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationGeneralResult.HasOutput); + Assert.IsTrue(calculationGeneralResult.Output.HasGeneralResult); + AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationGeneralResult.Output.GeneralResult); + var secondCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[1]; Assert.AreEqual(0, secondCalculationGroup.Children.Count); var calculationWithoutOutput = (StructuresCalculation) failureMechanism.CalculationsGroup.Children[2]; @@ -320,6 +335,38 @@ Assert.AreSame(calculationWithOutput, sectionResult.Calculation); } + private static void AssertGeneralResultTopLevelFaultTreeIllustrationPoint(GeneralResult generalResult) + { + WindDirection actualGoverningWindDirection = generalResult.GoverningWindDirection; + Assert.AreEqual("GoverningWindDirection", actualGoverningWindDirection.Name); + Assert.AreEqual(180, actualGoverningWindDirection.Angle, actualGoverningWindDirection.Angle.GetAccuracy()); + + Stochast stochast = generalResult.Stochasts.Single(); + Assert.AreEqual("Stochast", stochast.Name); + Assert.AreEqual(0.9, stochast.Alpha, stochast.Alpha.GetAccuracy()); + Assert.AreEqual(0.1, stochast.Duration, stochast.Duration.GetAccuracy()); + + TopLevelFaultTreeIllustrationPoint topLevelFaultTreeIllustrationPoint = + generalResult.TopLevelIllustrationPoints.Single(); + Assert.AreEqual("ClosingSituation", topLevelFaultTreeIllustrationPoint.ClosingSituation); + Assert.AreEqual("WindDirection", topLevelFaultTreeIllustrationPoint.WindDirection.Name); + Assert.AreEqual(120, topLevelFaultTreeIllustrationPoint.WindDirection.Angle, + topLevelFaultTreeIllustrationPoint.WindDirection.Angle.GetAccuracy()); + + IllustrationPointNode node = topLevelFaultTreeIllustrationPoint.FaultTreeNodeRoot; + Assert.AreEqual(0, node.Children.Count()); + + var faultTreeIllustrationPoint = node.Data as FaultTreeIllustrationPoint; + Assert.IsNotNull(faultTreeIllustrationPoint); + Assert.AreEqual("FaultTreeIllustrationPoint", faultTreeIllustrationPoint.Name); + Assert.AreEqual(0.5, faultTreeIllustrationPoint.Beta, faultTreeIllustrationPoint.Beta.GetAccuracy()); + + Stochast innerStochast = faultTreeIllustrationPoint.Stochasts.Single(); + Assert.AreEqual("FaultTreeIllustrationPoint stochast", innerStochast.Name); + Assert.AreEqual(2.58, innerStochast.Alpha, innerStochast.Alpha.GetAccuracy()); + Assert.AreEqual(1, innerStochast.Duration, innerStochast.Duration.GetAccuracy()); + } + #region Hydraulic Boundary Database private static void AssertHydraulicBoundaryDatabase(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)