Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Observers/AssessmentSectionResultObserverTest.cs (.../AssessmentSectionResultObserverTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -331,7 +331,7 @@
{
// Given
AssessmentSection assessmentSection = CreateAssessmentSection();
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
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 -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -694,7 +694,7 @@
private static void AddPipingCalculationScenario(AssessmentSection assessmentSection,
HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -314,7 +314,7 @@
private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection,
HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -287,7 +287,7 @@
sectionResult,
new[]
{
- SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation)
},
failureMechanism,
assessmentSection);
@@ -324,7 +324,7 @@
sectionResult,
new[]
{
- SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation)
},
failureMechanism,
assessmentSection);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -127,9 +127,9 @@
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section);
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section);
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section);
pipingCalculationScenario1.IsRelevant = true;
pipingCalculationScenario1.Contribution = (RoundedDouble) 0.2111;
@@ -220,7 +220,7 @@
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
// Call
double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(new[]
@@ -249,8 +249,8 @@
const double contribution1 = 0.2;
const double contribution2 = 0.8;
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section);
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario1 = SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
pipingCalculationScenario1.IsRelevant = true;
pipingCalculationScenario1.Contribution = (RoundedDouble) contribution1;
@@ -288,8 +288,8 @@
var failureMechanism = new PipingFailureMechanism();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- SemiProbabilisticPipingCalculationScenario scenarioA = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
- SemiProbabilisticPipingCalculationScenario scenarioB = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario scenarioA = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
+ SemiProbabilisticPipingCalculationScenario scenarioB = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
scenarioA.Contribution = (RoundedDouble) contributionA;
scenarioB.Contribution = (RoundedDouble) contributionB;
@@ -340,10 +340,10 @@
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
pipingCalculationScenario.Contribution = (RoundedDouble) 0.3211;
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5435;
SemiProbabilisticPipingCalculationScenario pipingCalculationScenario3 = SemiProbabilisticPipingCalculationTestFactory.CreateIrrelevantPipingCalculationScenario(section);
@@ -394,7 +394,7 @@
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
SemiProbabilisticPipingCalculationScenario calculationScenario2 = SemiProbabilisticPipingCalculationTestFactory.CreateIrrelevantPipingCalculationScenario(section);
// Call
@@ -418,7 +418,7 @@
new Point2D(998, 998)
});
var sectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(
+ SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(
FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
// Call
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationTestFactory.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationTestFactory.cs (.../SemiProbabilisticPipingCalculationTestFactory.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilistic/SemiProbabilisticPipingCalculationTestFactory.cs (.../SemiProbabilisticPipingCalculationTestFactory.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -41,9 +41,9 @@
/// The section for which an intersection will be created.
/// A new .
/// Thrown when is null.
- public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenario(FailureMechanismSection section)
+ public static SemiProbabilisticPipingCalculationScenario CreateCalculation(FailureMechanismSection section)
{
- SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedCalculation(section);
scenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
return scenario;
@@ -58,7 +58,7 @@
/// Thrown when is null.
public static SemiProbabilisticPipingCalculationScenario CreateIrrelevantPipingCalculationScenario(FailureMechanismSection section)
{
- SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario scenario = CreateNotCalculatedCalculation(section);
scenario.IsRelevant = false;
return scenario;
}
@@ -70,7 +70,7 @@
/// The section for which an intersection will be created.
/// A new .
/// Thrown when is null.
- public static SemiProbabilisticPipingCalculationScenario CreateNotCalculatedPipingCalculationScenario(FailureMechanismSection section)
+ public static SemiProbabilisticPipingCalculationScenario CreateNotCalculatedCalculation(FailureMechanismSection section)
{
if (section == null)
{
@@ -101,7 +101,7 @@
/// Creates a scenario with invalid input.
///
/// A new .
- public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenarioWithInvalidInput()
+ public static SemiProbabilisticPipingCalculationScenario CreateCalculationWithInvalidInput()
{
return new SemiProbabilisticPipingCalculationScenario();
}
@@ -114,7 +114,7 @@
/// 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)
+ public static SemiProbabilisticPipingCalculationScenario CreateCalculationWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
if (hydraulicBoundaryLocation == null)
{
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -174,8 +174,8 @@
public void CreateCalculationFeatures_GivenCalculations_ReturnsCalculationFeaturesCollection()
{
// Setup
- 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));
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0));
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -292,7 +292,7 @@
public void EntryPointL_EntryPointNotBeforeExitPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue)
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
var entryPointL = (RoundedDouble) newValue;
// Call & Assert
@@ -306,7 +306,7 @@
public void EntryPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
var entryPointL = (RoundedDouble) (-3.0);
// Call & Assert
@@ -319,7 +319,7 @@
public void ExitPointL_OnValidChange_NotifyObserverAndCalculationPropertyChanged()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
var exitPointL = (RoundedDouble) 0.3;
// Call & Assert
@@ -353,7 +353,7 @@
public void ExitPointL_ExitPointNotBeyondEntryPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue)
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
var exitPointL = (RoundedDouble) newValue;
// Call & Assert
@@ -367,7 +367,7 @@
public void ExitPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
var exitPointL = (RoundedDouble) 3.0;
// Call & Assert
@@ -418,7 +418,7 @@
SemiProbabilisticPipingOutput assignedOutput = null;
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
if (hasOutput)
{
assignedOutput = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -289,7 +289,7 @@
protected override SemiProbabilisticPipingCalculationScenario CreateCalculation()
{
- return SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ return SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
}
}
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -161,7 +161,7 @@
var result = new PipingFailureMechanismSectionResult(section);
SemiProbabilisticPipingCalculationScenario[] calculationScenarios =
{
- SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section)
};
// Call
@@ -501,7 +501,7 @@
};
SemiProbabilisticPipingCalculationScenario[] calculationScenarios =
{
- SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section)
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -548,7 +548,7 @@
};
SemiProbabilisticPipingCalculationScenario[] calculationScenarios =
{
- SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section)
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -622,7 +622,7 @@
};
SemiProbabilisticPipingCalculationScenario[] calculationScenarios =
{
- SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section)
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -736,7 +736,7 @@
SimpleAssessmentResult = simpleAssessmentResult
};
- SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section);
calculationScenario.Contribution = (RoundedDouble) 0.3;
using (new AssemblyToolCalculatorFactoryConfig())
@@ -786,7 +786,7 @@
sectionResult,
new[]
{
- SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section)
+ SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section)
},
failureMechanism,
assessmentSection,
@@ -819,7 +819,7 @@
SimpleAssessmentResult = simpleAssessmentResult
};
- SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(
+ SemiProbabilisticPipingCalculationScenario calculationScenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(
section);
calculationScenario.Output = PipingTestDataGenerator.GetSemiProbabilisticPipingOutput(double.NaN, double.NaN, double.NaN);
@@ -1033,7 +1033,7 @@
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
using (new AssemblyToolCalculatorFactoryConfig())
{
@@ -1069,7 +1069,7 @@
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new PipingFailureMechanismSectionResult(section);
- SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ SemiProbabilisticPipingCalculationScenario scenario = SemiProbabilisticPipingCalculationTestFactory.CreateNotCalculatedCalculation(section);
scenario.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
scenario.Contribution = (RoundedDouble) 0.3;
@@ -1108,7 +1108,7 @@
var sectionResult = new PipingFailureMechanismSectionResult(section);
SemiProbabilisticPipingCalculationScenario[] calculationScenarios =
{
- SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenario(section)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculation(section)
};
using (new AssemblyToolCalculatorFactoryConfig())
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -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 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation1);
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation1);
calculationA.InputParameters.SurfaceLine = surfaceLineA;
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation2);
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
calculationA.InputParameters.SurfaceLine = surfaceLineA;
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
calculationA.InputParameters.SurfaceLine = surfaceLineA;
var failureMechanism = new PipingFailureMechanism();
Index: Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -47,7 +47,7 @@
public static void CalculateEffectiveThicknessCoverageLayer_InvalidPipingCalculationWithOutput_ReturnsNaN()
{
// Setup
- SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
PipingInput input = validPipingCalculation.InputParameters;
var generalInput = new GeneralPipingInput();
@@ -228,7 +228,7 @@
{
// Setup
RoundedDouble assessmentLevel = new Random(21).NextRoundedDouble();
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
PipingInput input = validPipingCalculation.InputParameters;
using (new PipingSubCalculatorFactoryConfig())
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -612,7 +612,7 @@
{
Children =
{
- SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation)
}
};
@@ -1129,9 +1129,9 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
validCalculation.Name = "A";
- SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
invalidCalculation.Name = "B";
var childGroup = new CalculationGroup();
@@ -1202,9 +1202,9 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
calculationA.Name = "A";
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
calculationB.Name = "B";
var childGroup = new CalculationGroup();
@@ -1299,11 +1299,11 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
calculation1.Name = "A";
calculation1.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
calculation1.Attach(calculation1Observer);
- SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
calculation2.Name = "B";
calculation2.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
calculation2.Attach(calculation2Observer);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -496,7 +496,7 @@
{
Children =
{
- SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation)
}
}
};
@@ -625,9 +625,9 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
validCalculation.Name = "A";
- SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
invalidCalculation.Name = "B";
failureMechanism.CalculationsGroup.Children.Add(validCalculation);
@@ -677,9 +677,9 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
calculationA.Name = "A";
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
calculationB.Name = "B";
failureMechanism.CalculationsGroup.Children.Add(calculationA);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -939,7 +939,7 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(hydraulicBoundaryLocation);
var pipingCalculationScenarioContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation,
new CalculationGroup(),
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -68,7 +68,7 @@
public void CreateSemiProbabilisticPipingCalculationActivity_GeneralPipingInputNull_ThrowsArgumentNullException()
{
// Setup
- SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
var mocks = new MockRepository();
var assessmentSection = mocks.Stub();
@@ -89,7 +89,7 @@
public void CreateSemiProbabilisticPipingCalculationActivity_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Setup
- SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
// Call
TestDelegate test = () => PipingCalculationActivityFactory.CreateSemiProbabilisticPipingCalculationActivity(calculation,
@@ -323,7 +323,7 @@
private static SemiProbabilisticPipingCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
- SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculation calculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(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 -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs (.../SemiProbabilisticPipingCalculationActivityTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs (.../SemiProbabilisticPipingCalculationActivityTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -77,7 +77,7 @@
public void Run_InvalidPipingCalculation_LogValidationStartAndEndWithErrors()
{
// Setup
- SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
var activity = new SemiProbabilisticPipingCalculationActivity(invalidPipingCalculation,
new GeneralPipingInput(),
@@ -109,7 +109,7 @@
public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd()
{
// Setup
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
var activity = new SemiProbabilisticPipingCalculationActivity(validPipingCalculation,
new GeneralPipingInput(),
@@ -142,7 +142,7 @@
observer.Expect(o => o.UpdateObserver());
mocks.ReplayAll();
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
validPipingCalculation.Output = null;
validPipingCalculation.Attach(observer);
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -re656935809d20d908a461b270fd2dcdf641416c5 -rde3208f1b2edd577702e24093a06fa475d4aae5e
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision e656935809d20d908a461b270fd2dcdf641416c5)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision de3208f1b2edd577702e24093a06fa475d4aae5e)
@@ -53,7 +53,7 @@
[SetUp]
public void Setup()
{
- testCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ testCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput(new TestHydraulicBoundaryLocation());
testSurfaceLineTopLevel = testCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
}
@@ -105,7 +105,7 @@
{
// Setup
SemiProbabilisticPipingOutput output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
- SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
+ SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationTestFactory.CreateCalculationWithInvalidInput();
invalidPipingCalculation.Output = output;
// Call