Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationScenarioContext.cs =================================================================== diff -u -r95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationScenarioContext.cs (.../ClosingStructuresCalculationScenarioContext.cs) (revision 95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationScenarioContext.cs (.../ClosingStructuresCalculationScenarioContext.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -31,7 +31,7 @@ /// /// Presentation object for all data required to configure a closing structures calculation. /// - public class ClosingStructuresCalculationScenarioContext : StructuresCalculationContext + public class ClosingStructuresCalculationScenarioContext : StructuresCalculationScenarioContext { /// /// Creates a new instance of . @@ -41,7 +41,7 @@ /// The failure mechanism which the calculation belongs to. /// The assessment section which the calculation belongs to. /// Thrown when any input argument is null. - public ClosingStructuresCalculationScenarioContext(StructuresCalculation wrappedData, + public ClosingStructuresCalculationScenarioContext(StructuresCalculationScenario wrappedData, CalculationGroup parent, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../ClosingStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -118,7 +118,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new ClosingStructuresFailureMechanismSectionResult(section) { - Calculation = new TestClosingStructuresCalculation() + Calculation = new TestClosingStructuresCalculationScenario() }; // Call @@ -143,7 +143,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new ClosingStructuresFailureMechanismSectionResult(section) { - Calculation = new TestClosingStructuresCalculation + Calculation = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(0.45) } Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationScenarioTest.cs =================================================================== diff -u --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationScenarioTest.cs (revision 0) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationScenarioTest.cs (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -0,0 +1,73 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using NUnit.Framework; +using Riskeer.Common.Data.Structures; +using Riskeer.Common.Data.TestUtil; + +namespace Riskeer.ClosingStructures.Data.TestUtil.Test +{ + [TestFixture] + public class TestClosingStructureCalculationScenarioTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Setup + var referenceStructure = new TestClosingStructure(); + + // Call + var calculation = new TestClosingStructuresCalculationScenario(); + + // Assert + Assert.IsInstanceOf>(calculation); + Assert.AreEqual("Nieuwe berekening", calculation.Name); + Assert.IsNotNull(calculation.InputParameters); + Assert.IsNull(calculation.Comments.Body); + Assert.IsFalse(calculation.HasOutput); + + Assert.IsNotNull(calculation.InputParameters.Structure); + Assert.IsNotNull(calculation.InputParameters.HydraulicBoundaryLocation); + + DistributionAssert.AreEqual(referenceStructure.StorageStructureArea, calculation.InputParameters.StorageStructureArea); + DistributionAssert.AreEqual(referenceStructure.AllowedLevelIncreaseStorage, calculation.InputParameters.AllowedLevelIncreaseStorage); + Assert.AreEqual(referenceStructure.StructureNormalOrientation, calculation.InputParameters.StructureNormalOrientation); + DistributionAssert.AreEqual(referenceStructure.WidthFlowApertures, calculation.InputParameters.WidthFlowApertures); + DistributionAssert.AreEqual(referenceStructure.LevelCrestStructureNotClosing, calculation.InputParameters.LevelCrestStructureNotClosing); + DistributionAssert.AreEqual(referenceStructure.InsideWaterLevel, calculation.InputParameters.InsideWaterLevel); + DistributionAssert.AreEqual(referenceStructure.ThresholdHeightOpenWeir, calculation.InputParameters.ThresholdHeightOpenWeir); + DistributionAssert.AreEqual(referenceStructure.AreaFlowApertures, calculation.InputParameters.AreaFlowApertures); + DistributionAssert.AreEqual(referenceStructure.CriticalOvertoppingDischarge, calculation.InputParameters.CriticalOvertoppingDischarge); + DistributionAssert.AreEqual(referenceStructure.FlowWidthAtBottomProtection, calculation.InputParameters.FlowWidthAtBottomProtection); + Assert.AreEqual(referenceStructure.ProbabilityOpenStructureBeforeFlooding, calculation.InputParameters.ProbabilityOpenStructureBeforeFlooding); + Assert.AreEqual(referenceStructure.FailureProbabilityOpenStructure, calculation.InputParameters.FailureProbabilityOpenStructure); + Assert.AreEqual(referenceStructure.IdenticalApertures, calculation.InputParameters.IdenticalApertures); + Assert.AreEqual(referenceStructure.FailureProbabilityOpenStructure, calculation.InputParameters.FailureProbabilityOpenStructure); + Assert.AreEqual(referenceStructure.InflowModelType, calculation.InputParameters.InflowModelType); + + Assert.AreEqual(1.00, calculation.InputParameters.FactorStormDurationOpenStructure, + calculation.InputParameters.FactorStormDurationOpenStructure.GetAccuracy()); + Assert.AreEqual(0, calculation.InputParameters.DeviationWaveDirection, + calculation.InputParameters.DeviationWaveDirection.GetAccuracy()); + Assert.AreEqual(1.0, calculation.InputParameters.FailureProbabilityStructureWithErosion); + } + } +} \ No newline at end of file Fisheye: Tag e3e3433c92e142f37d6a5ed931a70ad582c240bc refers to a dead (removed) revision in file `Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3433c92e142f37d6a5ed931a70ad582c240bc refers to a dead (removed) revision in file `Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculationScenario.cs =================================================================== diff -u --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculationScenario.cs (revision 0) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculationScenario.cs (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -0,0 +1,45 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Base.Data; +using Riskeer.Common.Data.Hydraulics; +using Riskeer.Common.Data.Structures; + +namespace Riskeer.ClosingStructures.Data.TestUtil +{ + /// + /// Closing structures calculation scenario used for testing purposes. + /// + public class TestClosingStructuresCalculationScenario : StructuresCalculationScenario + { + /// + /// Creates a new instance of . + /// + public TestClosingStructuresCalculationScenario() + { + InputParameters.Structure = new TestClosingStructure(); + InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "location", 1, 1); + InputParameters.FactorStormDurationOpenStructure = (RoundedDouble) 1; + InputParameters.FailureProbabilityStructureWithErosion = 1; + InputParameters.DeviationWaveDirection = (RoundedDouble) 0; + } + } +} \ No newline at end of file Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationScenarioContextTest.cs =================================================================== diff -u -r95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationScenarioContextTest.cs (.../ClosingStructuresCalculationScenarioContextTest.cs) (revision 95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationScenarioContextTest.cs (.../ClosingStructuresCalculationScenarioContextTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -34,22 +34,22 @@ public class ClosingStructuresCalculationScenarioContextTest { [Test] - public void ConstructorWithData_Always_ExpectedPropertiesSet() + public void Constructor_ExpectedValues() { // Setup var mocksRepository = new MockRepository(); var assessmentSection = mocksRepository.Stub(); mocksRepository.ReplayAll(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new ClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); // Call var context = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); // Assert - Assert.IsInstanceOf>(context); + Assert.IsInstanceOf>(context); Assert.AreSame(calculation, context.WrappedData); Assert.AreSame(parent, context.Parent); Assert.AreSame(failureMechanism, context.FailureMechanism); @@ -65,7 +65,7 @@ var assessmentSection = mocksRepository.Stub(); mocksRepository.ReplayAll(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new ClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); var context = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -81,10 +81,10 @@ private class DerivedClosingStructuresCalculationScenarioContext : ClosingStructuresCalculationScenarioContext { - public DerivedClosingStructuresCalculationScenarioContext(StructuresCalculation calculation, - CalculationGroup parent, - ClosingStructuresFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + public DerivedClosingStructuresCalculationScenarioContext(StructuresCalculationScenario calculation, + CalculationGroup parent, + ClosingStructuresFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) : base(calculation, parent, failureMechanism, assessmentSection) {} } } Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresOutputContextTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresOutputContextTest.cs (.../ClosingStructuresOutputContextTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresOutputContextTest.cs (.../ClosingStructuresOutputContextTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -41,7 +41,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); var failureMechanism = new ClosingStructuresFailureMechanism(); // Call @@ -63,7 +63,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); // Call TestDelegate call = () => new ClosingStructuresOutputContext(calculation, null, assessmentSection); Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r98f26089b79e2cc68603066a181a3854189e80ad -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision 98f26089b79e2cc68603066a181a3854189e80ad) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -435,9 +435,9 @@ } } - private static TestClosingStructuresCalculation CreateCalculationWithOutput() + private static TestClosingStructuresCalculationScenario CreateCalculationWithOutput() { - return new TestClosingStructuresCalculation + return new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -721,7 +721,7 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - Calculation = new TestClosingStructuresCalculation(), + Calculation = new TestClosingStructuresCalculationScenario(), SimpleAssessmentResult = simpleAssessmentResult }; @@ -752,7 +752,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(double.NaN) }; @@ -817,7 +817,7 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - Calculation = new TestClosingStructuresCalculation(), + Calculation = new TestClosingStructuresCalculationScenario(), UseManualAssembly = true }; @@ -846,7 +846,7 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - Calculation = new TestClosingStructuresCalculation(), + Calculation = new TestClosingStructuresCalculationScenario(), DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed }; Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -121,7 +121,7 @@ private static StructuresCalculation CreateFullCalculation() { - return new TestClosingStructuresCalculation + return new TestClosingStructuresCalculationScenario { Name = "full config", InputParameters = @@ -255,7 +255,7 @@ protected override StructuresCalculation CreateCalculation() { - return new TestClosingStructuresCalculation(); + return new TestClosingStructuresCalculationScenario(); } protected override ClosingStructuresCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -rac0ae2ca602153e1090d30d86d18bc06e208cee6 -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision ac0ae2ca602153e1090d30d86d18bc06e208cee6) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -104,7 +104,7 @@ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -166,7 +166,7 @@ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -209,7 +209,7 @@ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -320,7 +320,7 @@ mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, @@ -369,7 +369,7 @@ mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, @@ -418,7 +418,7 @@ mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs =================================================================== diff -u -r95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs (.../ClosingStructuresCalculationContextExportInfoTest.cs) (revision 95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs (.../ClosingStructuresCalculationContextExportInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -89,7 +89,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new ClosingStructuresCalculationScenarioContext(new TestClosingStructuresCalculation(), + var context = new ClosingStructuresCalculationScenarioContext(new TestClosingStructuresCalculationScenario(), new CalculationGroup(), new ClosingStructuresFailureMechanism(), assessmentSection); @@ -108,7 +108,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new ClosingStructuresCalculationScenarioContext(new TestClosingStructuresCalculation(), + var context = new ClosingStructuresCalculationScenarioContext(new TestClosingStructuresCalculationScenario(), new CalculationGroup(), new ClosingStructuresFailureMechanism(), assessmentSection); Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationGroupContextExportInfoTest.cs (.../ClosingStructuresCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationGroupContextExportInfoTest.cs (.../ClosingStructuresCalculationGroupContextExportInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -138,7 +138,7 @@ if (hasCalculation) { - calculationGroup.Children.Add(new TestClosingStructuresCalculation()); + calculationGroup.Children.Add(new TestClosingStructuresCalculationScenario()); } var context = new ClosingStructuresCalculationGroupContext(calculationGroup, Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs (.../ClosingStructureUpdateDataStrategyTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs (.../ClosingStructureUpdateDataStrategyTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -320,7 +320,7 @@ ClosingStructure readStructure = new TestClosingStructure(sameId, "new structure"); ClosingStructure structure = new TestClosingStructure(sameId, "original structure"); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -373,7 +373,7 @@ var affectedStructure = new TestClosingStructure(affectedId, "Old name"); var unaffectedStructure = new TestClosingStructure(unaffectedId, unaffectedStructureName); - var affectedCalculation = new TestClosingStructuresCalculation + var affectedCalculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -382,7 +382,7 @@ Output = new TestStructuresOutput() }; - var unaffectedCalculation = new TestClosingStructuresCalculation + var unaffectedCalculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -446,7 +446,7 @@ const string sameId = "sameId"; ClosingStructure structure = new TestClosingStructure(sameId, "original structure"); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -500,7 +500,7 @@ var removedStructure = new TestClosingStructure(removedId, "Old name"); var unaffectedStructure = new TestClosingStructure(unaffectedId, unaffectedStructureName); - var affectedCalculation = new TestClosingStructuresCalculation + var affectedCalculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -509,7 +509,7 @@ Output = new TestStructuresOutput() }; - var unaffectedCalculation = new TestClosingStructuresCalculation + var unaffectedCalculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -569,7 +569,7 @@ // Setup const string affectedId = "affectedId"; var affectedStructure = new TestClosingStructure(affectedId, "Old name"); - var affectedCalculation = new TestClosingStructuresCalculation + var affectedCalculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -624,7 +624,7 @@ ClosingStructure readStructure = new TestClosingStructure(updatedMatchingPoint, sameId); ClosingStructure structure = new TestClosingStructure(originalMatchingPoint, sameId); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -704,7 +704,7 @@ var originalMatchingPoint = new Point2D(0, 0); ClosingStructure removedStructure = new TestClosingStructure(originalMatchingPoint, sameId); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresInputContextPropertyInfoTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresInputContextPropertyInfoTest.cs (.../ClosingStructuresInputContextPropertyInfoTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresInputContextPropertyInfoTest.cs (.../ClosingStructuresInputContextPropertyInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -67,7 +67,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); var failureMechanism = new ClosingStructuresFailureMechanism(); var context = new ClosingStructuresInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSection); Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresOutputPropertyInfoTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresOutputPropertyInfoTest.cs (.../ClosingStructuresOutputPropertyInfoTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/PropertyInfos/ClosingStructuresOutputPropertyInfoTest.cs (.../ClosingStructuresOutputPropertyInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -69,7 +69,7 @@ mocks.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { Output = new StructuresOutput(0, null) }; Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r4c3b6a2ffc9aa9b193773b8ed818e59eb79b561b -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 4c3b6a2ffc9aa9b193773b8ed818e59eb79b561b) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -145,7 +145,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var group = new CalculationGroup(); var childGroup = new CalculationGroup(); - var childCalculation = new StructuresCalculation(); + var childCalculation = new StructuresCalculationScenario(); group.Children.Add(childGroup); group.Children.Add(calculationItem); @@ -743,12 +743,12 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculationWithIllustrationPoints = new TestClosingStructuresCalculation + var calculationWithIllustrationPoints = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -759,7 +759,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } }; @@ -792,7 +792,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -802,7 +802,7 @@ Children = { calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } }; @@ -832,12 +832,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndAborted_ThenInquiryAndIllustrationPointsNotCleared() { // Given - var calculationWithIllustrationPoints = new TestClosingStructuresCalculation + var calculationWithIllustrationPoints = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -848,7 +848,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } }; @@ -895,12 +895,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndContinued_ThenInquiryAndIllustrationPointsCleared() { // Given - var calculationWithIllustrationPoints = new TestClosingStructuresCalculation + var calculationWithIllustrationPoints = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -911,7 +911,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } }; @@ -966,15 +966,15 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestClosingStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "A", InputParameters = { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "B", InputParameters = @@ -1063,15 +1063,15 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestClosingStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "A", InputParameters = { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "B", InputParameters = Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -120,7 +120,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = hasOutput ? new TestStructuresOutput() : null }; @@ -154,7 +154,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = mocks.StrictMock(); @@ -214,7 +214,7 @@ var failureMechanism = new TestClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -279,7 +279,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new TestClosingStructuresFailureMechanism(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -311,7 +311,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -349,7 +349,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -388,7 +388,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var structure = new TestClosingStructure(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -434,7 +434,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var structure = new TestClosingStructure(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -495,7 +495,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var structure = new TestClosingStructure(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -555,7 +555,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new TestClosingStructuresFailureMechanism(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -590,7 +590,7 @@ // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new TestClosingStructuresFailureMechanism(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -638,7 +638,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new TestClosingStructuresFailureMechanism(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -672,7 +672,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new TestClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new ClosingStructuresCalculationScenarioContext(calculation, parent, @@ -709,7 +709,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new TestClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -754,7 +754,7 @@ var foreshoreProfileInput = new TestForeshoreProfile(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -803,7 +803,7 @@ var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -855,7 +855,7 @@ var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -952,7 +952,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -1033,7 +1033,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -1077,7 +1077,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1109,7 +1109,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -1141,7 +1141,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1186,7 +1186,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1231,7 +1231,7 @@ // Setup var group = new CalculationGroup(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var elementToBeRemoved = new StructuresCalculation(); + var elementToBeRemoved = new StructuresCalculationScenario(); var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); var calculationContext = new ClosingStructuresCalculationScenarioContext(elementToBeRemoved, @@ -1248,7 +1248,7 @@ mocks.ReplayAll(); group.Children.Add(elementToBeRemoved); - group.Children.Add(new StructuresCalculation()); + group.Children.Add(new StructuresCalculationScenario()); group.Attach(observer); // Precondition @@ -1269,7 +1269,7 @@ // Setup var group = new CalculationGroup(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var elementToBeRemoved = new StructuresCalculation(); + var elementToBeRemoved = new StructuresCalculationScenario(); var assessmentSection = mocks.Stub(); var calculationContext = new ClosingStructuresCalculationScenarioContext(elementToBeRemoved, group, Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 56d072b8342f3e54ba89124ab918bd1529e257a3) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -579,15 +579,15 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestClosingStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "A", InputParameters = { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "B", InputParameters = @@ -672,15 +672,15 @@ { // Setup var failureMechanism = new TestClosingStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "A", InputParameters = { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() } }); - failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { Name = "B", InputParameters = @@ -736,12 +736,12 @@ public void ContextMenuStrip_FailureMechanismWithCalculationsContainingIllustrationPoints_ContextMenuItemClearIllustrationPointsEnabled() { // Setup - var calculationWithIllustrationPoints = new TestClosingStructuresCalculation + var calculationWithIllustrationPoints = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -754,7 +754,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } } }; @@ -788,7 +788,7 @@ public void ContextMenuStrip_FailureMechanismWithCalculationsWithoutIllustrationPoints_ContextMenuItemClearIllustrationPointsDisabled() { // Setup - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -800,7 +800,7 @@ Children = { calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } } }; @@ -834,12 +834,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndAborted_ThenInquiryAndIllustrationPointsNotCleared() { // Given - var calculationWithIllustrationPoints = new TestClosingStructuresCalculation + var calculationWithIllustrationPoints = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -852,7 +852,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } } }; @@ -901,12 +901,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndContinued_ThenInquiryAndIllustrationPointsCleared() { // Given - var calculationWithIllustrationPoints = new TestClosingStructuresCalculation + var calculationWithIllustrationPoints = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -919,7 +919,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestClosingStructuresCalculation() + new TestClosingStructuresCalculationScenario() } } }; Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -83,26 +83,26 @@ structureToKeep }, "path/to/structures"); - var calculationWithOutput = new TestClosingStructuresCalculation + var calculationWithOutput = new TestClosingStructuresCalculationScenario { Output = new TestStructuresOutput() }; - var calculationWithStructureToRemove = new TestClosingStructuresCalculation + var calculationWithStructureToRemove = new TestClosingStructuresCalculationScenario { InputParameters = { Structure = structureToRemove } }; - var calculationWithStructureToKeepAndOutput = new TestClosingStructuresCalculation + var calculationWithStructureToKeepAndOutput = new TestClosingStructuresCalculationScenario { InputParameters = { Structure = structureToKeep }, Output = new TestStructuresOutput() }; - var calculationWithStructureToRemoveAndOutput = new TestClosingStructuresCalculation + var calculationWithStructureToRemoveAndOutput = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -561,7 +561,7 @@ var structure1 = new TestClosingStructure(new Point2D(1, 0), "structure1"); var structure2 = new TestClosingStructure(new Point2D(3, 0), "structure2"); var profile = new TestForeshoreProfile(); - StructuresCalculation calculation1 = new TestClosingStructuresCalculation + StructuresCalculation calculation1 = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -570,15 +570,15 @@ }, Output = new TestStructuresOutput() }; - StructuresCalculation calculation2 = new TestClosingStructuresCalculation + StructuresCalculation calculation2 = new TestClosingStructuresCalculationScenario { InputParameters = { ForeshoreProfile = profile, Structure = structure2 } }; - StructuresCalculation calculation3 = new TestClosingStructuresCalculation + StructuresCalculation calculation3 = new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs =================================================================== diff -u -rac0ae2ca602153e1090d30d86d18bc06e208cee6 -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs (.../ClosingStructuresCalculationActivityFactoryTest.cs) (revision ac0ae2ca602153e1090d30d86d18bc06e208cee6) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs (.../ClosingStructuresCalculationActivityFactoryTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -281,7 +281,7 @@ private static StructuresCalculation CreateValidCalculation() { - return new TestClosingStructuresCalculation + return new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5 -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -77,7 +77,7 @@ Path.Combine(testDataPath, "HRD dutch coast south.sqlite")); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); SetInvalidInputParameters(calculation.InputParameters, (RoundedDouble) value); @@ -130,7 +130,7 @@ Path.Combine(testDataPath, "HRD dutch coast south.sqlite")); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -189,7 +189,7 @@ Path.Combine(testDataPath, "HRD dutch coast south.sqlite")); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -243,7 +243,7 @@ Path.Combine(testDataPath, "HRD dutch coast south.sqlite")); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -279,7 +279,7 @@ Path.Combine(testDataPath, "HRD dutch coast south.sqlite")); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -318,7 +318,7 @@ mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -363,7 +363,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -443,7 +443,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -524,7 +524,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -603,7 +603,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -682,7 +682,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -759,7 +759,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -850,7 +850,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -896,7 +896,7 @@ .Return(new TestStructuresCalculator()); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -965,7 +965,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -1028,7 +1028,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { @@ -1092,7 +1092,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestClosingStructuresCalculation + var calculation = new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -182,7 +182,7 @@ { // Given AssessmentSection assessmentSection = CreateAssessmentSection(); - var calculation = new TestClosingStructuresCalculation(); + var calculation = new TestClosingStructuresCalculationScenario(); assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(calculation); using (var resultObserver = new AssessmentSectionResultObserver(assessmentSection)) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -r1c8a7abfda575f28821ce84a36ec6c5836a751aa -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 1c8a7abfda575f28821ce84a36ec6c5836a751aa) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -784,7 +784,7 @@ private static void AddClosingStructuresCalculation(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs =================================================================== diff -u -r95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision 95ce9d6e938ed15b9e5d3cf9b1ae6e5183674a6d) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -199,7 +199,7 @@ protected override ICalculationContext GetCalculationContextWithCalculation() { return new ClosingStructuresCalculationScenarioContext( - new StructuresCalculation(), + new StructuresCalculationScenario(), new CalculationGroup(), new ClosingStructuresFailureMechanism(), new AssessmentSection(AssessmentSectionComposition.Dike)); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -r1c8a7abfda575f28821ce84a36ec6c5836a751aa -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 1c8a7abfda575f28821ce84a36ec6c5836a751aa) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -403,7 +403,7 @@ private static void AddClosingStructuresCalculation(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(new TestClosingStructuresCalculation + assessmentSection.ClosingStructures.CalculationsGroup.Children.Add(new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs =================================================================== diff -u -r877f0d6830122b89d78bc3e27aa3c61736617276 -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs (.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs) (revision 877f0d6830122b89d78bc3e27aa3c61736617276) +++ Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs (.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -333,7 +333,7 @@ { unaffectedForeshoreProfile }, sourceFilePath); - var unaffectedCalculation = new TestClosingStructuresCalculation + var unaffectedCalculation = new TestClosingStructuresCalculationScenario { InputParameters = { Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re3e3433c92e142f37d6a5ed931a70ad582c240bc --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc) @@ -223,7 +223,7 @@ public void Create_WithCalculationGroup_ReturnFailureMechanismEntityWithCalculationGroupEntities() { // Setup - StructuresCalculation calculation = new TestClosingStructuresCalculation(); + StructuresCalculation calculation = new TestClosingStructuresCalculationScenario(); calculation.InputParameters.Structure = null; calculation.InputParameters.HydraulicBoundaryLocation = null;