Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -331,7 +331,7 @@ { // Given AssessmentSection assessmentSection = CreateAssessmentSection(); - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); assessmentSection.MacroStabilityInwards.CalculationsGroup.Children.Add(calculation); using (var resultObserver = new AssessmentSectionResultObserver(assessmentSection)) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -694,7 +694,7 @@ private static void AddPipingCalculationScenario(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true; pipingCalculationScenario.InputParameters.AssessmentLevel = new Random(39).NextRoundedDouble(); assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -314,7 +314,7 @@ private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true; pipingCalculationScenario.InputParameters.AssessmentLevel = new Random(39).NextRoundedDouble(); assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario); Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -287,7 +287,7 @@ sectionResult, new[] { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) + SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) }, failureMechanism, assessmentSection); @@ -324,7 +324,7 @@ sectionResult, new[] { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) + SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) }, failureMechanism, assessmentSection); Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -127,9 +127,9 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section); pipingCalculationScenario1.IsRelevant = true; pipingCalculationScenario1.Contribution = (RoundedDouble) 0.2111; @@ -194,7 +194,7 @@ SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreateIrrelevantPipingCalculationScenario(section) }; // Call @@ -220,7 +220,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); // Call double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(new[] @@ -249,8 +249,8 @@ const double contribution1 = 0.2; const double contribution2 = 0.8; - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario1.IsRelevant = true; pipingCalculationScenario1.Contribution = (RoundedDouble) contribution1; @@ -288,8 +288,8 @@ var failureMechanism = new PipingFailureMechanism(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - SemiProbabilisticPipingCalculationScenario scenarioA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); - SemiProbabilisticPipingCalculationScenario scenarioB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario scenarioA = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario scenarioB = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); scenarioA.Contribution = (RoundedDouble) contributionA; scenarioB.Contribution = (RoundedDouble) contributionB; @@ -340,13 +340,13 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario.Contribution = (RoundedDouble) 0.3211; - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5435; - SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationTestFactory.CreateIrrelevantPipingCalculationScenario(section); SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { @@ -394,8 +394,8 @@ // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); - SemiProbabilisticPipingCalculationScenario calculationScenario2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario calculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateIrrelevantPipingCalculationScenario(section); // Call IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(new[] @@ -418,7 +418,7 @@ new Point2D(998, 998) }); var sectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario( + SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario( FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); // Call Fisheye: Tag e656935809d20d908a461b270fd2dcdf641416c5 refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioTestFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationTestFactory.cs =================================================================== diff -u --- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationTestFactory.cs (revision 0) +++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationTestFactory.cs (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -0,0 +1,143 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Linq; +using Core.Common.Base.Data; +using Core.Common.Base.Geometry; +using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.Hydraulics; +using Riskeer.Piping.Data.SemiProbabilistic; +using Riskeer.Piping.Primitives; + +namespace Riskeer.Piping.Data.TestUtil.SemiProbabilistic +{ + /// + /// Helper class for creating instances of . + /// + public static class SemiProbabilisticPipingCalculationTestFactory + { + /// + /// Creates a calculated scenario for which the surface line on the input intersects with . + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenario(FailureMechanismSection section) + { + SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section); + scenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(); + + return scenario; + } + + /// + /// Creates a scenario for which the surface line on the input intersects with and + /// is marked as not relevant for the assessment. + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static SemiProbabilisticPipingCalculationScenario CreateIrrelevantPipingCalculationScenario(FailureMechanismSection section) + { + SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section); + scenario.IsRelevant = false; + return scenario; + } + + /// + /// Creates a scenario for which the surface line on the input intersects with and + /// the calculation has not been performed. + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static SemiProbabilisticPipingCalculationScenario CreateNotCalculatedPipingCalculationScenario(FailureMechanismSection section) + { + if (section == null) + { + throw new ArgumentNullException(nameof(section)); + } + + var pipingSurfaceLine = new PipingSurfaceLine(string.Empty); + Point2D p = section.Points.First(); + pipingSurfaceLine.SetGeometry(new[] + { + new Point3D(p.X, p.Y, 0), + new Point3D(p.X + 2, p.Y + 2, 0) + }); + pipingSurfaceLine.ReferenceLineIntersectionWorldPoint = section.Points.First(); + + var scenario = new SemiProbabilisticPipingCalculationScenario + { + IsRelevant = true, + InputParameters = + { + SurfaceLine = pipingSurfaceLine + } + }; + return scenario; + } + + /// + /// Creates a scenario with invalid input. + /// + /// A new . + public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenarioWithInvalidInput() + { + return new SemiProbabilisticPipingCalculationScenario(); + } + + /// + /// Creates a scenario with valid input. + /// + /// The hydraulic boundary location to set to the input. + /// A new . + /// The caller is responsible for actually providing a valid hydraulic boundary location + /// (for instance when it comes to the presence of a normative assessment level). + /// Throw when is null. + public static SemiProbabilisticPipingCalculationScenario CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation) + { + if (hydraulicBoundaryLocation == null) + { + throw new ArgumentNullException(nameof(hydraulicBoundaryLocation)); + } + + return new SemiProbabilisticPipingCalculationScenario + { + InputParameters = + { + DampingFactorExit = + { + Mean = (RoundedDouble) 1.0 + }, + PhreaticLevelExit = + { + Mean = (RoundedDouble) 2.0 + }, + SurfaceLine = PipingCalculationScenarioTestFactory.GetSurfaceLine(), + StochasticSoilProfile = PipingCalculationScenarioTestFactory.GetStochasticSoilProfile(), + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + } + } +} \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -174,8 +174,8 @@ public void CreateCalculationFeatures_GivenCalculations_ReturnsCalculationFeaturesCollection() { // Setup - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0)); - SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8)); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0)); + SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8)); calculationA.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 3.0); calculationB.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 4.0); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -292,7 +292,7 @@ public void EntryPointL_EntryPointNotBeforeExitPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue) { // Setup - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var entryPointL = (RoundedDouble) newValue; // Call & Assert @@ -306,7 +306,7 @@ public void EntryPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers() { // Setup - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var entryPointL = (RoundedDouble) (-3.0); // Call & Assert @@ -319,7 +319,7 @@ public void ExitPointL_OnValidChange_NotifyObserverAndCalculationPropertyChanged() { // Setup - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var exitPointL = (RoundedDouble) 0.3; // Call & Assert @@ -353,7 +353,7 @@ public void ExitPointL_ExitPointNotBeyondEntryPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue) { // Setup - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var exitPointL = (RoundedDouble) newValue; // Call & Assert @@ -367,7 +367,7 @@ public void ExitPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers() { // Setup - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var exitPointL = (RoundedDouble) 3.0; // Call & Assert @@ -418,7 +418,7 @@ SemiProbabilisticPipingOutput assignedOutput = null; - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); if (hasOutput) { assignedOutput = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -289,7 +289,7 @@ protected override SemiProbabilisticPipingCalculationScenario CreateCalculation() { - return SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + return SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); } } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -161,7 +161,7 @@ var result = new PipingFailureMechanismSectionResult(section); SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section) }; // Call @@ -501,7 +501,7 @@ }; SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section) }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -548,7 +548,7 @@ }; SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section) }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -622,7 +622,7 @@ }; SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section) }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -736,7 +736,7 @@ SimpleAssessmentResult = simpleAssessmentResult }; - SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section); calculationScenario.Contribution = (RoundedDouble) 0.3; using (new AssemblyToolCalculatorFactoryConfig()) @@ -786,7 +786,7 @@ sectionResult, new[] { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section) }, failureMechanism, assessmentSection, @@ -819,7 +819,7 @@ SimpleAssessmentResult = simpleAssessmentResult }; - SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario( + SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario( section); calculationScenario.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(double.NaN, double.NaN, double.NaN); @@ -907,7 +907,7 @@ sectionResult, new[] { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreateIrrelevantPipingCalculationScenario(section) }, failureMechanism, assessmentSection, @@ -1033,7 +1033,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); using (new AssemblyToolCalculatorFactoryConfig()) { @@ -1069,7 +1069,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var sectionResult = new PipingFailureMechanismSectionResult(section); - SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section); scenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(); scenario.Contribution = (RoundedDouble) 0.3; @@ -1108,7 +1108,7 @@ var sectionResult = new PipingFailureMechanismSectionResult(section); SemiProbabilisticPipingCalculationScenario[] calculationScenarios = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section) + SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section) }; using (new AssemblyToolCalculatorFactoryConfig()) Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -213,9 +213,9 @@ var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0); var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(2, "test", 3.0, 4.0); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation1); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation1); calculationA.InputParameters.SurfaceLine = surfaceLineA; - SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation2); + SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation2); calculationB.InputParameters.SurfaceLine = surfaceLineB; failureMechanism.CalculationsGroup.Children.Add(calculationA); failureMechanism.CalculationsGroup.Children.Add(calculationB); @@ -620,10 +620,10 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); calculationA.InputParameters.SurfaceLine = surfaceLineA; - SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); calculationB.InputParameters.SurfaceLine = surfaceLineB; failureMechanism.CalculationsGroup.Children.Add(calculationA); @@ -669,7 +669,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new PipingFailureMechanism(); @@ -720,7 +720,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new PipingFailureMechanism(); @@ -842,7 +842,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new PipingFailureMechanism(); Index: Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -47,7 +47,7 @@ public static void CalculateEffectiveThicknessCoverageLayer_InvalidPipingCalculationWithOutput_ReturnsNaN() { // Setup - SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); // Make invalid by having surface line partially above soil profile: double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z); @@ -194,7 +194,7 @@ public static void CalculateEffectiveThicknessCoverageLayer_CompleteInput_InputSetOnSubCalculator() { // Setup - SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); PipingInput input = validPipingCalculation.InputParameters; var generalInput = new GeneralPipingInput(); @@ -228,7 +228,7 @@ { // Setup RoundedDouble assessmentLevel = new Random(21).NextRoundedDouble(); - SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); PipingInput input = validPipingCalculation.InputParameters; using (new PipingSubCalculatorFactoryConfig()) Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -612,7 +612,7 @@ { Children = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) + SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) } }; @@ -1129,9 +1129,9 @@ hydraulicBoundaryLocation }, true); - SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); validCalculation.Name = "A"; - SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; var childGroup = new CalculationGroup(); @@ -1202,9 +1202,9 @@ hydraulicBoundaryLocation }, true); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculationA.Name = "A"; - SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculationB.Name = "B"; var childGroup = new CalculationGroup(); @@ -1299,11 +1299,11 @@ hydraulicBoundaryLocation }, true); - SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculation1.Name = "A"; calculation1.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(); calculation1.Attach(calculation1Observer); - SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculation2.Name = "B"; calculation2.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(); calculation2.Attach(calculation2Observer); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -496,7 +496,7 @@ { Children = { - SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) + SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation) } } }; @@ -625,9 +625,9 @@ hydraulicBoundaryLocation }, true); - SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); validCalculation.Name = "A"; - SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; failureMechanism.CalculationsGroup.Children.Add(validCalculation); @@ -677,9 +677,9 @@ hydraulicBoundaryLocation }, true); - SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculationA.Name = "A"; - SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculationB.Name = "B"; failureMechanism.CalculationsGroup.Children.Add(calculationA); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -939,7 +939,7 @@ hydraulicBoundaryLocation }, true); - SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); var pipingCalculationScenarioContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation, new CalculationGroup(), Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -68,7 +68,7 @@ public void CreateSemiProbabilisticPipingCalculationActivity_GeneralPipingInputNull_ThrowsArgumentNullException() { // Setup - SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); @@ -89,7 +89,7 @@ public void CreateSemiProbabilisticPipingCalculationActivity_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); // Call TestDelegate test = () => PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation, @@ -323,7 +323,7 @@ private static SemiProbabilisticPipingCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); + SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation); calculation.InputParameters.ExitPointL = new Random(39).NextRoundedDouble(0.5, 1.0); return calculation; } Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs (.../SemiProbabilisticPipingCalculationActivityTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs (.../SemiProbabilisticPipingCalculationActivityTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -77,7 +77,7 @@ public void Run_InvalidPipingCalculation_LogValidationStartAndEndWithErrors() { // Setup - SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); var activity = new SemiProbabilisticPipingCalculationActivity(invalidPipingCalculation, new GeneralPipingInput(), @@ -109,7 +109,7 @@ public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd() { // Setup - SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); var activity = new SemiProbabilisticPipingCalculationActivity(validPipingCalculation, new GeneralPipingInput(), @@ -142,7 +142,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); validPipingCalculation.Output = null; validPipingCalculation.Attach(observer); Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs =================================================================== diff -u -r96024447a838d0efc914e4fc4db1c245ae13c9c1 -re656935809d20d908a461b270fd2dcdf641416c5 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision 96024447a838d0efc914e4fc4db1c245ae13c9c1) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5) @@ -53,7 +53,7 @@ [SetUp] public void Setup() { - testCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); + testCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation()); testSurfaceLineTopLevel = testCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z); } @@ -105,7 +105,7 @@ { // Setup SemiProbabilisticPipingOutput output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(); - SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidPipingCalculation.Output = output; // Call