Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -107,7 +107,7 @@
}
}
- public FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType input)
+ public FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType input)
{
try
{
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -44,11 +44,11 @@
///
/// Assembles the simple assessment for the given .
///
- /// The to assemble for.
+ /// The to assemble for.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
- FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType input);
+ FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType input);
///
/// Assembles the detailed assessment based on the input parameters.
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rbef7de785c1b8116e6dc9fb4b5a897772ff68e6a -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision bef7de785c1b8116e6dc9fb4b5a897772ff68e6a)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -75,28 +75,28 @@
///
/// Creates based on the given .
///
- /// The to create the result for.
+ /// The to create the result for.
/// The created .
- /// Thrown when
+ /// Thrown when
/// is an invalid value.
- /// Thrown when
+ /// Thrown when
/// is a valid value, but unsupported.
- public static SimpleCalculationResultValidityOnly CreateSimpleCalculationResultValidityOnly(SimpleAssessmentResultValidityOnlyType input)
+ public static SimpleCalculationResultValidityOnly CreateSimpleCalculationResultValidityOnly(SimpleAssessmentValidityOnlyResultType input)
{
- if (!Enum.IsDefined(typeof(SimpleAssessmentResultValidityOnlyType), input))
+ if (!Enum.IsDefined(typeof(SimpleAssessmentValidityOnlyResultType), input))
{
throw new InvalidEnumArgumentException(nameof(input),
(int) input,
- typeof(SimpleAssessmentResultValidityOnlyType));
+ typeof(SimpleAssessmentValidityOnlyResultType));
}
switch (input)
{
- case SimpleAssessmentResultValidityOnlyType.None:
+ case SimpleAssessmentValidityOnlyResultType.None:
return SimpleCalculationResultValidityOnly.None;
- case SimpleAssessmentResultValidityOnlyType.NotApplicable:
+ case SimpleAssessmentValidityOnlyResultType.NotApplicable:
return SimpleCalculationResultValidityOnly.NVT;
- case SimpleAssessmentResultValidityOnlyType.Applicable:
+ case SimpleAssessmentValidityOnlyResultType.Applicable:
return SimpleCalculationResultValidityOnly.WVT;
default:
throw new NotSupportedException();
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -653,7 +653,7 @@
var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
// Call
- TestDelegate test = () => calculator.AssembleSimpleAssessment((SimpleAssessmentResultValidityOnlyType) 99);
+ TestDelegate test = () => calculator.AssembleSimpleAssessment((SimpleAssessmentValidityOnlyResultType) 99);
// Assert
var exception = Assert.Throws(test);
@@ -667,7 +667,7 @@
public void AssembleSimpleAssessmentValidityOnly_WithValidInput_InputCorrectlySetToKernel()
{
// Setup
- const SimpleAssessmentResultValidityOnlyType assessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable;
+ const SimpleAssessmentValidityOnlyResultType assessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable;
using (new AssemblyToolKernelFactoryConfig())
{
var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
@@ -699,7 +699,7 @@
var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
// Call
- FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType.NotApplicable);
+ FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType.NotApplicable);
// Assert
AssertCalculatorOutput(kernel.FailureMechanismSectionAssemblyCategoryResult, assembly);
@@ -720,7 +720,7 @@
var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
// Call
- TestDelegate test = () => calculator.AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType.Applicable);
+ TestDelegate test = () => calculator.AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType.Applicable);
// Assert
var exception = Assert.Throws(test);
@@ -743,7 +743,7 @@
var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
// Call
- TestDelegate test = () => calculator.AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType.Applicable);
+ TestDelegate test = () => calculator.AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType.Applicable);
// Assert
var exception = Assert.Throws(test);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rbef7de785c1b8116e6dc9fb4b5a897772ff68e6a -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision bef7de785c1b8116e6dc9fb4b5a897772ff68e6a)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -68,19 +68,19 @@
public void CreateSimpleCalculationResultValidityOnly_WithInvalidEnumInput_ThrowInvalidEnumArgumentException()
{
// Call
- TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateSimpleCalculationResultValidityOnly((SimpleAssessmentResultValidityOnlyType) 99);
+ TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateSimpleCalculationResultValidityOnly((SimpleAssessmentValidityOnlyResultType) 99);
// Assert
- const string expectedMessage = "The value of argument 'input' (99) is invalid for Enum type 'SimpleAssessmentResultValidityOnlyType'.";
+ const string expectedMessage = "The value of argument 'input' (99) is invalid for Enum type 'SimpleAssessmentValidityOnlyResultType'.";
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage);
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None, SimpleCalculationResultValidityOnly.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.NotApplicable, SimpleCalculationResultValidityOnly.NVT)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, SimpleCalculationResultValidityOnly.WVT)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None, SimpleCalculationResultValidityOnly.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.NotApplicable, SimpleCalculationResultValidityOnly.NVT)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable, SimpleCalculationResultValidityOnly.WVT)]
public void CreateSimpleCalculationResultValidityOnly_ValidData_ReturnSimpleCalculationResultValidityOnly(
- SimpleAssessmentResultValidityOnlyType originalResult,
+ SimpleAssessmentValidityOnlyResultType originalResult,
SimpleCalculationResultValidityOnly expectedResult)
{
// Call
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -43,7 +43,7 @@
// Assert
Assert.IsInstanceOf(calculator);
Assert.AreEqual((SimpleAssessmentResultType) 0, calculator.SimpleAssessmentInput);
- Assert.AreEqual((SimpleAssessmentResultValidityOnlyType) 0, calculator.SimpleAssessmentValidityOnlyInput);
+ Assert.AreEqual((SimpleAssessmentValidityOnlyResultType) 0, calculator.SimpleAssessmentValidityOnlyInput);
Assert.IsNull(calculator.SimpleAssessmentAssemblyOutput);
Assert.IsNull(calculator.DetailedAssessmentCategoriesInput);
@@ -141,7 +141,7 @@
var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
// Call
- FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType.None);
+ FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType.None);
// Assert
Assert.AreEqual(1, assembly.Probability);
@@ -161,7 +161,7 @@
};
// Call
- FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType.None);
+ FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType.None);
// Assert
Assert.AreSame(calculator.SimpleAssessmentAssemblyOutput, assembly);
@@ -171,7 +171,7 @@
public void AssembleSimpleAssessmentValidityOnly_ThrowExceptionOnCalculateFalse_SetsInput()
{
// Setup
- const SimpleAssessmentResultValidityOnlyType input = SimpleAssessmentResultValidityOnlyType.None;
+ const SimpleAssessmentValidityOnlyResultType input = SimpleAssessmentValidityOnlyResultType.None;
var calculator = new FailureMechanismSectionAssemblyCalculatorStub();
// Call
@@ -191,7 +191,7 @@
};
// Call
- TestDelegate test = () => calculator.AssembleSimpleAssessment((SimpleAssessmentResultValidityOnlyType) 0);
+ TestDelegate test = () => calculator.AssembleSimpleAssessment((SimpleAssessmentValidityOnlyResultType) 0);
// Assert
var exception = Assert.Throws(test);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -45,7 +45,7 @@
///
/// Gets the input of the simple assessment validity only calculation.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentValidityOnlyInput { get; private set; }
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentValidityOnlyInput { get; private set; }
///
/// Gets or sets the output of the detailed assessment calculation.
@@ -165,7 +165,7 @@
(SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.Iv));
}
- public FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentResultValidityOnlyType input)
+ public FailureMechanismSectionAssembly AssembleSimpleAssessment(SimpleAssessmentValidityOnlyResultType input)
{
if (ThrowExceptionOnCalculate)
{
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -102,7 +102,7 @@
///
/// Adds a column to the showing a
- /// .
+ /// .
///
/// The to add the column to.
/// The data property name of the column.
@@ -119,14 +119,14 @@
throw new ArgumentNullException(nameof(dataPropertyName));
}
- IEnumerable> dataSource = CreateEnumDisplayWrappers();
+ IEnumerable> dataSource = CreateEnumDisplayWrappers();
dataGridViewControl.AddComboBoxColumn(
dataPropertyName,
Resources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName,
dataSource,
- nameof(EnumDisplayWrapper.Value),
- nameof(EnumDisplayWrapper.DisplayName));
+ nameof(EnumDisplayWrapper.Value),
+ nameof(EnumDisplayWrapper.DisplayName));
}
///
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -86,9 +86,9 @@
/// The simple assessment result to check.
/// true when the simple assessment is ,
/// false otherwise.
- public static bool SimpleAssessmentIsSufficient(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ public static bool SimpleAssessmentIsSufficient(SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
- return simpleAssessmentResult == SimpleAssessmentResultValidityOnlyType.NotApplicable;
+ return simpleAssessmentResult == SimpleAssessmentValidityOnlyResultType.NotApplicable;
}
///
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.Designer.cs
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -156,9 +156,9 @@
///
/// Looks up a localized string similar to WVT.
///
- internal static string SimpleAssessmentResultValidityOnlyType_Applicable {
+ internal static string SimpleAssessmentValidityOnlyResultType_Applicable {
get {
- return ResourceManager.GetString("SimpleAssessmentResultValidityOnlyType_Applicable", resourceCulture);
+ return ResourceManager.GetString("SimpleAssessmentValidityOnlyResultType_Applicable", resourceCulture);
}
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.resx
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.resx (.../Resources.resx) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -135,7 +135,7 @@
FV
-
+
WVT
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/Ringtoets.Common.Primitives.csproj
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/Ringtoets.Common.Primitives.csproj (.../Ringtoets.Common.Primitives.csproj) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/Ringtoets.Common.Primitives.csproj (.../Ringtoets.Common.Primitives.csproj) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -21,7 +21,7 @@
-
+
Fisheye: Tag e3f913fddac4cfa598ef5439ce6b832f354d7dd8 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Primitives/SimpleAssessmentResultValidityOnlyType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/SimpleAssessmentValidityOnlyResultType.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/SimpleAssessmentValidityOnlyResultType.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/SimpleAssessmentValidityOnlyResultType.cs (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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 Ringtoets.Common.Primitives.Properties;
+
+namespace Ringtoets.Common.Primitives
+{
+ ///
+ /// This enum defines the possible result types for a simple assessment
+ /// on a failure mechanism section in case there is only a relevance check.
+ ///
+ public enum SimpleAssessmentValidityOnlyResultType
+ {
+ ///
+ /// No option has been selected for this failure
+ /// mechanism section.
+ ///
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_None))]
+ None = 1,
+
+ ///
+ /// The failure mechanism section is not applicable.
+ ///
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.SimpleAssessmentResultType_NotApplicable))]
+ NotApplicable = 2,
+
+ ///
+ /// The failure mechanism section is applicable.
+ ///
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.SimpleAssessmentValidityOnlyResultType_Applicable))]
+ Applicable = 3
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -219,9 +219,9 @@
Assert.AreEqual("Value", columnData.ValueMember);
Assert.AreEqual("DisplayName", columnData.DisplayMember);
- IEnumerable> expectedDataSource =
- CreateExpectedEnumDisplayWrappers();
- AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource);
+ IEnumerable> expectedDataSource =
+ CreateExpectedEnumDisplayWrappers();
+ AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper[]) columnData.DataSource);
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -70,11 +70,11 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None, false)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, false)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.NotApplicable, true)]
- public void SimpleAssessmentIsSufficient_WithSimpleAssessmentResultValidityOnlyType_ReturnsExpectedResult(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult, bool expectedSufficiency)
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None, false)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable, false)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.NotApplicable, true)]
+ public void SimpleAssessmentIsSufficient_WithSimpleAssessmentValidityOnlyResultType_ReturnsExpectedResult(
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult, bool expectedSufficiency)
{
// Call
bool isSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(simpleAssessmentResult);
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/Ringtoets.Common.Primitives.Test.csproj
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/Ringtoets.Common.Primitives.Test.csproj (.../Ringtoets.Common.Primitives.Test.csproj) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/Ringtoets.Common.Primitives.Test.csproj (.../Ringtoets.Common.Primitives.Test.csproj) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -19,7 +19,7 @@
-
+
Fisheye: Tag e3f913fddac4cfa598ef5439ce6b832f354d7dd8 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentResultValidityOnlyTypeTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentValidityOnlyResultTypeTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentValidityOnlyResultTypeTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentValidityOnlyResultTypeTest.cs (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -0,0 +1,69 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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;
+
+namespace Ringtoets.Common.Primitives.Test
+{
+ [TestFixture]
+ public class SimpleAssessmentValidityOnlyResultTypeTest : EnumWithDisplayNameTestFixture
+ {
+ protected override IDictionary ExpectedValueForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ SimpleAssessmentValidityOnlyResultType.None, 1
+ },
+ {
+ SimpleAssessmentValidityOnlyResultType.NotApplicable, 2
+ },
+ {
+ SimpleAssessmentValidityOnlyResultType.Applicable, 3
+ }
+ };
+ }
+ }
+
+ protected override IDictionary ExpectedDisplayNameForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ SimpleAssessmentValidityOnlyResultType.None, ""
+ },
+ {
+ SimpleAssessmentValidityOnlyResultType.NotApplicable, "NVT"
+ },
+ {
+ SimpleAssessmentValidityOnlyResultType.Applicable, "WVT"
+ }
+ };
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs
===================================================================
diff -u -r19311fc87ea75a0407d8cdc617cc90b8c160429c -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs (.../DuneErosionFailureMechanismSectionResult.cs) (revision 19311fc87ea75a0407d8cdc617cc90b8c160429c)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs (.../DuneErosionFailureMechanismSectionResult.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -40,15 +40,15 @@
/// Thrown when is null.
public DuneErosionFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None;
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None;
AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated;
AssessmentLayerThree = RoundedDouble.NaN;
}
///
/// Gets or sets the simple assessment result.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get; set; }
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult { get; set; }
///
/// Gets or sets the value of the detailed assessment of safety per failure mechanism section, for which
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs
===================================================================
diff -u -r5785cc13c0454eaabed7ede4dad8e885db7efd50 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision 5785cc13c0454eaabed7ede4dad8e885db7efd50)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs (.../DuneErosionFailureMechanismResultView.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -67,18 +67,18 @@
RingtoetsCommonFormsResources.Section_DisplayName,
true);
- EnumDisplayWrapper[] simpleAssessmentDataSource =
- Enum.GetValues(typeof(SimpleAssessmentResultValidityOnlyType))
- .OfType()
- .Select(sa => new EnumDisplayWrapper(sa))
+ EnumDisplayWrapper[] simpleAssessmentDataSource =
+ Enum.GetValues(typeof(SimpleAssessmentValidityOnlyResultType))
+ .OfType()
+ .Select(sa => new EnumDisplayWrapper(sa))
.ToArray();
DataGridViewControl.AddComboBoxColumn(
nameof(DuneErosionSectionResultRow.SimpleAssessmentResult),
RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName,
simpleAssessmentDataSource,
- nameof(EnumDisplayWrapper.Value),
- nameof(EnumDisplayWrapper.DisplayName));
+ nameof(EnumDisplayWrapper.Value),
+ nameof(EnumDisplayWrapper.DisplayName));
EnumDisplayWrapper[] twoAResultDataSource =
Enum.GetValues(typeof(AssessmentLayerTwoAResult))
@@ -108,7 +108,7 @@
{
if (eventArgs.ColumnIndex > SimpleAssessmentColumnIndex)
{
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult = GetDataAtRow(eventArgs.RowIndex).SimpleAssessmentResult;
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult = GetDataAtRow(eventArgs.RowIndex).SimpleAssessmentResult;
if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(simpleAssessmentResult))
{
DataGridViewControl.DisableCell(eventArgs.RowIndex, eventArgs.ColumnIndex);
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs
===================================================================
diff -u -r833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs (.../DuneErosionSectionResultRow.cs) (revision 833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs (.../DuneErosionSectionResultRow.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -46,7 +46,7 @@
///
/// Gets or sets the value representing the simple assessment result.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult
{
get
{
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -rdeeb111cd648c41702c810d6b4f13ecc67098ccb -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -56,7 +56,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new DuneErosionFailureMechanismSectionResult(failureMechanismSection)
{
- SimpleAssessmentResult = random.NextEnumValue()
+ SimpleAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r7e64235010367ff8791434dfb717150e8f52e3ba -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision 7e64235010367ff8791434dfb717150e8f52e3ba)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -42,7 +42,7 @@
// Assert
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
- Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, result.SimpleAssessmentResult);
+ Assert.AreEqual(SimpleAssessmentValidityOnlyResultType.None, result.SimpleAssessmentResult);
Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.IsNaN(result.AssessmentLayerThree);
}
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs
===================================================================
diff -u -r44420c717ac32101ba0da4739d259c622f47976e -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision 44420c717ac32101ba0da4739d259c622f47976e)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -98,21 +98,21 @@
var result1 = new DuneErosionFailureMechanismSectionResult(
FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1"))
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result2 = new DuneErosionFailureMechanismSectionResult(
FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2"))
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result3 = new DuneErosionFailureMechanismSectionResult(
FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 3"))
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
AssessmentLayerThree = random.NextRoundedDouble()
};
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs
===================================================================
diff -u -r833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision 833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -68,7 +68,7 @@
mocks.ReplayAll();
var random = new Random(39);
- var newValue = random.NextEnumValue();
+ var newValue = random.NextEnumValue();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var result = new DuneErosionFailureMechanismSectionResult(section);
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -43,7 +43,7 @@
/// Thrown when is null.
public GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None;
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None;
DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability;
TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None;
TailorMadeAssessmentProbability = double.NaN;
@@ -59,7 +59,7 @@
///
/// Gets or sets the simple assessment result.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get; set; }
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult { get; set; }
///
/// Gets or sets the detailed assessment result.
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -116,7 +116,7 @@
///
/// Thrown when
/// is a valid value, but unsupported.
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult
{
get
{
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -72,7 +72,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(failureMechanismSection)
{
- SimpleAssessmentResult = random.NextEnumValue()
+ SimpleAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -42,7 +42,7 @@
// Assert
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
- Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, result.SimpleAssessmentResult);
+ Assert.AreEqual(SimpleAssessmentValidityOnlyResultType.None, result.SimpleAssessmentResult);
Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, result.DetailedAssessmentResult);
Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, result.TailorMadeAssessmentResult);
Assert.IsNaN(result.TailorMadeAssessmentProbability);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -184,7 +184,7 @@
DataGridViewCellCollection cells = rows[0].Cells;
Assert.AreEqual(columnCount, cells.Count);
Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
- Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value);
+ Assert.AreEqual(SimpleAssessmentValidityOnlyResultType.None, cells[simpleAssessmentResultIndex].Value);
Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value);
Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue);
Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -337,7 +337,7 @@
// When
calculator.ThrowExceptionOnCalculate = true;
- row.SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable;
+ row.SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable;
// Then
Assert.AreEqual(FailureMechanismSectionResultRowHelper.GetCategoryGroupDisplayname(FailureMechanismSectionAssemblyCategoryGroup.None),
@@ -401,7 +401,7 @@
// When
calculator.ThrowExceptionOnCalculate = false;
- row.SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable;
+ row.SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable;
// Then
Assert.AreEqual(string.Empty, columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex].ErrorText);
@@ -427,10 +427,10 @@
#region Column States
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None, true)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.NotApplicable, false)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, true)]
- public void Constructor_WithSimpleAssessment_ExpectedColumnStates(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None, true)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.NotApplicable, false)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable, true)]
+ public void Constructor_WithSimpleAssessment_ExpectedColumnStates(SimpleAssessmentValidityOnlyResultType simpleAssessmentResult,
bool cellsEnabled)
{
// Setup
@@ -653,10 +653,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void Constructor_SectionResultWithoutCalculation_DetailedAssessmentProbabilityHasErrorText(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Setup
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -685,10 +685,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void Constructor_SectionResultAndCalculationNotCalculated_DetailedAssessmentProbabilityHasErrorText(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Setup
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -718,10 +718,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void Constructor_SectionResultAndFailedCalculation_DetailedAssessmentProbabilityHasErrorText(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Setup
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -874,16 +874,16 @@
yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable
}).SetName("SectionWithoutCalculation");
yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
Calculation = new GrassCoverErosionInwardsCalculation()
}).SetName("SectionWithCalculationNoOutput");
yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
Calculation = new GrassCoverErosionInwardsCalculation
{
Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(double.NaN),
@@ -893,7 +893,7 @@
}).SetName("SectionWithInvalidCalculationOutput");
yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
Calculation = CreateCalculationWithOutput()
}).SetName("SectionWithValidCalculationOutput");
}
@@ -915,7 +915,7 @@
mocks.ReplayAll();
var random = new Random(39);
- var newValue = random.NextEnumValue();
+ var newValue = random.NextEnumValue();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(section);
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs (.../StabilityPointStructuresFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs (.../StabilityPointStructuresFailureMechanismSectionResult.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -44,7 +44,7 @@
/// Thrown when is null.
public StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None;
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None;
DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.Probability;
TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None;
TailorMadeAssessmentProbability = double.NaN;
@@ -60,7 +60,7 @@
///
/// Gets or sets the simple assessment result.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get; set; }
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult { get; set; }
///
/// Gets or sets the detailed assessment result.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -117,7 +117,7 @@
///
/// Thrown when
/// is a valid value, but unsupported.
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult
{
get
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -72,7 +72,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(failureMechanismSection)
{
- SimpleAssessmentResult = random.NextEnumValue()
+ SimpleAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -43,7 +43,7 @@
// Assert
Assert.IsInstanceOf(sectionResult);
Assert.IsNull(sectionResult.Calculation);
- Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, sectionResult.SimpleAssessmentResult);
+ Assert.AreEqual(SimpleAssessmentValidityOnlyResultType.None, sectionResult.SimpleAssessmentResult);
Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, sectionResult.DetailedAssessmentResult);
Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult);
Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -186,7 +186,7 @@
DataGridViewCellCollection cells = rows[0].Cells;
Assert.AreEqual(columnCount, cells.Count);
Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
- Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentResultIndex].Value);
+ Assert.AreEqual(SimpleAssessmentValidityOnlyResultType.None, cells[simpleAssessmentResultIndex].Value);
Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, cells[detailedAssessmentResultIndex].Value);
Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue);
Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -275,7 +275,7 @@
// When
calculator.ThrowExceptionOnCalculate = true;
- row.SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable;
+ row.SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable;
// Then
string expectedAssemblyDisplayName = FailureMechanismSectionResultRowHelper.GetCategoryGroupDisplayname(FailureMechanismSectionAssemblyCategoryGroup.None);
@@ -336,7 +336,7 @@
// When
calculator.ThrowExceptionOnCalculate = false;
- row.SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable;
+ row.SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable;
// Then
Assert.AreEqual(string.Empty, columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex].ErrorText);
@@ -460,10 +460,10 @@
#region Column States
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None, true)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.NotApplicable, false)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, true)]
- public void Constructor_WithSimpleAssessmentResultSet_ExpectedColumnStates(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None, true)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.NotApplicable, false)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable, true)]
+ public void Constructor_WithSimpleAssessmentResultSet_ExpectedColumnStates(SimpleAssessmentValidityOnlyResultType simpleAssessmentResult,
bool cellsEnabled)
{
// Setup
@@ -688,10 +688,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void Constructor_SectionResultWithoutCalculation_DetailedAssessmentProbabilityHasErrorText(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Setup
var failureMechanism = new StabilityPointStructuresFailureMechanism();
@@ -720,10 +720,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void Constructor_SectionResultAndCalculationNotCalculated_DetailedAssessmentProbabilityHasErrorText(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Setup
var failureMechanism = new StabilityPointStructuresFailureMechanism();
@@ -753,10 +753,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void Constructor_SectionResultAndFailedCalculation_DetailedAssessmentProbabilityHasErrorText(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Setup
var failureMechanism = new StabilityPointStructuresFailureMechanism();
@@ -907,24 +907,24 @@
yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable
}).SetName("SectionWithoutCalculationAndSimpleAssessmentResultNotApplicable");
yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
Calculation = new StructuresCalculation()
}).SetName("SectionWithCalculationNoOutputAndSimpleAssessmentResultNotApplicable");
yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
Calculation = new StructuresCalculation
{
Output = new TestStructuresOutput(double.NaN)
}
}).SetName("SectionWithInvalidCalculationOutputAndSimpleAssessmentResultNotApplicable");
yield return new TestCaseData(new StabilityPointStructuresFailureMechanismSectionResult(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
Calculation = CreateCalculationWithOutput()
}).SetName("SectionWithValidCalculationOutputAndSimpleAssessmentResultNotApplicable");
}
@@ -950,7 +950,7 @@
var result = new StabilityPointStructuresFailureMechanismSectionResult(section);
result.Attach(observer);
- var newValue = new Random(21).NextEnumValue();
+ var newValue = new Random(21).NextEnumValue();
using (new AssemblyToolCalculatorFactoryConfig())
{
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -40,15 +40,15 @@
/// Thrown when is null.
public StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None;
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None;
AssessmentLayerTwoA = AssessmentLayerTwoAResult.NotCalculated;
AssessmentLayerThree = RoundedDouble.NaN;
}
///
/// Gets or sets the simple assessment result.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get; set; }
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult { get; set; }
///
/// Gets or sets the value of the detailed assessment of safety per failure mechanism section, for which
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs
===================================================================
diff -u -r5785cc13c0454eaabed7ede4dad8e885db7efd50 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision 5785cc13c0454eaabed7ede4dad8e885db7efd50)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs (.../StabilityStoneCoverResultView.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -66,18 +66,18 @@
RingtoetsCommonFormsResources.Section_DisplayName,
true);
- EnumDisplayWrapper[] simpleAssessmentDataSource =
- Enum.GetValues(typeof(SimpleAssessmentResultValidityOnlyType))
- .OfType()
- .Select(sa => new EnumDisplayWrapper(sa))
+ EnumDisplayWrapper[] simpleAssessmentDataSource =
+ Enum.GetValues(typeof(SimpleAssessmentValidityOnlyResultType))
+ .OfType()
+ .Select(sa => new EnumDisplayWrapper(sa))
.ToArray();
DataGridViewControl.AddComboBoxColumn(
nameof(StabilityStoneCoverSectionResultRow.SimpleAssessmentResult),
RingtoetsCommonFormsResources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName,
simpleAssessmentDataSource,
- nameof(EnumDisplayWrapper.Value),
- nameof(EnumDisplayWrapper.DisplayName));
+ nameof(EnumDisplayWrapper.Value),
+ nameof(EnumDisplayWrapper.DisplayName));
EnumDisplayWrapper[] twoAResultDataSource =
Enum.GetValues(typeof(AssessmentLayerTwoAResult))
@@ -107,7 +107,7 @@
{
if (eventArgs.ColumnIndex > 1)
{
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult = GetDataAtRow(eventArgs.RowIndex).SimpleAssessmentResult;
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult = GetDataAtRow(eventArgs.RowIndex).SimpleAssessmentResult;
if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(simpleAssessmentResult))
{
DataGridViewControl.DisableCell(eventArgs.RowIndex, eventArgs.ColumnIndex);
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs
===================================================================
diff -u -r833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs (.../StabilityStoneCoverSectionResultRow.cs) (revision 833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs (.../StabilityStoneCoverSectionResultRow.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -47,7 +47,7 @@
///
/// Gets or sets the value representing the simple assessment result.
///
- public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult
+ public SimpleAssessmentValidityOnlyResultType SimpleAssessmentResult
{
get
{
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -r015eb3822c4c4d03e957ab676e5dc4428c46f1eb -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 015eb3822c4c4d03e957ab676e5dc4428c46f1eb)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -56,7 +56,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(failureMechanismSection)
{
- SimpleAssessmentResult = random.NextEnumValue()
+ SimpleAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r607494c1b1e1e5fd53be1f474c3e8042245e6467 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision 607494c1b1e1e5fd53be1f474c3e8042245e6467)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -42,7 +42,7 @@
// Assert
Assert.IsInstanceOf(result);
Assert.AreSame(section, result.Section);
- Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, result.SimpleAssessmentResult);
+ Assert.AreEqual(SimpleAssessmentValidityOnlyResultType.None, result.SimpleAssessmentResult);
Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, result.AssessmentLayerTwoA);
Assert.IsNaN(result.AssessmentLayerThree);
}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs
===================================================================
diff -u -r44420c717ac32101ba0da4739d259c622f47976e -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 44420c717ac32101ba0da4739d259c622f47976e)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -98,19 +98,19 @@
var random = new Random(21);
var result1 = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1"))
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.None,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result2 = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2"))
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
AssessmentLayerThree = random.NextRoundedDouble()
};
var result3 = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 3"))
{
- SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.Applicable,
+ SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.Applicable,
AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
AssessmentLayerThree = random.NextRoundedDouble()
};
@@ -167,10 +167,10 @@
}
[Test]
- [TestCase(SimpleAssessmentResultValidityOnlyType.None)]
- [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.None)]
+ [TestCase(SimpleAssessmentValidityOnlyResultType.Applicable)]
public void GivenFormWithSimpleFailureMechanismResultView_WhenSectionPassesSimpleAssessmentAndListenersNotified_ThenRowsForSectionBecomesDisabled(
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
+ SimpleAssessmentValidityOnlyResultType simpleAssessmentResult)
{
// Given
var section = new FailureMechanismSection("Section 1", new[]
@@ -196,7 +196,7 @@
form.Show();
// When
- result.SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.NotApplicable;
+ result.SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable;
result.NotifyObservers();
// Then
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs
===================================================================
diff -u -r833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1 -re3f913fddac4cfa598ef5439ce6b832f354d7dd8
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision 833e75c2d3d73d3b7c63ab12d44edaa3cbb09bf1)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
@@ -68,7 +68,7 @@
mocks.ReplayAll();
var random = new Random(39);
- var newValue = random.NextEnumValue();
+ var newValue = random.NextEnumValue();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var result = new StabilityStoneCoverFailureMechanismSectionResult(section);