Fisheye: Tag acf81a7c0b090870e29e5a53a6368832cadb6573 refers to a dead (removed) revision in file `Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/SemiProbabilistic/PipingCalculationScenarioContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContext.cs =================================================================== diff -u --- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContext.cs (revision 0) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContext.cs (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -0,0 +1,87 @@ +// 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 System; +using System.Collections.Generic; +using Core.Common.Controls.PresentationObjects; +using Riskeer.Common.Data.AssessmentSection; +using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Piping.Data; +using Riskeer.Piping.Data.SemiProbabilistic; +using Riskeer.Piping.Data.SoilProfile; +using Riskeer.Piping.Primitives; + +namespace Riskeer.Piping.Forms.PresentationObjects.SemiProbabilistic +{ + /// + /// Presentation object for all data required to configure an instance of + /// in order to prepare it for performing a calculation. + /// + public class SemiProbabilisticPipingCalculationScenarioContext : PipingContext, + ICalculationContext + { + /// + /// Initializes a new instance of the class. + /// + /// The instance wrapped by this context object. + /// The that owns the wrapped scenario. + /// The surface lines available within the piping context. + /// The stochastic soil models available within the piping context. + /// The piping failure mechanism which the piping context belongs to. + /// The assessment section which the piping context belongs to. + /// Thrown when any input argument is null. + public SemiProbabilisticPipingCalculationScenarioContext(SemiProbabilisticPipingCalculationScenario calculation, + CalculationGroup parent, + IEnumerable surfaceLines, + IEnumerable stochasticSoilModels, + PipingFailureMechanism pipingFailureMechanism, + IAssessmentSection assessmentSection) + : base(calculation, surfaceLines, stochasticSoilModels, pipingFailureMechanism, assessmentSection) + { + if (parent == null) + { + throw new ArgumentNullException(nameof(parent)); + } + + Parent = parent; + } + + public CalculationGroup Parent { get; } + + public override bool Equals(WrappedObjectContextBase other) + { + return base.Equals(other) + && other is SemiProbabilisticPipingCalculationScenarioContext + && ReferenceEquals(Parent, ((SemiProbabilisticPipingCalculationScenarioContext) other).Parent); + } + + public override bool Equals(object obj) + { + return Equals(obj as SemiProbabilisticPipingCalculationScenarioContext); + } + + public override int GetHashCode() + { + return base.GetHashCode() ^ Parent.GetHashCode(); + } + } +} \ No newline at end of file Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs =================================================================== diff -u -rd4f80dbede462caf32731cd5ecba60377909055d -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision d4f80dbede462caf32731cd5ecba60377909055d) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -111,7 +111,7 @@ } /// - /// Gets the available stochastic soil models on . + /// Gets the available stochastic soil models on . /// public IEnumerable GetAvailableStochasticSoilModels() { Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/PipingInputContextProperties.cs =================================================================== diff -u -rd4f80dbede462caf32731cd5ecba60377909055d -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision d4f80dbede462caf32731cd5ecba60377909055d) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -106,15 +106,15 @@ } /// - /// Gets the available surface lines on . + /// Gets the available surface lines on . /// public IEnumerable GetAvailableSurfaceLines() { return data.AvailablePipingSurfaceLines; } /// - /// Gets the available stochastic soil models on . + /// Gets the available stochastic soil models on . /// public IEnumerable GetAvailableStochasticSoilModels() { @@ -128,7 +128,7 @@ } /// - /// Gets the available stochastic soil profiles on . + /// Gets the available stochastic soil profiles on . /// public IEnumerable GetAvailableStochasticSoilProfiles() { Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rd4f80dbede462caf32731cd5ecba60377909055d -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision d4f80dbede462caf32731cd5ecba60377909055d) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -166,7 +166,7 @@ context => context.WrappedData.Children.Any(), GetInquiryHelper()); - yield return RiskeerExportInfoFactory.CreateCalculationConfigurationExportInfo( + yield return RiskeerExportInfoFactory.CreateCalculationConfigurationExportInfo( (context, filePath) => new PipingCalculationConfigurationExporter(new[] { context.WrappedData @@ -287,7 +287,7 @@ FailureMechanismEnabledContextMenuStrip, FailureMechanismDisabledContextMenuStrip); - yield return RiskeerTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo( + yield return RiskeerTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo( SemiProbabilisticCalculationContextChildNodeObjects, SemiProbabilisticCalculationContextContextMenuStrip, SemiProbabilisticCalculationContextOnNodeRemoved); @@ -491,7 +491,7 @@ private static bool ClosePipingInputViewForData(PipingInputView view, object o) { - if (o is PipingCalculationScenarioContext pipingCalculationScenarioContext) + if (o is SemiProbabilisticPipingCalculationScenarioContext pipingCalculationScenarioContext) { return ReferenceEquals(view.Data, pipingCalculationScenarioContext.WrappedData); } @@ -688,7 +688,7 @@ switch (item) { case SemiProbabilisticPipingCalculationScenario semiProbabilisticCalculation: - childNodeObjects.Add(new PipingCalculationScenarioContext(semiProbabilisticCalculation, + childNodeObjects.Add(new SemiProbabilisticPipingCalculationScenarioContext(semiProbabilisticCalculation, nodeData.WrappedData, nodeData.AvailablePipingSurfaceLines, nodeData.AvailableStochasticSoilModels, @@ -928,7 +928,7 @@ #region PipingCalculationScenarioContext TreeNodeInfo - private static object[] SemiProbabilisticCalculationContextChildNodeObjects(PipingCalculationScenarioContext context) + private static object[] SemiProbabilisticCalculationContextChildNodeObjects(SemiProbabilisticPipingCalculationScenarioContext context) { SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = context.WrappedData; @@ -958,7 +958,7 @@ return childNodes.ToArray(); } - private ContextMenuStrip SemiProbabilisticCalculationContextContextMenuStrip(PipingCalculationScenarioContext nodeData, + private ContextMenuStrip SemiProbabilisticCalculationContextContextMenuStrip(SemiProbabilisticPipingCalculationScenarioContext nodeData, object parentData, TreeViewControl treeViewControl) { var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); @@ -992,17 +992,17 @@ .Build(); } - private static void SemiProbabilisticCalculationContextOnNodeRemoved(PipingCalculationScenarioContext context, object parentNodeData) + private static void SemiProbabilisticCalculationContextOnNodeRemoved(SemiProbabilisticPipingCalculationScenarioContext context, object parentNodeData) { CalculationContextOnNodeRemoved(parentNodeData, context.WrappedData); } - private static void Validate(PipingCalculationScenarioContext context) + private static void Validate(SemiProbabilisticPipingCalculationScenarioContext context) { PipingCalculationService.Validate(context.WrappedData, GetNormativeAssessmentLevel(context.AssessmentSection, context.WrappedData)); } - private void Calculate(SemiProbabilisticPipingCalculation calculation, PipingCalculationScenarioContext context) + private void Calculate(SemiProbabilisticPipingCalculation calculation, SemiProbabilisticPipingCalculationScenarioContext context) { ActivityProgressDialogRunner.Run(Gui.MainWindow, PipingCalculationActivityFactory.CreateCalculationActivity(calculation, context.AssessmentSection)); Fisheye: Tag acf81a7c0b090870e29e5a53a6368832cadb6573 refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/PipingCalculationScenarioContextTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTest.cs =================================================================== diff -u --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTest.cs (revision 0) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTest.cs (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -0,0 +1,190 @@ +// 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 System; +using System.Collections.Generic; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Riskeer.Common.Data.AssessmentSection; +using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Piping.Data; +using Riskeer.Piping.Data.SemiProbabilistic; +using Riskeer.Piping.Data.SoilProfile; +using Riskeer.Piping.Data.TestUtil; +using Riskeer.Piping.Forms.PresentationObjects; +using Riskeer.Piping.Forms.PresentationObjects.SemiProbabilistic; +using Riskeer.Piping.Primitives; + +namespace Riskeer.Piping.Forms.Test.PresentationObjects.SemiProbabilistic +{ + [TestFixture] + public class SemiProbabilisticPipingCalculationScenarioContextTest + { + [Test] + public void ConstructorWithData_Always_ExpectedPropertiesSet() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var surfaceLines = new[] + { + new PipingSurfaceLine(string.Empty) + }; + PipingStochasticSoilModel[] soilModels = + { + PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel() + }; + var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); + var parent = new CalculationGroup(); + + // Call + var presentationObject = new SemiProbabilisticPipingCalculationScenarioContext(calculation, + parent, + surfaceLines, + soilModels, + failureMechanism, + assessmentSection); + + // Assert + Assert.IsInstanceOf>(presentationObject); + Assert.IsInstanceOf>(presentationObject); + Assert.AreSame(calculation, presentationObject.WrappedData); + Assert.AreSame(parent, presentationObject.Parent); + Assert.AreSame(surfaceLines, presentationObject.AvailablePipingSurfaceLines); + Assert.AreSame(soilModels, presentationObject.AvailableStochasticSoilModels); + Assert.AreSame(failureMechanism, presentationObject.FailureMechanism); + Assert.AreSame(assessmentSection, presentationObject.AssessmentSection); + mocks.VerifyAll(); + } + + [Test] + public void ParameteredConstructor_ParentNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var surfaceLines = new[] + { + new PipingSurfaceLine(string.Empty) + }; + PipingStochasticSoilModel[] soilModels = + { + PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel() + }; + var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); + + // Call + TestDelegate call = () => new SemiProbabilisticPipingCalculationScenarioContext(calculation, + null, + surfaceLines, + soilModels, + failureMechanism, + assessmentSection); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("parent", exception.ParamName); + mocks.VerifyAll(); + } + + [TestFixture] + private class PipingCalculationScenarioContextEqualsTest + : EqualsTestFixture + { + private static readonly MockRepository mocks = new MockRepository(); + + private static readonly IAssessmentSection assessmentSection = mocks.Stub(); + private static readonly SemiProbabilisticPipingCalculationScenario calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); + private static readonly IEnumerable surfaceLines = new PipingSurfaceLine[0]; + private static readonly IEnumerable stochasticSoilModels = new PipingStochasticSoilModel[0]; + private static readonly PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + private static readonly CalculationGroup parent = new CalculationGroup(); + + [SetUp] + public void SetUp() + { + mocks.ReplayAll(); + } + + [TearDown] + public void TearDown() + { + mocks.VerifyAll(); + } + + protected override SemiProbabilisticPipingCalculationScenarioContext CreateObject() + { + return new SemiProbabilisticPipingCalculationScenarioContext(calculation, + parent, + surfaceLines, + stochasticSoilModels, + failureMechanism, + assessmentSection); + } + + protected override DerivedSemiProbabilisticPipingCalculationScenarioContext CreateDerivedObject() + { + return new DerivedSemiProbabilisticPipingCalculationScenarioContext(calculation, + parent, + surfaceLines, + stochasticSoilModels, + failureMechanism, + assessmentSection); + } + + private static IEnumerable GetUnequalTestCases() + { + yield return new TestCaseData(new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), + parent, + surfaceLines, + stochasticSoilModels, + failureMechanism, + assessmentSection)) + .SetName("Calculation"); + yield return new TestCaseData(new SemiProbabilisticPipingCalculationScenarioContext(calculation, + new CalculationGroup(), + surfaceLines, + stochasticSoilModels, + failureMechanism, + assessmentSection)) + .SetName("Parent"); + } + } + + private class DerivedSemiProbabilisticPipingCalculationScenarioContext : SemiProbabilisticPipingCalculationScenarioContext + { + public DerivedSemiProbabilisticPipingCalculationScenarioContext(SemiProbabilisticPipingCalculationScenario calculation, + CalculationGroup parent, + IEnumerable surfaceLines, + IEnumerable stochasticSoilModels, + PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection) + : base(calculation, parent, surfaceLines, stochasticSoilModels, pipingFailureMechanism, assessmentSection) {} + } + } +} \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs =================================================================== diff -u -r7f6453bc0e3e028ad99948c230916ea25d92248a -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs (.../PipingCalculationContextExportInfoTest.cs) (revision 7f6453bc0e3e028ad99948c230916ea25d92248a) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs (.../PipingCalculationContextExportInfoTest.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -62,7 +62,7 @@ Gui = gui }; - info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(PipingCalculationScenarioContext)); + info = plugin.GetExportInfos().First(ei => ei.DataType == typeof(SemiProbabilisticPipingCalculationScenarioContext)); } [TearDown] @@ -92,7 +92,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new PipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), + var context = new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -113,7 +113,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var context = new PipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), + var context = new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs =================================================================== diff -u -rd4f80dbede462caf32731cd5ecba60377909055d -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision d4f80dbede462caf32731cd5ecba60377909055d) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -138,7 +138,7 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStochasticSoilModelCollectionContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStochasticSoilModel))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStochasticSoilProfile))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingCalculationScenarioContext))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(SemiProbabilisticPipingCalculationScenarioContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingCalculationGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingInputContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingFailureMechanismContext))); @@ -255,7 +255,7 @@ // Assert Assert.AreEqual(2, exportInfos.Length); Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(PipingCalculationGroupContext))); - Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(PipingCalculationScenarioContext))); + Assert.IsTrue(exportInfos.Any(tni => tni.DataType == typeof(SemiProbabilisticPipingCalculationScenarioContext))); } mocks.VerifyAll(); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r7f6453bc0e3e028ad99948c230916ea25d92248a -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 7f6453bc0e3e028ad99948c230916ea25d92248a) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -181,7 +181,7 @@ Assert.AreEqual(group.Children.Count, children.Length); Assert.AreSame(calculationItem, children[0]); - var returnedSemiProbabilisticCalculationContext = (PipingCalculationScenarioContext) children[1]; + var returnedSemiProbabilisticCalculationContext = (SemiProbabilisticPipingCalculationScenarioContext) children[1]; Assert.AreSame(semiProbabilisticChildCalculation, returnedSemiProbabilisticCalculationContext.WrappedData); Assert.AreSame(group, returnedSemiProbabilisticCalculationContext.Parent); Assert.AreSame(pipingFailureMechanism, returnedSemiProbabilisticCalculationContext.FailureMechanism); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r7f6453bc0e3e028ad99948c230916ea25d92248a -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 7f6453bc0e3e028ad99948c230916ea25d92248a) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -119,7 +119,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, + var pipingCalculationContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), new[] { @@ -159,7 +159,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var pipingCalculationContext = new PipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), + var pipingCalculationContext = new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -191,7 +191,7 @@ var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -230,7 +230,7 @@ }; var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -265,7 +265,7 @@ var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -305,7 +305,7 @@ { var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -367,7 +367,7 @@ { var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()), new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -420,7 +420,7 @@ var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -468,7 +468,7 @@ }; var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -516,7 +516,7 @@ }; var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -556,7 +556,7 @@ var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -606,7 +606,7 @@ var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -668,7 +668,7 @@ var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var nodeData = new PipingCalculationScenarioContext(calculation, + var nodeData = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -737,7 +737,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationContext = new PipingCalculationScenarioContext(elementToBeRemoved, + var calculationContext = new SemiProbabilisticPipingCalculationScenarioContext(elementToBeRemoved, group, Enumerable.Empty(), Enumerable.Empty(), @@ -789,7 +789,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var calculationContext = new PipingCalculationScenarioContext(elementToBeRemoved, + var calculationContext = new SemiProbabilisticPipingCalculationScenarioContext(elementToBeRemoved, group, Enumerable.Empty(), Enumerable.Empty(), @@ -826,7 +826,7 @@ var calculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new TestPipingFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); - var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, + var pipingCalculationContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -890,7 +890,7 @@ var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); - var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, + var pipingCalculationContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -940,7 +940,7 @@ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); - var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, + var pipingCalculationContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -1008,7 +1008,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); var assessmentSection = mocks.Stub(); - var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, + var pipingCalculationContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -1064,7 +1064,7 @@ { mocks = new MockRepository(); plugin = new PipingPlugin(); - info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingCalculationScenarioContext)); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(SemiProbabilisticPipingCalculationScenarioContext)); } public override void TearDown() Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs =================================================================== diff -u -r7f6453bc0e3e028ad99948c230916ea25d92248a -racf81a7c0b090870e29e5a53a6368832cadb6573 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision 7f6453bc0e3e028ad99948c230916ea25d92248a) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision acf81a7c0b090870e29e5a53a6368832cadb6573) @@ -108,7 +108,7 @@ mocks.ReplayAll(); var pipingCalculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); - var pipingCalculationScenarioContext = new PipingCalculationScenarioContext(pipingCalculation, + var pipingCalculationScenarioContext = new SemiProbabilisticPipingCalculationScenarioContext(pipingCalculation, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(), @@ -139,7 +139,7 @@ var pipingCalculation = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); var calculationToRemove = new SemiProbabilisticPipingCalculationScenario(new GeneralPipingInput()); - var pipingCalculationScenarioContext = new PipingCalculationScenarioContext(calculationToRemove, + var pipingCalculationScenarioContext = new SemiProbabilisticPipingCalculationScenarioContext(calculationToRemove, new CalculationGroup(), Enumerable.Empty(), Enumerable.Empty(),