Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -101,7 +101,7 @@
FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
if (assemblyResult.ProbabilityResultType == FailureMechanismAssemblyProbabilityResultType.Manual)
{
- return assemblyResult.ManualFailurePathAssemblyProbability;
+ return assemblyResult.ManualFailureMechanismAssemblyProbability;
}
return FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs (.../FailureMechanismAssemblyResult.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs (.../FailureMechanismAssemblyResult.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -31,15 +31,15 @@
///
public class FailureMechanismAssemblyResult : Observable
{
- private double manualFailurePathAssemblyProbability;
+ private double manualFailureMechanismAssemblyProbability;
///
/// Creates a new instance of .
///
public FailureMechanismAssemblyResult()
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic;
- ManualFailurePathAssemblyProbability = double.NaN;
+ ManualFailureMechanismAssemblyProbability = double.NaN;
}
///
@@ -51,15 +51,15 @@
/// Gets or sets the probability of a failure mechanism assembly.
///
/// Thrown when is not in range [0,1].
- public double ManualFailurePathAssemblyProbability
+ public double ManualFailureMechanismAssemblyProbability
{
- get => manualFailurePathAssemblyProbability;
+ get => manualFailureMechanismAssemblyProbability;
set
{
ProbabilityHelper.ValidateProbability(value, null,
RiskeerCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_,
true);
- manualFailurePathAssemblyProbability = value;
+ manualFailureMechanismAssemblyProbability = value;
}
}
}
Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailurePathAssemblyResultValidationHelper.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailurePathAssemblyResultValidationHelper.cs (.../FailurePathAssemblyResultValidationHelper.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailurePathAssemblyResultValidationHelper.cs (.../FailurePathAssemblyResultValidationHelper.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -43,7 +43,7 @@
throw new ArgumentNullException(nameof(result));
}
- return result.IsManualProbability() && double.IsNaN(result.ManualFailurePathAssemblyProbability)
+ return result.IsManualProbability() && double.IsNaN(result.ManualFailureMechanismAssemblyProbability)
? Resources.FailureProbability_must_not_be_NaN
: string.Empty;
}
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -222,7 +222,7 @@
FailureMechanismAssemblyResult assemblyResult = FailureMechanism.AssemblyResult;
double failurePathAssemblyProbability = assemblyResult.IsManualProbability()
- ? assemblyResult.ManualFailurePathAssemblyProbability
+ ? assemblyResult.ManualFailureMechanismAssemblyProbability
: TryGetFailurePathAssemblyProbability();
SetTextBoxValue(failurePathAssemblyProbability);
}
@@ -327,7 +327,7 @@
if (e.KeyCode == Keys.Escape)
{
ClearErrorMessage();
- SetTextBoxValue(FailureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ SetTextBoxValue(FailureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
e.Handled = true;
}
}
@@ -350,7 +350,7 @@
double probability = ProbabilityParsingHelper.Parse(failurePathAssemblyProbabilityTextBox.Text);
FailureMechanismAssemblyResult failureMechanismAssemblyResult = FailureMechanism.AssemblyResult;
- failureMechanismAssemblyResult.ManualFailurePathAssemblyProbability = probability;
+ failureMechanismAssemblyResult.ManualFailureMechanismAssemblyProbability = probability;
failureMechanismAssemblyResult.NotifyObservers();
SetTextBoxValue(probability);
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -161,7 +161,7 @@
.Return(new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
- ManualFailurePathAssemblyProbability = expectedAssemblyResult
+ ManualFailureMechanismAssemblyProbability = expectedAssemblyResult
});
mocks.ReplayAll();
@@ -188,7 +188,7 @@
.Return(new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
- ManualFailurePathAssemblyProbability = double.NaN
+ ManualFailureMechanismAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
.Return(new ObservableList
@@ -235,7 +235,7 @@
.Return(new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
- ManualFailurePathAssemblyProbability = double.NaN
+ ManualFailureMechanismAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
.Return(new ObservableList
@@ -276,7 +276,7 @@
.Return(new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
- ManualFailurePathAssemblyProbability = double.NaN
+ ManualFailureMechanismAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
.Return(new ObservableList
@@ -313,7 +313,7 @@
.Return(new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
- ManualFailurePathAssemblyProbability = double.NaN
+ ManualFailureMechanismAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
.Return(new ObservableList
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs (.../FailureMechanismAssemblyResultTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs (.../FailureMechanismAssemblyResultTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -40,7 +40,7 @@
Assert.IsInstanceOf(result);
Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, result.ProbabilityResultType);
- Assert.IsNaN(result.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(result.ManualFailureMechanismAssemblyProbability);
}
[Test]
@@ -55,7 +55,7 @@
var result = new FailureMechanismAssemblyResult();
// Call
- void Call() => result.ManualFailurePathAssemblyProbability = newValue;
+ void Call() => result.ManualFailureMechanismAssemblyProbability = newValue;
// Assert
const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.";
@@ -75,10 +75,10 @@
var result = new FailureMechanismAssemblyResult();
// Call
- result.ManualFailurePathAssemblyProbability = newValue;
+ result.ManualFailureMechanismAssemblyProbability = newValue;
// Assert
- Assert.AreEqual(newValue, result.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(newValue, result.ManualFailureMechanismAssemblyProbability);
}
}
}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs (.../FailurePathAssemblyResultValidationHelperTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs (.../FailurePathAssemblyResultValidationHelperTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -47,7 +47,7 @@
var result = new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
- ManualFailurePathAssemblyProbability = double.NaN
+ ManualFailureMechanismAssemblyProbability = double.NaN
};
// Call
@@ -65,7 +65,7 @@
var result = new FailureMechanismAssemblyResult
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
- ManualFailurePathAssemblyProbability = random.NextDouble()
+ ManualFailureMechanismAssemblyProbability = random.NextDouble()
};
// Call
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -783,7 +783,7 @@
AssemblyResult =
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
- ManualFailurePathAssemblyProbability = 0.1
+ ManualFailureMechanismAssemblyProbability = 0.1
}
};
@@ -873,7 +873,7 @@
AssemblyResult =
{
ProbabilityResultType = initialResultType,
- ManualFailurePathAssemblyProbability = manualProbability
+ ManualFailureMechanismAssemblyProbability = manualProbability
}
};
@@ -922,7 +922,7 @@
AssemblyResult =
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
- ManualFailurePathAssemblyProbability = manualProbability
+ ManualFailureMechanismAssemblyProbability = manualProbability
}
};
failureMechanism.AssemblyResult.Attach(observer);
@@ -942,7 +942,7 @@
textBoxTester.Enter(invalidValue);
// Then
- Assert.AreEqual(manualProbability, failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(manualProbability, failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
errorMessage = errorProvider.GetError(failurePathAssemblyProbabilityTextBox);
Assert.AreEqual(expectedErrorMessage, errorMessage);
@@ -968,7 +968,7 @@
AssemblyResult =
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
- ManualFailurePathAssemblyProbability = manualProbability
+ ManualFailureMechanismAssemblyProbability = manualProbability
}
};
failureMechanism.AssemblyResult.Attach(observer);
@@ -988,7 +988,7 @@
textBoxTester.Enter("-");
// Then
- Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
errorMessage = errorProvider.GetError(failurePathAssemblyProbabilityTextBox);
Assert.AreEqual("Er moet een waarde worden ingevuld voor de faalkans.", errorMessage);
@@ -1042,7 +1042,7 @@
Assert.IsEmpty(errorMessage);
Assert.AreEqual(formattedValidValue, failurePathAssemblyProbabilityTextBox.Text);
- Assert.AreEqual(expectedProbability, failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(expectedProbability, failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
}
mocks.VerifyAll();
@@ -1095,7 +1095,7 @@
AssemblyResult =
{
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
- ManualFailurePathAssemblyProbability = initialValue
+ ManualFailureMechanismAssemblyProbability = initialValue
}
};
@@ -1120,7 +1120,7 @@
// Then
Assert.AreEqual(initialValueText, failurePathAssemblyProbabilityTextBox.Text);
- Assert.AreEqual(initialValue, failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(initialValue, failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
}
mocks.VerifyAll();
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/FailureMechanismAssemblyResultRowFactory.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/FailureMechanismAssemblyResultRowFactory.cs (.../FailureMechanismAssemblyResultRowFactory.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/FailureMechanismAssemblyResultRowFactory.cs (.../FailureMechanismAssemblyResultRowFactory.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -69,7 +69,7 @@
string validationError = FailurePathAssemblyResultValidationHelper.GetValidationError(assemblyResult);
return !string.IsNullOrEmpty(validationError)
? new FailureMechanismAssemblyResultRow(failureMechanism, validationError)
- : new FailureMechanismAssemblyResultRow(failureMechanism, assemblyResult.ManualFailurePathAssemblyProbability);
+ : new FailureMechanismAssemblyResultRow(failureMechanism, assemblyResult.ManualFailureMechanismAssemblyProbability);
}
private static FailureMechanismAssemblyResultRow CreateAutomaticAssemblyRow(IFailureMechanism failureMechanism,
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs (.../FailureMechanismAssemblyResultRowFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs (.../FailureMechanismAssemblyResultRowFactoryTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -179,7 +179,7 @@
failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode);
failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult
{
- ManualFailurePathAssemblyProbability = assemblyResult,
+ ManualFailureMechanismAssemblyProbability = assemblyResult,
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual
});
mocks.ReplayAll();
@@ -212,7 +212,7 @@
failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode);
failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult
{
- ManualFailurePathAssemblyProbability = double.NaN,
+ ManualFailureMechanismAssemblyProbability = double.NaN,
ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual
});
mocks.ReplayAll();
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs (.../FailurePathCreateExtensions.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs (.../FailurePathCreateExtensions.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -125,7 +125,7 @@
NotInAssemblyComments = failurePath.NotInAssemblyComments.Body.DeepClone(),
FailureMechanismSectionCollectionSourcePath = failurePath.FailureMechanismSectionSourcePath.DeepClone(),
FailurePathAssemblyProbabilityResultType = Convert.ToByte(assemblyResult.ProbabilityResultType),
- ManualFailurePathAssemblyProbability = assemblyResult.ManualFailurePathAssemblyProbability.ToNaNAsNull()
+ ManualFailurePathAssemblyProbability = assemblyResult.ManualFailureMechanismAssemblyProbability.ToNaNAsNull()
};
AddEntitiesForFailureMechanismSections(failurePath, registry, entity);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -138,7 +138,7 @@
assemblyResult.ProbabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType;
if (entity.ManualFailurePathAssemblyProbability != null)
{
- assemblyResult.ManualFailurePathAssemblyProbability = entity.ManualFailurePathAssemblyProbability.ToNullAsNaN();
+ assemblyResult.ManualFailureMechanismAssemblyProbability = entity.ManualFailurePathAssemblyProbability.ToNullAsNaN();
}
}
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -67,7 +67,7 @@
AssemblyResult =
{
ProbabilityResultType = random.NextEnumValue(),
- ManualFailurePathAssemblyProbability = random.NextDouble()
+ ManualFailureMechanismAssemblyProbability = random.NextDouble()
}
};
@@ -90,7 +90,7 @@
FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
Assert.AreEqual(Convert.ToByte(assemblyResult.ProbabilityResultType), entity.FailurePathAssemblyProbabilityResultType);
- Assert.AreEqual(assemblyResult.ManualFailurePathAssemblyProbability, entity.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(assemblyResult.ManualFailureMechanismAssemblyProbability, entity.ManualFailurePathAssemblyProbability);
}
[Test]
@@ -105,7 +105,7 @@
// Precondition
FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
- Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(assemblyResult.ManualFailureMechanismAssemblyProbability);
// Call
FailureMechanismEntity entity = failureMechanism.Create(failureMechanismType, registry);
@@ -224,7 +224,7 @@
AssemblyResult =
{
ProbabilityResultType = random.NextEnumValue(),
- ManualFailurePathAssemblyProbability = random.NextDouble()
+ ManualFailureMechanismAssemblyProbability = random.NextDouble()
}
};
@@ -247,7 +247,7 @@
FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
Assert.AreEqual(Convert.ToByte(assemblyResult.ProbabilityResultType), entity.FailurePathAssemblyProbabilityResultType);
- Assert.AreEqual(assemblyResult.ManualFailurePathAssemblyProbability, entity.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(assemblyResult.ManualFailureMechanismAssemblyProbability, entity.ManualFailurePathAssemblyProbability);
}
[Test]
@@ -262,7 +262,7 @@
// Precondition
FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
- Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(assemblyResult.ManualFailureMechanismAssemblyProbability);
// Call
FailureMechanismEntity entity = failureMechanism.Create(failureMechanismType, registry);
@@ -383,7 +383,7 @@
AssemblyResult =
{
ProbabilityResultType = random.NextEnumValue(),
- ManualFailurePathAssemblyProbability = random.NextDouble()
+ ManualFailureMechanismAssemblyProbability = random.NextDouble()
}
};
@@ -408,7 +408,7 @@
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
Assert.AreEqual(Convert.ToByte(assemblyResult.ProbabilityResultType), entity.FailurePathAssemblyProbabilityResultType);
- Assert.AreEqual(assemblyResult.ManualFailurePathAssemblyProbability, entity.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(assemblyResult.ManualFailureMechanismAssemblyProbability, entity.ManualFailurePathAssemblyProbability);
}
[Test]
@@ -420,7 +420,7 @@
// Precondition
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
- Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(assemblyResult.ManualFailureMechanismAssemblyProbability);
// Call
SpecificFailurePathEntity entity = failurePath.Create(registry, 0);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -398,7 +398,7 @@
FailureMechanismAssemblyResult actualResult)
{
Assert.AreEqual(expectedResult.ProbabilityResultType, actualResult.ProbabilityResultType);
- Assert.AreEqual(expectedResult.ManualFailurePathAssemblyProbability, actualResult.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(expectedResult.ManualFailureMechanismAssemblyProbability, actualResult.ManualFailureMechanismAssemblyProbability);
}
private static void AssertFailureMechanismSections(IEnumerable expectedSections,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -139,7 +139,7 @@
CollectionAssert.IsEmpty(failureMechanism.Sections);
Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath);
- Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
}
[Test]
@@ -267,7 +267,7 @@
CollectionAssert.IsEmpty(failureMechanism.Sections);
Assert.IsNull(failureMechanism.FailureMechanismSectionSourcePath);
- Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailureMechanismAssemblyProbability);
}
[Test]
@@ -379,7 +379,7 @@
// Assert
FailureMechanismAssemblyResult assemblyResult = specificFailureMechanism.AssemblyResult;
- Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.IsNaN(assemblyResult.ManualFailureMechanismAssemblyProbability);
}
[Test]
@@ -456,7 +456,7 @@
var probabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType;
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
Assert.AreEqual(probabilityResultType, assemblyResult.ProbabilityResultType);
- Assert.AreEqual(entity.ManualFailurePathAssemblyProbability, assemblyResult.ManualFailurePathAssemblyProbability);
+ Assert.AreEqual(entity.ManualFailurePathAssemblyProbability, assemblyResult.ManualFailureMechanismAssemblyProbability);
}
private static FailureMechanismSectionEntity CreateSimpleFailureMechanismSectionEntity()
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r982ed18f69adb64384960a6fae949ba5437cb0f9 -rba639d608bbfcd02a294acfa6c428d41f2e627ce
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision ba639d608bbfcd02a294acfa6c428d41f2e627ce)
@@ -461,7 +461,7 @@
var random = new Random(seed);
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
assemblyResult.ProbabilityResultType = random.NextEnumValue();
- assemblyResult.ManualFailurePathAssemblyProbability = random.NextDouble();
+ assemblyResult.ManualFailureMechanismAssemblyProbability = random.NextDouble();
}
private static void SetSectionResults(IEnumerable sectionResults)