Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r3e7db9d95e07d438ec99f8488ec184848655b98c -r3992a077683baeefad7b74e04ed498e18e953c6a --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 3e7db9d95e07d438ec99f8488ec184848655b98c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 3992a077683baeefad7b74e04ed498e18e953c6a) @@ -398,24 +398,6 @@ } } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) - { - var expectedSectionResultsArray = expectedSectionResults.ToArray(); - var actualSectionResultsArray = actualSectionResults.ToArray(); - - Assert.AreEqual(expectedSectionResultsArray.Length, actualSectionResultsArray.Length); - - for (var i = 0; i < expectedSectionResultsArray.Length; i++) - { - ClosingStructuresFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - ClosingStructuresFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; - - Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); - Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); - Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); - } - } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) { var expectedSectionResultsArray = expectedSectionResults.ToArray(); @@ -541,23 +523,6 @@ } } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) - { - var expectedSectionResultsArray = expectedSectionResults.ToArray(); - var actualSectionResultsArray = actualSectionResults.ToArray(); - - Assert.AreEqual(expectedSectionResultsArray.Length, actualSectionResultsArray.Length); - - for (var i = 0; i < expectedSectionResultsArray.Length; i++) - { - StabilityPointStructuresFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - StabilityPointStructuresFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; - - Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); - Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); - } - } - private static void AssertFailureMechanism(IFailureMechanism expectedFailureMechanism, IFailureMechanism actualFailureMechanism) { Assert.AreEqual(expectedFailureMechanism.Name, actualFailureMechanism.Name); @@ -732,7 +697,7 @@ var expectedStabilityPointStructuresCalculation = expectedChild as StructuresCalculation; if (expectedStabilityPointStructuresCalculation != null) { - AssertStructuresCalculation(expectedStabilityPointStructuresCalculation, (StructuresCalculation)actualChild); + AssertStructuresCalculation(expectedStabilityPointStructuresCalculation, (StructuresCalculation) actualChild); } var expectedStabilityStoneCoverWaveConditionsCalculation = expectedChild as StabilityStoneCoverWaveConditionsCalculation; if (expectedStabilityStoneCoverWaveConditionsCalculation != null) @@ -929,6 +894,23 @@ AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup); } + private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) + { + var expectedSectionResultsArray = expectedSectionResults.ToArray(); + var actualSectionResultsArray = actualSectionResults.ToArray(); + + Assert.AreEqual(expectedSectionResultsArray.Length, actualSectionResultsArray.Length); + + for (var i = 0; i < expectedSectionResultsArray.Length; i++) + { + StabilityPointStructuresFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + StabilityPointStructuresFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + } + } + private static void AssertStabilityPointStructures(ObservableList expectedStabilityPointStructures, ObservableList actualStabilityPointStructures) { @@ -1044,6 +1026,24 @@ AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup); } + private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) + { + var expectedSectionResultsArray = expectedSectionResults.ToArray(); + var actualSectionResultsArray = actualSectionResults.ToArray(); + + Assert.AreEqual(expectedSectionResultsArray.Length, actualSectionResultsArray.Length); + + for (var i = 0; i < expectedSectionResultsArray.Length; i++) + { + ClosingStructuresFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + ClosingStructuresFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); + Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + } + } + private static void AssertClosingStructures(ObservableList expectedClosingStructures, ObservableList actualClosingStructures) { Assert.AreEqual(expectedClosingStructures.Count, actualClosingStructures.Count); @@ -1083,7 +1083,7 @@ Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); AssertClosingStructuresInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); - + if (expectedCalculation.HasOutput) { AssertProbabilityAssessmentOutput(expectedCalculation.Output, actualCalculation.Output);