Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -r5308cb57e139e30a827582c956fdb46fd0f39c4c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 5308cb57e139e30a827582c956fdb46fd0f39c4c) @@ -1030,6 +1030,7 @@ Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N); AssertDuneLocations(expectedFailureMechanism.DuneLocations, actualFailureMechanism.DuneLocations); + AssertDuneLocationCalculations(expectedFailureMechanism, actualFailureMechanism); } private static void AssertFailureMechanismSectionResults( @@ -1060,6 +1061,33 @@ AssertDuneBoundaryLocation); } + private static void AssertDuneLocationCalculations(DuneErosionFailureMechanism expectedFailureMechanism, + DuneErosionFailureMechanism actualFailureMechanism) + { + AssertDuneLocationCalculations(expectedFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm, + actualFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm); + + AssertDuneLocationCalculations(expectedFailureMechanism.CalculationsForMechanismSpecificSignalingNorm, + actualFailureMechanism.CalculationsForMechanismSpecificSignalingNorm); + + AssertDuneLocationCalculations(expectedFailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm, + actualFailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm); + + AssertDuneLocationCalculations(expectedFailureMechanism.CalculationsForLowerLimitNorm, + actualFailureMechanism.CalculationsForLowerLimitNorm); + + AssertDuneLocationCalculations(expectedFailureMechanism.CalculationsForFactorizedLowerLimitNorm, + actualFailureMechanism.CalculationsForFactorizedLowerLimitNorm); + } + + private static void AssertDuneLocationCalculations(IEnumerable expectedDuneLocationCalculations, + IEnumerable actualDuneLocationCalculations) + { + AssertCollectionAndItems(expectedDuneLocationCalculations, + actualDuneLocationCalculations, + AssertDuneLocationCalculation); + } + private static void AssertDuneBoundaryLocation(DuneLocation expectedLocation, DuneLocation actualLocation) { Assert.AreEqual(expectedLocation.Id, actualLocation.Id); @@ -1069,9 +1097,14 @@ Assert.AreEqual(expectedLocation.Offset, actualLocation.Offset); Assert.AreEqual(expectedLocation.Orientation, actualLocation.Orientation); Assert.AreEqual(expectedLocation.D50, actualLocation.D50); - AssertDuneLocationCalculationOutput(expectedLocation.Calculation.Output, actualLocation.Calculation.Output); } + private static void AssertDuneLocationCalculation(DuneLocationCalculation expectedCalculation, DuneLocationCalculation actualCalculation) + { + AssertDuneBoundaryLocation(expectedCalculation.DuneLocation, actualCalculation.DuneLocation); + AssertDuneLocationCalculationOutput(expectedCalculation.Output, actualCalculation.Output); + } + private static void AssertDuneLocationCalculationOutput(DuneLocationCalculationOutput expectedOutput, DuneLocationCalculationOutput actualOutput) { if (expectedOutput == null)