Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs
===================================================================
diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs (.../DuneErosionFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResult.cs (.../DuneErosionFailureMechanismSectionResult.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -43,7 +43,7 @@
DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForFactorizedLowerLimitNorm = DetailedAssessmentResultType.None;
- TailorMadeAssessmentResult = FailureMechanismSectionAssemblyCategoryGroup.None;
+ TailorMadeAssessmentResult = TailorMadeAssessmentCategoryGroupResultType.None;
ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
}
@@ -85,7 +85,7 @@
///
/// Gets or sets the tailor made assessment result.
///
- public FailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult { get; set; }
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult { get; set; }
///
/// Gets or sets the indicator whether the combined assembly should be overwritten by .
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs
===================================================================
diff -u -rbbbfacd9e38cf43c98dba73e39694850fb932a66 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs (.../DuneErosionSectionResultRow.cs) (revision bbbfacd9e38cf43c98dba73e39694850fb932a66)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionSectionResultRow.cs (.../DuneErosionSectionResultRow.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -209,15 +209,15 @@
///
/// Thrown when
/// is a valid value, but unsupported.
- public SelectableFailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult
{
get
{
- return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.TailorMadeAssessmentResult);
+ return SectionResult.TailorMadeAssessmentResult;
}
set
{
- SectionResult.TailorMadeAssessmentResult = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value);
+ SectionResult.TailorMadeAssessmentResult = value;
UpdateInternalData();
}
}
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r5e0a72833803f6a51d6e70a166bdd48d1d4418c7 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismAssemblyFactoryTest.cs) (revision 5e0a72833803f6a51d6e70a166bdd48d1d4418c7)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs (.../DuneErosionFailureMechanismAssemblyFactoryTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -236,7 +236,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new DuneErosionFailureMechanismSectionResult(failureMechanismSection)
{
- TailorMadeAssessmentResult = random.NextEnumValue()
+ TailorMadeAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -248,7 +248,7 @@
DuneErosionFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(sectionResult);
// Assert
- Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentGroupInput);
+ Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentCategoryGroupResultInput);
}
}
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r90628a1cd9c2bee5e41f323e448c799044aec528 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision 90628a1cd9c2bee5e41f323e448c799044aec528)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultTest.cs (.../DuneErosionFailureMechanismSectionResultTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -48,7 +48,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, result.TailorMadeAssessmentResult);
Assert.IsFalse(result.UseManualAssemblyCategoryGroup);
Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
}
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -154,7 +154,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForFactorizedLowerLimitNormIndex].Value);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[tailorMadeResultIndex].Value);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, cells[tailorMadeResultIndex].Value);
Assert.AreEqual("VIIv", cells[simpleAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("Iv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs
===================================================================
diff -u -rcbd59f2213a5cfac87c5af5039ff452ac9f39251 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision cbd59f2213a5cfac87c5af5039ff452ac9f39251)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -101,8 +101,7 @@
Assert.AreEqual(result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, row.DetailedAssessmentResultForSignalingNorm);
Assert.AreEqual(result.DetailedAssessmentResultForLowerLimitNorm, row.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(result.DetailedAssessmentResultForFactorizedLowerLimitNorm, row.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.TailorMadeAssessmentResult),
- row.TailorMadeAssessmentResult);
+ Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup);
Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup),
row.ManualAssemblyCategoryGroup);
@@ -640,7 +639,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);
@@ -654,8 +653,7 @@
row.TailorMadeAssessmentResult = newValue;
// Assert
- FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue);
- Assert.AreEqual(expectedCategoryGroup, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(newValue, result.TailorMadeAssessmentResult);
mocks.VerifyAll();
}
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResult.cs
===================================================================
diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResult.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -43,7 +43,7 @@
DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForFactorizedLowerLimitNorm = DetailedAssessmentResultType.None;
- TailorMadeAssessmentResult = FailureMechanismSectionAssemblyCategoryGroup.None;
+ TailorMadeAssessmentResult = TailorMadeAssessmentCategoryGroupResultType.None;
ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
}
@@ -85,7 +85,7 @@
///
/// Gets or sets the tailor made assessment result.
///
- public FailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult { get; set; }
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult { get; set; }
///
/// Gets or sets the indicator whether the combined assembly should be overwritten by .
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs
===================================================================
diff -u -rbbbfacd9e38cf43c98dba73e39694850fb932a66 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs) (revision bbbfacd9e38cf43c98dba73e39694850fb932a66)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -209,15 +209,15 @@
///
/// Thrown when
/// is a valid value, but unsupported.
- public SelectableFailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult
{
get
{
- return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.TailorMadeAssessmentResult);
+ return SectionResult.TailorMadeAssessmentResult;
}
set
{
- SectionResult.TailorMadeAssessmentResult = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value);
+ SectionResult.TailorMadeAssessmentResult = value;
UpdateInternalData();
}
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r5e0a72833803f6a51d6e70a166bdd48d1d4418c7 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 5e0a72833803f6a51d6e70a166bdd48d1d4418c7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -236,7 +236,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(failureMechanismSection)
{
- TailorMadeAssessmentResult = random.NextEnumValue()
+ TailorMadeAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -248,7 +248,7 @@
GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(sectionResult);
// Assert
- Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentGroupInput);
+ Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentCategoryGroupResultInput);
}
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rb096784d1845696aba767ca12194673dd9347428 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision b096784d1845696aba767ca12194673dd9347428)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -31,7 +31,7 @@
public class GrassCoverErosionOutwardsFailureMechanismSectionResultTest
{
[Test]
- public void Constructor_WithSection_ResultCreatedForSection()
+ public void Constructor_WithParameters_ExpectedValues()
{
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -41,13 +41,14 @@
// Assert
Assert.IsInstanceOf(result);
+ Assert.AreSame(section, result.Section);
Assert.AreEqual(SimpleAssessmentResultType.None, result.SimpleAssessmentResult);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedSignalingNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForSignalingNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, result.TailorMadeAssessmentResult);
Assert.IsFalse(result.UseManualAssemblyCategoryGroup);
Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
}
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -155,7 +155,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForFactorizedLowerLimitNormIndex].Value);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[tailorMadeResultIndex].Value);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, cells[tailorMadeResultIndex].Value);
Assert.AreEqual("Iv", cells[simpleAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("Iv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -rcbd59f2213a5cfac87c5af5039ff452ac9f39251 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs) (revision cbd59f2213a5cfac87c5af5039ff452ac9f39251)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -88,8 +88,7 @@
Assert.AreEqual(result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, row.DetailedAssessmentResultForSignalingNorm);
Assert.AreEqual(result.DetailedAssessmentResultForLowerLimitNorm, row.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(result.DetailedAssessmentResultForFactorizedLowerLimitNorm, row.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.TailorMadeAssessmentResult),
- row.TailorMadeAssessmentResult);
+ Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup);
Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup),
row.ManualAssemblyCategoryGroup);
@@ -629,7 +628,7 @@
mocks.ReplayAll();
var random = new Random(39);
- var newValue = random.NextEnumValue();
+ var newValue = random.NextEnumValue();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var result = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section);
@@ -643,8 +642,7 @@
row.TailorMadeAssessmentResult = newValue;
// Assert
- FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue);
- Assert.AreEqual(expectedCategoryGroup, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(newValue, result.TailorMadeAssessmentResult);
mocks.VerifyAll();
}
}
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs
===================================================================
diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResult.cs (.../StabilityStoneCoverFailureMechanismSectionResult.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -43,7 +43,7 @@
DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForFactorizedLowerLimitNorm = DetailedAssessmentResultType.None;
- TailorMadeAssessmentResult = FailureMechanismSectionAssemblyCategoryGroup.None;
+ TailorMadeAssessmentResult = TailorMadeAssessmentCategoryGroupResultType.None;
ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
}
@@ -85,7 +85,7 @@
///
/// Gets or sets the tailor made assessment result.
///
- public FailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult { get; set; }
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult { get; set; }
///
/// Gets or sets the indicator whether the combined assembly should be overwritten by .
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs
===================================================================
diff -u -rbbbfacd9e38cf43c98dba73e39694850fb932a66 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs (.../StabilityStoneCoverSectionResultRow.cs) (revision bbbfacd9e38cf43c98dba73e39694850fb932a66)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverSectionResultRow.cs (.../StabilityStoneCoverSectionResultRow.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -210,15 +210,15 @@
///
/// Thrown when
/// is a valid value, but unsupported.
- public SelectableFailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult
{
get
{
- return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.TailorMadeAssessmentResult);
+ return SectionResult.TailorMadeAssessmentResult;
}
set
{
- SectionResult.TailorMadeAssessmentResult = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value);
+ SectionResult.TailorMadeAssessmentResult = value;
UpdateInternalData();
}
}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r5e0a72833803f6a51d6e70a166bdd48d1d4418c7 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs) (revision 5e0a72833803f6a51d6e70a166bdd48d1d4418c7)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -236,7 +236,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(failureMechanismSection)
{
- TailorMadeAssessmentResult = random.NextEnumValue()
+ TailorMadeAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -248,7 +248,7 @@
StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(sectionResult);
// Assert
- Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentGroupInput);
+ Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentCategoryGroupResultInput);
}
}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs
===================================================================
diff -u -ref5806c808ecd8a1d443a647f3bde8c46d48dfe1 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision ef5806c808ecd8a1d443a647f3bde8c46d48dfe1)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -48,7 +48,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, result.TailorMadeAssessmentResult);
Assert.IsFalse(result.UseManualAssemblyCategoryGroup);
Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
}
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -155,7 +155,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForFactorizedLowerLimitNormIndex].Value);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[tailorMadeResultIndex].Value);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, cells[tailorMadeResultIndex].Value);
Assert.AreEqual("VIIv", cells[simpleAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("Iv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs
===================================================================
diff -u -rcbd59f2213a5cfac87c5af5039ff452ac9f39251 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision cbd59f2213a5cfac87c5af5039ff452ac9f39251)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverSectionResultRowTest.cs (.../StabilityStoneCoverSectionResultRowTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -103,8 +103,7 @@
Assert.AreEqual(result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, row.DetailedAssessmentResultForSignalingNorm);
Assert.AreEqual(result.DetailedAssessmentResultForLowerLimitNorm, row.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(result.DetailedAssessmentResultForFactorizedLowerLimitNorm, row.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.TailorMadeAssessmentResult),
- row.TailorMadeAssessmentResult);
+ Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup);
Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup),
row.ManualAssemblyCategoryGroup);
@@ -643,7 +642,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);
@@ -657,8 +656,7 @@
row.TailorMadeAssessmentResult = newValue;
// Assert
- FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue);
- Assert.AreEqual(expectedCategoryGroup, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(newValue, result.TailorMadeAssessmentResult);
mocks.VerifyAll();
}
}
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs
===================================================================
diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResult.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResult.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -43,7 +43,7 @@
DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForLowerLimitNorm = DetailedAssessmentResultType.None;
DetailedAssessmentResultForFactorizedLowerLimitNorm = DetailedAssessmentResultType.None;
- TailorMadeAssessmentResult = FailureMechanismSectionAssemblyCategoryGroup.None;
+ TailorMadeAssessmentResult = TailorMadeAssessmentCategoryGroupResultType.None;
ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
}
@@ -85,7 +85,7 @@
///
/// Gets or sets the tailor made assessment result.
///
- public FailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult { get; set; }
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult { get; set; }
///
/// Gets or sets the indicator whether the combined assembly should be overwritten by .
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs
===================================================================
diff -u -rbbbfacd9e38cf43c98dba73e39694850fb932a66 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision bbbfacd9e38cf43c98dba73e39694850fb932a66)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -209,15 +209,15 @@
///
/// Thrown when
/// is a valid value, but unsupported.
- public SelectableFailureMechanismSectionAssemblyCategoryGroup TailorMadeAssessmentResult
+ public TailorMadeAssessmentCategoryGroupResultType TailorMadeAssessmentResult
{
get
{
- return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.TailorMadeAssessmentResult);
+ return SectionResult.TailorMadeAssessmentResult;
}
set
{
- SectionResult.TailorMadeAssessmentResult = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value);
+ SectionResult.TailorMadeAssessmentResult = value;
UpdateInternalData();
}
}
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r5e0a72833803f6a51d6e70a166bdd48d1d4418c7 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision 5e0a72833803f6a51d6e70a166bdd48d1d4418c7)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs (.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -236,7 +236,7 @@
FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(failureMechanismSection)
{
- TailorMadeAssessmentResult = random.NextEnumValue()
+ TailorMadeAssessmentResult = random.NextEnumValue()
};
using (new AssemblyToolCalculatorFactoryConfig())
@@ -248,7 +248,7 @@
WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(sectionResult);
// Assert
- Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentGroupInput);
+ Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentCategoryGroupResultInput);
}
}
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs
===================================================================
diff -u -ref5806c808ecd8a1d443a647f3bde8c46d48dfe1 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision ef5806c808ecd8a1d443a647f3bde8c46d48dfe1)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -48,7 +48,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, result.TailorMadeAssessmentResult);
Assert.IsFalse(result.UseManualAssemblyCategoryGroup);
Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
}
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs
===================================================================
diff -u -rabff4c96abe92244fa1cea606223edb85f59e1fd -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -155,7 +155,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForLowerLimitNormIndex].Value);
Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForFactorizedLowerLimitNormIndex].Value);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[tailorMadeResultIndex].Value);
+ Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, cells[tailorMadeResultIndex].Value);
Assert.AreEqual("Iv", cells[simpleAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value);
Assert.AreEqual("Iv", cells[tailorMadeAssemblyCategoryGroupIndex].Value);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs
===================================================================
diff -u -rcbd59f2213a5cfac87c5af5039ff452ac9f39251 -r81fd8acef376c0e4bcceab16676c1313e4293e83
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision cbd59f2213a5cfac87c5af5039ff452ac9f39251)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRowTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83)
@@ -103,8 +103,7 @@
Assert.AreEqual(result.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, row.DetailedAssessmentResultForSignalingNorm);
Assert.AreEqual(result.DetailedAssessmentResultForLowerLimitNorm, row.DetailedAssessmentResultForLowerLimitNorm);
Assert.AreEqual(result.DetailedAssessmentResultForFactorizedLowerLimitNorm, row.DetailedAssessmentResultForFactorizedLowerLimitNorm);
- Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.TailorMadeAssessmentResult),
- row.TailorMadeAssessmentResult);
+ Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup);
Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup),
row.ManualAssemblyCategoryGroup);
@@ -644,7 +643,7 @@
mocks.ReplayAll();
var random = new Random(39);
- var newValue = random.NextEnumValue();
+ var newValue = random.NextEnumValue();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var result = new WaveImpactAsphaltCoverFailureMechanismSectionResult(section);
@@ -658,8 +657,7 @@
row.TailorMadeAssessmentResult = newValue;
// Assert
- FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue);
- Assert.AreEqual(expectedCategoryGroup, result.TailorMadeAssessmentResult);
+ Assert.AreEqual(newValue, result.TailorMadeAssessmentResult);
mocks.VerifyAll();
}
}