Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -rcc8cd8bb3747e3578ffadc0851675302aeaca01a --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision cc8cd8bb3747e3578ffadc0851675302aeaca01a) @@ -250,8 +250,360 @@ } } - private void AssertProjectsAreEqual(RingtoetsProject expectedProject, RingtoetsProject actualProject) + #region Piping FailureMechanism + + private static void AssertPipingFailureMechanism(PipingFailureMechanism expectedPipingFailureMechanism, PipingFailureMechanism actualPipingFailureMechanism) { + AssertProbabilityAssessmentInput(expectedPipingFailureMechanism.PipingProbabilityAssessmentInput, actualPipingFailureMechanism.PipingProbabilityAssessmentInput); + AssertStochasticSoilModels(expectedPipingFailureMechanism.StochasticSoilModels, actualPipingFailureMechanism.StochasticSoilModels); + AssertSurfaceLines(expectedPipingFailureMechanism.SurfaceLines, actualPipingFailureMechanism.SurfaceLines); + AssertCalculationGroup(expectedPipingFailureMechanism.CalculationsGroup, actualPipingFailureMechanism.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++) + { + PipingFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + PipingFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + } + } + + private static void AssertProbabilityAssessmentInput(PipingProbabilityAssessmentInput expectedModel, PipingProbabilityAssessmentInput actualModel) + { + Assert.AreEqual(expectedModel.A, actualModel.A); + Assert.AreEqual(expectedModel.UpliftCriticalSafetyFactor, actualModel.UpliftCriticalSafetyFactor); + } + + private static void AssertPipingCalculationScenario(PipingCalculationScenario expectedPipingCalculation, PipingCalculationScenario actualPipingCalculation) + { + Assert.AreEqual(expectedPipingCalculation.IsRelevant, actualPipingCalculation.IsRelevant); + Assert.AreEqual(expectedPipingCalculation.Contribution, actualPipingCalculation.Contribution); + Assert.AreEqual(expectedPipingCalculation.Name, actualPipingCalculation.Name); + Assert.AreEqual(expectedPipingCalculation.Comments, actualPipingCalculation.Comments); + + AssertPipingInput(expectedPipingCalculation.InputParameters, actualPipingCalculation.InputParameters); + AssertPipingOutput(expectedPipingCalculation.Output, actualPipingCalculation.Output); + AssertPipingSemiProbabilisticOutput(expectedPipingCalculation.SemiProbabilisticOutput, actualPipingCalculation.SemiProbabilisticOutput); + } + + private static void AssertPipingInput(PipingInput expectedPipingInput, PipingInput actualPipingInput) + { + Assert.AreEqual(expectedPipingInput.ExitPointL, actualPipingInput.ExitPointL); + Assert.AreEqual(expectedPipingInput.EntryPointL, actualPipingInput.EntryPointL); + Assert.AreEqual(expectedPipingInput.PhreaticLevelExit.Mean, actualPipingInput.PhreaticLevelExit.Mean); + Assert.AreEqual(expectedPipingInput.PhreaticLevelExit.StandardDeviation, actualPipingInput.PhreaticLevelExit.StandardDeviation); + Assert.AreEqual(expectedPipingInput.DampingFactorExit.Mean, actualPipingInput.DampingFactorExit.Mean); + Assert.AreEqual(expectedPipingInput.DampingFactorExit.StandardDeviation, actualPipingInput.DampingFactorExit.StandardDeviation); + Assert.AreEqual(expectedPipingInput.SaturatedVolumicWeightOfCoverageLayer.Mean, actualPipingInput.SaturatedVolumicWeightOfCoverageLayer.Mean); + Assert.AreEqual(expectedPipingInput.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation, actualPipingInput.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation); + Assert.AreEqual(expectedPipingInput.SaturatedVolumicWeightOfCoverageLayer.Shift, actualPipingInput.SaturatedVolumicWeightOfCoverageLayer.Shift); + Assert.AreEqual(expectedPipingInput.Diameter70.Mean, actualPipingInput.Diameter70.Mean); + Assert.AreEqual(expectedPipingInput.Diameter70.StandardDeviation, actualPipingInput.Diameter70.StandardDeviation); + Assert.AreEqual(expectedPipingInput.DarcyPermeability.Mean, actualPipingInput.DarcyPermeability.Mean); + Assert.AreEqual(expectedPipingInput.DarcyPermeability.StandardDeviation, actualPipingInput.DarcyPermeability.StandardDeviation); + } + + private static void AssertPipingOutput(PipingOutput expectedOutput, PipingOutput actualOutput) + { + if (expectedOutput == null) + { + Assert.IsNull(actualOutput); + } + else + { + Assert.AreEqual(expectedOutput.HeaveFactorOfSafety, actualOutput.HeaveFactorOfSafety); + Assert.AreEqual(expectedOutput.HeaveZValue, actualOutput.HeaveZValue); + Assert.AreEqual(expectedOutput.UpliftFactorOfSafety, actualOutput.UpliftFactorOfSafety); + Assert.AreEqual(expectedOutput.UpliftZValue, actualOutput.UpliftZValue); + Assert.AreEqual(expectedOutput.SellmeijerFactorOfSafety, actualOutput.SellmeijerFactorOfSafety); + Assert.AreEqual(expectedOutput.SellmeijerZValue, actualOutput.SellmeijerZValue); + } + } + + private static void AssertPipingSemiProbabilisticOutput(PipingSemiProbabilisticOutput expectedOutput, PipingSemiProbabilisticOutput actualOutput) + { + if (expectedOutput == null) + { + Assert.IsNull(actualOutput); + } + else + { + Assert.AreEqual(expectedOutput.HeaveFactorOfSafety, actualOutput.HeaveFactorOfSafety); + Assert.AreEqual(expectedOutput.HeaveProbability, actualOutput.HeaveProbability); + Assert.AreEqual(expectedOutput.HeaveReliability, actualOutput.HeaveReliability); + + Assert.AreEqual(expectedOutput.SellmeijerFactorOfSafety, actualOutput.SellmeijerFactorOfSafety); + Assert.AreEqual(expectedOutput.SellmeijerProbability, actualOutput.SellmeijerProbability); + Assert.AreEqual(expectedOutput.SellmeijerReliability, actualOutput.SellmeijerReliability); + + Assert.AreEqual(expectedOutput.UpliftFactorOfSafety, actualOutput.UpliftFactorOfSafety); + Assert.AreEqual(expectedOutput.UpliftProbability, actualOutput.UpliftProbability); + + Assert.AreEqual(expectedOutput.RequiredReliability, actualOutput.RequiredReliability); + Assert.AreEqual(expectedOutput.RequiredProbability, actualOutput.RequiredProbability); + + Assert.AreEqual(expectedOutput.PipingFactorOfSafety, actualOutput.PipingFactorOfSafety); + Assert.AreEqual(expectedOutput.PipingReliability, actualOutput.PipingReliability); + Assert.AreEqual(expectedOutput.PipingProbability, actualOutput.PipingProbability); + } + } + + #endregion + + #region GrassCoverErosionInwards FailureMechanism + + private static void AssertGrassCoverErosionInwardsFailureMechanism(GrassCoverErosionInwardsFailureMechanism expectedFailureMechanism, + GrassCoverErosionInwardsFailureMechanism actualFailureMechanism) + { + Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N); + AssertDikeProfiles(expectedFailureMechanism.DikeProfiles, actualFailureMechanism.DikeProfiles); + 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++) + { + GrassCoverErosionInwardsFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + GrassCoverErosionInwardsFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + if (expectedSection.Calculation == null) + { + Assert.IsNull(actualSection.Calculation); + } + else + { + AssertGrassCoverErosionInwardsCalculation(expectedSection.Calculation, actualSection.Calculation); + } + } + } + + private static void AssertGrassCoverErosionInwardsCalculation(GrassCoverErosionInwardsCalculation expectedCalculation, + GrassCoverErosionInwardsCalculation actualCalculation) + { + Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); + Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); + + AssertGrassCoverErosionInwardsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); + + if (expectedCalculation.HasOutput) + { + AssertGrassCoverErosionInwardsOutput(expectedCalculation.Output, actualCalculation.Output); + } + else + { + Assert.IsFalse(actualCalculation.HasOutput); + } + } + + private static void AssertGrassCoverErosionInwardsInput(GrassCoverErosionInwardsInput expectedInput, GrassCoverErosionInwardsInput actualInput) + { + if (expectedInput.DikeProfile == null) + { + Assert.IsNull(actualInput.DikeProfile); + } + else + { + AssertDikeProfile(expectedInput.DikeProfile, actualInput.DikeProfile); + } + if (expectedInput.HydraulicBoundaryLocation == null) + { + Assert.IsNull(actualInput.HydraulicBoundaryLocation); + } + else + { + AssertHydraulicBoundaryLocation(expectedInput.HydraulicBoundaryLocation, actualInput.HydraulicBoundaryLocation); + } + AssertBreakWater(expectedInput.BreakWater, actualInput.BreakWater); + Assert.AreEqual(expectedInput.Orientation, actualInput.Orientation); + Assert.AreEqual(expectedInput.UseBreakWater, actualInput.UseBreakWater); + Assert.AreEqual(expectedInput.UseForeshore, actualInput.UseForeshore); + Assert.AreEqual(expectedInput.DikeHeight, actualInput.DikeHeight); + Assert.AreEqual(expectedInput.CriticalFlowRate.Mean, actualInput.CriticalFlowRate.Mean); + Assert.AreEqual(expectedInput.CriticalFlowRate.StandardDeviation, actualInput.CriticalFlowRate.StandardDeviation); + Assert.AreEqual(expectedInput.CalculateDikeHeight, actualInput.CalculateDikeHeight); + } + + private static void AssertGrassCoverErosionInwardsOutput(GrassCoverErosionInwardsOutput expectedOutput, GrassCoverErosionInwardsOutput actualOutput) + { + Assert.AreEqual(expectedOutput.DikeHeightCalculated, actualOutput.DikeHeightCalculated); + Assert.AreEqual(expectedOutput.DikeHeight, actualOutput.DikeHeight); + Assert.AreEqual(expectedOutput.WaveHeight, actualOutput.WaveHeight); + Assert.AreEqual(expectedOutput.IsOvertoppingDominant, actualOutput.IsOvertoppingDominant); + AssertProbabilityAssessmentOutput(expectedOutput.ProbabilityAssessmentOutput, actualOutput.ProbabilityAssessmentOutput); + } + + #endregion + + #region GrassCoverErosionOutwards FailureMechanism + + private static void AssertGrassCoverErosionOutwardsFailureMechanism(GrassCoverErosionOutwardsFailureMechanism expectedFailureMechanism, + GrassCoverErosionOutwardsFailureMechanism actualFailureMechanism) + { + Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N); + AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); + AssertHydraulicBoundaryLocations(expectedFailureMechanism.HydraulicBoundaryLocations, actualFailureMechanism.HydraulicBoundaryLocations); + AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); + } + + 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++) + { + GrassCoverErosionOutwardsFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + GrassCoverErosionOutwardsFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); + Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + } + } + + + #endregion + + #region StabilityStoneCover FailureMechanism + + private static void AssertStabilityStoneCoverFailureMechanism(StabilityStoneCoverFailureMechanism expectedFailureMechanism, + StabilityStoneCoverFailureMechanism actualFailureMechanism) + { + AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); + AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); + } + + 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++) + { + StabilityStoneCoverFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + StabilityStoneCoverFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + } + } + + private static void AssertStabilityStoneCoverWaveConditionsCalculation(StabilityStoneCoverWaveConditionsCalculation expectedCalculation, StabilityStoneCoverWaveConditionsCalculation actualCalculation) + { + Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); + Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); + + AssertWaveConditionsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); + + Assert.AreEqual(expectedCalculation.HasOutput, actualCalculation.HasOutput); + } + + #endregion + + #region WaveImpactAsphaltCover FailureMechanism + + private static void AssertWaveImpactAsphaltCoverFailureMechanism(WaveImpactAsphaltCoverFailureMechanism expectedFailureMechanism, + WaveImpactAsphaltCoverFailureMechanism actualFailureMechanism) + { + AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); + AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); + } + + 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++) + { + WaveImpactAsphaltCoverFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; + WaveImpactAsphaltCoverFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; + + Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); + Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); + Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); + } + } + + private static void AssertWaveImpactAsphaltCoverWaveConditionsCalculation(WaveImpactAsphaltCoverWaveConditionsCalculation expectedCalculation, WaveImpactAsphaltCoverWaveConditionsCalculation actualCalculation) + { + Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); + Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); + + AssertWaveConditionsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); + + Assert.AreEqual(expectedCalculation.HasOutput, actualCalculation.HasOutput); + } + + #endregion + + #region Hydraulic Boundary Database + + private static void AssertHydraulicBoundaryDatabase(HydraulicBoundaryDatabase expectedBoundaryDatabase, HydraulicBoundaryDatabase actualBoundaryDatabase) + { + Assert.IsNotNull(expectedBoundaryDatabase); + Assert.AreEqual(expectedBoundaryDatabase.Version, actualBoundaryDatabase.Version); + Assert.AreEqual(expectedBoundaryDatabase.FilePath, actualBoundaryDatabase.FilePath); + Assert.AreEqual(expectedBoundaryDatabase.Locations.Count, actualBoundaryDatabase.Locations.Count); + + AssertHydraulicBoundaryLocations(expectedBoundaryDatabase.Locations, actualBoundaryDatabase.Locations); + } + + private static void AssertHydraulicBoundaryLocations(List expectedHydraulicBoundaryLocations, List actualHydraulicBoundaryLocations) + { + for (int i = 0; i < expectedHydraulicBoundaryLocations.Count; i++) + { + HydraulicBoundaryLocation expectedBoundaryLocation = expectedHydraulicBoundaryLocations[i]; + HydraulicBoundaryLocation actualBoundaryLocation = actualHydraulicBoundaryLocations[i]; + + AssertHydraulicBoundaryLocation(expectedBoundaryLocation, actualBoundaryLocation); + } + } + + private static void AssertHydraulicBoundaryLocation(HydraulicBoundaryLocation expectedBoundaryLocation, HydraulicBoundaryLocation actualBoundaryLocation) + { + Assert.AreEqual(expectedBoundaryLocation.Id, actualBoundaryLocation.Id); + Assert.AreEqual(expectedBoundaryLocation.Name, actualBoundaryLocation.Name); + Assert.AreEqual(expectedBoundaryLocation.DesignWaterLevel, actualBoundaryLocation.DesignWaterLevel); + Assert.AreEqual(expectedBoundaryLocation.WaveHeight, actualBoundaryLocation.WaveHeight); + Assert.AreEqual(expectedBoundaryLocation.Location, actualBoundaryLocation.Location); + Assert.AreEqual(expectedBoundaryLocation.DesignWaterLevelCalculationConvergence, + actualBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(expectedBoundaryLocation.WaveHeightCalculationConvergence, + actualBoundaryLocation.WaveHeightCalculationConvergence); + } + + #endregion + + private static void AssertProjectsAreEqual(RingtoetsProject expectedProject, RingtoetsProject actualProject) + { Assert.NotNull(expectedProject); Assert.NotNull(actualProject); Assert.AreNotSame(expectedProject, actualProject); @@ -339,50 +691,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++) - { - PipingFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - PipingFailureMechanismSectionResult 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(); - var actualSectionResultsArray = actualSectionResults.ToArray(); - - Assert.AreEqual(expectedSectionResultsArray.Length, actualSectionResultsArray.Length); - - for (var i = 0; i < expectedSectionResultsArray.Length; i++) - { - GrassCoverErosionInwardsFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - GrassCoverErosionInwardsFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; - - Assert.AreEqual(expectedSection.AssessmentLayerOne, actualSection.AssessmentLayerOne); - Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); - if (expectedSection.Calculation == null) - { - Assert.IsNull(actualSection.Calculation); - } - else - { - AssertGrassCoverErosionInwardsCalculation(expectedSection.Calculation, actualSection.Calculation); - } - } - } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) { var expectedSectionResultsArray = expectedSectionResults.ToArray(); @@ -505,42 +813,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++) - { - WaveImpactAsphaltCoverFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - WaveImpactAsphaltCoverFailureMechanismSectionResult 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(); - var actualSectionResultsArray = actualSectionResults.ToArray(); - - Assert.AreEqual(expectedSectionResultsArray.Length, actualSectionResultsArray.Length); - - for (var i = 0; i < expectedSectionResultsArray.Length; i++) - { - GrassCoverErosionOutwardsFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - GrassCoverErosionOutwardsFailureMechanismSectionResult 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(); @@ -630,23 +902,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++) - { - StabilityStoneCoverFailureMechanismSectionResult expectedSection = expectedSectionResultsArray[i]; - StabilityStoneCoverFailureMechanismSectionResult actualSection = actualSectionResultsArray[i]; - - Assert.AreEqual(expectedSection.AssessmentLayerTwoA, actualSection.AssessmentLayerTwoA); - Assert.AreEqual(expectedSection.AssessmentLayerThree, actualSection.AssessmentLayerThree); - } - } - private static void AssertFailureMechanismSectionResults(IEnumerable expectedSectionResults, IEnumerable actualSectionResults) { var expectedSectionResultsArray = expectedSectionResults.ToArray(); @@ -689,61 +944,13 @@ } } - private static void AssertHydraulicBoundaryDatabase(HydraulicBoundaryDatabase expectedBoundaryDatabase, HydraulicBoundaryDatabase actualBoundaryDatabase) - { - Assert.IsNotNull(expectedBoundaryDatabase); - Assert.AreEqual(expectedBoundaryDatabase.Version, actualBoundaryDatabase.Version); - Assert.AreEqual(expectedBoundaryDatabase.FilePath, actualBoundaryDatabase.FilePath); - Assert.AreEqual(expectedBoundaryDatabase.Locations.Count, actualBoundaryDatabase.Locations.Count); - - AssertHydraulicBoundaryLocations(expectedBoundaryDatabase.Locations, actualBoundaryDatabase.Locations); - } - - private static void AssertHydraulicBoundaryLocations(List expectedHydraulicBoundaryLocations, List actualHydraulicBoundaryLocations) - { - for (int i = 0; i < expectedHydraulicBoundaryLocations.Count; i++) - { - HydraulicBoundaryLocation expectedBoundaryLocation = expectedHydraulicBoundaryLocations[i]; - HydraulicBoundaryLocation actualBoundaryLocation = actualHydraulicBoundaryLocations[i]; - - AssertHydraulicBoundaryLocation(expectedBoundaryLocation, actualBoundaryLocation); - } - } - - private static void AssertHydraulicBoundaryLocation(HydraulicBoundaryLocation expectedBoundaryLocation, HydraulicBoundaryLocation actualBoundaryLocation) - { - Assert.AreEqual(expectedBoundaryLocation.Id, actualBoundaryLocation.Id); - Assert.AreEqual(expectedBoundaryLocation.Name, actualBoundaryLocation.Name); - Assert.AreEqual(expectedBoundaryLocation.DesignWaterLevel, actualBoundaryLocation.DesignWaterLevel); - Assert.AreEqual(expectedBoundaryLocation.WaveHeight, actualBoundaryLocation.WaveHeight); - Assert.AreEqual(expectedBoundaryLocation.Location, actualBoundaryLocation.Location); - Assert.AreEqual(expectedBoundaryLocation.DesignWaterLevelCalculationConvergence, - actualBoundaryLocation.DesignWaterLevelCalculationConvergence); - Assert.AreEqual(expectedBoundaryLocation.WaveHeightCalculationConvergence, - actualBoundaryLocation.WaveHeightCalculationConvergence); - } - private static void AssertReferenceLine(ReferenceLine expectedReferenceLine, ReferenceLine actualReferenceLine) { Assert.IsNotNull(expectedReferenceLine); CollectionAssert.AreEqual(expectedReferenceLine.Points, actualReferenceLine.Points); } - private static void AssertPipingFailureMechanism(PipingFailureMechanism expectedPipingFailureMechanism, PipingFailureMechanism actualPipingFailureMechanism) - { - AssertProbabilityAssessmentInput(expectedPipingFailureMechanism.PipingProbabilityAssessmentInput, actualPipingFailureMechanism.PipingProbabilityAssessmentInput); - AssertStochasticSoilModels(expectedPipingFailureMechanism.StochasticSoilModels, actualPipingFailureMechanism.StochasticSoilModels); - AssertSurfaceLines(expectedPipingFailureMechanism.SurfaceLines, actualPipingFailureMechanism.SurfaceLines); - AssertCalculationGroup(expectedPipingFailureMechanism.CalculationsGroup, actualPipingFailureMechanism.CalculationsGroup); - } - - private static void AssertProbabilityAssessmentInput(PipingProbabilityAssessmentInput expectedModel, PipingProbabilityAssessmentInput actualModel) - { - Assert.AreEqual(expectedModel.A, actualModel.A); - Assert.AreEqual(expectedModel.UpliftCriticalSafetyFactor, actualModel.UpliftCriticalSafetyFactor); - } - private static void AssertStochasticSoilModels(ObservableList expectedModels, ObservableList actualModels) { // Precondition: @@ -881,153 +1088,15 @@ } } - private static void AssertPipingCalculationScenario(PipingCalculationScenario expectedPipingCalculation, PipingCalculationScenario actualPipingCalculation) + private static void AssertProbabilityAssessmentOutput(ProbabilityAssessmentOutput expectedOutput, ProbabilityAssessmentOutput actualOutput) { - Assert.AreEqual(expectedPipingCalculation.IsRelevant, actualPipingCalculation.IsRelevant); - Assert.AreEqual(expectedPipingCalculation.Contribution, actualPipingCalculation.Contribution); - Assert.AreEqual(expectedPipingCalculation.Name, actualPipingCalculation.Name); - Assert.AreEqual(expectedPipingCalculation.Comments, actualPipingCalculation.Comments); - - AssertPipingInput(expectedPipingCalculation.InputParameters, actualPipingCalculation.InputParameters); - AssertPipingOutput(expectedPipingCalculation.Output, actualPipingCalculation.Output); - AssertPipingSemiProbabilisticOutput(expectedPipingCalculation.SemiProbabilisticOutput, actualPipingCalculation.SemiProbabilisticOutput); - } - - private static void AssertPipingInput(PipingInput expectedPipingInput, PipingInput actualPipingInput) - { - Assert.AreEqual(expectedPipingInput.ExitPointL, actualPipingInput.ExitPointL); - Assert.AreEqual(expectedPipingInput.EntryPointL, actualPipingInput.EntryPointL); - Assert.AreEqual(expectedPipingInput.PhreaticLevelExit.Mean, actualPipingInput.PhreaticLevelExit.Mean); - Assert.AreEqual(expectedPipingInput.PhreaticLevelExit.StandardDeviation, actualPipingInput.PhreaticLevelExit.StandardDeviation); - Assert.AreEqual(expectedPipingInput.DampingFactorExit.Mean, actualPipingInput.DampingFactorExit.Mean); - Assert.AreEqual(expectedPipingInput.DampingFactorExit.StandardDeviation, actualPipingInput.DampingFactorExit.StandardDeviation); - Assert.AreEqual(expectedPipingInput.SaturatedVolumicWeightOfCoverageLayer.Mean, actualPipingInput.SaturatedVolumicWeightOfCoverageLayer.Mean); - Assert.AreEqual(expectedPipingInput.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation, actualPipingInput.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation); - Assert.AreEqual(expectedPipingInput.SaturatedVolumicWeightOfCoverageLayer.Shift, actualPipingInput.SaturatedVolumicWeightOfCoverageLayer.Shift); - Assert.AreEqual(expectedPipingInput.Diameter70.Mean, actualPipingInput.Diameter70.Mean); - Assert.AreEqual(expectedPipingInput.Diameter70.StandardDeviation, actualPipingInput.Diameter70.StandardDeviation); - Assert.AreEqual(expectedPipingInput.DarcyPermeability.Mean, actualPipingInput.DarcyPermeability.Mean); - Assert.AreEqual(expectedPipingInput.DarcyPermeability.StandardDeviation, actualPipingInput.DarcyPermeability.StandardDeviation); - } - - private static void AssertPipingOutput(PipingOutput expectedOutput, PipingOutput actualOutput) - { - if (expectedOutput == null) - { - Assert.IsNull(actualOutput); - } - else - { - Assert.AreEqual(expectedOutput.HeaveFactorOfSafety, actualOutput.HeaveFactorOfSafety); - Assert.AreEqual(expectedOutput.HeaveZValue, actualOutput.HeaveZValue); - Assert.AreEqual(expectedOutput.UpliftFactorOfSafety, actualOutput.UpliftFactorOfSafety); - Assert.AreEqual(expectedOutput.UpliftZValue, actualOutput.UpliftZValue); - Assert.AreEqual(expectedOutput.SellmeijerFactorOfSafety, actualOutput.SellmeijerFactorOfSafety); - Assert.AreEqual(expectedOutput.SellmeijerZValue, actualOutput.SellmeijerZValue); - } - } - - private static void AssertPipingSemiProbabilisticOutput(PipingSemiProbabilisticOutput expectedOutput, PipingSemiProbabilisticOutput actualOutput) - { - if (expectedOutput == null) - { - Assert.IsNull(actualOutput); - } - else - { - Assert.AreEqual(expectedOutput.HeaveFactorOfSafety, actualOutput.HeaveFactorOfSafety); - Assert.AreEqual(expectedOutput.HeaveProbability, actualOutput.HeaveProbability); - Assert.AreEqual(expectedOutput.HeaveReliability, actualOutput.HeaveReliability); - - Assert.AreEqual(expectedOutput.SellmeijerFactorOfSafety, actualOutput.SellmeijerFactorOfSafety); - Assert.AreEqual(expectedOutput.SellmeijerProbability, actualOutput.SellmeijerProbability); - Assert.AreEqual(expectedOutput.SellmeijerReliability, actualOutput.SellmeijerReliability); - - Assert.AreEqual(expectedOutput.UpliftFactorOfSafety, actualOutput.UpliftFactorOfSafety); - Assert.AreEqual(expectedOutput.UpliftProbability, actualOutput.UpliftProbability); - - Assert.AreEqual(expectedOutput.RequiredReliability, actualOutput.RequiredReliability); - Assert.AreEqual(expectedOutput.RequiredProbability, actualOutput.RequiredProbability); - - Assert.AreEqual(expectedOutput.PipingFactorOfSafety, actualOutput.PipingFactorOfSafety); - Assert.AreEqual(expectedOutput.PipingReliability, actualOutput.PipingReliability); - Assert.AreEqual(expectedOutput.PipingProbability, actualOutput.PipingProbability); - } - } - - private static void AssertGrassCoverErosionInwardsCalculation(GrassCoverErosionInwardsCalculation expectedCalculation, GrassCoverErosionInwardsCalculation actualCalculation) - { - Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); - Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); - - AssertGrassCoverErosionInwardsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); - - if (expectedCalculation.HasOutput) - { - AssertGrassCoverErosionInwardsOutput(expectedCalculation.Output, actualCalculation.Output); - } - else - { - Assert.IsFalse(actualCalculation.HasOutput); - } - } - - private static void AssertGrassCoverErosionInwardsInput(GrassCoverErosionInwardsInput expectedInput, GrassCoverErosionInwardsInput actualInput) - { - if (expectedInput.DikeProfile == null) - { - Assert.IsNull(actualInput.DikeProfile); - } - else - { - AssertDikeProfile(expectedInput.DikeProfile, actualInput.DikeProfile); - } - if (expectedInput.HydraulicBoundaryLocation == null) - { - Assert.IsNull(actualInput.HydraulicBoundaryLocation); - } - else - { - AssertHydraulicBoundaryLocation(expectedInput.HydraulicBoundaryLocation, actualInput.HydraulicBoundaryLocation); - } - AssertBreakWater(expectedInput.BreakWater, actualInput.BreakWater); - Assert.AreEqual(expectedInput.Orientation, actualInput.Orientation); - Assert.AreEqual(expectedInput.UseBreakWater, actualInput.UseBreakWater); - Assert.AreEqual(expectedInput.UseForeshore, actualInput.UseForeshore); - Assert.AreEqual(expectedInput.DikeHeight, actualInput.DikeHeight); - Assert.AreEqual(expectedInput.CriticalFlowRate.Mean, actualInput.CriticalFlowRate.Mean); - Assert.AreEqual(expectedInput.CriticalFlowRate.StandardDeviation, actualInput.CriticalFlowRate.StandardDeviation); - Assert.AreEqual(expectedInput.CalculateDikeHeight, actualInput.CalculateDikeHeight); - } - - private static void AssertGrassCoverErosionInwardsOutput(GrassCoverErosionInwardsOutput expectedOutput, GrassCoverErosionInwardsOutput actualOutput) - { - Assert.AreEqual(expectedOutput.DikeHeightCalculated, actualOutput.DikeHeightCalculated); - Assert.AreEqual(expectedOutput.DikeHeight, actualOutput.DikeHeight); - Assert.AreEqual(expectedOutput.WaveHeight, actualOutput.WaveHeight); - Assert.AreEqual(expectedOutput.IsOvertoppingDominant, actualOutput.IsOvertoppingDominant); - AssertProbabilityAssessmentOutput(expectedOutput.ProbabilityAssessmentOutput, actualOutput.ProbabilityAssessmentOutput); - } - - private static void AssertProbabilityAssessmentOutput(ProbabilityAssessmentOutput expectedOutput, ProbabilityAssessmentOutput actualOutput) - { Assert.AreEqual(expectedOutput.FactorOfSafety, actualOutput.FactorOfSafety); Assert.AreEqual(expectedOutput.Probability, actualOutput.Probability); Assert.AreEqual(expectedOutput.Reliability, actualOutput.Reliability); Assert.AreEqual(expectedOutput.RequiredProbability, actualOutput.RequiredProbability); Assert.AreEqual(expectedOutput.RequiredReliability, actualOutput.RequiredReliability); } - private static void AssertStabilityStoneCoverWaveConditionsCalculation(StabilityStoneCoverWaveConditionsCalculation expectedCalculation, StabilityStoneCoverWaveConditionsCalculation actualCalculation) - { - Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); - Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); - - AssertWaveConditionsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); - - Assert.AreEqual(expectedCalculation.HasOutput, actualCalculation.HasOutput); - } - private static void AssertWaveConditionsInput(WaveConditionsInput expectedInput, WaveConditionsInput actualInput) { if (expectedInput.ForeshoreProfile == null) @@ -1058,47 +1127,6 @@ } - private static void AssertGrassCoverErosionInwardsFailureMechanism(GrassCoverErosionInwardsFailureMechanism expectedFailureMechanism, - GrassCoverErosionInwardsFailureMechanism actualFailureMechanism) - { - Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N); - AssertDikeProfiles(expectedFailureMechanism.DikeProfiles, actualFailureMechanism.DikeProfiles); - AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup); - } - - private static void AssertGrassCoverErosionOutwardsFailureMechanism(GrassCoverErosionOutwardsFailureMechanism expectedFailureMechanism, - GrassCoverErosionOutwardsFailureMechanism actualFailureMechanism) - { - Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N); - AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); - AssertHydraulicBoundaryLocations(expectedFailureMechanism.HydraulicBoundaryLocations, actualFailureMechanism.HydraulicBoundaryLocations); - AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); - } - - private static void AssertStabilityStoneCoverFailureMechanism(StabilityStoneCoverFailureMechanism expectedFailureMechanism, - StabilityStoneCoverFailureMechanism actualFailureMechanism) - { - AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); - AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); - } - - private static void AssertWaveImpactAsphaltCoverFailureMechanism(WaveImpactAsphaltCoverFailureMechanism expectedFailureMechanism, - WaveImpactAsphaltCoverFailureMechanism actualFailureMechanism) - { - AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); - AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup); - } - - private static void AssertWaveImpactAsphaltCoverWaveConditionsCalculation(WaveImpactAsphaltCoverWaveConditionsCalculation expectedCalculation, WaveImpactAsphaltCoverWaveConditionsCalculation actualCalculation) - { - Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); - Assert.AreEqual(expectedCalculation.Comments, actualCalculation.Comments); - - AssertWaveConditionsInput(expectedCalculation.InputParameters, actualCalculation.InputParameters); - - Assert.AreEqual(expectedCalculation.HasOutput, actualCalculation.HasOutput); - } - private static void AssertDikeProfiles(IList expectedDikeProfiles, IList actualDikeProfiles) { Assert.AreEqual(expectedDikeProfiles.Count, actualDikeProfiles.Count); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -rcc8cd8bb3747e3578ffadc0851675302aeaca01a --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs (.../SqLiteDatabaseHelperTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/SqLiteDatabaseHelperTest.cs (.../SqLiteDatabaseHelperTest.cs) (revision cc8cd8bb3747e3578ffadc0851675302aeaca01a) @@ -203,7 +203,7 @@ } [Test] - public void CreateDatabaseFile_FileAreadyExists_OverwriteFile() + public void CreateDatabaseFile_FileAlreadyExists_OverwriteFile() { // Setup string validPath = Path.Combine(testDataPath, "tempFile.rtd"); @@ -224,7 +224,7 @@ } [Test] - public void CreateDatabaseFile_FileAreadyExistsAndLocked_Fail() + public void CreateDatabaseFile_FileAlreadyExistsAndLocked_Fail() { // Setup string validPath = Path.Combine(testDataPath, "tempFile.rtd"); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -rcc8cd8bb3747e3578ffadc0851675302aeaca01a --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision cc8cd8bb3747e3578ffadc0851675302aeaca01a) @@ -716,7 +716,12 @@ UpperBoundaryWaterLevels = (RoundedDouble) 13.3, LowerBoundaryWaterLevels = (RoundedDouble) (-1.9), StepSize = WaveConditionsInputStepSize.One - } + }, + Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[] + { + new WaveConditionsOutput(1, 2, 3, 4), + new WaveConditionsOutput(2, 3, 4, 5) + }) }); } @@ -873,16 +878,16 @@ HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations[0], BreakWater = { - Height = (RoundedDouble)(foreshoreProfile.BreakWater.Height + 0.1), + Height = (RoundedDouble) (foreshoreProfile.BreakWater.Height + 0.1), Type = BreakWaterType.Dam }, Orientation = foreshoreProfile.Orientation, UseForeshore = false, UseBreakWater = false, - UpperBoundaryRevetment = (RoundedDouble)12.3, - LowerBoundaryRevetment = (RoundedDouble)(-3.5), - UpperBoundaryWaterLevels = (RoundedDouble)13.3, - LowerBoundaryWaterLevels = (RoundedDouble)(-1.9), + UpperBoundaryRevetment = (RoundedDouble) 12.3, + LowerBoundaryRevetment = (RoundedDouble) (-3.5), + UpperBoundaryWaterLevels = (RoundedDouble) 13.3, + LowerBoundaryWaterLevels = (RoundedDouble) (-1.9), StepSize = WaveConditionsInputStepSize.One }, Output = new WaveImpactAsphaltCoverWaveConditionsOutput(new[]