Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs =================================================================== diff -u -rd1c333df3a55ad8baba0d1cc0c4cff54c69668d7 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision d1c333df3a55ad8baba0d1cc0c4cff54c69668d7) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -354,7 +354,7 @@ { // Given AssessmentSection assessmentSection = CreateAssessmentSection(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(calculation); using (var resultObserver = new AssessmentSectionResultObserver(assessmentSection)) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -rd1c333df3a55ad8baba0d1cc0c4cff54c69668d7 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision d1c333df3a55ad8baba0d1cc0c4cff54c69668d7) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -796,7 +796,7 @@ private static void AddStabilityPointStructuresCalculation(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GeneralResultFaultTreeIllustrationPointViewInfoTest.cs (.../GeneralResultFaultTreeIllustrationPointViewInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -248,7 +248,7 @@ protected override ICalculationContext GetCalculationContextWithCalculation() { return new StabilityPointStructuresCalculationScenarioContext( - new StructuresCalculation(), + new StructuresCalculationScenario(), new CalculationGroup(), new StabilityPointStructuresFailureMechanism(), new AssessmentSection(AssessmentSectionComposition.Dike)); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -rd1c333df3a55ad8baba0d1cc0c4cff54c69668d7 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision d1c333df3a55ad8baba0d1cc0c4cff54c69668d7) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -415,7 +415,7 @@ private static void AddStabilityPointStructuresCalculation(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + assessmentSection.StabilityPointStructures.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs =================================================================== diff -u -rd1c333df3a55ad8baba0d1cc0c4cff54c69668d7 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs (.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs) (revision d1c333df3a55ad8baba0d1cc0c4cff54c69668d7) +++ Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs (.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -354,7 +354,7 @@ { unaffectedForeshoreProfile }, sourceFilePath); - var unaffectedCalculation = new TestStabilityPointStructuresCalculation + var unaffectedCalculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationScenarioContext.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationScenarioContext.cs (.../StabilityPointStructuresCalculationScenarioContext.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationScenarioContext.cs (.../StabilityPointStructuresCalculationScenarioContext.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -31,7 +31,7 @@ /// /// Presentation object for all data required to configure a stability point structures calculation. /// - public class StabilityPointStructuresCalculationScenarioContext : StructuresCalculationContext + public class StabilityPointStructuresCalculationScenarioContext : StructuresCalculationScenarioContext { /// /// Creates a new instance of . @@ -41,7 +41,7 @@ /// The failure mechanism which the context belongs to. /// The assessment section which the calculation belongs to. /// Thrown when any input argument is null. - public StabilityPointStructuresCalculationScenarioContext(StructuresCalculation calculation, + public StabilityPointStructuresCalculationScenarioContext(StructuresCalculationScenario calculation, CalculationGroup parent, StabilityPointStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -458,7 +458,7 @@ foreach (ICalculationBase calculationItem in context.WrappedData.Children) { - var calculation = calculationItem as StructuresCalculation; + var calculation = calculationItem as StructuresCalculationScenario; var group = calculationItem as CalculationGroup; if (calculation != null) Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -118,7 +118,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section) { - Calculation = new TestStabilityPointStructuresCalculation() + Calculation = new TestStabilityPointStructuresCalculationScenario() }; // Call @@ -143,7 +143,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new StabilityPointStructuresFailureMechanismSectionResult(section) { - Calculation = new TestStabilityPointStructuresCalculation + Calculation = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(0.75) } Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructuresCalculationTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructuresCalculationTest.cs (.../TestStabilityPointStructuresCalculationTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructuresCalculationTest.cs (.../TestStabilityPointStructuresCalculationTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -26,7 +26,7 @@ namespace Riskeer.StabilityPointStructures.Data.TestUtil.Test { [TestFixture] - public class TestStabilityPointStructuresCalculationTest + public class TestStabilityPointStructuresCalculationScenarioTest { [Test] public void Constructor_DefaultPropertyValuesAreSet() @@ -35,11 +35,13 @@ var referenceStructure = new TestStabilityPointStructure(); // Call - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); // Assert - Assert.IsInstanceOf>(calculation); + Assert.IsInstanceOf>(calculation); Assert.AreEqual("Nieuwe berekening", calculation.Name); + Assert.AreEqual(1, calculation.Contribution, calculation.Contribution.GetAccuracy()); + Assert.IsTrue(calculation.IsRelevant); Assert.IsNotNull(calculation.InputParameters); Assert.IsNull(calculation.Comments.Body); Assert.IsFalse(calculation.HasOutput); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil/TestStabilityPointStructuresCalculation.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil/TestStabilityPointStructuresCalculation.cs (.../TestStabilityPointStructuresCalculation.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil/TestStabilityPointStructuresCalculation.cs (.../TestStabilityPointStructuresCalculation.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -26,14 +26,14 @@ namespace Riskeer.StabilityPointStructures.Data.TestUtil { /// - /// Stability point structures calculation used for testing purposes. + /// Stability point structures calculation scenario used for testing purposes. /// - public class TestStabilityPointStructuresCalculation : StructuresCalculation + public class TestStabilityPointStructuresCalculationScenario : StructuresCalculationScenario { /// - /// Creates a new instance of . + /// Creates a new instance of . /// - public TestStabilityPointStructuresCalculation() + public TestStabilityPointStructuresCalculationScenario() { InputParameters.Structure = new TestStabilityPointStructure(); InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "location", 1, 1); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs (.../StabilityPointStructuresCalculationContextTest.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs (.../StabilityPointStructuresCalculationContextTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -41,15 +41,15 @@ var assessmentSection = mocksRepository.Stub(); mocksRepository.ReplayAll(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); // Call var context = new StabilityPointStructuresCalculationScenarioContext(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 StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var context = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -81,7 +81,7 @@ private class DerivedStabilityPointStructuresCalculationScenarioContext : StabilityPointStructuresCalculationScenarioContext { - public DerivedStabilityPointStructuresCalculationScenarioContext(StructuresCalculation calculation, + public DerivedStabilityPointStructuresCalculationScenarioContext(StructuresCalculationScenario calculation, CalculationGroup parent, StabilityPointStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresOutputContextTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresOutputContextTest.cs (.../StabilityPointStructuresOutputContextTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresOutputContextTest.cs (.../StabilityPointStructuresOutputContextTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -41,7 +41,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); // Call @@ -63,7 +63,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); // Call TestDelegate call = () => new StabilityPointStructuresOutputContext(calculation, null, assessmentSection); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r98f26089b79e2cc68603066a181a3854189e80ad -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 98f26089b79e2cc68603066a181a3854189e80ad) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -433,9 +433,9 @@ } } - private static TestStabilityPointStructuresCalculation CreateCalculationWithOutput() + private static TestStabilityPointStructuresCalculationScenario CreateCalculationWithOutput() { - return new TestStabilityPointStructuresCalculation + return new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -718,7 +718,7 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - Calculation = new TestStabilityPointStructuresCalculation(), + Calculation = new TestStabilityPointStructuresCalculationScenario(), SimpleAssessmentResult = simpleAssessmentResult }; @@ -749,7 +749,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(double.NaN) }; @@ -814,7 +814,7 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - Calculation = new TestStabilityPointStructuresCalculation(), + Calculation = new TestStabilityPointStructuresCalculationScenario(), UseManualAssembly = true }; @@ -843,7 +843,7 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - Calculation = new TestStabilityPointStructuresCalculation(), + Calculation = new TestStabilityPointStructuresCalculationScenario(), DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed }; Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -338,7 +338,7 @@ protected override StructuresCalculation CreateCalculation() { - return new TestStabilityPointStructuresCalculation(); + return new TestStabilityPointStructuresCalculationScenario(); } protected override StabilityPointStructuresCalculationConfigurationExporter CallConfigurationFilePathConstructor( Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r2977c8e5fa7ebcc99425b1b2deecba881601738b -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 2977c8e5fa7ebcc99425b1b2deecba881601738b) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -103,7 +103,7 @@ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -166,7 +166,7 @@ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -211,7 +211,7 @@ DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection, validFilePath); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -323,7 +323,7 @@ mockRepository.ReplayAll(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, @@ -371,7 +371,7 @@ mockRepository.ReplayAll(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, @@ -419,7 +419,7 @@ mockRepository.ReplayAll(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); CalculatableActivity activity = StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs (.../StabilityPointStructuresCalculationContextExportInfoTest.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs (.../StabilityPointStructuresCalculationContextExportInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -89,7 +89,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new StabilityPointStructuresCalculationScenarioContext(new TestStabilityPointStructuresCalculation(), + var context = new StabilityPointStructuresCalculationScenarioContext(new TestStabilityPointStructuresCalculationScenario(), new CalculationGroup(), new StabilityPointStructuresFailureMechanism(), assessmentSection); @@ -108,7 +108,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new StabilityPointStructuresCalculationScenarioContext(new TestStabilityPointStructuresCalculation(), + var context = new StabilityPointStructuresCalculationScenarioContext(new TestStabilityPointStructuresCalculationScenario(), new CalculationGroup(), new StabilityPointStructuresFailureMechanism(), assessmentSection); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationGroupContextExportInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextExportInfoTest.cs) (revision 277b8107bf8ffad7dad7fa6dbb75cdb23a0feee2) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationGroupContextExportInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextExportInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -138,7 +138,7 @@ if (hasCalculation) { - calculationGroup.Children.Add(new TestStabilityPointStructuresCalculation()); + calculationGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario()); } var context = new StabilityPointStructuresCalculationGroupContext(calculationGroup, Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs (.../StabilityPointStructureReplaceDataStrategyTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs (.../StabilityPointStructureReplaceDataStrategyTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -261,7 +261,7 @@ { // Setup var structure = new TestStabilityPointStructure(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -301,7 +301,7 @@ { // Setup var structure = new TestStabilityPointStructure(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -344,7 +344,7 @@ // Setup var location = new Point2D(12, 34); var structure = new TestStabilityPointStructure(location); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs (.../StabilityPointStructuresUpdateDataStrategyTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs (.../StabilityPointStructuresUpdateDataStrategyTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -286,7 +286,7 @@ StabilityPointStructure readStructure = new TestStabilityPointStructure(sameId, "new structure"); StabilityPointStructure structure = new TestStabilityPointStructure(sameId, "original structure"); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -343,7 +343,7 @@ var affectedStructure = new TestStabilityPointStructure(affectedId, "Old name"); var unaffectedStructure = new TestStabilityPointStructure(unaffectedId, unaffectedStructureName); - var affectedCalculation = new TestStabilityPointStructuresCalculation + var affectedCalculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -352,7 +352,7 @@ Output = new TestStructuresOutput() }; - var unaffectedCalculation = new TestStabilityPointStructuresCalculation + var unaffectedCalculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -417,7 +417,7 @@ const string removedId = "sameId"; StabilityPointStructure structure = new TestStabilityPointStructure(removedId, "original structure"); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -471,7 +471,7 @@ var removedStructure = new TestStabilityPointStructure(removedId, "Old name"); var unaffectedStructure = new TestStabilityPointStructure(unaffectedId, unaffectedStructureName); - var affectedCalculation = new TestStabilityPointStructuresCalculation + var affectedCalculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -480,7 +480,7 @@ Output = new TestStructuresOutput() }; - var unaffectedCalculation = new TestStabilityPointStructuresCalculation + var unaffectedCalculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -540,7 +540,7 @@ // Setup const string affectedId = "affectedId"; var affectedStructure = new TestStabilityPointStructure(affectedId, "Old name"); - var affectedCalculation = new TestStabilityPointStructuresCalculation + var affectedCalculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -595,7 +595,7 @@ StabilityPointStructure readStructure = new TestStabilityPointStructure(updatedMatchingPoint, sameId); StabilityPointStructure structure = new TestStabilityPointStructure(originalMatchingPoint, sameId); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -674,7 +674,7 @@ var originalMatchingPoint = new Point2D(0, 0); StabilityPointStructure removedStructure = new TestStabilityPointStructure(originalMatchingPoint, sameId); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresInputContextPropertyInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresInputContextPropertyInfoTest.cs (.../StabilityPointStructuresInputContextPropertyInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresInputContextPropertyInfoTest.cs (.../StabilityPointStructuresInputContextPropertyInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -67,7 +67,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var context = new StabilityPointStructuresInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSection); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresOutputPropertyInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresOutputPropertyInfoTest.cs (.../StabilityPointStructuresOutputPropertyInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/PropertyInfos/StabilityPointStructuresOutputPropertyInfoTest.cs (.../StabilityPointStructuresOutputPropertyInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -69,7 +69,7 @@ mocks.ReplayAll(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { Output = new StructuresOutput(0, null) }; Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -703,7 +703,7 @@ public void ContextMenuStrip_CalculationGroupWithCalculationWithStructureAndInputInSync_ContextMenuItemUpdateStructuresDisabledAndToolTipSet() { // Setup - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); var group = new CalculationGroup { Children = @@ -742,7 +742,7 @@ public void ContextMenuStrip_CalculationGroupWithCalculationWithStructureAndInputOutOfSync_ContextMenuItemUpdateStructuresEnabledAndToolTipSet() { // Setup - var calculation = new TestStabilityPointStructuresCalculation(); + var calculation = new TestStabilityPointStructuresCalculationScenario(); ChangeStructure(calculation.InputParameters.Structure); var group = new CalculationGroup { @@ -1151,12 +1151,12 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculation + var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -1167,7 +1167,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } }; @@ -1200,7 +1200,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -1210,7 +1210,7 @@ Children = { calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } }; @@ -1240,12 +1240,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndAborted_ThenInquiryAndIllustrationPointsNotCleared() { // Given - var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculation + var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -1256,7 +1256,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } }; @@ -1303,12 +1303,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndContinued_ThenInquiryAndIllustrationPointsCleared() { // Given - var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculation + var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -1319,7 +1319,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } }; @@ -1468,7 +1468,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", InputParameters = @@ -1478,7 +1478,7 @@ LoadSchematizationType = LoadSchematizationType.Linear } }); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "B", InputParameters = @@ -1571,7 +1571,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", InputParameters = @@ -1581,7 +1581,7 @@ LoadSchematizationType = LoadSchematizationType.Linear } }); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "B", InputParameters = Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r61c379b44c671d66c1bbf1b5c79b900a50c20f06 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 61c379b44c671d66c1bbf1b5c79b900a50c20f06) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -118,7 +118,7 @@ mocks.ReplayAll(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = hasOutput ? new TestStructuresOutput() : null }; @@ -152,7 +152,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = mocks.StrictMock(); @@ -215,7 +215,7 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -283,7 +283,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -318,7 +318,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -359,7 +359,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -406,7 +406,7 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -455,7 +455,7 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -529,7 +529,7 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -567,7 +567,7 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -618,7 +618,7 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -654,7 +654,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); + var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, @@ -692,7 +692,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -738,7 +738,7 @@ var foreshoreProfileInput = new TestForeshoreProfile(); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -788,7 +788,7 @@ var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -841,7 +841,7 @@ var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { InputParameters = { @@ -937,7 +937,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1025,7 +1025,7 @@ assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1072,7 +1072,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1107,7 +1107,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -1142,7 +1142,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1190,7 +1190,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); - var calculation = new StructuresCalculation + var calculation = new StructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; @@ -1237,7 +1237,7 @@ { // Setup var group = new CalculationGroup(); - var elementToBeRemoved = new StructuresCalculation(); + var elementToBeRemoved = new StructuresCalculationScenario(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); @@ -1255,7 +1255,7 @@ mocks.ReplayAll(); group.Children.Add(elementToBeRemoved); - group.Children.Add(new StructuresCalculation()); + group.Children.Add(new StructuresCalculationScenario()); group.Attach(observer); // Precondition @@ -1276,7 +1276,7 @@ // Setup var group = new CalculationGroup(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var elementToBeRemoved = new StructuresCalculation(); + var elementToBeRemoved = new StructuresCalculationScenario(); var assessmentSection = mocks.Stub(); var calculationContext = new StabilityPointStructuresCalculationScenarioContext(elementToBeRemoved, group, Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 56d072b8342f3e54ba89124ab918bd1529e257a3) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -625,7 +625,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", InputParameters = @@ -636,7 +636,7 @@ LoadSchematizationType = LoadSchematizationType.Linear } }); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "B", InputParameters = @@ -726,7 +726,7 @@ { // Setup var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", InputParameters = @@ -736,7 +736,7 @@ LoadSchematizationType = LoadSchematizationType.Linear } }); - failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculation + failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "B", InputParameters = @@ -795,12 +795,12 @@ public void ContextMenuStrip_FailureMechanismWithCalculationsContainingIllustrationPoints_ContextMenuItemClearIllustrationPointsEnabled() { // Setup - var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculation + var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -813,7 +813,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } } }; @@ -850,7 +850,7 @@ public void ContextMenuStrip_FailureMechanismWithCalculationsWithoutIllustrationPoints_ContextMenuItemClearIllustrationPointsDisabled() { // Setup - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -862,7 +862,7 @@ Children = { calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } } }; @@ -899,12 +899,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndAborted_ThenInquiryAndIllustrationPointsNotCleared() { // Given - var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculation + var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -917,7 +917,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } } }; @@ -968,12 +968,12 @@ public void GivenCalculationsWithIllustrationPoints_WhenClearIllustrationPointsClickedAndContinued_ThenInquiryAndIllustrationPointsCleared() { // Given - var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculation + var calculationWithIllustrationPoints = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var calculationWithOutput = new TestStabilityPointStructuresCalculation + var calculationWithOutput = new TestStabilityPointStructuresCalculationScenario { Output = new TestStructuresOutput() }; @@ -986,7 +986,7 @@ { calculationWithIllustrationPoints, calculationWithOutput, - new TestStabilityPointStructuresCalculation() + new TestStabilityPointStructuresCalculationScenario() } } }; Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityFactoryTest.cs =================================================================== diff -u -r2977c8e5fa7ebcc99425b1b2deecba881601738b -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityFactoryTest.cs (.../StabilityPointStructuresCalculationActivityFactoryTest.cs) (revision 2977c8e5fa7ebcc99425b1b2deecba881601738b) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityFactoryTest.cs (.../StabilityPointStructuresCalculationActivityFactoryTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -281,7 +281,7 @@ private static StructuresCalculation CreateValidCalculation() { - return new TestStabilityPointStructuresCalculation + return new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r2977c8e5fa7ebcc99425b1b2deecba881601738b -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 2977c8e5fa7ebcc99425b1b2deecba881601738b) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -84,7 +84,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -128,7 +128,7 @@ validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -207,7 +207,7 @@ validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -286,7 +286,7 @@ validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -367,7 +367,7 @@ validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -445,7 +445,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -476,7 +476,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -505,7 +505,7 @@ mockRepository.ReplayAll(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -545,7 +545,7 @@ var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -591,7 +591,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -709,7 +709,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -828,7 +828,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -946,7 +946,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1065,7 +1065,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1185,7 +1185,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1306,7 +1306,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1426,7 +1426,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1560,7 +1560,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1608,7 +1608,7 @@ .Return(new TestStructuresCalculator()); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1678,7 +1678,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1741,7 +1741,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -1804,7 +1804,7 @@ .Return(calculator); mockRepository.ReplayAll(); - var calculation = new TestStabilityPointStructuresCalculation + var calculation = new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs (.../StabilityPointStructuresDataSynchronizationServiceTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs (.../StabilityPointStructuresDataSynchronizationServiceTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -377,7 +377,7 @@ var structure1 = new TestStabilityPointStructure(new Point2D(1, 0), "id structure1"); var structure2 = new TestStabilityPointStructure(new Point2D(3, 0), "id structure2"); var profile = new TestForeshoreProfile(); - StructuresCalculation calculation1 = new TestStabilityPointStructuresCalculation + StructuresCalculation calculation1 = new TestStabilityPointStructuresCalculationScenario { InputParameters = { @@ -386,15 +386,15 @@ }, Output = new TestStructuresOutput() }; - StructuresCalculation calculation2 = new TestStabilityPointStructuresCalculation + StructuresCalculation calculation2 = new TestStabilityPointStructuresCalculationScenario { InputParameters = { ForeshoreProfile = profile, Structure = structure2 } }; - StructuresCalculation calculation3 = new TestStabilityPointStructuresCalculation + StructuresCalculation calculation3 = new TestStabilityPointStructuresCalculationScenario { InputParameters = { Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) @@ -255,7 +255,7 @@ public void Create_WithCalculationGroup_ReturnFailureMechanismEntityWithCalculationGroupEntities() { // Setup - StructuresCalculation calculation = new TestStabilityPointStructuresCalculation(); + StructuresCalculation calculation = new TestStabilityPointStructuresCalculationScenario(); calculation.InputParameters.Structure = null; calculation.InputParameters.HydraulicBoundaryLocation = null;