Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -77,7 +77,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -115,7 +115,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -143,7 +143,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -99,7 +99,7 @@
}
FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
- if (assemblyResult.ProbabilityResultType == FailurePathAssemblyProbabilityResultType.Manual)
+ if (assemblyResult.ProbabilityResultType == FailureMechanismAssemblyProbabilityResultType.Manual)
{
return assemblyResult.ManualFailurePathAssemblyProbability;
}
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyProbabilityResultType.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyProbabilityResultType.cs (revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyProbabilityResultType.cs (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2021. 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 Core.Common.Util.Attributes;
+using Riskeer.Common.Data.Properties;
+
+namespace Riskeer.Common.Data.FailureMechanism
+{
+ ///
+ /// Specifies the type of probability for a failure mechanism assembly result.
+ ///
+ public enum FailureMechanismAssemblyProbabilityResultType
+ {
+ ///
+ /// The automatically calculated probability type.
+ ///
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailurePathAssemblyProbabilityResultTypeAutomatic_DisplayName))]
+ Automatic = 1,
+
+ ///
+ /// The manual probability type.
+ ///
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailurePathAssemblyProbabilityResultTypeManual_DisplayName))]
+ Manual = 2
+ }
+}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs (.../FailureMechanismAssemblyResult.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs (.../FailureMechanismAssemblyResult.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -38,14 +38,14 @@
///
public FailureMechanismAssemblyResult()
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic;
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic;
ManualFailurePathAssemblyProbability = double.NaN;
}
///
- /// Gets or sets the .
+ /// Gets or sets the .
///
- public FailurePathAssemblyProbabilityResultType ProbabilityResultType { get; set; }
+ public FailureMechanismAssemblyProbabilityResultType ProbabilityResultType { get; set; }
///
/// Gets or sets the probability of a failure mechanism assembly.
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResultExtensions.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResultExtensions.cs (.../FailureMechanismAssemblyResultExtensions.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResultExtensions.cs (.../FailureMechanismAssemblyResultExtensions.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -41,7 +41,7 @@
throw new ArgumentNullException(nameof(result));
}
- return result.ProbabilityResultType == FailurePathAssemblyProbabilityResultType.Manual;
+ return result.ProbabilityResultType == FailureMechanismAssemblyProbabilityResultType.Manual;
}
}
}
\ No newline at end of file
Fisheye: Tag 982ed18f69adb64384960a6fae949ba5437cb0f9 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailurePathAssemblyProbabilityResultType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -191,18 +191,18 @@
private void InitializeComboBox()
{
- IEnumerable> dataSource =
- Enum.GetValues(typeof(FailurePathAssemblyProbabilityResultType))
- .Cast()
- .Select(e => new EnumDisplayWrapper(e))
+ IEnumerable> dataSource =
+ Enum.GetValues(typeof(FailureMechanismAssemblyProbabilityResultType))
+ .Cast()
+ .Select(e => new EnumDisplayWrapper(e))
.ToArray();
probabilityResultTypeComboBox.BeginUpdate();
probabilityResultTypeComboBoxUpdating = true;
probabilityResultTypeComboBox.DataSource = dataSource;
- probabilityResultTypeComboBox.ValueMember = nameof(EnumDisplayWrapper.Value);
- probabilityResultTypeComboBox.DisplayMember = nameof(EnumDisplayWrapper.DisplayName);
+ probabilityResultTypeComboBox.ValueMember = nameof(EnumDisplayWrapper.Value);
+ probabilityResultTypeComboBox.DisplayMember = nameof(EnumDisplayWrapper.DisplayName);
probabilityResultTypeComboBox.SelectedValue = FailureMechanism.AssemblyResult.ProbabilityResultType;
probabilityResultTypeComboBoxUpdating = false;
@@ -309,7 +309,7 @@
}
FailureMechanismAssemblyResult assemblyResult = FailureMechanism.AssemblyResult;
- assemblyResult.ProbabilityResultType = (FailurePathAssemblyProbabilityResultType) probabilityResultTypeComboBox.SelectedValue;
+ assemblyResult.ProbabilityResultType = (FailureMechanismAssemblyProbabilityResultType) probabilityResultTypeComboBox.SelectedValue;
assemblyResult.NotifyObservers();
UpdateAssemblyData();
@@ -376,7 +376,7 @@
private bool IsManualAssembly()
{
- return FailureMechanism.AssemblyResult.ProbabilityResultType == FailurePathAssemblyProbabilityResultType.Manual;
+ return FailureMechanism.AssemblyResult.ProbabilityResultType == FailureMechanismAssemblyProbabilityResultType.Manual;
}
private void SetErrorMessage(string errorMessage)
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -160,7 +160,7 @@
failurePath.Stub(fp => fp.AssemblyResult)
.Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
ManualFailurePathAssemblyProbability = expectedAssemblyResult
});
mocks.ReplayAll();
@@ -187,7 +187,7 @@
failurePath.Stub(fp => fp.AssemblyResult)
.Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
ManualFailurePathAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
@@ -234,7 +234,7 @@
failurePath.Stub(fp => fp.AssemblyResult)
.Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
ManualFailurePathAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
@@ -275,7 +275,7 @@
failurePath.Stub(fp => fp.AssemblyResult)
.Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
ManualFailurePathAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
@@ -312,7 +312,7 @@
failurePath.Stub(fp => fp.AssemblyResult)
.Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
ManualFailurePathAssemblyProbability = double.NaN
});
failurePath.Stub(fp => fp.SectionResults)
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyProbabilityResultTypeTest.cs
===================================================================
diff -u
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyProbabilityResultTypeTest.cs (revision 0)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyProbabilityResultTypeTest.cs (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -0,0 +1,54 @@
+// Copyright (C) Stichting Deltares 2021. 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.Collections.Generic;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Riskeer.Common.Data.FailureMechanism;
+
+namespace Riskeer.Common.Data.Test.FailureMechanism
+{
+ [TestFixture]
+ public class FailureMechanismAssemblyProbabilityResultTypeTest : EnumWithResourcesDisplayNameTestFixture
+ {
+ protected override IDictionary ExpectedValueForEnumValues =>
+ new Dictionary
+ {
+ {
+ FailureMechanismAssemblyProbabilityResultType.Automatic, 1
+ },
+ {
+ FailureMechanismAssemblyProbabilityResultType.Manual, 2
+ }
+ };
+
+ protected override IDictionary ExpectedDisplayNameForEnumValues =>
+ new Dictionary
+ {
+ {
+ FailureMechanismAssemblyProbabilityResultType.Automatic, "Automatisch berekenen"
+ },
+ {
+ FailureMechanismAssemblyProbabilityResultType.Manual, "Handmatig invullen"
+ }
+ };
+ }
+}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs (.../FailureMechanismAssemblyResultExtensionsTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs (.../FailureMechanismAssemblyResultExtensionsTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -40,10 +40,10 @@
}
[Test]
- [TestCase(FailurePathAssemblyProbabilityResultType.Automatic, false)]
- [TestCase(FailurePathAssemblyProbabilityResultType.Manual, true)]
+ [TestCase(FailureMechanismAssemblyProbabilityResultType.Automatic, false)]
+ [TestCase(FailureMechanismAssemblyProbabilityResultType.Manual, true)]
public void IsManualProbability_WithFailurePathAssemblyProbabilityResultType_ReturnsExpectedResult(
- FailurePathAssemblyProbabilityResultType resultType, bool expectedResult)
+ FailureMechanismAssemblyProbabilityResultType resultType, bool expectedResult)
{
// Setup
var result = new FailureMechanismAssemblyResult
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs (.../FailureMechanismAssemblyResultTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs (.../FailureMechanismAssemblyResultTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -39,7 +39,7 @@
// Assert
Assert.IsInstanceOf(result);
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, result.ProbabilityResultType);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, result.ProbabilityResultType);
Assert.IsNaN(result.ManualFailurePathAssemblyProbability);
}
Fisheye: Tag 982ed18f69adb64384960a6fae949ba5437cb0f9 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailurePathAssemblyProbabilityResultTypeTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs (.../FailurePathAssemblyResultValidationHelperTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs (.../FailurePathAssemblyResultValidationHelperTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -46,7 +46,7 @@
// Setup
var result = new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
ManualFailurePathAssemblyProbability = double.NaN
};
@@ -64,7 +64,7 @@
var random = new Random(21);
var result = new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
ManualFailurePathAssemblyProbability = random.NextDouble()
};
@@ -81,7 +81,7 @@
// Setup
var result = new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
};
// Call
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -207,16 +207,16 @@
{
// Assert
ComboBox comboBox = GetProbabilityResultTypeComboBox();
- Assert.AreEqual(nameof(EnumDisplayWrapper.DisplayName), comboBox.DisplayMember);
- Assert.AreEqual(nameof(EnumDisplayWrapper.Value), comboBox.ValueMember);
- Assert.IsInstanceOf>(comboBox.SelectedItem);
+ Assert.AreEqual(nameof(EnumDisplayWrapper.DisplayName), comboBox.DisplayMember);
+ Assert.AreEqual(nameof(EnumDisplayWrapper.Value), comboBox.ValueMember);
+ Assert.IsInstanceOf>(comboBox.SelectedItem);
- var configurationTypes = (EnumDisplayWrapper[]) comboBox.DataSource;
+ var configurationTypes = (EnumDisplayWrapper[]) comboBox.DataSource;
Assert.AreEqual(2, configurationTypes.Length);
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, configurationTypes[0].Value);
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Manual, configurationTypes[1].Value);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, configurationTypes[0].Value);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Manual, configurationTypes[1].Value);
Assert.AreEqual(failureMechanism.AssemblyResult.ProbabilityResultType,
- ((EnumDisplayWrapper) comboBox.SelectedItem).Value);
+ ((EnumDisplayWrapper) comboBox.SelectedItem).Value);
}
}
@@ -658,7 +658,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -667,7 +667,7 @@
{
// Precondition
ComboBox comboBox = GetProbabilityResultTypeComboBox();
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
// Then
TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox();
@@ -691,7 +691,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -701,7 +701,7 @@
{
// Precondition
ComboBox comboBox = GetProbabilityResultTypeComboBox();
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
// Then
TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox();
@@ -730,7 +730,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -750,7 +750,7 @@
{
// Precondition
ComboBox comboBox = GetProbabilityResultTypeComboBox();
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
ErrorProvider errorProvider = GetErrorProvider(view);
TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox();
@@ -782,7 +782,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic,
ManualFailurePathAssemblyProbability = 0.1
}
};
@@ -791,15 +791,15 @@
{
// Precondition
ComboBox comboBox = GetProbabilityResultTypeComboBox();
- Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
+ Assert.AreEqual(FailureMechanismAssemblyProbabilityResultType.Automatic, comboBox.SelectedValue);
ErrorProvider errorProvider = GetErrorProvider(view);
TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox();
string errorMessage = errorProvider.GetError(failurePathAssemblyProbabilityTextBox);
Assert.AreEqual(exceptionMessage, errorMessage);
// When
- comboBox.SelectedValue = FailurePathAssemblyProbabilityResultType.Manual;
+ comboBox.SelectedValue = FailureMechanismAssemblyProbabilityResultType.Manual;
// Then
errorMessage = errorProvider.GetError(failurePathAssemblyProbabilityTextBox);
@@ -822,7 +822,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.AssemblyResult.Attach(observer);
@@ -836,7 +836,7 @@
Assert.IsTrue(failurePathAssemblyProbabilityTextBox.ReadOnly);
// When
- const FailurePathAssemblyProbabilityResultType newResultType = FailurePathAssemblyProbabilityResultType.Manual;
+ const FailureMechanismAssemblyProbabilityResultType newResultType = FailureMechanismAssemblyProbabilityResultType.Manual;
ComboBox comboBox = GetProbabilityResultTypeComboBox();
comboBox.SelectedValue = newResultType;
@@ -851,11 +851,11 @@
[Test]
[SetCulture("nl-NL")]
- [TestCase(FailurePathAssemblyProbabilityResultType.Automatic, FailurePathAssemblyProbabilityResultType.Manual)]
- [TestCase(FailurePathAssemblyProbabilityResultType.Manual, FailurePathAssemblyProbabilityResultType.Automatic)]
+ [TestCase(FailureMechanismAssemblyProbabilityResultType.Automatic, FailureMechanismAssemblyProbabilityResultType.Manual)]
+ [TestCase(FailureMechanismAssemblyProbabilityResultType.Manual, FailureMechanismAssemblyProbabilityResultType.Automatic)]
public void GivenFailureMechanismResultView_WhenChangingProbabilityResultType_ThenFailurePathAssemblyProbabilityUpdated(
- FailurePathAssemblyProbabilityResultType initialResultType,
- FailurePathAssemblyProbabilityResultType newResultType)
+ FailureMechanismAssemblyProbabilityResultType initialResultType,
+ FailureMechanismAssemblyProbabilityResultType newResultType)
{
// Given
const double assemblyResult = 0.1;
@@ -881,7 +881,7 @@
{
// Precondition
TextBox failurePathAssemblyProbabilityTextBox = GetFailurePathAssemblyProbabilityTextBox();
- string expectedProbabilityText = initialResultType == FailurePathAssemblyProbabilityResultType.Automatic
+ string expectedProbabilityText = initialResultType == FailureMechanismAssemblyProbabilityResultType.Automatic
? assemblyResultText
: manualProbabilityText;
Assert.AreEqual(expectedProbabilityText, failurePathAssemblyProbabilityTextBox.Text);
@@ -891,7 +891,7 @@
comboBox.SelectedValue = newResultType;
// Then
- expectedProbabilityText = newResultType == FailurePathAssemblyProbabilityResultType.Automatic
+ expectedProbabilityText = newResultType == FailureMechanismAssemblyProbabilityResultType.Automatic
? assemblyResultText
: manualProbabilityText;
Assert.AreEqual(expectedProbabilityText, failurePathAssemblyProbabilityTextBox.Text);
@@ -921,7 +921,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
ManualFailurePathAssemblyProbability = manualProbability
}
};
@@ -967,7 +967,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
ManualFailurePathAssemblyProbability = manualProbability
}
};
@@ -1017,7 +1017,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual
}
};
@@ -1055,7 +1055,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual
}
};
@@ -1072,7 +1072,7 @@
// When
ComboBox comboBox = GetProbabilityResultTypeComboBox();
- comboBox.SelectedValue = FailurePathAssemblyProbabilityResultType.Automatic;
+ comboBox.SelectedValue = FailureMechanismAssemblyProbabilityResultType.Automatic;
// Then
errorMessage = errorProvider.GetError(failurePathAssemblyProbabilityTextBox);
@@ -1094,7 +1094,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual,
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual,
ManualFailurePathAssemblyProbability = initialValue
}
};
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -77,7 +77,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -115,7 +115,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -143,7 +143,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -81,7 +81,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -119,7 +119,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -147,7 +147,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -239,7 +239,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -277,7 +277,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -305,7 +305,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs (.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -77,7 +77,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -115,7 +115,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -143,7 +143,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs (.../FailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs (.../FailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -251,7 +251,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -289,7 +289,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -317,7 +317,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs (.../PipingStructureFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs (.../PipingStructureFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -79,7 +79,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -117,7 +117,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -145,7 +145,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs (.../FailureMechanismAssemblyResultRowFactoryTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs (.../FailureMechanismAssemblyResultRowFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -107,7 +107,7 @@
failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode);
failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
});
mocks.ReplayAll();
@@ -143,7 +143,7 @@
failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode);
failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
});
mocks.ReplayAll();
@@ -180,7 +180,7 @@
failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult
{
ManualFailurePathAssemblyProbability = assemblyResult,
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual
});
mocks.ReplayAll();
@@ -213,7 +213,7 @@
failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult
{
ManualFailurePathAssemblyProbability = double.NaN,
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Manual
});
mocks.ReplayAll();
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -245,7 +245,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -283,7 +283,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -311,7 +311,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -252,7 +252,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -290,7 +290,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -318,7 +318,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -77,7 +77,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -115,7 +115,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -143,7 +143,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -239,7 +239,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -277,7 +277,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -305,7 +305,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -135,7 +135,7 @@
private static void ReadAssemblyResult(IFailureMechanismEntity entity, IFailureMechanism failurePath)
{
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
- assemblyResult.ProbabilityResultType = (FailurePathAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType;
+ assemblyResult.ProbabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType;
if (entity.ManualFailurePathAssemblyProbability != null)
{
assemblyResult.ManualFailurePathAssemblyProbability = entity.ManualFailurePathAssemblyProbability.ToNullAsNaN();
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -66,7 +66,7 @@
InAssembly = random.NextBoolean(),
AssemblyResult =
{
- ProbabilityResultType = random.NextEnumValue(),
+ ProbabilityResultType = random.NextEnumValue(),
ManualFailurePathAssemblyProbability = random.NextDouble()
}
};
@@ -223,7 +223,7 @@
InAssembly = random.NextBoolean(),
AssemblyResult =
{
- ProbabilityResultType = random.NextEnumValue(),
+ ProbabilityResultType = random.NextEnumValue(),
ManualFailurePathAssemblyProbability = random.NextDouble()
}
};
@@ -382,7 +382,7 @@
InAssembly = random.NextBoolean(),
AssemblyResult =
{
- ProbabilityResultType = random.NextEnumValue(),
+ ProbabilityResultType = random.NextEnumValue(),
ManualFailurePathAssemblyProbability = random.NextDouble()
}
};
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -95,7 +95,7 @@
{
// Setup
var random = new Random(21);
- var assemblyResultType = random.NextEnumValue();
+ var assemblyResultType = random.NextEnumValue();
var entity = new FailureMechanismEntity
{
@@ -223,7 +223,7 @@
{
// Setup
var random = new Random(21);
- var assemblyResultType = random.NextEnumValue();
+ var assemblyResultType = random.NextEnumValue();
var entity = new FailureMechanismEntity
{
@@ -325,7 +325,7 @@
// Setup
var random = new Random(21);
bool inAssembly = random.NextBoolean();
- var probabilityResultType = random.NextEnumValue();
+ var probabilityResultType = random.NextEnumValue();
const string filePath = "failureMechanismSections/File/Path";
var entity = new SpecificFailurePathEntity
@@ -453,7 +453,7 @@
Assert.AreEqual(entity.InAssemblyOutputComments, failurePath.InAssemblyOutputComments.Body);
Assert.AreEqual(entity.NotInAssemblyComments, failurePath.NotInAssemblyComments.Body);
- var probabilityResultType = (FailurePathAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType;
+ var probabilityResultType = (FailureMechanismAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType;
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
Assert.AreEqual(probabilityResultType, assemblyResult.ProbabilityResultType);
Assert.AreEqual(entity.ManualFailurePathAssemblyProbability, assemblyResult.ManualFailurePathAssemblyProbability);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -raf2197c2746678b756546687bea4c6d2bd89cffc -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -460,7 +460,7 @@
{
var random = new Random(seed);
FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult;
- assemblyResult.ProbabilityResultType = random.NextEnumValue();
+ assemblyResult.ProbabilityResultType = random.NextEnumValue();
assemblyResult.ManualFailurePathAssemblyProbability = random.NextDouble();
}
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r982ed18f69adb64384960a6fae949ba5437cb0f9
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision 982ed18f69adb64384960a6fae949ba5437cb0f9)
@@ -239,7 +239,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
failureMechanism.SetSections(new[]
@@ -277,7 +277,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};
@@ -305,7 +305,7 @@
{
AssemblyResult =
{
- ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic
+ ProbabilityResultType = FailureMechanismAssemblyProbabilityResultType.Automatic
}
};