Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -29,7 +29,7 @@ namespace Ringtoets.MacroStabilityInwards.Data { /// - /// Class that holds all macro stability inwards calculation specific input parameters, i.e.. the values + /// Class that holds all macro stability inwards calculation specific input parameters, i.e. the values /// that can differ across various calculations. /// public class MacroStabilityInwardsInput : Observable, ICalculationInput Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsProbabilityAssessmentInput.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsProbabilityAssessmentInput.cs (.../MacroStabilityInwardsProbabilityAssessmentInput.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsProbabilityAssessmentInput.cs (.../MacroStabilityInwardsProbabilityAssessmentInput.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -49,6 +49,7 @@ /// Gets or sets 'a' parameter used to factor in the 'length effect' when determining the /// maximum tolerated probability of failure. /// + /// Thrown when value is not in the range [0, 1]. public double A { get Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs (.../MacroStabilityInwardsMapDataFeaturesFactory.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs (.../MacroStabilityInwardsMapDataFeaturesFactory.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -106,9 +106,10 @@ return new MapFeature[0]; } - IEnumerable calculationsWithLocationAndHydraulicBoundaryLocation = calculations.Where(c => - c.InputParameters.SurfaceLine != null && - c.InputParameters.HydraulicBoundaryLocation != null); + IEnumerable calculationsWithLocationAndHydraulicBoundaryLocation = + calculations.Where(c => + c.InputParameters.SurfaceLine != null && + c.InputParameters.HydraulicBoundaryLocation != null); MapCalculationData[] calculationData = calculationsWithLocationAndHydraulicBoundaryLocation.Select( Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -44,7 +44,7 @@ /// and the . /// /// Surface lines to generate the structure for and to use to configure - /// with. + /// with. /// The soil models from which profiles are taken to configure with. /// General input to assign to each generated macro stability inwards calculation. /// A structure of matching combinations of and Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationScenarioContext.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationScenarioContext.cs (.../MacroStabilityInwardsCalculationScenarioContext.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationScenarioContext.cs (.../MacroStabilityInwardsCalculationScenarioContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -29,7 +29,7 @@ namespace Ringtoets.MacroStabilityInwards.Forms.PresentationObjects { /// - /// Presentation object for all data required to configure an instance of + /// Presentation object for all data required to configure an instance of /// in order to prepare it for performing a calculation. /// public class MacroStabilityInwardsCalculationScenarioContext : MacroStabilityInwardsContext, ICalculationContext Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs (.../MacroStabilityInwardsContext.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs (.../MacroStabilityInwardsContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -107,7 +107,10 @@ /// The macro stability inwards failure mechanism. /// The assessment section. /// Thrown when any input parameter is null. - private static void AssertInputsAreNotNull(object surfaceLines, object stochasticSoilModels, object macroStabilityInwardsFailureMechanism, object assessmentSection) + private static void AssertInputsAreNotNull(IEnumerable surfaceLines, + IEnumerable stochasticSoilModels, + MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism, + IAssessmentSection assessmentSection) { if (surfaceLines == null) { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsScenariosContext.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsScenariosContext.cs (.../MacroStabilityInwardsScenariosContext.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsScenariosContext.cs (.../MacroStabilityInwardsScenariosContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Core.Common.Controls.PresentationObjects; using Ringtoets.Common.Data.Calculation; using Ringtoets.MacroStabilityInwards.Data; @@ -35,9 +36,14 @@ /// /// The wrapped . /// A forming the context. + /// Thrown when any parameter is null. public MacroStabilityInwardsScenariosContext(CalculationGroup wrappedData, MacroStabilityInwardsFailureMechanism failureMechanism) : base(wrappedData) { + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } ParentFailureMechanism = failureMechanism; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/RingtoetsMacroStabilityInwardsSurfaceLinesContext.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/RingtoetsMacroStabilityInwardsSurfaceLinesContext.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContext.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/RingtoetsMacroStabilityInwardsSurfaceLinesContext.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -61,6 +61,9 @@ /// public IAssessmentSection AssessmentSection { get; private set; } + /// + /// Gets the failure mechanism which the context belongs to. + /// public MacroStabilityInwardsFailureMechanism FailureMechanism { get; private set; } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs (.../MacroStabilityInwardsInputContextProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs (.../MacroStabilityInwardsInputContextProperties.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -44,7 +44,6 @@ namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses { /// - /// /// ViewModel of for properties panel. /// public class MacroStabilityInwardsInputContextProperties : ObjectProperties, @@ -53,21 +52,9 @@ private const int selectedHydraulicBoundaryLocationPropertyIndex = 1; private const int assessmentLevelPropertyIndex = 2; private const int useHydraulicBoundaryLocationPropertyIndex = 3; - private const int dampingFactorExitPropertyIndex = 4; - private const int phreaticLevelExitPropertyIndex = 5; - private const int piezometricHeadExitPropertyIndex = 6; - private const int surfaceLinePropertyIndex = 7; - private const int stochasticSoilModelPropertyIndex = 8; - private const int stochasticSoilProfilePropertyIndex = 9; - private const int entryPointLPropertyIndex = 10; - private const int exitPointLPropertyIndex = 11; - private const int seepageLengthPropertyIndex = 12; - private const int thicknessCoverageLayerPropertyIndex = 13; - private const int effectiveThicknessCoverageLayerPropertyIndex = 14; - private const int thicknessAquiferLayerPropertyIndex = 15; - private const int darcyPermeabilityPropertyIndex = 16; - private const int diameter70PropertyIndex = 17; - private const int saturatedVolumicWeightOfCoverageLayerPropertyIndex = 18; + private const int surfaceLinePropertyIndex = 4; + private const int stochasticSoilModelPropertyIndex = 5; + private const int stochasticSoilProfilePropertyIndex = 6; private readonly IObservablePropertyChangeHandler propertyChangeHandler; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsOutputContextProperties.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsOutputContextProperties.cs (.../MacroStabilityInwardsOutputContextProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsOutputContextProperties.cs (.../MacroStabilityInwardsOutputContextProperties.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -29,6 +29,9 @@ namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses { + /// + /// ViewModel of for properties panel. + /// public class MacroStabilityInwardsOutputContextProperties : ObjectProperties { [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsOutputContext_Categories_MacroStabilityInwards), 1, 1)] Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -79,9 +79,9 @@ failureMechanismObserver = new Observer(OnFailureMechanismUpdate); assessmentSectionObserver = new Observer(UpdateSelectableHydraulicBoundaryLocationsColumn); // The concat is needed to observe the input of calculations in child groups. - inputObserver = new RecursiveObserver(UpdateDataGridViewDataSource, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); - calculationGroupObserver = new RecursiveObserver(UpdateDataGridViewDataSource, pcg => pcg.Children); - calculationObserver = new RecursiveObserver(dataGridViewControl.RefreshDataGridView, pcg => pcg.Children); + inputObserver = new RecursiveObserver(UpdateDataGridViewDataSource, cg => cg.Children.Concat(cg.Children.OfType().Select(pc => pc.InputParameters))); + calculationGroupObserver = new RecursiveObserver(UpdateDataGridViewDataSource, cg => cg.Children); + calculationObserver = new RecursiveObserver(dataGridViewControl.RefreshDataGridView, cg => cg.Children); surfaceLineObserver = new RecursiveObserver(UpdateDataGridViewDataSource, rpslc => rpslc); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRow.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRow.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -43,7 +43,7 @@ /// Creates a new instance of . /// /// The that is - /// the source of this row. + /// the source of this row. /// /// Throw when any parameter is null. public MacroStabilityInwardsFailureMechanismSectionResultRow(MacroStabilityInwardsFailureMechanismSectionResult sectionResult, IEnumerable calculations) : base(sectionResult) Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs (.../MacroStabilityInwardsScenariosView.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs (.../MacroStabilityInwardsScenariosView.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -57,9 +57,9 @@ failureMechanismObserver = new Observer(OnFailureMechanismUpdate); // The concat is needed to observe the input of calculations in child groups. - inputObserver = new RecursiveObserver(UpdateDataGridViewDataSource, pcg => pcg.Children.Concat(pcg.Children.OfType().Select(pc => pc.InputParameters))); - calculationGroupObserver = new RecursiveObserver(UpdateDataGridViewDataSource, pcg => pcg.Children); - calculationObserver = new RecursiveObserver(dataGridViewControl.RefreshDataGridView, pcg => pcg.Children); + inputObserver = new RecursiveObserver(UpdateDataGridViewDataSource, cg => cg.Children.Concat(cg.Children.OfType().Select(pc => pc.InputParameters))); + calculationGroupObserver = new RecursiveObserver(UpdateDataGridViewDataSource, cg => cg.Children); + calculationObserver = new RecursiveObserver(dataGridViewControl.RefreshDataGridView, cg => cg.Children); } /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilDatabaseQueryBuilder.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -175,6 +175,11 @@ StochasticSoilModelTableColumns.TableName); } + /// + /// Returns the SQL query to execute to check if the probabilities of the stochastic + /// soil profiles are valid. + /// + /// The SQL query to execute. public static string GetStochasticSoilProfileProbabilitiesValidQuery() { return string.Format( Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilProfileBuilder1D.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilProfileBuilder1D.cs (.../SoilProfileBuilder1D.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilProfileBuilder1D.cs (.../SoilProfileBuilder1D.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -36,6 +36,12 @@ private readonly double bottom; private readonly long soilProfileId; + /// + /// Creates a new instance of . + /// + /// The name of the profile. + /// The bottom level of the profile. + /// Identifier of the profile. internal SoilProfileBuilder1D(string name, double bottom, long soilProfileId) { this.name = name; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilProfileBuilder2D.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -46,7 +46,7 @@ /// /// The name for the constructed by the . /// The x position from which to obtain a 1D profile. - /// The indentifier of the profile in the database. + /// The identifier of the profile in the database. /// Thrown when can not be used to determine intersections with /// (is ). internal SoilProfileBuilder2D(string profileName, double atX, long soilProfileId) Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayer.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayer.cs (.../MacroStabilityInwardsSoilLayer.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayer.cs (.../MacroStabilityInwardsSoilLayer.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -35,7 +35,7 @@ /// /// Creates a new instance of , where the top is set to . /// - /// + /// The top level of the layer. public MacroStabilityInwardsSoilLayer(double top) { Top = top; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioExtensionsTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioExtensionsTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -82,6 +82,41 @@ } [Test] + public void IsSurfaceLineIntersectionWithReferenceLineInSection_WithoutReferenceLineIntersectionWorldPoint_ThrowsArgumentNullException() + { + // Setup + var surfaceLine = new RingtoetsMacroStabilityInwardsSurfaceLine(); + surfaceLine.SetGeometry(new[] + { + new Point3D(0.0, 5.0, 0.0), + new Point3D(0.0, 0.0, 1.0), + new Point3D(0.0, -5.0, 0.0) + }); + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(new[] + { + new Point2D(0.0, 0.0), + new Point2D(10.0, 0.0) + }); + + var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + { + InputParameters = + { + SurfaceLine = surfaceLine + } + }; + + IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points); + + // Call + TestDelegate call = () => calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments); + + // Assert + Assert.Throws(call); + } + + [Test] public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineIntersectsReferenceline_ReturnsTrue() { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsScenariosContextTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsScenariosContextTest.cs (.../MacroStabilityInwardsScenariosContextTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsScenariosContextTest.cs (.../MacroStabilityInwardsScenariosContextTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Core.Common.Controls.PresentationObjects; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; @@ -45,5 +46,19 @@ Assert.AreSame(calculationGroup, context.WrappedData); Assert.AreSame(failureMechanism, context.ParentFailureMechanism); } + + [Test] + public void Constructor_FailuremechanismNull_ThrowArgumentNullException() + { + // Setup + var calculationGroup = new CalculationGroup(); + + // Call + TestDelegate test = () => new MacroStabilityInwardsScenariosContext(calculationGroup, null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("failureMechanism", exception.ParamName); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -30,40 +30,39 @@ [Test] public void GetStochasticSoilModelOfMechanismQuery_Always_ReturnsExpectedValues() { - // Setup + // Call + string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismQuery(); + + // Assert const string expectedQuery = "SELECT SP.XWorld, SP.YWorld, S.SE_Name, SSM.SSM_Name, SSM.SSM_ID " + "FROM Mechanism M " + "INNER JOIN Segment S USING(ME_ID) " + "INNER JOIN StochasticSoilModel SSM USING(SSM_ID) " + "INNER JOIN SegmentPoints SP USING(SE_ID) " + "WHERE M.ME_Name = @ME_Name ORDER BY SSM.SSM_ID;"; - - // Call - string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismQuery(); - - // Assert Assert.AreEqual(expectedQuery, query); } [Test] public void GetAllStochasticSoilProfileQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = "SELECT SSM_ID, Probability, SP1D_ID, SP2D_ID " + - "FROM StochasticSoilProfile " + - "ORDER BY SSM_ID;"; - // Call string query = SoilDatabaseQueryBuilder.GetAllStochasticSoilProfileQuery(); // Assert + const string expectedQuery = "SELECT SSM_ID, Probability, SP1D_ID, SP2D_ID " + + "FROM StochasticSoilProfile " + + "ORDER BY SSM_ID;"; Assert.AreEqual(expectedQuery, query); } [Test] public void GetPipingSoilProfileCountQuery_Always_ReturnsExpectedValues() { - // Setup + // Call + string query = SoilDatabaseQueryBuilder.GetPipingSoilProfileCountQuery(); + + // Assert const string expectedQuery = "SELECT (" + "SELECT COUNT(DISTINCT sl1D.SP1D_ID) " + "FROM Mechanism m " + @@ -80,75 +79,62 @@ "JOIN MechanismPointLocation mpl USING(ME_ID, SP2D_ID) " + "WHERE m.ME_Name = @ME_Name" + ") AS nrOfRows;"; - - // Call - string query = SoilDatabaseQueryBuilder.GetPipingSoilProfileCountQuery(); - - // Assert Assert.AreEqual(expectedQuery, query); } [Test] public void GetStochasticSoilModelOfMechanismCountQuery_Always_ReturnsExpectedValues() { - // Setup + // Call + string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismCountQuery(); + + // Assert const string expectedQuery = "SELECT COUNT('1') AS nrOfRows FROM (" + "SELECT '1' FROM Mechanism M " + "INNER JOIN Segment S USING(ME_ID) " + "INNER JOIN StochasticSoilModel SSM USING(SSM_ID) " + "INNER JOIN SegmentPoints SP USING(SE_ID) " + "WHERE M.ME_Name = @ME_Name GROUP BY SSM_ID);"; - - // Call - string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismCountQuery(); - - // Assert Assert.AreEqual(expectedQuery, query); } [Test] public void GetCheckVersionQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = "SELECT Value " + - "FROM _MetaData " + - "WHERE Key = 'VERSION' AND Value = @Value;"; - // Call string query = SoilDatabaseQueryBuilder.GetCheckVersionQuery(); // Assert + const string expectedQuery = "SELECT Value " + + "FROM _MetaData " + + "WHERE Key = 'VERSION' AND Value = @Value;"; Assert.AreEqual(expectedQuery, query); } [Test] public void GetSoilModelNamesUniqueQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = - "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " + - "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " + - "JOIN(SELECT COUNT(DISTINCT SSM_Name) nameCount FROM StochasticSoilModel) AS [Distinct];"; - // Call string query = SoilDatabaseQueryBuilder.GetSoilModelNamesUniqueQuery(); // Assert + const string expectedQuery = + "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " + + "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " + + "JOIN(SELECT COUNT(DISTINCT SSM_Name) nameCount FROM StochasticSoilModel) AS [Distinct];"; Assert.AreEqual(expectedQuery, query); } [Test] public void GetStochasticSoilProfileProbabilitiesDefinedQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " + - "FROM StochasticSoilProfile " + - "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;"; - // Call string query = SoilDatabaseQueryBuilder.GetStochasticSoilProfileProbabilitiesValidQuery(); // Assert + const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " + + "FROM StochasticSoilProfile " + + "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;"; Assert.AreEqual(expectedQuery, query); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilProfileBuilder2DTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -35,10 +35,11 @@ public class SoilProfileBuilder2DTest { [Test] - [TestCase(null)] - [TestCase("name")] - public void Constructor_WithNameInvalidX_ThrowsArgumentException(string name) + public void Constructor_WithNameInvalidX_ThrowsArgumentException() { + // Setup + const string name = "name"; + // Call TestDelegate test = () => new SoilProfileBuilder2D(name, double.NaN, 0); @@ -49,12 +50,10 @@ } [Test] - [TestCase(null)] - [TestCase("name")] - public void Constructor_WithNameValidX_DoesNotThrow(string name) + public void Constructor_WithNameValidX_DoesNotThrow() { // Call - TestDelegate test = () => new SoilProfileBuilder2D(name, 0.0, 0); + TestDelegate test = () => new SoilProfileBuilder2D("name", 0.0, 0); // Assert Assert.DoesNotThrow(test); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test.csproj =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test.csproj) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test.csproj) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -10,7 +10,6 @@ Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test v4.0 512 - true Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -84,8 +84,7 @@ private MacroStabilityInwardsPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new MacroStabilityInwardsPlugin(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -60,8 +60,7 @@ private MacroStabilityInwardsPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new MacroStabilityInwardsPlugin(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -62,8 +62,7 @@ private MacroStabilityInwardsPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new MacroStabilityInwardsPlugin(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -44,15 +44,13 @@ private MacroStabilityInwardsPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new MacroStabilityInwardsPlugin(); info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StochasticSoilModelCollectionContext)); } - [TearDown] public override void TearDown() { plugin.Dispose(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -46,14 +46,12 @@ private UpdateInfo updateInfo; private MacroStabilityInwardsPlugin plugin; - [SetUp] - public void SetUp() + public override void Setup() { plugin = new MacroStabilityInwardsPlugin(); updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(RingtoetsMacroStabilityInwardsSurfaceLinesContext)); } - [TearDown] public override void TearDown() { plugin.Dispose(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -47,14 +47,12 @@ private UpdateInfo updateInfo; private MacroStabilityInwardsPlugin plugin; - [SetUp] - public void SetUp() + public override void Setup() { plugin = new MacroStabilityInwardsPlugin(); updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext)); } - [TearDown] public override void TearDown() { plugin.Dispose(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs =================================================================== diff -u -ra6e620bbe142b553dbde05a7b450050be599de02 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision a6e620bbe142b553dbde05a7b450050be599de02) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -34,7 +34,7 @@ namespace Ringtoets.Piping.Data { /// - /// Class that holds all piping calculation specific input parameters, i.e.. the values + /// Class that holds all piping calculation specific input parameters, i.e. the values /// that can differ across various calculations. /// public class PipingInput : Observable, ICalculationInput Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs (.../PipingProbabilityAssessmentInput.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs (.../PipingProbabilityAssessmentInput.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -49,6 +49,7 @@ /// Gets or sets 'a' parameter used to factor in the 'length effect' when determining the /// maximum tolerated probability of failure. /// + /// Thrown when value is not in the range [0, 1]. public double A { get Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSoilProfileExtensions.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSoilProfileExtensions.cs (.../PipingSoilProfileExtensions.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSoilProfileExtensions.cs (.../PipingSoilProfileExtensions.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -38,6 +38,10 @@ /// The soil profile containing to consider. /// The level under which the aquifer layers are sought. /// The thickness of the part of the consecutive aquifer layer(s) (partly) under the . + /// Thrown when either or + /// the collection of consecutive aquifer layer(s) is null. + /// Thrown when the bottommost is not part of + /// . public static double GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(this PipingSoilProfile soilProfile, double level) { return TotalThicknessOfConsecutiveLayersBelowLevel( @@ -100,10 +104,6 @@ /// Collection of consecutive , ordered by /// which are part of . /// The total thickness of the consecutive layers below the given . - /// Thrown when either or - /// is null. - /// Thrown when the bottommost is not part of - /// . private static double TotalThicknessOfConsecutiveLayersBelowLevel(PipingSoilProfile soilProfile, double level, PipingSoilLayer[] layers) { if (soilProfile == null) Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -44,7 +44,7 @@ /// and the . /// /// Surface lines to generate the structure for and to use to configure - /// with. + /// with. /// The soil models from which profiles are taken to configure with. /// General input to assign to each generated piping calculation. /// A structure of matching combinations of and Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs (.../PipingContext.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs (.../PipingContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -107,7 +107,10 @@ /// The piping failure mechanism. /// The assessment section. /// Thrown when any input parameter is null. - private static void AssertInputsAreNotNull(object surfaceLines, object stochasticSoilModels, object pipingFailureMechanism, object assessmentSection) + private static void AssertInputsAreNotNull(IEnumerable surfaceLines, + IEnumerable stochasticSoilModels, + PipingFailureMechanism pipingFailureMechanism, + IAssessmentSection assessmentSection) { if (surfaceLines == null) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingScenariosContext.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingScenariosContext.cs (.../PipingScenariosContext.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingScenariosContext.cs (.../PipingScenariosContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Core.Common.Controls.PresentationObjects; using Ringtoets.Common.Data.Calculation; using Ringtoets.Piping.Data; @@ -35,9 +36,14 @@ /// /// The wrapped . /// A forming the context. + /// Thrown when any parameter is null. public PipingScenariosContext(CalculationGroup wrappedData, PipingFailureMechanism failureMechanism) : base(wrappedData) { + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } ParentFailureMechanism = failureMechanism; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs (.../RingtoetsPipingSurfaceLinesContext.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/RingtoetsPipingSurfaceLinesContext.cs (.../RingtoetsPipingSurfaceLinesContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -61,6 +61,9 @@ /// public IAssessmentSection AssessmentSection { get; private set; } + /// + /// Gets the failure mechanism which the context belongs to. + /// public PipingFailureMechanism FailureMechanism { get; private set; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs (.../PipingOutputContextProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs (.../PipingOutputContextProperties.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -29,6 +29,9 @@ namespace Ringtoets.Piping.Forms.PropertyClasses { + /// + /// ViewModel of for properties panel. + /// public class PipingOutputContextProperties : ObjectProperties { [ResourcesCategory(typeof(Resources), nameof(Resources.PipingOutputContext_Categories_Uplift), 1, 4)] Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -43,7 +43,7 @@ /// Creates a new instance of . /// /// The that is - /// the source of this row. + /// the source of this row. /// /// Throw when any parameter is null. public PipingFailureMechanismSectionResultRow(PipingFailureMechanismSectionResult sectionResult, IEnumerable calculations) : base(sectionResult) Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -175,6 +175,11 @@ StochasticSoilModelTableColumns.TableName); } + /// + /// Returns the SQL query to execute to check if the probabilities of the stochastic + /// soil profiles are valid. + /// + /// The SQL query to execute. public static string GetStochasticSoilProfileProbabilitiesValidQuery() { return string.Format( Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder1D.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder1D.cs (.../SoilProfileBuilder1D.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder1D.cs (.../SoilProfileBuilder1D.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -36,6 +36,12 @@ private readonly double bottom; private readonly long soilProfileId; + /// + /// Creates a new instance of . + /// + /// The name of the profile. + /// The bottom level of the profile. + /// Identifier of the profile. internal SoilProfileBuilder1D(string name, double bottom, long soilProfileId) { this.name = name; Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -46,7 +46,7 @@ /// /// The name for the constructed by the . /// The x position from which to obtain a 1D profile. - /// The indentifier of the profile in the database. + /// The identifier of the profile in the database. /// Thrown when can not be used to determine intersections with /// (is ). internal SoilProfileBuilder2D(string profileName, double atX, long soilProfileId) Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilLayer.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilLayer.cs (.../PipingSoilLayer.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilLayer.cs (.../PipingSoilLayer.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -35,7 +35,7 @@ /// /// Creates a new instance of , where the top is set to . /// - /// + /// The top level of the layer. public PipingSoilLayer(double top) { Top = top; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingScenariosContextTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingScenariosContextTest.cs (.../PipingScenariosContextTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingScenariosContextTest.cs (.../PipingScenariosContextTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Core.Common.Controls.PresentationObjects; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; @@ -45,5 +46,19 @@ Assert.AreSame(calculationGroup, context.WrappedData); Assert.AreSame(failureMechanism, context.ParentFailureMechanism); } + + [Test] + public void Constructor_FailuremechanismNull_ThrowArgumentNullException() + { + // Setup + var calculationGroup = new CalculationGroup(); + + // Call + TestDelegate test = () => new PipingScenariosContext(calculationGroup, null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("failureMechanism", exception.ParamName); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -30,40 +30,41 @@ [Test] public void GetStochasticSoilModelOfMechanismQuery_Always_ReturnsExpectedValues() { - // Setup + // Call + string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismQuery(); + + // Assert const string expectedQuery = "SELECT SP.XWorld, SP.YWorld, S.SE_Name, SSM.SSM_Name, SSM.SSM_ID " + "FROM Mechanism M " + "INNER JOIN Segment S USING(ME_ID) " + "INNER JOIN StochasticSoilModel SSM USING(SSM_ID) " + "INNER JOIN SegmentPoints SP USING(SE_ID) " + "WHERE M.ME_Name = @ME_Name ORDER BY SSM.SSM_ID;"; - // Call - string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismQuery(); - - // Assert Assert.AreEqual(expectedQuery, query); } [Test] public void GetAllStochasticSoilProfileQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = "SELECT SSM_ID, Probability, SP1D_ID, SP2D_ID " + - "FROM StochasticSoilProfile " + - "ORDER BY SSM_ID;"; - // Call string query = SoilDatabaseQueryBuilder.GetAllStochasticSoilProfileQuery(); // Assert + const string expectedQuery = "SELECT SSM_ID, Probability, SP1D_ID, SP2D_ID " + + "FROM StochasticSoilProfile " + + "ORDER BY SSM_ID;"; Assert.AreEqual(expectedQuery, query); } [Test] public void GetPipingSoilProfileCountQuery_Always_ReturnsExpectedValues() { - // Setup + + // Call + string query = SoilDatabaseQueryBuilder.GetPipingSoilProfileCountQuery(); + + // Assert const string expectedQuery = "SELECT (" + "SELECT COUNT(DISTINCT sl1D.SP1D_ID) " + "FROM Mechanism m " + @@ -80,75 +81,62 @@ "JOIN MechanismPointLocation mpl USING(ME_ID, SP2D_ID) " + "WHERE m.ME_Name = @ME_Name" + ") AS nrOfRows;"; - - // Call - string query = SoilDatabaseQueryBuilder.GetPipingSoilProfileCountQuery(); - - // Assert Assert.AreEqual(expectedQuery, query); } [Test] public void GetStochasticSoilModelOfMechanismCountQuery_Always_ReturnsExpectedValues() { - // Setup + // Call + string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismCountQuery(); + + // Assert const string expectedQuery = "SELECT COUNT('1') AS nrOfRows FROM (" + "SELECT '1' FROM Mechanism M " + "INNER JOIN Segment S USING(ME_ID) " + "INNER JOIN StochasticSoilModel SSM USING(SSM_ID) " + "INNER JOIN SegmentPoints SP USING(SE_ID) " + "WHERE M.ME_Name = @ME_Name GROUP BY SSM_ID);"; - - // Call - string query = SoilDatabaseQueryBuilder.GetStochasticSoilModelOfMechanismCountQuery(); - - // Assert Assert.AreEqual(expectedQuery, query); } [Test] public void GetCheckVersionQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = "SELECT Value " + - "FROM _MetaData " + - "WHERE Key = 'VERSION' AND Value = @Value;"; - // Call string query = SoilDatabaseQueryBuilder.GetCheckVersionQuery(); // Assert + const string expectedQuery = "SELECT Value " + + "FROM _MetaData " + + "WHERE Key = 'VERSION' AND Value = @Value;"; Assert.AreEqual(expectedQuery, query); } [Test] public void GetSoilModelNamesUniqueQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = - "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " + - "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " + - "JOIN(SELECT COUNT(DISTINCT SSM_Name) nameCount FROM StochasticSoilModel) AS [Distinct];"; - // Call string query = SoilDatabaseQueryBuilder.GetSoilModelNamesUniqueQuery(); // Assert + const string expectedQuery = + "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " + + "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " + + "JOIN(SELECT COUNT(DISTINCT SSM_Name) nameCount FROM StochasticSoilModel) AS [Distinct];"; Assert.AreEqual(expectedQuery, query); } [Test] public void GetStochasticSoilProfileProbabilitiesDefinedQuery_Always_ReturnsExpectedValues() { - // Setup - const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " + - "FROM StochasticSoilProfile " + - "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;"; - // Call string query = SoilDatabaseQueryBuilder.GetStochasticSoilProfileProbabilitiesValidQuery(); // Assert + const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " + + "FROM StochasticSoilProfile " + + "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;"; Assert.AreEqual(expectedQuery, query); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -35,10 +35,11 @@ public class SoilProfileBuilder2DTest { [Test] - [TestCase(null)] - [TestCase("name")] - public void Constructor_WithNameInvalidX_ThrowsArgumentException(string name) + public void Constructor_WithNameInvalidX_ThrowsArgumentException() { + // Setup + const string name = "name"; + // Call TestDelegate test = () => new SoilProfileBuilder2D(name, double.NaN, 0); @@ -49,12 +50,10 @@ } [Test] - [TestCase(null)] - [TestCase("name")] - public void Constructor_WithNameValidX_DoesNotThrow(string name) + public void Constructor_WithNameValidX_DoesNotThrow() { // Call - TestDelegate test = () => new SoilProfileBuilder2D(name, 0.0, 0); + TestDelegate test = () => new SoilProfileBuilder2D("name", 0.0, 0); // Assert Assert.DoesNotThrow(test); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj =================================================================== diff -u -r303f3924f66df0bc726646b29031a926a94882bc -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj) (revision 303f3924f66df0bc726646b29031a926a94882bc) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.Test.csproj) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -10,7 +10,6 @@ Ringtoets.Piping.KernelWrapper.TestUtil.Test v4.0 512 - true Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -87,8 +87,7 @@ private PipingPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new PipingPlugin(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -63,8 +63,7 @@ private PipingPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new PipingPlugin(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -62,8 +62,7 @@ private PipingPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new PipingPlugin(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -44,15 +44,13 @@ private PipingPlugin plugin; private TreeNodeInfo info; - [SetUp] - public void SetUp() + public override void Setup() { mocks = new MockRepository(); plugin = new PipingPlugin(); info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StochasticSoilModelCollectionContext)); } - [TearDown] public override void TearDown() { plugin.Dispose(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs =================================================================== diff -u -r842e446f88e513e8be98fa0cf6c111f74d19de6c -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs) (revision 842e446f88e513e8be98fa0cf6c111f74d19de6c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -46,14 +46,12 @@ private UpdateInfo updateInfo; private PipingPlugin plugin; - [SetUp] - public void SetUp() + public override void Setup() { plugin = new PipingPlugin(); updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(RingtoetsPipingSurfaceLinesContext)); } - [TearDown] public override void TearDown() { plugin.Dispose(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs =================================================================== diff -u -r842e446f88e513e8be98fa0cf6c111f74d19de6c -r5906f61fff270a7526253bea07dfecdf680898ed --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 842e446f88e513e8be98fa0cf6c111f74d19de6c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) @@ -47,14 +47,12 @@ private UpdateInfo updateInfo; private PipingPlugin plugin; - [SetUp] - public void SetUp() + public override void Setup() { plugin = new PipingPlugin(); updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext)); } - [TearDown] public override void TearDown() { plugin.Dispose();