Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs =================================================================== diff -u -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs (.../RingtoetsNodePresenterBaseTest.cs) (revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs (.../RingtoetsNodePresenterBaseTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -34,13 +34,13 @@ var mocks = new MockRepository(); var parentNode = mocks.StrictMock(); var pipingNode = mocks.StrictMock(); - var pipingData = mocks.StrictMock(); + var nodeData = mocks.StrictMock(); mocks.ReplayAll(); var nodePresenter = new SimpleRingtoetsNodePresenterBase(); // Call - nodePresenter.UpdateNode(parentNode, pipingNode, pipingData); + nodePresenter.UpdateNode(parentNode, pipingNode, nodeData); // Assert mocks.VerifyAll(); // Expect no calls on mocks Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs =================================================================== diff -u -r48fe36c87dd40ff715adf4c0cf393f7390e6c993 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs (.../AddNewDemoDikeAssessmentSectionCommandTest.cs) (revision 48fe36c87dd40ff715adf4c0cf393f7390e6c993) +++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs (.../AddNewDemoDikeAssessmentSectionCommandTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -76,7 +76,7 @@ mocks.VerifyAll(); } - private void AssertCalculationAbleToCalculate(PipingCalculationData calculation) + private void AssertCalculationAbleToCalculate(PipingCalculation calculation) { PipingInput inputParameters = calculation.InputParameters; AssertExpectedPipingInput(inputParameters); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,69 @@ +using Core.Common.Base; + +using Ringtoets.Common.Placeholder; +using Ringtoets.Piping.Data.Properties; + +namespace Ringtoets.Piping.Data +{ + /// + /// This class holds the information which can be made visible in the graphical interface of the application. + /// + public class PipingCalculation : Observable + { + /// + /// Constructs a new instance of with default values set for some of the parameters. + /// + public PipingCalculation() + { + Name = Resources.PipingCalculationData_DefaultName; + + Comments = new InputPlaceholder(Resources.Comments_DisplayName); + InputParameters = new PipingInput(); + CalculationReport = new PlaceholderWithReadonlyName(Resources.CalculationReport_DisplayName); + } + + /// + /// Gets or sets the name the user gave this this calculation object. + /// + public string Name { get; set; } + + /// + /// Gets the user notes for this calculation. + /// + public PlaceholderWithReadonlyName Comments { get; private set; } + + /// + /// Gets the input parameters to perform a piping calculation with. + /// + public PipingInput InputParameters { get; private set; } + + /// + /// Gets a value indicating whether the has . + /// + public bool HasOutput + { + get + { + return Output != null; + } + } + + /// + /// Gets or sets , which contains the results of a Piping calculation. + /// + public PipingOutput Output { get; set; } + + /// + /// Gets the calculation report for the calculation that generated . + /// + public PlaceholderWithReadonlyName CalculationReport { get; private set; } + + /// + /// Clears the . + /// + public void ClearOutput() + { + Output = null; + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationData.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -re84d6f09851705c41a9ff8f26124c039a36adecf -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision e84d6f09851705c41a9ff8f26124c039a36adecf) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -22,7 +22,7 @@ SurfaceLines = new ObservableList(); SoilProfiles = new ObservableList(); BoundaryConditions = new InputPlaceholder(RingtoetsCommonDataResources.FailureMechanism_BoundaryConditions_DisplayName); - Calculations = new List { new PipingCalculationData() }; + Calculations = new List { new PipingCalculation() }; AssessmentResult = new OutputPlaceholder(RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName); } @@ -49,7 +49,7 @@ /// /// Gets all available piping calculations. /// - public ICollection Calculations { get; private set; } + public ICollection Calculations { get; private set; } /// /// Gets the calculation results for this failure mechanism. Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -63,7 +63,7 @@ - + Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/EmptyPipingCalculationReportNodePresenter.cs =================================================================== diff -u -rca5e60f150095bbe4b6919062dc98a5d2b71c77e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/EmptyPipingCalculationReportNodePresenter.cs (.../EmptyPipingCalculationReportNodePresenter.cs) (revision ca5e60f150095bbe4b6919062dc98a5d2b71c77e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/EmptyPipingCalculationReportNodePresenter.cs (.../EmptyPipingCalculationReportNodePresenter.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -13,7 +13,7 @@ { /// /// A node presenter for instances implemented - /// to mimicks the looks of the node presenter for + /// to mimicks the looks of the node presenter for /// to provide a uniform look and feel. /// public class EmptyPipingCalculationReportNodePresenter : RingtoetsNodePresenterBase Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,134 @@ +using System; +using System.Collections; +using System.Linq; +using System.Windows.Forms; +using Core.Common.Base.Workflow; +using Core.Common.Controls; + +using Ringtoets.Common.Forms.Extensions; +using Ringtoets.Common.Forms.NodePresenters; +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Service; + +using Ringtoets.Piping.Forms.PresentationObjects; +using Ringtoets.Piping.Forms.Properties; + +using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.Piping.Forms.NodePresenters +{ + /// + /// This class presents the data on as a node in a and + /// implements the way the user can interact with the node. + /// + public class PipingCalculationContextNodePresenter : RingtoetsNodePresenterBase + { + /// + /// Injection points for a method to cause an to be scheduled for execution. + /// + public Action RunActivityAction { private get; set; } + + protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, PipingCalculationContext pipingCalculationContext) + { + node.Text = pipingCalculationContext.WrappedPipingCalculation.Name; + node.Image = Resources.PipingIcon; + } + + protected override IEnumerable GetChildNodeObjects(PipingCalculationContext pipingCalculationContext, ITreeNode node) + { + yield return pipingCalculationContext.WrappedPipingCalculation.Comments; + yield return new PipingInputContext + { + WrappedPipingInput = pipingCalculationContext.WrappedPipingCalculation.InputParameters, + AvailablePipingSurfaceLines = pipingCalculationContext.AvailablePipingSurfaceLines, + AvailablePipingSoilProfiles = pipingCalculationContext.AvailablePipingSoilProfiles + }; + if (pipingCalculationContext.WrappedPipingCalculation.HasOutput) + { + yield return pipingCalculationContext.WrappedPipingCalculation.Output; + yield return pipingCalculationContext.WrappedPipingCalculation.CalculationReport; + } + else + { + yield return new EmptyPipingOutput(); + yield return new EmptyPipingCalculationReport(); + } + } + + public override bool CanRenameNode(ITreeNode node) + { + return true; + } + + public override bool CanRenameNodeTo(ITreeNode node, string newName) + { + return true; + } + + protected override bool CanRemove(object parentNodeData, PipingCalculationContext nodeData) + { + var calculationsFolder = parentNodeData as PipingCalculationsTreeFolder; + if (calculationsFolder != null) + { + return calculationsFolder.Contents.OfType().Contains(nodeData); + } + return base.CanRemove(parentNodeData, nodeData); + } + + protected override bool RemoveNodeData(object parentNodeData, PipingCalculationContext nodeData) + { + var calculationsFolder = parentNodeData as PipingCalculationsTreeFolder; + if (calculationsFolder != null) + { + var succesfullyRemovedData = calculationsFolder.ParentFailureMechanism.Calculations.Remove(nodeData.WrappedPipingCalculation); + calculationsFolder.ParentFailureMechanism.NotifyObservers(); + return succesfullyRemovedData; + } + return base.RemoveNodeData(parentNodeData, nodeData); + } + + protected override void OnNodeRenamed(PipingCalculationContext pipingCalculationContext, string newName) + { + pipingCalculationContext.WrappedPipingCalculation.Name = newName; + pipingCalculationContext.WrappedPipingCalculation.NotifyObservers(); + } + + protected override ContextMenuStrip GetContextMenu(ITreeNode sender, PipingCalculationContext nodeData) + { + PipingCalculation calculation = nodeData.WrappedPipingCalculation; + + var contextMenu = new ContextMenuStrip(); + contextMenu.AddMenuItem(Resources.Validate, + null, + null, + (o, args) => + { + PipingCalculationService.Validate(calculation); + }); + contextMenu.AddMenuItem(Resources.Calculate, + null, + Resources.Play, + (o, args) => + { + RunActivityAction(new PipingCalculationActivity(calculation)); + }); + + var clearOutputItem = contextMenu.AddMenuItem(Resources.Clear_output, + null, + RingtoetsFormsResources.ClearIcon, + (o, args) => + { + calculation.ClearOutput(); + calculation.NotifyObservers(); + }); + + if (!calculation.HasOutput) + { + clearOutputItem.Enabled = false; + clearOutputItem.ToolTipText = Resources.ClearOutput_No_output_to_clear; + } + + return contextMenu; + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs =================================================================== diff -u -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -52,11 +52,11 @@ Resources.PipingFailureMechanism_Add_Piping_Calculation_Tooltip, Resources.PipingIcon, (o, args) => { - var pipingData = new PipingCalculationData + var calculation = new PipingCalculation { Name = NamingHelper.GetUniqueName(failureMechanism.Calculations, PipingDataResources.PipingCalculationData_DefaultName, pd => pd.Name) }; - failureMechanism.Calculations.Add(pipingData); + failureMechanism.Calculations.Add(calculation); failureMechanism.NotifyObservers(); }); rootMenu.AddMenuItem(RingtoetsCommonFormsResources.Calculate_all, Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs =================================================================== diff -u -rca5e60f150095bbe4b6919062dc98a5d2b71c77e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs (.../PipingOutputNodePresenter.cs) (revision ca5e60f150095bbe4b6919062dc98a5d2b71c77e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs (.../PipingOutputNodePresenter.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -25,10 +25,10 @@ protected override bool RemoveNodeData(object parentNodeData, PipingOutput nodeData) { - var pipingCalculationInputs = (PipingCalculationInputs)parentNodeData; + var pipingCalculationContext = (PipingCalculationContext)parentNodeData; - pipingCalculationInputs.ClearOutput(); - pipingCalculationInputs.NotifyObservers(); + pipingCalculationContext.ClearOutput(); + pipingCalculationContext.NotifyObservers(); return true; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/EmptyPipingCalculationReport.cs =================================================================== diff -u -rca5e60f150095bbe4b6919062dc98a5d2b71c77e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/EmptyPipingCalculationReport.cs (.../EmptyPipingCalculationReport.cs) (revision ca5e60f150095bbe4b6919062dc98a5d2b71c77e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/EmptyPipingCalculationReport.cs (.../EmptyPipingCalculationReport.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -3,8 +3,8 @@ namespace Ringtoets.Piping.Forms.PresentationObjects { /// - /// This class represents the placeholder for a - /// for a that hasn't been calculated yet. + /// This class represents the placeholder for a + /// for a that hasn't been calculated yet. /// public class EmptyPipingCalculationReport { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/EmptyPipingOutput.cs =================================================================== diff -u -rca5e60f150095bbe4b6919062dc98a5d2b71c77e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/EmptyPipingOutput.cs (.../EmptyPipingOutput.cs) (revision ca5e60f150095bbe4b6919062dc98a5d2b71c77e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/EmptyPipingOutput.cs (.../EmptyPipingOutput.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -3,7 +3,7 @@ namespace Ringtoets.Piping.Forms.PresentationObjects { /// - /// This class represents the placeholder for a for a + /// This class represents the placeholder for a for a /// that hasn't been calculated yet. /// public class EmptyPipingOutput Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,67 @@ +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base; +using Ringtoets.Piping.Data; + +namespace Ringtoets.Piping.Forms.PresentationObjects +{ + /// + /// Presentation object for all data required to configure an instance of + /// in order to prepare it for performing a calculation. + /// + public class PipingCalculationContext : IObservable + { + /// + /// Initializes a new instance of the class. + /// + public PipingCalculationContext() + { + AvailablePipingSurfaceLines = Enumerable.Empty(); + AvailablePipingSoilProfiles = Enumerable.Empty(); + } + + /// + /// Gets or sets the piping data to be configured. + /// + public PipingCalculation WrappedPipingCalculation { get; set; } + + /// + /// Gets or sets the available piping surface lines in order for the user to select + /// one to set . + /// + public IEnumerable AvailablePipingSurfaceLines { get; set; } + + /// + /// Gets or sets the available piping soil profiles in order for the user to select + /// one to set . + /// + public IEnumerable AvailablePipingSoilProfiles { get; set; } + + #region IObservable + + public void Attach(IObserver observer) + { + WrappedPipingCalculation.Attach(observer); + } + + public void Detach(IObserver observer) + { + WrappedPipingCalculation.Detach(observer); + } + + public void NotifyObservers() + { + WrappedPipingCalculation.NotifyObservers(); + } + + #endregion + + /// + /// Clears the output of the . + /// + public void ClearOutput() + { + WrappedPipingCalculation.ClearOutput(); + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationInputs.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationsTreeFolder.cs =================================================================== diff -u -rca5e60f150095bbe4b6919062dc98a5d2b71c77e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationsTreeFolder.cs (.../PipingCalculationsTreeFolder.cs) (revision ca5e60f150095bbe4b6919062dc98a5d2b71c77e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationsTreeFolder.cs (.../PipingCalculationsTreeFolder.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -24,11 +24,11 @@ public PipingFailureMechanism ParentFailureMechanism { get; private set; } - private static IEnumerable WrapCalculationsInPresentationObjects(PipingFailureMechanism failureMechanism) + private static IEnumerable WrapCalculationsInPresentationObjects(PipingFailureMechanism failureMechanism) { - return failureMechanism.Calculations.Select(calculation => new PipingCalculationInputs + return failureMechanism.Calculations.Select(calculation => new PipingCalculationContext { - PipingData = calculation, + WrappedPipingCalculation = calculation, AvailablePipingSurfaceLines = failureMechanism.SurfaceLines, AvailablePipingSoilProfiles = failureMechanism.SoilProfiles }); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -234,6 +234,15 @@ } /// + /// Looks up a localized string similar to Piping. + /// + public static string PipingCalculationContextProperties_DisplayName { + get { + return ResourceManager.GetString("PipingCalculationContextProperties_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Naam van de piping berekening.. /// public static string PipingCalculationData_Name_Description { @@ -252,15 +261,6 @@ } /// - /// Looks up a localized string similar to Piping. - /// - public static string PipingCalculationInputsProperties_DisplayName { - get { - return ResourceManager.GetString("PipingCalculationInputsProperties_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap PipingCalculationReportIcon { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -196,7 +196,7 @@ Stijghoogte in achterland [m+NAP] - + Piping Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingCalculationContextProperties.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingCalculationContextProperties.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingCalculationContextProperties.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,28 @@ +using Core.Common.Gui; +using Core.Common.Utils; + +using Ringtoets.Piping.Forms.PresentationObjects; +using Ringtoets.Piping.Forms.Properties; + +namespace Ringtoets.Piping.Forms.PropertyClasses +{ + [ResourcesDisplayName(typeof(Resources), "PipingCalculationContextProperties_DisplayName")] + public class PipingCalculationContextProperties : ObjectProperties + { + [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesDisplayName(typeof(Resources), "PipingCalculationData_Name_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingCalculationData_Name_Description")] + public string Name + { + get + { + return data.WrappedPipingCalculation.Name; + } + set + { + data.WrappedPipingCalculation.Name = value; + data.WrappedPipingCalculation.NotifyObservers(); + } + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingCalculationInputsProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -527,15 +527,15 @@ #endregion /// - /// Gets the available surface lines on . + /// Gets the available surface lines on . /// public IEnumerable GetAvailableSurfaceLines() { return data.AvailablePipingSurfaceLines; } /// - /// Gets the available soil profiles on . + /// Gets the available soil profiles on . /// public IEnumerable GetAvailableSoilProfiles() { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -63,14 +63,14 @@ - + - + @@ -79,7 +79,7 @@ True Resources.resx - + Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionDesignVariableTypeConverter.cs =================================================================== diff -u -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionDesignVariableTypeConverter.cs (.../LognormalDistributionDesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/LognormalDistributionDesignVariableTypeConverter.cs (.../LognormalDistributionDesignVariableTypeConverter.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -11,7 +11,7 @@ /// A implementation for /// properties. /// - /// This class has been designed to be used in . + /// This class has been designed to be used in . /// If its reused somewhere else, change notification might not work properly. public sealed class LognormalDistributionDesignVariableTypeConverter : DesignVariableTypeConverter { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionDesignVariableTypeConverter.cs =================================================================== diff -u -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionDesignVariableTypeConverter.cs (.../NormalDistributionDesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/NormalDistributionDesignVariableTypeConverter.cs (.../NormalDistributionDesignVariableTypeConverter.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -11,7 +11,7 @@ /// A implementation for /// properties. /// - /// This class has been designed to be used in . + /// This class has been designed to be used in . /// If its reused somewhere else, change notification might not work properly. public sealed class NormalDistributionDesignVariableTypeConverter : DesignVariableTypeConverter { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionDesignVariableTypeConverter.cs =================================================================== diff -u -r6c2deb9f342ef571d0c32764f0dd2c67510dca2e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionDesignVariableTypeConverter.cs (.../ShiftedLognormalDistributionDesignVariableTypeConverter.cs) (revision 6c2deb9f342ef571d0c32764f0dd2c67510dca2e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/ShiftedLognormalDistributionDesignVariableTypeConverter.cs (.../ShiftedLognormalDistributionDesignVariableTypeConverter.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -11,7 +11,7 @@ /// A implementation for /// properties. /// - /// This class has been designed to be used in . + /// This class has been designed to be used in . /// If its reused somewhere else, change notification might not work properly. public sealed class ShiftedLognormalDistributionDesignVariableTypeConverter : DesignVariableTypeConverter { Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -r48fe36c87dd40ff715adf4c0cf393f7390e6c993 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 48fe36c87dd40ff715adf4c0cf393f7390e6c993) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -23,7 +23,7 @@ public override IEnumerable GetPropertyInfos() { - yield return new PropertyInfo(); + yield return new PropertyInfo(); yield return new PropertyInfo(); yield return new PropertyInfo(); yield return new PropertyInfo(); @@ -32,7 +32,7 @@ public override IEnumerable GetProjectTreeViewNodePresenters() { - yield return new PipingCalculationInputsNodePresenter + yield return new PipingCalculationContextNodePresenter { RunActivityAction = Gui.ApplicationCore.ActivityRunner.Enqueue }; Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs =================================================================== diff -u -re84d6f09851705c41a9ff8f26124c039a36adecf -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision e84d6f09851705c41a9ff8f26124c039a36adecf) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -8,40 +8,40 @@ /// public class PipingCalculationActivity : Activity { - private readonly PipingCalculationData pipingData; + private readonly PipingCalculation calculation; /// /// Initializes a new instance of the class. /// - /// The piping data used for the calculation. - public PipingCalculationActivity(PipingCalculationData pipingData) + /// The piping data used for the calculation. + public PipingCalculationActivity(PipingCalculation calculation) { - this.pipingData = pipingData; + this.calculation = calculation; } public override string Name { get { - return pipingData.Name; + return calculation.Name; } } protected override void OnInitialize() { - if (!PipingCalculationService.Validate(pipingData)) + if (!PipingCalculationService.Validate(calculation)) { Status = ActivityStatus.Failed; } else { - pipingData.Output = null; + calculation.Output = null; } } protected override void OnExecute() { - PipingCalculationService.Calculate(pipingData); + PipingCalculationService.Calculate(calculation); Status = ActivityStatus.Done; } @@ -57,7 +57,7 @@ protected override void OnFinish() { - pipingData.NotifyObservers(); + calculation.NotifyObservers(); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs =================================================================== diff -u -re47cee04d169bb53197aeb1ce567f1a286217594 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision e47cee04d169bb53197aeb1ce567f1a286217594) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -15,45 +15,45 @@ /// public static class PipingCalculationService { - private static readonly ILog pipingDataLogger = LogManager.GetLogger(typeof(PipingCalculationData)); + private static readonly ILog pipingCalculationLogger = LogManager.GetLogger(typeof(PipingCalculation)); /// - /// Performs validation over the values on the given . Error and status information is logged during + /// Performs validation over the values on the given . Error and status information is logged during /// the execution of the operation. /// - /// The for which to validate the values. - /// False if contains validation errors; True otherwise. - public static bool Validate(PipingCalculationData pipingData) + /// The for which to validate the values. + /// False if contains validation errors; True otherwise. + public static bool Validate(PipingCalculation calculation) { - pipingDataLogger.Info(String.Format(Resources.Validation_Subject_0_started_Time_1_, - pipingData.Name, DateTimeService.CurrentTimeAsString)); + pipingCalculationLogger.Info(String.Format(Resources.Validation_Subject_0_started_Time_1_, + calculation.Name, DateTimeService.CurrentTimeAsString)); - var validationResults = new PipingCalculator(CreateInputFromData(pipingData.InputParameters)).Validate(); + var validationResults = new PipingCalculator(CreateInputFromData(calculation.InputParameters)).Validate(); LogMessagesAsError(Resources.Error_in_piping_validation_0, validationResults.ToArray()); - pipingDataLogger.Info(String.Format(Resources.Validation_Subject_0_ended_Time_1_, - pipingData.Name, DateTimeService.CurrentTimeAsString)); + pipingCalculationLogger.Info(String.Format(Resources.Validation_Subject_0_ended_Time_1_, + calculation.Name, DateTimeService.CurrentTimeAsString)); return validationResults.Count == 0; } /// - /// Performs a piping calculation based on the supplied and sets + /// Performs a piping calculation based on the supplied and sets /// to the if the calculation was successful. Error and status information is logged during /// the execution of the operation. /// - /// The to base the input for the calculation upon. + /// The to base the input for the calculation upon. /// Consider calling first to see if calculation is possible. - public static void Calculate(PipingCalculationData pipingData) + public static void Calculate(PipingCalculation calculation) { - pipingDataLogger.Info(String.Format(Resources.Calculation_Subject_0_started_Time_1_, - pipingData.Name, DateTimeService.CurrentTimeAsString)); + pipingCalculationLogger.Info(String.Format(Resources.Calculation_Subject_0_started_Time_1_, + calculation.Name, DateTimeService.CurrentTimeAsString)); try { - var pipingResult = new PipingCalculator(CreateInputFromData(pipingData.InputParameters)).Calculate(); + var pipingResult = new PipingCalculator(CreateInputFromData(calculation.InputParameters)).Calculate(); - pipingData.Output = new PipingOutput(pipingResult.UpliftZValue, + calculation.Output = new PipingOutput(pipingResult.UpliftZValue, pipingResult.UpliftFactorOfSafety, pipingResult.HeaveZValue, pipingResult.HeaveFactorOfSafety, @@ -66,16 +66,16 @@ } finally { - pipingDataLogger.Info(String.Format(Resources.Calculation_Subject_0_ended_Time_1_, - pipingData.Name, DateTimeService.CurrentTimeAsString)); + pipingCalculationLogger.Info(String.Format(Resources.Calculation_Subject_0_ended_Time_1_, + calculation.Name, DateTimeService.CurrentTimeAsString)); } } private static void LogMessagesAsError(string format, params string[] errorMessages) { foreach (var errorMessage in errorMessages) { - pipingDataLogger.Error(string.Format(format, errorMessage)); + pipingCalculationLogger.Error(string.Format(format, errorMessage)); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -10,7 +10,7 @@ #region General parameters [Test] - public void GetThicknessCoverageLayer_ValidPipingData_CreateDesignVariableForThicknessCoverageLayer() + public void GetThicknessCoverageLayer_ValidPipingCalculation_CreateDesignVariableForThicknessCoverageLayer() { // Setup var inputParameters = new PipingInput(); @@ -24,7 +24,7 @@ } [Test] - public void GetPhreaticLevelExit_ValidPipingData_CreateDesignVariableForPhreaticLevelExit() + public void GetPhreaticLevelExit_ValidPipingCalculation_CreateDesignVariableForPhreaticLevelExit() { // Setup var inputParameters = new PipingInput(); @@ -38,7 +38,7 @@ } [Test] - public void GetDampingFactorExit_ValidPipingData_CreateDesignVariableForDampingFactorExit() + public void GetDampingFactorExit_ValidPipingCalculation_CreateDesignVariableForDampingFactorExit() { // Setup var inputParameters = new PipingInput(); @@ -56,7 +56,7 @@ #region Piping parameters [Test] - public void GetSeepageLength_ValidPipingData_CreateDesignVariableForSeepageLength() + public void GetSeepageLength_ValidPipingCalculation_CreateDesignVariableForSeepageLength() { // Setup var inputParameters = new PipingInput(); @@ -70,7 +70,7 @@ } [Test] - public void GetDiameter70_ValidPipingData_CreateDesignVariableForDiameter70() + public void GetDiameter70_ValidPipingCalculation_CreateDesignVariableForDiameter70() { // Setup var inputParameters = new PipingInput(); @@ -84,7 +84,7 @@ } [Test] - public void GetDarcyPermeability_ValidPipingData_CreateDesignVariableForDarcyPermeability() + public void GetDarcyPermeability_ValidPipingCalculation_CreateDesignVariableForDarcyPermeability() { // Setup var inputParameters = new PipingInput(); @@ -98,7 +98,7 @@ } [Test] - public void GetThicknessAquiferLayer_ValidPipingData_CreateDesignVariableForThicknessAquiferLayer() + public void GetThicknessAquiferLayer_ValidPipingCalculation_CreateDesignVariableForThicknessAquiferLayer() { // Setup var inputParameters = new PipingInput(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationDataTest.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationDataTest.cs (.../PipingCalculationDataTest.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationDataTest.cs (.../PipingCalculationDataTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -19,7 +19,7 @@ public void DefaultConstructor_DefaultPropertyValuesAreSet() { // Call - var defaultConstructed = new PipingCalculationData(); + var defaultConstructed = new PipingCalculation(); // Assert Assert.AreEqual("Berekening", defaultConstructed.Name); @@ -41,12 +41,12 @@ mockRepository.ReplayAll(); - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); - pipingData.Attach(observer); + calculation.Attach(observer); // Call & Assert - pipingData.NotifyObservers(); + calculation.NotifyObservers(); } [Test] @@ -57,13 +57,13 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Never(); mockRepository.ReplayAll(); - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); - pipingData.Attach(observer); - pipingData.Detach(observer); + calculation.Attach(observer); + calculation.Detach(observer); // Call & Assert - pipingData.NotifyObservers(); + calculation.NotifyObservers(); } [Test] @@ -78,13 +78,13 @@ mockRepository.ReplayAll(); - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); - pipingData.Attach(observerA); - pipingData.Attach(observerB); + calculation.Attach(observerA); + calculation.Attach(observerB); // Call & Assert - pipingData.NotifyObservers(); + calculation.NotifyObservers(); } [Test] @@ -99,14 +99,14 @@ mockRepository.ReplayAll(); - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); - pipingData.Attach(observerA); - pipingData.Attach(observerB); - pipingData.Detach(observerA); + calculation.Attach(observerA); + calculation.Attach(observerB); + calculation.Detach(observerA); // Call & Assert - pipingData.NotifyObservers(); + calculation.NotifyObservers(); } [Test] @@ -115,17 +115,17 @@ // Setup var observer = mockRepository.StrictMock(); - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); // Call & Assert - pipingData.Detach(observer); + calculation.Detach(observer); } [Test] public void ClearOutput_Always_SetsOutputToNull() { // Setup - var data = new PipingCalculationData + var data = new PipingCalculation { Output = new TestPipingOutput() }; @@ -141,7 +141,7 @@ public void HasOutput_OutputNull_ReturnsFalse() { // Setup - var data = new PipingCalculationData + var data = new PipingCalculation { Output = null }; @@ -154,7 +154,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var data = new PipingCalculationData + var data = new PipingCalculation { Output = new TestPipingOutput() }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationNodePresenterTest.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationNodePresenterTest.cs (.../PipingCalculationNodePresenterTest.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationNodePresenterTest.cs (.../PipingCalculationNodePresenterTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -39,12 +39,12 @@ public void DefaultConstructor_ExpectedValues() { // Call - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Assert Assert.IsInstanceOf(nodePresenter); Assert.IsNull(nodePresenter.TreeView); - Assert.AreEqual(typeof(PipingCalculationInputs), nodePresenter.NodeTagType); + Assert.AreEqual(typeof(PipingCalculationContext), nodePresenter.NodeTagType); } [Test] @@ -56,18 +56,18 @@ var pipingNode = mockRepository.Stub(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); - var pipingCalculationInputs = new PipingCalculationInputs + var pipingCalculationContext = new PipingCalculationContext { - PipingData = new PipingCalculationData + WrappedPipingCalculation = new PipingCalculation { Name = nodeName } }; // Call - nodePresenter.UpdateNode(null, pipingNode, pipingCalculationInputs); + nodePresenter.UpdateNode(null, pipingNode, pipingCalculationContext); // Assert Assert.AreEqual(nodeName, pipingNode.Text); @@ -82,11 +82,11 @@ var nodeMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); - var pipingCalculationInputs = new PipingCalculationInputs + var pipingCalculationContext = new PipingCalculationContext { - PipingData = new PipingCalculationData + WrappedPipingCalculation = new PipingCalculation { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, @@ -95,17 +95,17 @@ }; // Call - var children = nodePresenter.GetChildNodeObjects(pipingCalculationInputs, nodeMock).OfType().ToArray(); + var children = nodePresenter.GetChildNodeObjects(pipingCalculationContext, nodeMock).OfType().ToArray(); // Assert Assert.AreEqual(4, children.Length); - Assert.AreSame(pipingCalculationInputs.PipingData.Comments, children[0]); + Assert.AreSame(pipingCalculationContext.WrappedPipingCalculation.Comments, children[0]); var pipingInputContext = (PipingInputContext)children[1]; - Assert.AreSame(pipingCalculationInputs.PipingData.InputParameters, pipingInputContext.WrappedPipingInput); - CollectionAssert.AreEqual(pipingCalculationInputs.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); - CollectionAssert.AreEqual(pipingCalculationInputs.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles); - Assert.AreSame(pipingCalculationInputs.PipingData.Output, children[2]); - Assert.AreSame(pipingCalculationInputs.PipingData.CalculationReport, children[3]); + Assert.AreSame(pipingCalculationContext.WrappedPipingCalculation.InputParameters, pipingInputContext.WrappedPipingInput); + CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); + CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles); + Assert.AreSame(pipingCalculationContext.WrappedPipingCalculation.Output, children[2]); + Assert.AreSame(pipingCalculationContext.WrappedPipingCalculation.CalculationReport, children[3]); mockRepository.VerifyAll(); // Expect no calls on tree node } @@ -116,26 +116,26 @@ var nodeMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); - var pipingCalculationInputs = new PipingCalculationInputs + var pipingCalculationContext = new PipingCalculationContext { - PipingData = new PipingCalculationData() + WrappedPipingCalculation = new PipingCalculation() }; // Precondition - Assert.IsFalse(pipingCalculationInputs.PipingData.HasOutput); + Assert.IsFalse(pipingCalculationContext.WrappedPipingCalculation.HasOutput); // Call - var children = nodePresenter.GetChildNodeObjects(pipingCalculationInputs, nodeMock).OfType().ToArray(); + var children = nodePresenter.GetChildNodeObjects(pipingCalculationContext, nodeMock).OfType().ToArray(); // Assert Assert.AreEqual(4, children.Length); - Assert.AreSame(pipingCalculationInputs.PipingData.Comments, children[0]); + Assert.AreSame(pipingCalculationContext.WrappedPipingCalculation.Comments, children[0]); var pipingInputContext = (PipingInputContext)children[1]; - Assert.AreSame(pipingCalculationInputs.PipingData.InputParameters, pipingInputContext.WrappedPipingInput); - CollectionAssert.AreEqual(pipingCalculationInputs.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); - CollectionAssert.AreEqual(pipingCalculationInputs.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles); + Assert.AreSame(pipingCalculationContext.WrappedPipingCalculation.InputParameters, pipingInputContext.WrappedPipingInput); + CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); + CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles); Assert.IsInstanceOf(children[2]); Assert.IsInstanceOf(children[3]); @@ -149,7 +149,7 @@ var nodeMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call var renameAllowed = nodePresenter.CanRenameNode(nodeMock); @@ -166,7 +166,7 @@ var nodeMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call var renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, ""); @@ -177,31 +177,31 @@ } [Test] - public void OnNodeRenamed_Always_SetNewNameToPipingData() + public void OnNodeRenamed_Always_SetNewNameToPipingCalculation() { // Setup var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); mockRepository.ReplayAll(); - var pipingData = new PipingCalculationData + var calculation = new PipingCalculation { Name = "" }; - var pipingCalculationsInputs = new PipingCalculationInputs + var pipingCalculationsInputs = new PipingCalculationContext { - PipingData = pipingData + WrappedPipingCalculation = calculation }; pipingCalculationsInputs.Attach(observerMock); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call const string newName = ""; nodePresenter.OnNodeRenamed(pipingCalculationsInputs, newName); // Assert - Assert.AreEqual(newName, pipingData.Name); + Assert.AreEqual(newName, calculation.Name); mockRepository.VerifyAll(); } @@ -212,7 +212,7 @@ var nodeMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call nodePresenter.OnNodeChecked(nodeMock); @@ -225,10 +225,10 @@ public void CanDrag_Always_ReturnNone() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call DragOperations dragAllowed = nodePresenter.CanDrag(dataMock); @@ -242,12 +242,12 @@ public void CanDrop_Always_ReturnNone() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); var sourceMock = mockRepository.StrictMock(); var targetMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call DragOperations dropAllowed = nodePresenter.CanDrop(dataMock, sourceMock, targetMock, DragOperations.Move); @@ -261,12 +261,12 @@ public void CanInsert_Always_ReturnFalse() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); var sourceMock = mockRepository.StrictMock(); var targetMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call bool insertionAllowed = nodePresenter.CanInsert(dataMock, sourceMock, targetMock); @@ -280,12 +280,12 @@ public void OnDragDrop_Always_DoNothing() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); var sourceParentNodeMock = mockRepository.StrictMock(); var targetParentNodeDataMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call nodePresenter.OnDragDrop(dataMock, sourceParentNodeMock, targetParentNodeDataMock, DragOperations.Move, 2); @@ -298,10 +298,10 @@ public void OnNodeSelected_Always_DoNothing() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call nodePresenter.OnNodeSelected(dataMock); @@ -311,14 +311,14 @@ } [Test] - public void GetContextMenu_WithPipingData_ContextMenuWithThreeItems() + public void GetContextMenu_WithPipingCalculation_ContextMenuWithThreeItems() { // Setup var nodeMock = mockRepository.StrictMock(); - var dataMock = mockRepository.StrictMock(); - dataMock.PipingData = new PipingCalculationData(); + var dataMock = mockRepository.StrictMock(); + dataMock.WrappedPipingCalculation = new PipingCalculation(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); mockRepository.ReplayAll(); @@ -343,14 +343,14 @@ } [Test] - public void GetContextMenu_PipingDataWithoutOutput_ContextMenuItemClearOutputDisabled() + public void GetContextMenu_PipingCalculationWithoutOutput_ContextMenuItemClearOutputDisabled() { // Setup var nodeMock = mockRepository.StrictMock(); - var dataMock = mockRepository.StrictMock(); - dataMock.PipingData = new PipingCalculationData(); + var dataMock = mockRepository.StrictMock(); + dataMock.WrappedPipingCalculation = new PipingCalculation(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); mockRepository.ReplayAll(); @@ -368,17 +368,17 @@ } [Test] - public void GetContextMenu_PipingDataWithOutput_ContextMenuItemClearOutputEnabled() + public void GetContextMenu_PipingCalculationWithOutput_ContextMenuItemClearOutputEnabled() { // Setup var nodeMock = mockRepository.StrictMock(); - var dataMock = mockRepository.StrictMock(); - dataMock.PipingData = new PipingCalculationData + var dataMock = mockRepository.StrictMock(); + dataMock.WrappedPipingCalculation = new PipingCalculation { Output = new TestPipingOutput() }; - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); mockRepository.ReplayAll(); @@ -399,12 +399,12 @@ public void OnPropertyChange_Always_DoNothing() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); var nodeMock = mockRepository.StrictMock(); var eventArgsMock = mockRepository.StrictMock(""); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call nodePresenter.OnPropertyChanged(dataMock, nodeMock, eventArgsMock); @@ -417,11 +417,11 @@ public void OnCollectionChange_Always_DoNothing() { // Setup - var dataMock = mockRepository.StrictMock(); + var dataMock = mockRepository.StrictMock(); var eventArgsMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call nodePresenter.OnCollectionChanged(dataMock, eventArgsMock); @@ -437,7 +437,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); var pipingCalculationsFolder = new PipingCalculationsTreeFolder("Berekeningen", pipingFailureMechanism); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call bool removalAllowed = nodePresenter.CanRemove(pipingCalculationsFolder, pipingCalculationsFolder.Contents.OfType().First()); @@ -453,10 +453,10 @@ var pipingFailureMechanism = new PipingFailureMechanism(); var pipingCalculationsFolder = new PipingCalculationsTreeFolder("Berekeningen", pipingFailureMechanism); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call - bool removalAllowed = nodePresenter.CanRemove(pipingCalculationsFolder, new PipingCalculationInputs()); + bool removalAllowed = nodePresenter.CanRemove(pipingCalculationsFolder, new PipingCalculationContext()); // Assert Assert.IsFalse(removalAllowed); @@ -467,10 +467,10 @@ { // Setup var dataMock = mockRepository.StrictMock(); - var nodeMock = mockRepository.StrictMock(); + var nodeMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call bool removalAllowed = nodePresenter.CanRemove(dataMock, nodeMock); @@ -489,16 +489,16 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var elementToBeRemoved = new PipingCalculationData(); + var elementToBeRemoved = new PipingCalculation(); var pipingFailureMechanism = new PipingFailureMechanism(); pipingFailureMechanism.Calculations.Add(elementToBeRemoved); - pipingFailureMechanism.Calculations.Add(new PipingCalculationData()); + pipingFailureMechanism.Calculations.Add(new PipingCalculation()); pipingFailureMechanism.Attach(observer); var pipingCalculationsFolder = new PipingCalculationsTreeFolder("Berekeningen", pipingFailureMechanism); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Precondition var treeElementToRemove = pipingCalculationsFolder.Contents.OfType().ElementAt(1); @@ -520,7 +520,7 @@ public void RemoveNodeData_Always_ThrowsInvalidOperationException() { // Setup - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); // Call TestDelegate removeAction = () => nodePresenter.RemoveNodeData(null, null); @@ -532,7 +532,7 @@ } [Test] - public void GivenInvalidPipingData_WhenCalculatingFromContextMenu_ThenPipingDataNotifiesObserversAndLogMessageAdded() + public void GivenInvalidPipingCalculation_WhenCalculatingFromContextMenu_ThenPipingCalculationNotifiesObserversAndLogMessageAdded() { // Given var expectedValidationMessageCount = 2; // No surfaceline or soil profile selected for calculation @@ -541,16 +541,16 @@ mockRepository.ReplayAll(); var calculateContextMenuItemIndex = 1; - var pipingData = new PipingCalculationData(); - pipingData.Attach(observer); + var calculation = new PipingCalculation(); + calculation.Attach(observer); var activityRunner = new ActivityRunner(); - var nodePresenter = new PipingCalculationInputsNodePresenter + var nodePresenter = new PipingCalculationContextNodePresenter { RunActivityAction = activity => activityRunner.Enqueue(activity) }; - var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationInputs { PipingData = pipingData }); + var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationContext { WrappedPipingCalculation = calculation }); // When Action action = () => @@ -577,28 +577,28 @@ Assert.IsTrue(msgs.MoveNext()); StringAssert.StartsWith("Validatie van 'Berekening' beëindigd om: ", msgs.Current); }); - Assert.IsNull(pipingData.Output); + Assert.IsNull(calculation.Output); mockRepository.VerifyAll();// Expect no calls on observer as no calculation has been performed } [Test] - public void GivenInvalidPipingData_WhenValidatingFromContextMenu_ThenLogMessageAddedAndNoNotifyObserver() + public void GivenInvalidPipingCalculation_WhenValidatingFromContextMenu_ThenLogMessageAddedAndNoNotifyObserver() { // Given var expectedValidationMessageCount = 2; // No surfaceline or soil profile selected for calculation var expectedStatusMessageCount = 2; var expectedLogMessageCount = expectedValidationMessageCount + expectedStatusMessageCount; var validateContextMenuItemIndex = 0; - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); var observer = mockRepository.StrictMock(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); + var nodePresenter = new PipingCalculationContextNodePresenter(); observer.Expect(o => o.UpdateObserver()).Repeat.Never(); - pipingData.Attach(observer); + calculation.Attach(observer); mockRepository.ReplayAll(); - var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationInputs { PipingData = pipingData }); + var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationContext { WrappedPipingCalculation = calculation }); // When Action action = () => contextMenuAdapter.Items[validateContextMenuItemIndex].PerformClick(); @@ -609,46 +609,46 @@ } [Test] - public void GivenValidPipingData_WhenCalculatingFromContextMenu_ThenPipingDataNotifiesObservers() + public void GivenValidPipingCalculation_WhenCalculatingFromContextMenu_ThenPipingCalculationNotifiesObservers() { // Given var calculateContextMenuItemIndex = 1; - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); var validPipingInput = new TestPipingInput(); - pipingData.InputParameters.AssessmentLevel = validPipingInput.AssessmentLevel; - pipingData.InputParameters.BeddingAngle = validPipingInput.BeddingAngle; - pipingData.InputParameters.DampingFactorExit.Mean = validPipingInput.DampingFactorExit; - pipingData.InputParameters.DarcyPermeability.Mean = validPipingInput.DarcyPermeability; - pipingData.InputParameters.Diameter70.Mean = validPipingInput.Diameter70; - pipingData.InputParameters.ExitPointXCoordinate = validPipingInput.ExitPointXCoordinate; - pipingData.InputParameters.Gravity = validPipingInput.Gravity; - pipingData.InputParameters.MeanDiameter70 = validPipingInput.MeanDiameter70; - pipingData.InputParameters.PhreaticLevelExit.Mean = validPipingInput.PhreaticLevelExit; - pipingData.InputParameters.PiezometricHeadExit = validPipingInput.PiezometricHeadExit; - pipingData.InputParameters.PiezometricHeadPolder = validPipingInput.PiezometricHeadPolder; - pipingData.InputParameters.SandParticlesVolumicWeight = validPipingInput.SandParticlesVolumicWeight; - pipingData.InputParameters.SeepageLength.Mean = validPipingInput.SeepageLength; - pipingData.InputParameters.SellmeijerModelFactor = validPipingInput.SellmeijerModelFactor; - pipingData.InputParameters.SellmeijerReductionFactor = validPipingInput.SellmeijerReductionFactor; - pipingData.InputParameters.ThicknessAquiferLayer.Mean = validPipingInput.ThicknessAquiferLayer; - pipingData.InputParameters.ThicknessCoverageLayer.Mean = validPipingInput.ThicknessCoverageLayer; - pipingData.InputParameters.UpliftModelFactor = validPipingInput.UpliftModelFactor; - pipingData.InputParameters.WaterVolumetricWeight = validPipingInput.WaterVolumetricWeight; - pipingData.InputParameters.WaterKinematicViscosity = validPipingInput.WaterKinematicViscosity; - pipingData.InputParameters.WhitesDragCoefficient = validPipingInput.WhitesDragCoefficient; - pipingData.InputParameters.SurfaceLine = validPipingInput.SurfaceLine; - pipingData.InputParameters.SoilProfile = validPipingInput.SoilProfile; + calculation.InputParameters.AssessmentLevel = validPipingInput.AssessmentLevel; + calculation.InputParameters.BeddingAngle = validPipingInput.BeddingAngle; + calculation.InputParameters.DampingFactorExit.Mean = validPipingInput.DampingFactorExit; + calculation.InputParameters.DarcyPermeability.Mean = validPipingInput.DarcyPermeability; + calculation.InputParameters.Diameter70.Mean = validPipingInput.Diameter70; + calculation.InputParameters.ExitPointXCoordinate = validPipingInput.ExitPointXCoordinate; + calculation.InputParameters.Gravity = validPipingInput.Gravity; + calculation.InputParameters.MeanDiameter70 = validPipingInput.MeanDiameter70; + calculation.InputParameters.PhreaticLevelExit.Mean = validPipingInput.PhreaticLevelExit; + calculation.InputParameters.PiezometricHeadExit = validPipingInput.PiezometricHeadExit; + calculation.InputParameters.PiezometricHeadPolder = validPipingInput.PiezometricHeadPolder; + calculation.InputParameters.SandParticlesVolumicWeight = validPipingInput.SandParticlesVolumicWeight; + calculation.InputParameters.SeepageLength.Mean = validPipingInput.SeepageLength; + calculation.InputParameters.SellmeijerModelFactor = validPipingInput.SellmeijerModelFactor; + calculation.InputParameters.SellmeijerReductionFactor = validPipingInput.SellmeijerReductionFactor; + calculation.InputParameters.ThicknessAquiferLayer.Mean = validPipingInput.ThicknessAquiferLayer; + calculation.InputParameters.ThicknessCoverageLayer.Mean = validPipingInput.ThicknessCoverageLayer; + calculation.InputParameters.UpliftModelFactor = validPipingInput.UpliftModelFactor; + calculation.InputParameters.WaterVolumetricWeight = validPipingInput.WaterVolumetricWeight; + calculation.InputParameters.WaterKinematicViscosity = validPipingInput.WaterKinematicViscosity; + calculation.InputParameters.WhitesDragCoefficient = validPipingInput.WhitesDragCoefficient; + calculation.InputParameters.SurfaceLine = validPipingInput.SurfaceLine; + calculation.InputParameters.SoilProfile = validPipingInput.SoilProfile; var observer = mockRepository.StrictMock(); observer.Expect(o => o.UpdateObserver()); - pipingData.Attach(observer); + calculation.Attach(observer); mockRepository.ReplayAll(); var activityRunner = new ActivityRunner(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); - var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationInputs { PipingData = pipingData }); + var nodePresenter = new PipingCalculationContextNodePresenter(); + var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationContext { WrappedPipingCalculation = calculation }); nodePresenter.RunActivityAction = activity => activityRunner.Enqueue(activity); // When @@ -676,31 +676,31 @@ Assert.IsTrue(msgs.MoveNext()); StringAssert.StartsWith("Berekening van 'Berekening' beëindigd om: ", msgs.Current); }); - Assert.IsNotNull(pipingData.Output); + Assert.IsNotNull(calculation.Output); mockRepository.VerifyAll(); } [Test] - public void GivenPipingDataWithOutput_WhenClearingOutputFromContextMenu_ThenPipingDataOutputClearedAndNotified() + public void GivenPipingCalculationWithOutput_WhenClearingOutputFromContextMenu_ThenPipingCalculationOutputClearedAndNotified() { // Given int clearOutputItemPosition = 2; - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); var observer = mockRepository.StrictMock(); observer.Expect(o => o.UpdateObserver()); - pipingData.Output = new TestPipingOutput(); - pipingData.Attach(observer); + calculation.Output = new TestPipingOutput(); + calculation.Attach(observer); mockRepository.ReplayAll(); - var nodePresenter = new PipingCalculationInputsNodePresenter(); - var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationInputs { PipingData = pipingData }); + var nodePresenter = new PipingCalculationContextNodePresenter(); + var contextMenuAdapter = nodePresenter.GetContextMenu(null, new PipingCalculationContext { WrappedPipingCalculation = calculation }); // When contextMenuAdapter.Items[clearOutputItemPosition].PerformClick(); // Then - Assert.IsFalse(pipingData.HasOutput); + Assert.IsFalse(calculation.HasOutput); mockRepository.VerifyAll(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs =================================================================== diff -u -r28c1d2fcb335ee5ce4838986fbf669d34eca99cb -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs (.../PipingFailureMechanismNodePresenterTest.cs) (revision 28c1d2fcb335ee5ce4838986fbf669d34eca99cb) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs (.../PipingFailureMechanismNodePresenterTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -47,10 +47,10 @@ var nodePresenter = new PipingFailureMechanismNodePresenter(); - var pipingData = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); // Call - nodePresenter.UpdateNode(null, pipingNode, pipingData); + nodePresenter.UpdateNode(null, pipingNode, failureMechanism); // Assert Assert.AreEqual("Dijken - Piping", pipingNode.Text); @@ -69,8 +69,8 @@ var nodePresenter = new PipingFailureMechanismNodePresenter(); var pipingFailureMechanism = new PipingFailureMechanism(); - pipingFailureMechanism.Calculations.Add(new PipingCalculationData()); - pipingFailureMechanism.Calculations.Add(new PipingCalculationData()); + pipingFailureMechanism.Calculations.Add(new PipingCalculation()); + pipingFailureMechanism.Calculations.Add(new PipingCalculation()); // Call var children = nodePresenter.GetChildNodeObjects(pipingFailureMechanism, nodeMock).OfType().ToArray(); @@ -91,14 +91,14 @@ var calculationsFolder = (CategoryTreeFolder)children[1]; Assert.AreEqual("Berekeningen", calculationsFolder.Name); Assert.AreEqual(TreeFolderCategory.General, calculationsFolder.Category); - var pipingCalculationChildObjects = calculationsFolder.Contents.Cast() + var pipingCalculationChildObjects = calculationsFolder.Contents.Cast() .Take(pipingFailureMechanism.Calculations.Count) .ToArray(); - CollectionAssert.AreEqual(pipingFailureMechanism.Calculations, pipingCalculationChildObjects.Select(pci => pci.PipingData).ToArray()); - foreach (var pipingData in pipingCalculationChildObjects) + CollectionAssert.AreEqual(pipingFailureMechanism.Calculations, pipingCalculationChildObjects.Select(pci => pci.WrappedPipingCalculation).ToArray()); + foreach (var pipingCalculationContext in pipingCalculationChildObjects) { - Assert.AreSame(pipingFailureMechanism.SurfaceLines, pipingData.AvailablePipingSurfaceLines); - Assert.AreSame(pipingFailureMechanism.SoilProfiles, pipingData.AvailablePipingSoilProfiles); + Assert.AreSame(pipingFailureMechanism.SurfaceLines, pipingCalculationContext.AvailablePipingSurfaceLines); + Assert.AreSame(pipingFailureMechanism.SoilProfiles, pipingCalculationContext.AvailablePipingSoilProfiles); } var outputsFolder = (CategoryTreeFolder)children[2]; @@ -347,7 +347,7 @@ var mocks = new MockRepository(); var nodeMock = mocks.StrictMock(); var dataMock = mocks.StrictMock(); - dataMock.Calculations.Add(new PipingCalculationData + dataMock.Calculations.Add(new PipingCalculation { Output = new TestPipingOutput() }); @@ -370,7 +370,7 @@ } [Test] - public void GetContextMenu_ClickOnAddCalculationItem_NewPipingDataInstanceAddedToCalculationAndNotifyObservers() + public void GetContextMenu_ClickOnAddCalculationItem_NewPipingCalculationInstanceAddedToFailureMechanismAndNotifyObservers() { // Setup var mocks = new MockRepository(); @@ -467,19 +467,19 @@ } [Test] - public void GivenMultiplePipingDataWithOutput_WhenClearingOutputFromContextMenu_ThenPipingDataOutputCleared() + public void GivenMultiplePipingCalculationsWithOutput_WhenClearingOutputFromContextMenu_ThenPipingOutputCleared() { // Given var mocks = new MockRepository(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()).Repeat.Twice(); var dataMock = mocks.StrictMock(); - dataMock.Calculations.Add(new PipingCalculationData + dataMock.Calculations.Add(new PipingCalculation { Output = new TestPipingOutput() }); - dataMock.Calculations.Add(new PipingCalculationData + dataMock.Calculations.Add(new PipingCalculation { Output = new TestPipingOutput() }); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs =================================================================== diff -u -re84d6f09851705c41a9ff8f26124c039a36adecf -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs (.../PipingOutputNodePresenterTest.cs) (revision e84d6f09851705c41a9ff8f26124c039a36adecf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs (.../PipingOutputNodePresenterTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -143,13 +143,13 @@ } [Test] - public void RemoveNodeData_WithParentNotContainingPipingData_ThrowsNullReferenceException() + public void RemoveNodeData_WithParentNotContainingPipingCalculation_ThrowsNullReferenceException() { // Setup var nodePresenter = new PipingOutputNodePresenter(); // Call - TestDelegate removeAction = () => nodePresenter.RemoveNodeData(new PipingCalculationInputs(), new TestPipingOutput()); + TestDelegate removeAction = () => nodePresenter.RemoveNodeData(new PipingCalculationContext(), new TestPipingOutput()); // Assert Assert.Throws(removeAction); @@ -161,19 +161,19 @@ // Setup var nodePresenter = new PipingOutputNodePresenter(); - var pipingCalculationInputs = new PipingCalculationInputs + var pipingCalculationContext = new PipingCalculationContext { - PipingData = new PipingCalculationData + WrappedPipingCalculation = new PipingCalculation { Output = new TestPipingOutput() } }; // Call - nodePresenter.RemoveNodeData(pipingCalculationInputs, new TestPipingOutput()); + nodePresenter.RemoveNodeData(pipingCalculationContext, new TestPipingOutput()); // Assert - Assert.IsNull(pipingCalculationInputs.PipingData.Output); + Assert.IsNull(pipingCalculationContext.WrappedPipingCalculation.Output); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,114 @@ +using Core.Common.Base; +using NUnit.Framework; + +using Rhino.Mocks; +using Ringtoets.Piping.Calculation.TestUtil; +using Ringtoets.Piping.Data; + +using Ringtoets.Piping.Forms.PresentationObjects; + +namespace Ringtoets.Piping.Forms.Test.PresentationObjects +{ + [TestFixture] + public class PipingCalculationContextTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call + var presentationObject = new PipingCalculationContext(); + + // Assert + Assert.IsInstanceOf(presentationObject); + Assert.IsNull(presentationObject.WrappedPipingCalculation); + CollectionAssert.IsEmpty(presentationObject.AvailablePipingSurfaceLines); + CollectionAssert.IsEmpty(presentationObject.AvailablePipingSoilProfiles); + } + + [Test] + public void NotifyObservers_HasPipingCalculationAndObserverAttached_NotifyObserver() + { + // Setup + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + observer.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + + var presentationObject = new PipingCalculationContext + { + WrappedPipingCalculation = new PipingCalculation() + }; + presentationObject.Attach(observer); + + // Call + presentationObject.NotifyObservers(); + + // Assert + mocks.VerifyAll(); + } + + [Test] + public void NotifyObservers_HasPipingCalculationAndObserverDetached_NoCallsOnObserver() + { + // Setup + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + mocks.ReplayAll(); + + var presentationObject = new PipingCalculationContext + { + WrappedPipingCalculation = new PipingCalculation() + }; + presentationObject.Attach(observer); + presentationObject.Detach(observer); + + // Call + presentationObject.NotifyObservers(); + + // Assert + mocks.VerifyAll(); // Expect not calls on 'observer' + } + + [Test] + public void PipingCalculationNotifyObservers_AttachedOnPipingCalculationContext_ObserverNotified() + { + // Setup + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + observer.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + + var calculation = new PipingCalculation(); + var presentationObject = new PipingCalculationContext + { + WrappedPipingCalculation = calculation + }; + presentationObject.Attach(observer); + + // Call + calculation.NotifyObservers(); + + // Assert + mocks.VerifyAll(); + } + + [Test] + public void ClearOutput_Always_SetsOutputToNull() + { + // Setup + var inputs = new PipingCalculationContext + { + WrappedPipingCalculation = new PipingCalculation + { + Output = new TestPipingOutput() + } + }; + + // Call + inputs.ClearOutput(); + + // Assert + Assert.IsNull(inputs.WrappedPipingCalculation.Output); + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationInputsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationsTreeFolderTest.cs =================================================================== diff -u -rca5e60f150095bbe4b6919062dc98a5d2b71c77e -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationsTreeFolderTest.cs (.../PipingCalculationsTreeFolderTest.cs) (revision ca5e60f150095bbe4b6919062dc98a5d2b71c77e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationsTreeFolderTest.cs (.../PipingCalculationsTreeFolderTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -29,16 +29,16 @@ Assert.IsInstanceOf(calculationsFolder); Assert.AreEqual(folderName, calculationsFolder.Name); Assert.AreSame(failureMechanism, calculationsFolder.ParentFailureMechanism); - var calculationInputPresentationObjects = calculationsFolder.Contents - .OfType() - .ToArray(); - foreach (var pipingCalculationInputs in calculationInputPresentationObjects) + var calculationPresentationObjects = calculationsFolder.Contents + .OfType() + .ToArray(); + foreach (var pipingCalculationContext in calculationPresentationObjects) { - CollectionAssert.AreEqual(failureMechanism.SurfaceLines, pipingCalculationInputs.AvailablePipingSurfaceLines); - CollectionAssert.AreEqual(failureMechanism.SoilProfiles, pipingCalculationInputs.AvailablePipingSoilProfiles); + CollectionAssert.AreEqual(failureMechanism.SurfaceLines, pipingCalculationContext.AvailablePipingSurfaceLines); + CollectionAssert.AreEqual(failureMechanism.SoilProfiles, pipingCalculationContext.AvailablePipingSoilProfiles); } - CollectionAssert.AreEqual(failureMechanism.Calculations, calculationInputPresentationObjects - .Select(pci => pci.PipingData) + CollectionAssert.AreEqual(failureMechanism.Calculations, calculationPresentationObjects + .Select(pci => pci.WrappedPipingCalculation) .ToArray()); Assert.AreEqual(TreeFolderCategory.General, calculationsFolder.Category); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -26,7 +26,7 @@ } [Test] - public void NotifyObservers_HasPipingDataAndObserverAttached_NotifyObserver() + public void NotifyObservers_HasPipingInputAndObserverAttached_NotifyObserver() { // Setup var mocks = new MockRepository(); @@ -48,7 +48,7 @@ } [Test] - public void NotifyObservers_HasPipingDataAndObserverDetached_NoCallsOnObserver() + public void NotifyObservers_HasPipingInputAndObserverDetached_NoCallsOnObserver() { // Setup var mocks = new MockRepository(); @@ -70,23 +70,23 @@ } [Test] - public void PipingDataNotifyObservers_AttachedOnPipingCalculationInputs_ObserverNotified() + public void PipingInputNotifyObservers_AttachedOnPipingCalculationContext_ObserverNotified() { // Setup var mocks = new MockRepository(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var pipingData = new PipingInput(); + var pipingInput = new PipingInput(); var presentationObject = new PipingInputContext { - WrappedPipingInput = pipingData + WrappedPipingInput = pipingInput }; presentationObject.Attach(observer); // Call - pipingData.NotifyObservers(); + pipingInput.NotifyObservers(); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,104 @@ +using Core.Common.Base; +using Core.Common.Gui; +using NUnit.Framework; +using Rhino.Mocks; + +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Forms.PresentationObjects; +using Ringtoets.Piping.Forms.PropertyClasses; + +namespace Ringtoets.Piping.Forms.Test.PropertyClasses +{ + [TestFixture] + public class PipingCalculationContextPropertiesTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call + var properties = new PipingCalculationContextProperties(); + + // Assert + Assert.IsInstanceOf>(properties); + Assert.IsNull(properties.Data); + } + + [Test] + public void GetProperties_WithData_ReturnExpectedValues() + { + // Setup + const string name = ""; + var calculation = new PipingCalculation + { + Name = name + }; + + var properties = new PipingCalculationContextProperties + { + Data = new PipingCalculationContext + { + WrappedPipingCalculation = calculation + } + }; + + // Call & Assert + Assert.AreEqual(name, properties.Name); + } + + [Test] + public void SetProperties_WithData_UpdateDataAndNotifyObservers() + { + // Setup + var mocks = new MockRepository(); + var projectObserver = mocks.StrictMock(); + projectObserver.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + + var calculation = new PipingCalculation(); + calculation.Attach(projectObserver); + + var properties = new PipingCalculationContextProperties + { + Data = new PipingCalculationContext + { + WrappedPipingCalculation = calculation + } + }; + + // Call & Assert + const string newName = "haha"; + properties.Name = newName; + Assert.AreEqual(newName, calculation.Name); + mocks.VerifyAll(); + } + + [Test] + public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers() + { + // Setup + var mocks = new MockRepository(); + var projectObserver = mocks.StrictMock(); + int numberProperties = 1; + projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + mocks.ReplayAll(); + + var calculation = new PipingCalculation(); + calculation.Attach(projectObserver); + + // Call + new PipingCalculationContextProperties + { + Data = new PipingCalculationContext + { + WrappedPipingCalculation = calculation + }, + Name = string.Empty + }; + + // Assert + Assert.AreEqual(string.Empty, calculation.Name); + + mocks.VerifyAll(); + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationInputsPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -70,10 +70,10 @@ - + - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs (.../PipingInputContextSoilProfileSelectionEditorTest.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs (.../PipingInputContextSoilProfileSelectionEditorTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -19,7 +19,7 @@ public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue() { // Setup - var pipingCalculationInputs = new PipingInputContext + var pipingInputContext = new PipingInputContext { AvailablePipingSoilProfiles = new[] { new TestPipingSoilProfile() }, WrappedPipingInput = new PipingInput @@ -30,7 +30,7 @@ var properties = new PipingInputContextProperties { - Data = pipingCalculationInputs + Data = pipingInputContext }; var editor = new PipingInputContextSoilProfileSelectionEditor(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs =================================================================== diff -u -r48fe36c87dd40ff715adf4c0cf393f7390e6c993 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs (.../PipingGuiPluginTest.cs) (revision 48fe36c87dd40ff715adf4c0cf393f7390e6c993) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs (.../PipingGuiPluginTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -42,11 +42,11 @@ // assert Assert.AreEqual(5, propertyInfos.Length); - var pipingDataProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(PipingCalculationInputs)); - Assert.AreEqual(typeof(PipingCalculationInputsProperties), pipingDataProperties.PropertyType); - Assert.IsNull(pipingDataProperties.AdditionalDataCheck); - Assert.IsNull(pipingDataProperties.GetObjectPropertiesData); - Assert.IsNull(pipingDataProperties.AfterCreate); + var pipingCalculationContextProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(PipingCalculationContext)); + Assert.AreEqual(typeof(PipingCalculationContextProperties), pipingCalculationContextProperties.PropertyType); + Assert.IsNull(pipingCalculationContextProperties.AdditionalDataCheck); + Assert.IsNull(pipingCalculationContextProperties.GetObjectPropertiesData); + Assert.IsNull(pipingCalculationContextProperties.AfterCreate); var pipingInputContextProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(PipingInputContext)); Assert.AreEqual(typeof(PipingInputContextProperties), pipingInputContextProperties.PropertyType); @@ -107,7 +107,7 @@ Assert.IsTrue(nodePresenters.Any(np => np is PipingSurfaceLineNodePresenter)); Assert.IsTrue(nodePresenters.Any(np => np is PipingSoilProfileCollectionNodePresenter)); Assert.IsTrue(nodePresenters.Any(np => np is PipingSoilProfileNodePresenter)); - Assert.IsTrue(nodePresenters.Any(np => np is PipingCalculationInputsNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingCalculationContextNodePresenter)); Assert.IsTrue(nodePresenters.Any(np => np is PipingInputContextNodePresenter)); Assert.IsTrue(nodePresenters.Any(np => np is PipingFailureMechanismNodePresenter)); Assert.IsTrue(nodePresenters.Any(np => np is PipingOutputNodePresenter)); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -re84d6f09851705c41a9ff8f26124c039a36adecf -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision e84d6f09851705c41a9ff8f26124c039a36adecf) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -20,27 +20,27 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var pipingData = new PipingCalculationData(); + var calculation = new PipingCalculation(); // Call - var activity = new PipingCalculationActivity(pipingData); + var activity = new PipingCalculationActivity(calculation); // Assert Assert.IsInstanceOf(activity); - Assert.AreEqual(pipingData.Name, activity.Name); + Assert.AreEqual(calculation.Name, activity.Name); CollectionAssert.IsEmpty(activity.DependsOn); Assert.IsNull(activity.ProgressText); Assert.AreEqual(ActivityStatus.None, activity.Status); } [Test] - public void Initialize_ValidPipingDataWithOutput_LogValidationStartAndEndedAndClearOutput() + public void Initialize_ValidPipingCalculationWithOutput_LogValidationStartAndEndedAndClearOutput() { // Setup - var validPipingData = PipingDataFactory.CreateCalculationWithValidInput(); - validPipingData.Output = new TestPipingOutput(); + var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + validPipingCalculation.Output = new TestPipingOutput(); - var activity = new PipingCalculationActivity(validPipingData); + var activity = new PipingCalculationActivity(validPipingCalculation); // Call Action call = () => activity.Initialize(); @@ -50,23 +50,23 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validPipingData.Name), msgs.First()); - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validPipingData.Name), msgs.Last()); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", validPipingCalculation.Name), msgs.First()); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs.Last()); }); Assert.AreEqual(ActivityStatus.Initialized, activity.Status); - Assert.IsNull(validPipingData.Output); + Assert.IsNull(validPipingCalculation.Output); } [Test] - public void Initialize_InvalidPipingDataWithOutput_LogValidationStartAndEndWithErrors() + public void Initialize_InvalidPipingCalculationWithOutput_LogValidationStartAndEndWithErrors() { // Setup var originalOutput = new TestPipingOutput(); - var invalidPipingData = PipingDataFactory.CreateCalculationWithInvalidData(); - invalidPipingData.Output = originalOutput; + var invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData(); + invalidPipingCalculation.Output = originalOutput; - var activity = new PipingCalculationActivity(invalidPipingData); + var activity = new PipingCalculationActivity(invalidPipingCalculation); // Call Action call = () => activity.Initialize(); @@ -77,25 +77,25 @@ var msgs = messages.ToArray(); Assert.Greater(msgs.Length, 2, "Expecting more than 2 messages"); - StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidPipingData.Name), msgs.First()); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidPipingCalculation.Name), msgs.First()); foreach (var expectedValidationErrorMessage in msgs.Skip(1).Take(msgs.Length-2)) { StringAssert.StartsWith("Validatie mislukt: ", expectedValidationErrorMessage); } - StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidPipingData.Name), msgs.Last()); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs.Last()); }); Assert.AreEqual(ActivityStatus.Failed, activity.Status); - Assert.AreEqual(originalOutput, invalidPipingData.Output); + Assert.AreEqual(originalOutput, invalidPipingCalculation.Output); } [Test] - public void Execute_ValidPipingDataAndInitialized_PerformPipingCalculationAndLogStartAndEnd() + public void Execute_ValidPipingCalculationAndInitialized_PerformPipingCalculationAndLogStartAndEnd() { // Setup - var validPipingData = PipingDataFactory.CreateCalculationWithValidInput(); - validPipingData.Output = null; + var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + validPipingCalculation.Output = null; - var activity = new PipingCalculationActivity(validPipingData); + var activity = new PipingCalculationActivity(validPipingCalculation); activity.Initialize(); // Call @@ -106,27 +106,27 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingData.Name), msgs.First()); - StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingData.Name), msgs.Last()); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs.First()); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs.Last()); }); Assert.AreEqual(ActivityStatus.Done, activity.Status); - Assert.IsNotNull(validPipingData.Output); + Assert.IsNotNull(validPipingCalculation.Output); } [Test] - public void OnFinish_ValidPipingDataAndExecuted_NotifyObserversOfPipingData() + public void OnFinish_ValidPipingCalculationAndExecuted_NotifyObserversOfPipingCalculation() { // Setup var mocks = new MockRepository(); var observerMock = mocks.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var validPipingData = PipingDataFactory.CreateCalculationWithValidInput(); - validPipingData.Output = null; - validPipingData.Attach(observerMock); + var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + validPipingCalculation.Output = null; + validPipingCalculation.Attach(observerMock); - var activity = new PipingCalculationActivity(validPipingData); + var activity = new PipingCalculationActivity(validPipingCalculation); activity.Initialize(); activity.Execute(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r4f48ea35b4937263954973396e267934ca7bdb55 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 4f48ea35b4937263954973396e267934ca7bdb55) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -19,11 +19,11 @@ // Setup const string name = ""; - var pipingData = PipingDataFactory.CreateCalculationWithValidInput(); - pipingData.Name = name; + PipingCalculation pipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + pipingCalculation.Name = name; // Call - Action call = () => PipingCalculationService.Validate(pipingData); + Action call = () => PipingCalculationService.Validate(pipingCalculation); // Assert TestHelper.AssertLogMessages(call, messages => @@ -35,56 +35,56 @@ } [Test] - public void Validate_InValidPipingDataWithOutput_ReturnsFalseNoOutputChange() + public void Validate_InValidPipingCalculationWithOutput_ReturnsFalseNoOutputChange() { // Setup var output = new TestPipingOutput(); - var invalidPipingData = PipingDataFactory.CreateCalculationWithInvalidData(); - invalidPipingData.Output = output; + PipingCalculation invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithInvalidData(); + invalidPipingCalculation.Output = output; // Call - var isValid = PipingCalculationService.Validate(invalidPipingData); + var isValid = PipingCalculationService.Validate(invalidPipingCalculation); // Assert Assert.IsFalse(isValid); - Assert.AreSame(output, invalidPipingData.Output); + Assert.AreSame(output, invalidPipingCalculation.Output); } [Test] - public void Calculate_InValidPipingDataWithOutput_LogsError() + public void Calculate_InValidPipingCalculationWithOutput_LogsError() { // Setup - var invalidPipingData = PipingDataFactory.CreateCalculationWithValidInput(); - invalidPipingData.InputParameters.BeddingAngle = -1; + PipingCalculation invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + invalidPipingCalculation.InputParameters.BeddingAngle = -1; // Call - Action call = () => PipingCalculationService.Calculate(invalidPipingData); + Action call = () => PipingCalculationService.Calculate(invalidPipingCalculation); // Assert TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", invalidPipingData.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", invalidPipingCalculation.Name), msgs[0]); StringAssert.StartsWith("Piping berekening niet gelukt: ", msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", invalidPipingData.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs[2]); }); } [Test] - public void PerformValidatedCalculation_ValidPipingData_LogStartAndEndOfValidatingInputsAndCalculation() + public void PerformValidatedCalculation_ValidPipingCalculation_LogStartAndEndOfValidatingInputsAndCalculation() { // Setup const string name = ""; - var pipingData = PipingDataFactory.CreateCalculationWithValidInput(); - pipingData.Name = name; + PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + validPipingCalculation.Name = name; // Call Action call = () => { - Assert.IsTrue(PipingCalculationService.Validate(pipingData)); - PipingCalculationService.Calculate(pipingData); + Assert.IsTrue(PipingCalculationService.Validate(validPipingCalculation)); + PipingCalculationService.Calculate(validPipingCalculation); }; // Assert @@ -100,37 +100,37 @@ } [Test] - public void PerformValidatedCalculation_ValidPipingDataNoOutput_ShouldSetOutput() + public void PerformValidatedCalculation_ValidPipingCalculationNoOutput_ShouldSetOutput() { // Setup - PipingCalculationData validPipingData = PipingDataFactory.CreateCalculationWithValidInput(); + PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); // Precondition - Assert.IsNull(validPipingData.Output); + Assert.IsNull(validPipingCalculation.Output); // Call - Assert.IsTrue(PipingCalculationService.Validate(validPipingData)); - PipingCalculationService.Calculate(validPipingData); + Assert.IsTrue(PipingCalculationService.Validate(validPipingCalculation)); + PipingCalculationService.Calculate(validPipingCalculation); // Assert - Assert.IsNotNull(validPipingData.Output); + Assert.IsNotNull(validPipingCalculation.Output); } [Test] - public void PerformValidatedCalculation_ValidPipingDataWithOutput_ShouldChangeOutput() + public void PerformValidatedCalculation_ValidPipingCalculationWithOutput_ShouldChangeOutput() { // Setup var output = new TestPipingOutput(); - PipingCalculationData validPipingData = PipingDataFactory.CreateCalculationWithValidInput(); - validPipingData.Output = output; + PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); + validPipingCalculation.Output = output; // Call - Assert.IsTrue(PipingCalculationService.Validate(validPipingData)); - PipingCalculationService.Calculate(validPipingData); + Assert.IsTrue(PipingCalculationService.Validate(validPipingCalculation)); + PipingCalculationService.Calculate(validPipingCalculation); // Assert - Assert.AreNotSame(output, validPipingData.Output); + Assert.AreNotSame(output, validPipingCalculation.Output); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj =================================================================== diff -u -r3aa69a0ff858d591479a1b33ef1ad36ae76a5052 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision 3aa69a0ff858d591479a1b33ef1ad36ae76a5052) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -57,7 +57,7 @@ - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/TestHelpers/PipingCalculationFactory.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/TestHelpers/PipingCalculationFactory.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/TestHelpers/PipingCalculationFactory.cs (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -0,0 +1,75 @@ +using System; +using Ringtoets.Piping.Data; + +namespace Ringtoets.Piping.Service.Test.TestHelpers +{ + public static class PipingCalculationFactory + { + public static PipingCalculation CreateCalculationWithInvalidData() + { + return new PipingCalculation(); + } + + public static PipingCalculation CreateCalculationWithValidInput() + { + var random = new Random(22); + var soilProfile = new PipingSoilProfile(String.Empty, random.NextDouble(), new[] + { + new PipingSoilLayer(random.NextDouble()) + { + IsAquifer = true + } + }); + return new PipingCalculation + { + InputParameters = + { + AssessmentLevel = 1.0, + BeddingAngle = 1.0, + DampingFactorExit = + { + Mean = 1.0 + }, + DarcyPermeability = + { + Mean = 1.0 + }, + Diameter70 = + { + Mean = 1.0 + }, + ExitPointXCoordinate = 1.0, + Gravity = 1.0, + MeanDiameter70 = 1.0, + PiezometricHeadExit = 1.0, + PiezometricHeadPolder = 1.0, + PhreaticLevelExit = + { + Mean = 2.0 + }, + SandParticlesVolumicWeight = 1.0, + SeepageLength = + { + Mean = 1.0 + }, + SellmeijerModelFactor = 1.0, + SellmeijerReductionFactor = 1.0, + ThicknessAquiferLayer = + { + Mean = 1.0 + }, + ThicknessCoverageLayer = + { + Mean = 1.0 + }, + UpliftModelFactor = 1.0, + WaterKinematicViscosity = 1.0, + WaterVolumetricWeight = 1.0, + WhitesDragCoefficient = 1.0, + SurfaceLine = new RingtoetsPipingSurfaceLine(), + SoilProfile = soilProfile + } + }; + } + } +} \ No newline at end of file Fisheye: Tag fb32e3411873a7b4c567792b9f335eba462e2702 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/TestHelpers/PipingDataFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/uml/Ringtoets.Piping.Data.UML/PipingDataModel.cd =================================================================== diff -u -r79a816a478616907118e0d953a3bdd26a9c99af8 -rfb32e3411873a7b4c567792b9f335eba462e2702 --- Ringtoets/Piping/uml/Ringtoets.Piping.Data.UML/PipingDataModel.cd (.../PipingDataModel.cd) (revision 79a816a478616907118e0d953a3bdd26a9c99af8) +++ Ringtoets/Piping/uml/Ringtoets.Piping.Data.UML/PipingDataModel.cd (.../PipingDataModel.cd) (revision fb32e3411873a7b4c567792b9f335eba462e2702) @@ -1,13 +1,5 @@  - - - - - - - -