Fisheye: Tag d619624819b7200ac55b357b0a0c54d198fc20e4 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/GeneralMacroStabilityInwardsInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs =================================================================== diff -u -r17b11c850b35c3ea99150ba25098b5b769b58f4f -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs (.../MacroStabilityInwardsCalculation.cs) (revision 17b11c850b35c3ea99150ba25098b5b769b58f4f) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculation.cs (.../MacroStabilityInwardsCalculation.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -35,13 +35,10 @@ /// /// Creates a new instance of with default values set for some of the parameters. /// - /// General macro stability inwards calculation parameters that - /// are the same across all macro stability inwards calculations. - /// Thrown when is null. - public MacroStabilityInwardsCalculation(GeneralMacroStabilityInwardsInput generalInputParameters) + public MacroStabilityInwardsCalculation() { Name = RingtoetsCommonDataResources.Calculation_DefaultName; - InputParameters = new MacroStabilityInwardsInput(generalInputParameters); + InputParameters = new MacroStabilityInwardsInput(); Comments = new Comment(); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculationScenario.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculationScenario.cs (.../MacroStabilityInwardsCalculationScenario.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsCalculationScenario.cs (.../MacroStabilityInwardsCalculationScenario.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -35,11 +35,7 @@ /// /// Creates a new instance of with default values set for some of the parameters. /// - /// General macro stability inwards calculation parameters that - /// are the same across all macro stability inwards calculations. - /// Thrown when is null. - public MacroStabilityInwardsCalculationScenario(GeneralMacroStabilityInwardsInput generalInputParameters) - : base(generalInputParameters) + public MacroStabilityInwardsCalculationScenario() { IsRelevant = true; contribution = new RoundedDouble(2, 1.0); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -42,7 +42,6 @@ : base(Resources.MacroStabilityInwardsFailureMechanism_DisplayName, Resources.MacroStabilityInwardsFailureMechanism_Code) { MacroStabilityInwardsProbabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput(); - GeneralInput = new GeneralMacroStabilityInwardsInput(); SurfaceLines = new MacroStabilityInwardsSurfaceLineCollection(); StochasticSoilModels = new MacroStabilityInwardsStochasticSoilModelCollection(); CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false); @@ -69,11 +68,6 @@ public MacroStabilityInwardsStochasticSoilModelCollection StochasticSoilModels { get; } /// - /// Gets the general calculation input parameters that apply to each macro stability inwards calculation. - /// - public GeneralMacroStabilityInwardsInput GeneralInput { get; } - - /// /// Gets the general probabilistic assessment input parameters that apply to each calculation /// in a semi-probabilistic assessment. /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs =================================================================== diff -u -r443600a37b8249cc44c134216fa98eed7a5bfa49 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 443600a37b8249cc44c134216fa98eed7a5bfa49) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -35,7 +35,6 @@ /// public class MacroStabilityInwardsInput : Observable, ICalculationInput { - private readonly GeneralMacroStabilityInwardsInput generalInputParameters; private RoundedDouble assessmentLevel; private bool useAssessmentLevelManualInput; private RoundedDouble slipPlaneMinimumDepth; @@ -64,19 +63,8 @@ /// /// Initializes a new instance of the class. /// - /// General macro stability inwards calculation parameters that - /// are the same across all macro stability inwards calculations. - /// Thrown when - /// is null. - public MacroStabilityInwardsInput(GeneralMacroStabilityInwardsInput generalInputParameters) + public MacroStabilityInwardsInput() { - if (generalInputParameters == null) - { - throw new ArgumentNullException(nameof(generalInputParameters)); - } - - this.generalInputParameters = generalInputParameters; - assessmentLevel = new RoundedDouble(2, double.NaN); useAssessmentLevelManualInput = false; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -42,7 +42,6 @@ - Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -47,16 +47,14 @@ /// Surface lines to generate the structure for and to use to configure /// 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 /// profiles of intersecting . /// Throw when either: /// /// is null /// is null - /// is null /// - public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput) + public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels) { if (surfaceLines == null) { @@ -66,15 +64,11 @@ { throw new ArgumentNullException(nameof(soilModels)); } - if (generalInput == null) - { - throw new ArgumentNullException(nameof(generalInput)); - } var groups = new List(); foreach (MacroStabilityInwardsSurfaceLine surfaceLine in surfaceLines) { - CalculationGroup group = CreateCalculationGroup(surfaceLine, soilModels, generalInput); + CalculationGroup group = CreateCalculationGroup(surfaceLine, soilModels); if (group.GetCalculations().Any()) { groups.Add(group); @@ -109,27 +103,27 @@ .ToList(); } - private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput) + private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels) { var calculationGroup = new CalculationGroup(surfaceLine.Name, true); IEnumerable stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); foreach (MacroStabilityInwardsStochasticSoilModel stochasticSoilModel in stochasticSoilModels) { foreach (MacroStabilityInwardsStochasticSoilProfile soilProfile in stochasticSoilModel.StochasticSoilProfiles) { - calculationGroup.Children.Add(CreateMacroStabilityInwardsCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput)); + calculationGroup.Children.Add(CreateMacroStabilityInwardsCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children)); } } return calculationGroup; } - private static ICalculationBase CreateMacroStabilityInwardsCalculation(MacroStabilityInwardsSurfaceLine surfaceLine, MacroStabilityInwardsStochasticSoilModel stochasticSoilModel, MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralMacroStabilityInwardsInput generalInput) + private static ICalculationBase CreateMacroStabilityInwardsCalculation(MacroStabilityInwardsSurfaceLine surfaceLine, MacroStabilityInwardsStochasticSoilModel stochasticSoilModel, MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile, IEnumerable calculations) { string nameBase = $"{surfaceLine.Name} {stochasticSoilProfile}"; string name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name); - return new MacroStabilityInwardsCalculationScenario(generalInput) + return new MacroStabilityInwardsCalculationScenario { Name = name, InputParameters = Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs =================================================================== diff -u -r0c5fdf3803fc373c20aa5e12fd180247797e15e2 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 0c5fdf3803fc373c20aa5e12fd180247797e15e2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -551,8 +551,7 @@ dialog.ShowDialog(); IEnumerable calculationsStructure = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( dialog.SelectedItems, - macroStabilityInwardsFailureMechanism.StochasticSoilModels, - macroStabilityInwardsFailureMechanism.GeneralInput); + macroStabilityInwardsFailureMechanism.StochasticSoilModels); foreach (ICalculationBase item in calculationsStructure) { calculationGroup.Children.Add(item); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -82,7 +82,7 @@ protected override ICalculation ParseReadCalculation(MacroStabilityInwardsCalculationConfiguration calculationConfiguration) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Name = calculationConfiguration.Name }; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r7b513e5e4b0d15ba13e161b4c5a2e1097f58b8fd -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 7b513e5e4b0d15ba13e161b4c5a2e1097f58b8fd) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -908,7 +908,7 @@ private static void AddCalculationScenario(MacroStabilityInwardsCalculationGroupContext nodeData) { - var calculation = new MacroStabilityInwardsCalculationScenario(nodeData.FailureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name) }; @@ -944,14 +944,14 @@ using (var view = new MacroStabilityInwardsSurfaceLineSelectionDialog(Gui.MainWindow, nodeData.AvailableMacroStabilityInwardsSurfaceLines)) { view.ShowDialog(); - GenerateCalculations(nodeData.WrappedData, view.SelectedItems, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput); + GenerateCalculations(nodeData.WrappedData, view.SelectedItems, nodeData.AvailableStochasticSoilModels); } nodeData.NotifyObservers(); } - private static void GenerateCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput) + private static void GenerateCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels) { - foreach (ICalculationBase group in MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput)) + foreach (ICalculationBase group in MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels)) { target.Children.Add(group); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioExtensionsTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioExtensionsTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -36,7 +36,7 @@ public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineNull_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call bool intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -66,7 +66,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -99,7 +99,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -137,7 +137,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -175,7 +175,7 @@ new Point2D(20.0, 0.0) }); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -34,11 +34,8 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); - // Call - var scenario = new MacroStabilityInwardsCalculationScenario(generalInputParameters); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Assert Assert.IsInstanceOf(scenario); @@ -54,7 +51,7 @@ public void IsRelevant_Always_ReturnsSetValue(bool isRelevant) { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Call scenario.IsRelevant = isRelevant; @@ -69,7 +66,7 @@ public void Contribution_Always_ReturnsSetValue(double newValue) { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); var roundedDouble = (RoundedDouble) newValue; // Call @@ -85,7 +82,7 @@ // Setup const double expectedProbability = 1.0 / 49862180; - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(expectedProbability) @@ -102,7 +99,7 @@ public void Probability_ScenarioStatusNotDone_ThrowsInvalidOperationException() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Call TestDelegate call = () => @@ -118,7 +115,7 @@ public void CalculationScenarioStatus_OutputNull_ReturnsStatusNotCalculated() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); // Call CalculationScenarioStatus status = scenario.Status; @@ -131,7 +128,7 @@ public void CalculationScenarioStatus_SemiProbabilisticOutputNull_ReturnsStatusFailed() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = null @@ -148,7 +145,7 @@ public void CalculationScenarioStatus_ScenarioInvalid_ReturnsStatusFailed() { // Setup - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(double.NaN) @@ -167,7 +164,7 @@ // Setup const double expectedProbability = 1.0 / 49862180; - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(expectedProbability) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs (.../MacroStabilityInwardsCalculationTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs (.../MacroStabilityInwardsCalculationTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -43,11 +43,8 @@ [Test] public void Constructor_DefaultPropertyValuesAreSet() { - // Setup - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); - // Call - var calculation = new MacroStabilityInwardsCalculation(generalInputParameters); + var calculation = new MacroStabilityInwardsCalculation(); // Assert Assert.IsInstanceOf(calculation); @@ -63,16 +60,6 @@ } [Test] - public void Constructor_GeneralInputIsNull_ThrowArgumentNullException() - { - // Call - TestDelegate call = () => new MacroStabilityInwardsCalculation(null); - - // Assert - Assert.Throws(call); - } - - [Test] public void Notify_SingleListenerAttached_ListenerIsNotified() { // Setup @@ -81,7 +68,7 @@ mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observer); @@ -98,7 +85,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Never(); mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observer); calculation.Detach(observer); @@ -120,7 +107,7 @@ mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observerA); calculation.Attach(observerB); @@ -142,7 +129,7 @@ mockRepository.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); calculation.Attach(observerA); calculation.Attach(observerB); @@ -158,7 +145,7 @@ { // Setup var observer = mockRepository.StrictMock(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); // Call & Assert calculation.Detach(observer); @@ -168,7 +155,7 @@ public void ClearOutput_Always_SetsOutputAndSemiProbabilisticOutputToNull() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -186,7 +173,7 @@ public void HasOutput_OutputAndSemiProbabilisticOutputNull_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = null, SemiProbabilisticOutput = null @@ -203,7 +190,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = new TestMacroStabilityInwardsOutput() }; @@ -219,7 +206,7 @@ public void HasOutput_SemiProbabilisticOutputSet_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -51,8 +51,6 @@ Assert.AreEqual("Dijken en dammen - Macrostabiliteit binnenwaarts", failureMechanism.Name); Assert.AreEqual("STBI", failureMechanism.Code); - Assert.IsInstanceOf(failureMechanism.GeneralInput); - Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name); Assert.IsFalse(failureMechanism.CalculationsGroup.IsNameEditable); CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children); @@ -160,7 +158,7 @@ public void Calculations_AddCalculation_ItemIsAddedToCollection() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call @@ -174,7 +172,7 @@ public void Calculations_RemoveCalculation_ItemIsRemovedFromCollection() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs =================================================================== diff -u -r443600a37b8249cc44c134216fa98eed7a5bfa49 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 443600a37b8249cc44c134216fa98eed7a5bfa49) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -36,7 +36,7 @@ public void Constructor_ExpectedValues() { // Call - var inputParameters = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var inputParameters = new MacroStabilityInwardsInput(); // Assert Assert.IsInstanceOf(inputParameters); @@ -164,7 +164,7 @@ double tangentLineZBottom = random.Next(); // Call - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SlipPlaneMinimumDepth = (RoundedDouble) slipPlaneMinimumDepth, SlipPlaneMinimumLength = (RoundedDouble) slipPlaneMinimumLength, @@ -216,20 +216,10 @@ } [Test] - public void Constructor_GeneralInputIsNull_ArgumentNullException() - { - // Call - TestDelegate call = () => new MacroStabilityInwardsInput(null); - - // Assert - Assert.Throws(call); - } - - [Test] public void AssessmentLevel_UseAssessmentLevelManualInputIsFalse_ReturnsNaN() { // Setup - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { UseAssessmentLevelManualInput = false, HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() @@ -255,7 +245,7 @@ } }; - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { HydraulicBoundaryLocation = testHydraulicBoundaryLocation }; @@ -271,7 +261,7 @@ public void AssessmentLevel_UseAssessmentLevelManualInputFalseAndSettingValue_ThrowsInvalidOperationException() { // Setup - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { UseAssessmentLevelManualInput = false }; @@ -290,7 +280,7 @@ public void AssessmentLevel_UseAssessmentLevelManualInputTrueAndSettingValue_ReturnSetValue() { // Setup - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { UseAssessmentLevelManualInput = true }; @@ -311,7 +301,7 @@ // Given var random = new Random(21); var testLevel = (RoundedDouble) random.NextDouble(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(testLevel) }; @@ -334,7 +324,7 @@ // Given var random = new Random(21); var testLevel = (RoundedDouble) random.NextDouble(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { UseAssessmentLevelManualInput = true, AssessmentLevel = testLevel Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -106,7 +106,7 @@ }); surfaceLine.ReferenceLineIntersectionWorldPoint = section.Points.First(); - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var scenario = new MacroStabilityInwardsCalculationScenario { IsRelevant = true, InputParameters = @@ -123,7 +123,7 @@ /// A new . public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput() { - return new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + return new MacroStabilityInwardsCalculationScenario(); } /// @@ -170,7 +170,7 @@ }); HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(1.0); - return new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + return new MacroStabilityInwardsCalculationScenario { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs (.../MacroStabilityInwardsInputFactory.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs (.../MacroStabilityInwardsInputFactory.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -66,7 +66,7 @@ } })); - return new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + return new MacroStabilityInwardsInput { SurfaceLine = surfaceLine, StochasticSoilProfile = stochasticSoilProfile @@ -97,7 +97,7 @@ } })); - return new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + return new MacroStabilityInwardsInput { SurfaceLine = surfaceLine, StochasticSoilProfile = stochasticSoilProfile @@ -143,7 +143,7 @@ } })); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SurfaceLine = surfaceLine, StochasticSoilProfile = stochasticSoilProfile @@ -189,7 +189,7 @@ } })); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SurfaceLine = surfaceLine, StochasticSoilProfile = stochasticSoilProfile Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -139,7 +139,7 @@ new Point3D(0, 10, 0) }); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Name = "PK001_0001 W1-6_0_1D1", InputParameters = @@ -271,8 +271,8 @@ stochasticSoilModel2 }, "some/path/to/stochasticsoilmodels"); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); - var calculationWithOutput = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario(); + var calculationWithOutput = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -283,7 +283,7 @@ Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() }; - var calculationWithSurfaceLineAndSoilModel = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithSurfaceLineAndSoilModel = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -293,7 +293,7 @@ StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0] } }; - var calculationWithOutputAndHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithOutputAndHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -304,14 +304,14 @@ Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() }; - var calculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario { InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; - var calculationWithSurfaceLineAndStochasticSoilModel = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithSurfaceLineAndStochasticSoilModel = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -321,8 +321,8 @@ } }; - var subCalculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); - var subCalculationWithOutput = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var subCalculation = new MacroStabilityInwardsCalculationScenario(); + var subCalculationWithOutput = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -334,7 +334,7 @@ Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() }; - var subCalculationWithOutputAndHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var subCalculationWithOutputAndHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -346,14 +346,14 @@ Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() }; - var subCalculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var subCalculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario { InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; - var subCalculationWithSurfaceLineAndStochasticSoilModel = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var subCalculationWithSurfaceLineAndStochasticSoilModel = new MacroStabilityInwardsCalculationScenario { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -313,8 +313,7 @@ // Call TestDelegate test = () => MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( null, - Enumerable.Empty(), - new GeneralMacroStabilityInwardsInput()); + Enumerable.Empty()); // Assert string parameter = Assert.Throws(test).ParamName; @@ -327,29 +326,14 @@ // Call TestDelegate test = () => MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( Enumerable.Empty(), - null, - new GeneralMacroStabilityInwardsInput()); + null); // Assert string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("soilModels", parameter); } [Test] - public void GenerateCalculationItemsStructure_WithoutGeneralInput_ThrowsArgumentNullException() - { - // Call - TestDelegate test = () => MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( - Enumerable.Empty(), - Enumerable.Empty(), - null); - - // Assert - string parameter = Assert.Throws(test).ParamName; - Assert.AreEqual("generalInput", parameter); - } - - [Test] public void GenerateCalculationItemsStructure_WithSurfaceLinesWithEmptySoilModels_LogFourWarnings() { // Setup @@ -372,8 +356,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - Enumerable.Empty(), - new GeneralMacroStabilityInwardsInput()).ToArray(); + Enumerable.Empty()).ToArray(); }; // Assert @@ -438,8 +421,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -500,8 +482,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); }; // Assert @@ -566,8 +547,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); }; // Assert @@ -639,8 +619,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -735,8 +714,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert Assert.AreEqual(2, result.Count()); @@ -848,8 +826,7 @@ { result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); }; // Assert @@ -923,13 +900,10 @@ surfaceLine }; - var generalInput = new GeneralMacroStabilityInwardsInput(); - // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - generalInput).ToArray(); + availableSoilModels).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; @@ -998,8 +972,7 @@ // Call IEnumerable result = MacroStabilityInwardsCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, - availableSoilModels, - new GeneralMacroStabilityInwardsInput()).ToArray(); + availableSoilModels).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs =================================================================== diff -u -r801944e042197afab2cf3bb57359970479e286b3 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -51,7 +51,7 @@ { new TestStochasticSoilModel() }; - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var parent = new CalculationGroup(); @@ -91,7 +91,7 @@ { new TestStochasticSoilModel() }; - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs (.../MacroStabilityInwardsInputContextTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsInputContextTest.cs (.../MacroStabilityInwardsInputContextTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -41,7 +41,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var surfaceLines = new[] { new MacroStabilityInwardsSurfaceLine(string.Empty) @@ -75,7 +75,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationInput = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var calculationInput = new MacroStabilityInwardsInput(); var surfaceLines = new[] { new MacroStabilityInwardsSurfaceLine(string.Empty) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs =================================================================== diff -u -rbf0a7527d0942c4646c9b6b9c49d21b58346431c -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs (.../MacroStabilityInwardsDrainagePropertiesTest.cs) (revision bf0a7527d0942c4646c9b6b9c49d21b58346431c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsDrainagePropertiesTest.cs (.../MacroStabilityInwardsDrainagePropertiesTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -51,7 +51,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler); @@ -83,7 +83,7 @@ public void Constructor_HandlerNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new MacroStabilityInwardsDrainageProperties(new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()), + TestDelegate call = () => new MacroStabilityInwardsDrainageProperties(new MacroStabilityInwardsInput(), null); // Assert @@ -101,7 +101,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { DrainageConstructionPresent = drainageConstructionPresent }; @@ -150,7 +150,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler); @@ -166,7 +166,7 @@ public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput() { // Given - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsInput input = calculationItem.InputParameters; var handler = new ObservablePropertyChangeHandler(calculationItem, input); @@ -194,7 +194,7 @@ public void DrainageConstructionPresent_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.DrainageConstructionPresent = true, calculation); @@ -204,7 +204,7 @@ public void XCoordinateDrainageConstruction_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.XCoordinateDrainageConstruction = (RoundedDouble) 1, calculation); @@ -214,7 +214,7 @@ public void ZCoordinateDrainageConstruction_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.ZCoordinateDrainageConstruction = (RoundedDouble) 1, calculation); @@ -230,7 +230,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { DrainageConstructionPresent = drainageConstructionPresent }; @@ -252,7 +252,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); var properties = new MacroStabilityInwardsDrainageProperties(input, changeHandler); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs =================================================================== diff -u -rbf0a7527d0942c4646c9b6b9c49d21b58346431c -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs (.../MacroStabilityInwardsGridPropertiesTest.cs) (revision bf0a7527d0942c4646c9b6b9c49d21b58346431c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs (.../MacroStabilityInwardsGridPropertiesTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -192,7 +192,7 @@ public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnGrid() { // Given - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsInput input = calculationItem.InputParameters; MacroStabilityInwardsGrid grid = input.LeftGrid; @@ -228,7 +228,7 @@ public void XLeft_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.XLeft = (RoundedDouble) 1, calculation); @@ -238,7 +238,7 @@ public void XRight_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.XRight = (RoundedDouble) 1, calculation); @@ -248,7 +248,7 @@ public void ZTop_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.ZTop = (RoundedDouble) 1, calculation); @@ -258,7 +258,7 @@ public void ZBottom_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.ZBottom = (RoundedDouble) 1, calculation); @@ -268,7 +268,7 @@ public void NumberOfHorizontalPoints_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.NumberOfHorizontalPoints = 1, calculation); @@ -278,7 +278,7 @@ public void NumberOfVerticalPoints_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.NumberOfVerticalPoints = 1, calculation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs =================================================================== diff -u -rc3d61cf2df840ffe8a6b54ec4d3ddb4316996f2e -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs (.../MacroStabilityInwardsGridSettingsPropertiesTest.cs) (revision c3d61cf2df840ffe8a6b54ec4d3ddb4316996f2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs (.../MacroStabilityInwardsGridSettingsPropertiesTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -56,7 +56,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsGridSettingsProperties(input, changeHandler); @@ -88,7 +88,7 @@ public void Constructor_HandlerNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new MacroStabilityInwardsGridSettingsProperties(new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()), + TestDelegate call = () => new MacroStabilityInwardsGridSettingsProperties(new MacroStabilityInwardsInput(), null); // Assert @@ -106,7 +106,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { GridDetermination = gridDeterminationAutomatic ? MacroStabilityInwardsGridDetermination.Automatic @@ -195,7 +195,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { GridDetermination = gridDetermination }; @@ -222,7 +222,7 @@ public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput() { // Given - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsInput input = calculationItem.InputParameters; var handler = new ObservablePropertyChangeHandler(calculationItem, input); @@ -254,7 +254,7 @@ public void MoveGrid_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.MoveGrid = true, calculation); @@ -264,7 +264,7 @@ public void GridDetermination_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.GridDetermination = MacroStabilityInwardsGridDetermination.Manual, calculation); @@ -274,7 +274,7 @@ public void TangentLineDetermination_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.TangentLineDetermination = MacroStabilityInwardsTangentLineDetermination.Specified, calculation); @@ -284,7 +284,7 @@ public void TangentLineZTop_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.TangentLineZTop = (RoundedDouble) 1, calculation); @@ -294,7 +294,7 @@ public void TangentLineZBottom_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.TangentLineZBottom = (RoundedDouble) 1, calculation); @@ -308,7 +308,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); var properties = new MacroStabilityInwardsGridSettingsProperties(input, changeHandler); // Call @@ -328,7 +328,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { GridDetermination = gridDetermination ? MacroStabilityInwardsGridDetermination.Automatic Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r443600a37b8249cc44c134216fa98eed7a5bfa49 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 443600a37b8249cc44c134216fa98eed7a5bfa49) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -89,7 +89,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, @@ -116,7 +116,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, @@ -144,7 +144,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, @@ -277,7 +277,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters, @@ -359,7 +359,7 @@ HydraulicBoundaryLocation testHydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(0.0); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -412,7 +412,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); MacroStabilityInwardsInput inputParameters = calculationItem.InputParameters; @@ -465,7 +465,7 @@ { // Setup MacroStabilityInwardsSurfaceLine newSurfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(p => p.SurfaceLine = newSurfaceLine, calculation); @@ -476,7 +476,7 @@ { // Setup MacroStabilityInwardsStochasticSoilModel newSoilModel = ValidStochasticSoilModel(0.0, 4.0); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.StochasticSoilModel = newSoilModel, calculation); @@ -487,7 +487,7 @@ { // Setup MacroStabilityInwardsStochasticSoilProfile newSoilProfile = ValidStochasticSoilModel(0.0, 4.0).StochasticSoilProfiles.First(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.StochasticSoilProfile = newSoilProfile, calculation); @@ -498,7 +498,7 @@ { // Setup RoundedDouble newAssessmentLevel = new Random(21).NextRoundedDouble(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -514,7 +514,7 @@ public void UseCustomAssessmentLevel_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.UseAssessmentLevelManualInput = true, @@ -526,7 +526,7 @@ { // Setup var newDikeSoilScenario = new Random().NextEnumValue(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.DikeSoilScenario = newDikeSoilScenario, @@ -537,7 +537,7 @@ public void SlipPlaneMinimumDepth_SetNewValue_SetsValuesAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.SlipPlaneMinimumDepth = (RoundedDouble) 1, @@ -548,7 +548,7 @@ public void SlipPlaneMinimumLength_SetNewValue_SetsValuesAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.SlipPlaneMinimumLength = (RoundedDouble) 1, @@ -559,7 +559,7 @@ public void MaximumSliceWidth_SetNewValue_SetsValuesAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.MaximumSliceWidth = (RoundedDouble) 1, @@ -576,7 +576,7 @@ observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -616,7 +616,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var testLevel = (RoundedDouble) new Random(21).NextDouble(); HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated( testLevel); @@ -653,11 +653,11 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var random = new Random(21); - var inputParameters = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var inputParameters = new MacroStabilityInwardsInput { HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(50) }; @@ -704,7 +704,7 @@ observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -747,7 +747,7 @@ mocks.ReplayAll(); var random = new Random(21); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -793,7 +793,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -842,7 +842,7 @@ var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -886,7 +886,7 @@ var soilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()); var stochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(soilProfile); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -943,7 +943,7 @@ var stochasticSoilModel2 = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModel2Name"); stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile2); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -988,7 +988,7 @@ mocks.ReplayAll(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); @@ -1012,7 +1012,7 @@ mocks.ReplayAll(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); @@ -1085,7 +1085,7 @@ } }; failureMechanism.StochasticSoilModels.AddRange(soilModels, "path"); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1122,7 +1122,7 @@ mocks.ReplayAll(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); @@ -1156,7 +1156,7 @@ new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()) } }; - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1189,7 +1189,7 @@ mocks.ReplayAll(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); @@ -1227,7 +1227,7 @@ MacroStabilityInwardsStochasticSoilModel soilModel = ValidStochasticSoilModel(0.0, 4.0); MacroStabilityInwardsStochasticSoilProfile soilProfile = soilModel.StochasticSoilProfiles.First(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1278,7 +1278,7 @@ assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); @@ -1323,7 +1323,7 @@ MacroStabilityInwardsSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1377,7 +1377,7 @@ MacroStabilityInwardsSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0, 0); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1434,7 +1434,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1467,7 +1467,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, Enumerable.Empty(), @@ -1497,7 +1497,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -1530,7 +1530,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput); + var calculation = new MacroStabilityInwardsCalculationScenario(); var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation, Enumerable.Empty(), Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs =================================================================== diff -u -r5d16bb16bb6c1de18fc053fa842c6814845bc6b9 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs (.../MacroStabilityInwardsOffsetPropertiesTest.cs) (revision 5d16bb16bb6c1de18fc053fa842c6814845bc6b9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs (.../MacroStabilityInwardsOffsetPropertiesTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -53,7 +53,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsOffsetProperties(input, changeHandler); @@ -85,7 +85,7 @@ public void Constructor_HandlerNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new MacroStabilityInwardsOffsetProperties(new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()), + TestDelegate call = () => new MacroStabilityInwardsOffsetProperties(new MacroStabilityInwardsInput(), null); // Assert @@ -103,7 +103,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { UseDefaultOffset = useDefaultOffset }; @@ -168,7 +168,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsOffsetProperties(input, changeHandler); @@ -186,7 +186,7 @@ public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput() { // Given - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsInput input = calculationItem.InputParameters; var handler = new ObservablePropertyChangeHandler(calculationItem, input); @@ -222,7 +222,7 @@ public void UseDefaultOffset_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.UseDefaultOffset = true, calculation); @@ -232,7 +232,7 @@ public void PhreaticLineOffsetBelowDikeTopAtRiver_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) 1, calculation); @@ -242,7 +242,7 @@ public void PhreaticLineOffsetBelowDikeTopAtPolder_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) 1, calculation); @@ -252,7 +252,7 @@ public void PhreaticLineOffsetBelowShoulderBaseInside_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) 1, calculation); @@ -262,7 +262,7 @@ public void PhreaticLineOffsetBelowDikeToeAtPolder_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) 1, calculation); @@ -278,7 +278,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { UseDefaultOffset = useDefaultOffset }; @@ -300,7 +300,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); var properties = new MacroStabilityInwardsOffsetProperties(input, changeHandler); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs =================================================================== diff -u -r443600a37b8249cc44c134216fa98eed7a5bfa49 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision 443600a37b8249cc44c134216fa98eed7a5bfa49) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressesPropertiesTest.cs (.../MacroStabilityInwardsWaterStressesPropertiesTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -62,7 +62,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler); @@ -94,7 +94,7 @@ public void Constructor_HandlerNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()), + TestDelegate call = () => new MacroStabilityInwardsWaterStressesProperties(new MacroStabilityInwardsInput(), null); // Assert @@ -110,7 +110,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler); @@ -237,7 +237,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler); @@ -264,7 +264,7 @@ public void GivenPropertiesWithData_WhenChangingProperties_ThenPropertiesSetOnInput() { // Given - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsInput input = calculationItem.InputParameters; var handler = new ObservablePropertyChangeHandler(calculationItem, input); @@ -328,7 +328,7 @@ public void WaterLevelRiverAverage_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.WaterLevelRiverAverage = (RoundedDouble) 1, calculation); @@ -338,7 +338,7 @@ public void WaterLevelPolder_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.WaterLevelPolder = (RoundedDouble) 1, calculation); @@ -348,7 +348,7 @@ public void MinimumLevelPhreaticLineAtDikeTopRiver_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble) 1, calculation); @@ -358,7 +358,7 @@ public void MinimumLevelPhreaticLineAtDikeTopPolder_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble) 1, calculation); @@ -368,7 +368,7 @@ public void AdjustPhreaticLine3And4ForUplift_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.AdjustPhreaticLine3And4ForUplift = true, calculation); @@ -378,7 +378,7 @@ public void LeakageLengthOutwardsPhreaticLine3_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble) 1, calculation); @@ -388,7 +388,7 @@ public void LeakageLengthInwardsPhreaticLine3_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.LeakageLengthInwardsPhreaticLine3 = (RoundedDouble) 1, calculation); @@ -398,7 +398,7 @@ public void LeakageLengthOutwardsPhreaticLine4_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble) 1, calculation); @@ -408,7 +408,7 @@ public void LeakageLengthInwardsPhreaticLine4_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.LeakageLengthInwardsPhreaticLine4 = (RoundedDouble) 1, calculation); @@ -418,7 +418,7 @@ public void PiezometricHeadPhreaticLine2Outwards_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PiezometricHeadPhreaticLine2Outwards = (RoundedDouble) 1, calculation); @@ -428,7 +428,7 @@ public void PiezometricHeadPhreaticLine2Inwards_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PiezometricHeadPhreaticLine2Inwards = (RoundedDouble) 1, calculation); @@ -438,7 +438,7 @@ public void PenetrationLength_SetValidValue_SetsValueAndUpdatesObservers() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.PenetrationLength = (RoundedDouble) 1, calculation); @@ -452,7 +452,7 @@ var changeHandler = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); var properties = new MacroStabilityInwardsWaterStressesProperties(input, changeHandler); // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -54,10 +54,10 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { StochasticSoilModel = new MacroStabilityInwardsStochasticSoilModel("StochasticSoilModelName") }; @@ -123,10 +123,10 @@ new Point3D(2, 3, 0) }); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SurfaceLine = surfaceLine, StochasticSoilModel = stochasticSoilModel, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -54,10 +54,10 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()) }; @@ -123,10 +123,10 @@ new Point3D(2, 3, 0) }); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SurfaceLine = surfaceLine, StochasticSoilModel = stochasticSoilModel, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -52,10 +52,10 @@ var assessmentSection = mockRepository.Stub(); var handler = mockRepository.Stub(); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SurfaceLine = ValidSurfaceLine() }; @@ -107,10 +107,10 @@ new Point3D(0.0, 0.0, 0.0), new Point3D(1.0, 0.0, 1.0) }); - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationItem = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { SurfaceLine = surfaceLine }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs =================================================================== diff -u -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -63,7 +63,7 @@ public void Constructor_WithoutHandler_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new MacroStabilityInwardsCalculationRow(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), null); + TestDelegate test = () => new MacroStabilityInwardsCalculationRow(new MacroStabilityInwardsCalculationScenario(), null); // Assert string paramName = Assert.Throws(test).ParamName; @@ -147,7 +147,7 @@ var newModel = new MacroStabilityInwardsStochasticSoilModel("test"); var newValue = new DataGridViewComboBoxItemWrapper(newModel); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsAndOutputForCalculation(row => row.StochasticSoilModel = newValue, calculation); @@ -181,7 +181,7 @@ var newProfile = new MacroStabilityInwardsStochasticSoilProfile(0, new TestMacroStabilityInwardsSoilProfile1D()); var newValue = new DataGridViewComboBoxItemWrapper(newProfile); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsAndOutputForCalculation(row => row.StochasticSoilProfile = newValue, calculation); @@ -216,7 +216,7 @@ var selectableHydraulicBoundaryLocation = new SelectableHydraulicBoundaryLocation(newLocation, new Point2D(0, 0)); var newValue = new DataGridViewComboBoxItemWrapper(selectableHydraulicBoundaryLocation); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert SetPropertyAndVerifyNotifcationsAndOutputForCalculation(row => row.SelectableHydraulicBoundaryLocation = newValue, calculation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -1192,15 +1192,15 @@ { Children = { - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 1", InputParameters = { SurfaceLine = surfaceLine1 } }, - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 2", InputParameters = @@ -1246,15 +1246,15 @@ { Children = { - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 1", InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation1 } }, - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 2", InputParameters = @@ -1338,7 +1338,7 @@ { Children = { - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 1", InputParameters = @@ -1348,7 +1348,7 @@ HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First() } }, - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 2", InputParameters = Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -109,7 +109,7 @@ // Setup using (var view = new MacroStabilityInwardsInputView()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call view.Data = calculation; @@ -141,7 +141,7 @@ // Setup using (var view = new MacroStabilityInwardsInputView { - Data = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + Data = new MacroStabilityInwardsCalculationScenario() }) { // Precondition @@ -162,7 +162,7 @@ public void Data_SetToNull_TableDataCleared() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -207,7 +207,7 @@ MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -235,7 +235,7 @@ // Setup using (var view = new MacroStabilityInwardsInputView()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call view.Data = calculation; @@ -252,7 +252,7 @@ using (var view = new MacroStabilityInwardsInputView()) { MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -281,7 +281,7 @@ using (var view = new MacroStabilityInwardsInputView()) { MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -309,7 +309,7 @@ // Setup using (var view = new MacroStabilityInwardsInputView()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); // Call view.Data = calculation; @@ -328,7 +328,7 @@ const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Name = initialName }; @@ -357,7 +357,7 @@ const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Name = initialName }; @@ -367,7 +367,7 @@ // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); - var calculation2 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation2 = new MacroStabilityInwardsCalculationScenario { Name = initialName }; @@ -397,7 +397,7 @@ { MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -449,7 +449,7 @@ new MacroStabilityInwardsSoilLayer1D(3) })); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -495,7 +495,7 @@ const int updatedDikeToeAtRiverIndex = dikeToeAtRiverIndex - 1; const int updatedSurfaceLevelOutsideIndex = surfaceLevelOutsideIndex - 1; - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); using (var view = new MacroStabilityInwardsInputView { @@ -595,7 +595,7 @@ using (var view = new MacroStabilityInwardsInputView()) { - var calculation1 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation1 = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -611,7 +611,7 @@ chartData.Attach(observer); } - view.Data = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + view.Data = new MacroStabilityInwardsCalculationScenario(); MacroStabilityInwardsSurfaceLine surfaceLine2 = GetSecondSurfaceLineWithGeometry(); @@ -634,7 +634,7 @@ { MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -338,15 +338,15 @@ { Children = { - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 1", InputParameters = { SurfaceLine = surfaceLine1 } }, - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + new MacroStabilityInwardsCalculationScenario { Name = "Calculation 2", InputParameters = Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -323,7 +323,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var expectedCalculation = new MacroStabilityInwardsCalculationScenario { Name = "Calculation", Contribution = (RoundedDouble) 0.088 @@ -354,7 +354,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var expectedCalculation = new MacroStabilityInwardsCalculationScenario { Name = "Calculation", IsRelevant = false @@ -418,7 +418,7 @@ // Assert Assert.IsTrue(successful); - var expectedCalculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var expectedCalculation = new MacroStabilityInwardsCalculationScenario { Name = "Calculation", InputParameters = Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs =================================================================== diff -u -rbcad3e9362f5130ab5f29dad05ec17a6812d859a -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision bcad3e9362f5130ab5f29dad05ec17a6812d859a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -74,14 +74,14 @@ DataImportHelper.ImportMacroStabilityInwardsSurfaceLines(assessmentSection); // Setup some calculations - var calculation1 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation1 = new MacroStabilityInwardsCalculationScenario { InputParameters = { SurfaceLine = assessmentSection.MacroStabilityInwards.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var calculation2 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation2 = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -119,7 +119,7 @@ Assert.AreEqual(2, dataGridView.Rows.Count); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set. - var calculation3 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation3 = new MacroStabilityInwardsCalculationScenario(); nestedCalculationGroup.Children.Add(calculation3); nestedCalculationGroup.NotifyObservers(); Assert.AreEqual(2, dataGridView.Rows.Count); @@ -134,7 +134,7 @@ Assert.AreEqual("New name", dataGridView.Rows[0].Cells[nameColumnIndex].FormattedValue); // Add another calculation and assign all soil models - var calculation4 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation4 = new MacroStabilityInwardsCalculationScenario(); assessmentSection.MacroStabilityInwards.CalculationsGroup.Children.Add(calculation4); assessmentSection.MacroStabilityInwards.CalculationsGroup.NotifyObservers(); calculation4.InputParameters.SurfaceLine = assessmentSection.MacroStabilityInwards.SurfaceLines.First(sl => sl.Name == "PK001_0001"); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r081badaad87a6e2a6d5c861de9ee95fa1ca6dea3 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision 081badaad87a6e2a6d5c861de9ee95fa1ca6dea3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -73,15 +73,15 @@ DataImportHelper.ImportMacroStabilityInwardsSurfaceLines(assessmentSection); // Setup some calculations - var calculation1 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation1 = new MacroStabilityInwardsCalculationScenario { InputParameters = { SurfaceLine = assessmentSection.MacroStabilityInwards.SurfaceLines.First( sl => sl.Name == "PK001_0001") } }; - var calculation2 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation2 = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -129,7 +129,7 @@ Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set - var calculation3 = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation3 = new MacroStabilityInwardsCalculationScenario(); nestedCalculationGroup.Children.Add(calculation3); nestedCalculationGroup.NotifyObservers(); Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / calculation1.Probability), Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextExportInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextExportInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -67,7 +67,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), + var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -111,7 +111,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), + var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -150,7 +150,7 @@ if (hasCalculation) { - calculationGroup.Children.Add(new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput())); + calculationGroup.Children.Add(new MacroStabilityInwardsCalculation()); } var context = new MacroStabilityInwardsCalculationGroupContext(calculationGroup, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs =================================================================== diff -u -r86e6c6985b6841357f600bff63c169a92b528640 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs) (revision 86e6c6985b6841357f600bff63c169a92b528640) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -171,7 +171,7 @@ { // Setup var existingModel = new TestStochasticSoilModel(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); calculation.InputParameters.StochasticSoilModel = existingModel; calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; calculation.Output = new MacroStabilityInwardsOutput(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -r140635b34616f25ca853982955976632b6000c52 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs) (revision 140635b34616f25ca853982955976632b6000c52) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -274,12 +274,12 @@ MacroStabilityInwardsStochasticSoilProfile firstExistingProfile = existingModel.StochasticSoilProfiles[0]; MacroStabilityInwardsStochasticSoilModel readModel = CreateSimpleModel(modelsName, firstExistingProfile.SoilProfile.Name); - var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(); - var calculationWithDeletedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithDeletedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithDeletedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithDeletedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[1]; calculationWithDeletedProfile.Output = new MacroStabilityInwardsOutput(); @@ -329,12 +329,12 @@ MacroStabilityInwardsStochasticSoilProfile changedProfile = CloneAndSlightlyModify1DProfile(readModel.StochasticSoilProfiles.ElementAt(0)); readModel.StochasticSoilProfiles[0] = changedProfile; - var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; calculationWithUpdatedProfile.Output = new MacroStabilityInwardsOutput(); - var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[1]; calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(); @@ -391,12 +391,12 @@ MacroStabilityInwardsStochasticSoilProfile changedProfile = CloneAndSlightlyModify2DProfile(readModel.StochasticSoilProfiles.ElementAt(1)); readModel.StochasticSoilProfiles[1] = changedProfile; - var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(); - var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[1]; calculationWithUpdatedProfile.Output = new MacroStabilityInwardsOutput(); @@ -440,7 +440,7 @@ { // Setup var existingModel = new TestStochasticSoilModel(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); calculation.InputParameters.StochasticSoilModel = existingModel; calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; calculation.Output = new MacroStabilityInwardsOutput(); @@ -489,12 +489,12 @@ MacroStabilityInwardsStochasticSoilModel readModel = new TestStochasticSoilModel(modelsName); readModel.StochasticSoilProfiles.RemoveAt(0); - var calculationWithRemovedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithRemovedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithRemovedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithRemovedProfile.InputParameters.StochasticSoilProfile = removedProfile; calculationWithRemovedProfile.Output = new MacroStabilityInwardsOutput(); - var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = unaffectedProfile; calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -183,7 +183,7 @@ new Point3D(3, 4, 5) }); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario() { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -350,7 +350,7 @@ { // Setup MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -398,7 +398,7 @@ new Point3D(1, 2, 3), new Point3D(4, 5, 6) }); - var affectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var affectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -415,7 +415,7 @@ }; var unaffectedSurfaceLine = new MacroStabilityInwardsSurfaceLine(unaffectedSurfaceLineName); unaffectedSurfaceLine.SetGeometry(unaffectedGeometry); - var unAffectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var unAffectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -482,7 +482,7 @@ new Point3D(1, 2, 3), new Point3D(4, 5, 6) }); - var affectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var affectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -499,7 +499,7 @@ }; var unaffectedSurfaceLine = new MacroStabilityInwardsSurfaceLine(unaffectedSurfaceLineName); unaffectedSurfaceLine.SetGeometry(unaffectedGeometry); - var unAffectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var unAffectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -553,7 +553,7 @@ { // Setup MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -670,7 +670,7 @@ }; MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -733,7 +733,7 @@ }; MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -786,7 +786,7 @@ }; MacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -836,7 +836,7 @@ new Point3D(1, 2, 3), new Point3D(4, 5, 6) }); - var affectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var affectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -851,7 +851,7 @@ }; var unaffectedSurfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); unaffectedSurfaceLine.SetGeometry(unaffectedGeometry); - var unAffectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var unAffectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { @@ -942,7 +942,7 @@ new Point3D(1, 2, 3), new Point3D(4, 5, 6) }); - var affectedCalculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var affectedCalculation = new MacroStabilityInwardsCalculation { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs =================================================================== diff -u -r801944e042197afab2cf3bb57359970479e286b3 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -146,7 +146,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); var surfaceLines = new MacroStabilityInwardsSurfaceLineCollection(); var context = new MacroStabilityInwardsSurfaceLinesContext(surfaceLines, failureMechanism, assessmentSection); @@ -176,7 +176,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculationWithOutput = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithOutput = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput() }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs =================================================================== diff -u -rbcad3e9362f5130ab5f29dad05ec17a6812d859a -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision bcad3e9362f5130ab5f29dad05ec17a6812d859a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -144,7 +144,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); var stochasticSoilModelCollection = new MacroStabilityInwardsStochasticSoilModelCollection(); var context = new StochasticSoilModelCollectionContext(stochasticSoilModelCollection, failureMechanism, assessmentSection); @@ -174,7 +174,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculationWithOutput = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithOutput = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput() }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -68,7 +68,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var scenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var scenario = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var context = new MacroStabilityInwardsInputContext( Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -142,7 +142,7 @@ // Setup var calculationItem = mocks.StrictMock(); - var childCalculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var childCalculation = new MacroStabilityInwardsCalculationScenario(); var childGroup = new CalculationGroup(); @@ -187,7 +187,7 @@ var group = new CalculationGroup(); var parentGroup = new CalculationGroup(); - group.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + group.Children.Add(new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -311,7 +311,7 @@ // Setup var group = new CalculationGroup(); - group.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + group.Children.Add(new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -743,7 +743,7 @@ plugin.Gui = gui; - var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationItem = new MacroStabilityInwardsCalculationScenario { Name = "Nieuwe berekening" }; @@ -1322,7 +1322,7 @@ TestMacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = TestMacroStabilityInwardsFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); MacroStabilityInwardsSurfaceLine[] surfaceLines = macroStabilityInwardsFailureMechanism.SurfaceLines.ToArray(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -106,7 +106,7 @@ public void ChildNodeObjects_WithOutputData_ReturnOutputChildNode() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -155,7 +155,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationContext = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), + var calculationContext = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -184,7 +184,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationScenarioContext(calculation, @@ -220,7 +220,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -259,7 +259,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationScenarioContext(calculation, @@ -303,7 +303,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationScenarioContext(calculation, @@ -346,7 +346,7 @@ { var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), + var nodeData = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -396,11 +396,11 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var elementToBeRemoved = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var elementToBeRemoved = new MacroStabilityInwardsCalculationScenario(); var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())); + group.Children.Add(new MacroStabilityInwardsCalculationScenario()); group.Attach(observer); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); @@ -444,7 +444,7 @@ TestMacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = TestMacroStabilityInwardsFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels(); MacroStabilityInwardsSurfaceLine[] surfaceLines = macroStabilityInwardsFailureMechanism.SurfaceLines.ToArray(); - var elementToBeRemoved = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var elementToBeRemoved = new MacroStabilityInwardsCalculationScenario { InputParameters = { @@ -454,7 +454,7 @@ var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())); + group.Children.Add(new MacroStabilityInwardsCalculationScenario()); group.Attach(observer); macroStabilityInwardsFailureMechanism.CalculationsGroup.Children.Add(group); @@ -495,7 +495,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", new[] { @@ -566,7 +566,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); @@ -681,7 +681,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r801944e042197afab2cf3bb57359970479e286b3 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -127,10 +127,9 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(generalInputParameters)); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(generalInputParameters)); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection); @@ -192,13 +191,12 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); var failureMechanism = new MacroStabilityInwardsFailureMechanism { IsRelevant = false }; - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(generalInputParameters)); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(generalInputParameters)); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, assessmentSection); @@ -219,13 +217,12 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var generalInputParameters = new GeneralMacroStabilityInwardsInput(); - var calculation1 = new MacroStabilityInwardsCalculationScenario(generalInputParameters) + var calculation1 = new MacroStabilityInwardsCalculationScenario() { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() }; - var calculation2 = new MacroStabilityInwardsCalculationScenario(generalInputParameters) + var calculation2 = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -297,7 +294,7 @@ { // Setup var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); - var calculation = new MacroStabilityInwardsCalculationScenario(failureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -432,7 +429,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -90,8 +90,8 @@ { // Setup var context = new MacroStabilityInwardsInputContext( - new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()), - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), + new MacroStabilityInwardsInput(), + new MacroStabilityInwardsCalculationScenario(), Enumerable.Empty(), Enumerable.Empty(), new MacroStabilityInwardsFailureMechanism(), @@ -111,8 +111,8 @@ { // Setup var context = new MacroStabilityInwardsInputContext( - new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()), - new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()), + new MacroStabilityInwardsInput(), + new MacroStabilityInwardsCalculationScenario(), Enumerable.Empty(), Enumerable.Empty(), new MacroStabilityInwardsFailureMechanism(), Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs =================================================================== diff -u -r801944e042197afab2cf3bb57359970479e286b3 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -144,7 +144,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); var surfaceLines = new MacroStabilityInwardsSurfaceLineCollection(); var context = new MacroStabilityInwardsSurfaceLinesContext(surfaceLines, failureMechanism, assessmentSection); @@ -174,7 +174,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculationWithOutput = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithOutput = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput() }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs =================================================================== diff -u -rbcad3e9362f5130ab5f29dad05ec17a6812d859a -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision bcad3e9362f5130ab5f29dad05ec17a6812d859a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -146,7 +146,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput())); + failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario()); var stochasticSoilModelCollection = new MacroStabilityInwardsStochasticSoilModelCollection(); var context = new StochasticSoilModelCollectionContext(stochasticSoilModelCollection, failureMechanism, assessmentSection); @@ -176,7 +176,7 @@ plugin.Gui = gui; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var calculationWithOutput = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + var calculationWithOutput = new MacroStabilityInwardsCalculationScenario { Output = new TestMacroStabilityInwardsOutput() }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -71,7 +71,7 @@ // Setup using (var view = new MacroStabilityInwardsInputView()) { - var calculationScenario = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculationScenario = new MacroStabilityInwardsCalculationScenario(); // Call string viewName = info.GetViewName(view, calculationScenario); @@ -88,9 +88,9 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationInputContext = new MacroStabilityInwardsInputContext(input, calculation, Enumerable.Empty(), Enumerable.Empty(), new MacroStabilityInwardsFailureMechanism(), @@ -111,7 +111,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationScenarioContext = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), @@ -140,8 +140,8 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); - var calculationToRemove = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); + var calculationToRemove = new MacroStabilityInwardsCalculationScenario(); var calculationScenarioContext = new MacroStabilityInwardsCalculationScenarioContext(calculationToRemove, new CalculationGroup(), @@ -171,7 +171,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -202,7 +202,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -233,7 +233,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var nestedGroup = new CalculationGroup(); nestedGroup.Children.Add(calculation); var calculationGroup = new CalculationGroup(); @@ -266,7 +266,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var nestedGroup = new CalculationGroup(); nestedGroup.Children.Add(calculation); var calculationGroup = new CalculationGroup(); @@ -299,7 +299,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -326,7 +326,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -353,7 +353,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -383,7 +383,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -410,7 +410,7 @@ public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -431,7 +431,7 @@ public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -452,7 +452,7 @@ public void CloseForData_NestedViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -476,7 +476,7 @@ public void CloseForData_NestedViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -500,7 +500,7 @@ public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -530,7 +530,7 @@ public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -544,7 +544,7 @@ using (var view = new MacroStabilityInwardsInputView { - Data = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + Data = new MacroStabilityInwardsCalculationScenario() }) { // Call @@ -560,7 +560,7 @@ public void CloseForData_NestedViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -593,7 +593,7 @@ public void CloseForData_NestedViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculationScenario(); var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); @@ -610,7 +610,7 @@ using (var view = new MacroStabilityInwardsInputView { - Data = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) + Data = new MacroStabilityInwardsCalculationScenario() }) { // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -40,7 +40,7 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); // Call var activity = new MacroStabilityInwardsCalculationActivity(calculation, new MacroStabilityInwardsProbabilityAssessmentInput(), int.MinValue, double.NaN); @@ -67,7 +67,7 @@ public void ParameteredConstructor_MacroStabilityInwardsProbabilityAssessmentInputNull_ThrowsArgumentNullException() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()); + var calculation = new MacroStabilityInwardsCalculation(); // Call TestDelegate call = () => new MacroStabilityInwardsCalculationActivity(calculation, null, int.MinValue, double.NaN); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -98,7 +98,7 @@ // Setup const string name = ""; - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Name = name }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -52,7 +52,7 @@ public void ClearCalculationOutput_WithCalculation_ClearsOutputAndReturnAffectedCaculations() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = new TestMacroStabilityInwardsOutput(), SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput() @@ -77,7 +77,7 @@ public void ClearCalculationOutput_CalculationWithoutOutput_DoNothing() { // Setup - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + var calculation = new MacroStabilityInwardsCalculation { Output = null, SemiProbabilisticOutput = null Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs =================================================================== diff -u -r8cbe9f4263082b2a7199fa4643f32a09b025d2ec -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 8cbe9f4263082b2a7199fa4643f32a09b025d2ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -35,7 +35,7 @@ { // Setup var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); // Call MacroStabilityInwardsInputService.SetMatchingStochasticSoilModel(input, new[] @@ -51,7 +51,7 @@ public void SetMatchingStochasticSoilModel_SurfaceLineOverlappingMultipleSoilModels_DoesNotSetModel() { // Setup - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); + var input = new MacroStabilityInwardsInput(); var soilModel1 = new MacroStabilityInwardsStochasticSoilModel("A"); var soilModel2 = new MacroStabilityInwardsStochasticSoilModel("C"); @@ -71,7 +71,7 @@ { // Setup var nonOverlappingSoilModel = new MacroStabilityInwardsStochasticSoilModel("A"); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { StochasticSoilModel = nonOverlappingSoilModel }; @@ -99,7 +99,7 @@ var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.StochasticSoilProfiles.Add(soilProfile); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { StochasticSoilModel = soilModel }; @@ -121,7 +121,7 @@ new MacroStabilityInwardsStochasticSoilProfile(0.0, new TestMacroStabilityInwardsSoilProfile1D()), new MacroStabilityInwardsStochasticSoilProfile(1.0, new TestMacroStabilityInwardsSoilProfile1D()) }); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { StochasticSoilModel = soilModel }; @@ -142,7 +142,7 @@ var soilModel = new MacroStabilityInwardsStochasticSoilModel("A"); soilModel.StochasticSoilProfiles.Add(soilProfile); - var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) + var input = new MacroStabilityInwardsInput { StochasticSoilModel = soilModel, StochasticSoilProfile = soilProfile Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -r653635488c2ad1357fb3794f310f283d9e345d4d -rd619624819b7200ac55b357b0a0c54d198fc20e4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs (.../MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs) (revision 653635488c2ad1357fb3794f310f283d9e345d4d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs (.../MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) @@ -136,7 +136,7 @@ private static MacroStabilityInwardsCalculation AsMacroStabilityInwardsCalculation(MacroStabilityInwardsOutput macroStabilityInwardsOutput) { - return new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) + return new MacroStabilityInwardsCalculation { Output = macroStabilityInwardsOutput };