Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r9754fefbba93c8c3c4e229cd4d59259bf4462882 -r6d105c76b9439df9a98e43779a1ac158c3419d67 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 9754fefbba93c8c3c4e229cd4d59259bf4462882) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 6d105c76b9439df9a98e43779a1ac158c3419d67) @@ -346,23 +346,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++) - { - HeightStructuresFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - HeightStructuresFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; - - Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); - Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); - } - } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) { var expectedSectionResultsArray = expectedSectionResults.ToArray(); @@ -1003,6 +986,31 @@ 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++) + { + HeightStructuresFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + HeightStructuresFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + if (expectedSection.Calculation == null) + { + Assert.IsNull(actualSection.Calculation); + } + else + { + AssertStructuresCalculation(expectedSection.Calculation, actualSection.Calculation); + } + } + } + private static void AssertHeightStructures(ObservableList expectedHeightStructures, ObservableList actualHeightStructures) { Assert.AreEqual(expectedHeightStructures.Count, actualHeightStructures.Count);