Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -r015b55ad823829b18ff6d14c121f99aa83aaf372 -r18de317218ca80545399311fcdbea5ad6b628b2b
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 015b55ad823829b18ff6d14c121f99aa83aaf372)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 18de317218ca80545399311fcdbea5ad6b628b2b)
@@ -351,18 +351,18 @@
SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = actualSectionAssemblyResult.SectionResults;
Assert.AreEqual(3, serializedSectionResults.Length);
- AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.SimpleAssembly,
- SerializableAssessmentType.SimpleAssessment,
- serializedSectionResults[0]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.DetailedAssembly,
- SerializableAssessmentType.DetailedAssessment,
- serializedSectionResults[1]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.TailorMadeAssembly,
- SerializableAssessmentType.TailorMadeAssessment,
- serializedSectionResults[2]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.CombinedAssembly,
- SerializableAssessmentType.CombinedAssessment,
- actualSectionAssemblyResult.CombinedSectionResult);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.SimpleAssembly,
+ SerializableAssessmentType.SimpleAssessment,
+ serializedSectionResults[0]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.DetailedAssembly,
+ SerializableAssessmentType.DetailedAssessment,
+ serializedSectionResults[1]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.TailorMadeAssembly,
+ SerializableAssessmentType.TailorMadeAssessment,
+ serializedSectionResults[2]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithProbability.CombinedAssembly,
+ SerializableAssessmentType.CombinedAssessment,
+ actualSectionAssemblyResult.CombinedSectionResult);
}
private static void AssertSectionAssemblyResultsWithoutProbability(ExportableAggregatedFailureMechanismSectionAssemblyResultBase expectedSectionAssemblyResult,
@@ -372,18 +372,16 @@
SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = actualSectionAssemblyResult.SectionResults;
Assert.AreEqual(3, serializedSectionResults.Length);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.SimpleAssembly,
- SerializableAssessmentType.SimpleAssessment,
- serializedSectionResults[0]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.DetailedAssembly,
- SerializableAssessmentType.DetailedAssessment,
- serializedSectionResults[1]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.TailorMadeAssembly,
- SerializableAssessmentType.TailorMadeAssessment,
- serializedSectionResults[2]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.CombinedAssembly,
- SerializableAssessmentType.CombinedAssessment,
- actualSectionAssemblyResult.CombinedSectionResult);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.SimpleAssembly,
+ SerializableAssessmentType.SimpleAssessment,
+ serializedSectionResults[0]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.DetailedAssembly,
+ SerializableAssessmentType.DetailedAssessment,
+ serializedSectionResults[1]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.TailorMadeAssembly,
+ SerializableAssessmentType.TailorMadeAssessment, serializedSectionResults[2]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.CombinedAssembly,
+ SerializableAssessmentType.CombinedAssessment, actualSectionAssemblyResult.CombinedSectionResult);
}
private static void AssertSectionAssemblyResultsWithoutDetailedAssembly(ExportableAggregatedFailureMechanismSectionAssemblyResultBase expectedSectionAssemblyResult,
@@ -393,41 +391,17 @@
SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = actualSectionAssemblyResult.SectionResults;
Assert.AreEqual(2, serializedSectionResults.Length);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.SimpleAssembly,
- SerializableAssessmentType.SimpleAssessment,
- serializedSectionResults[0]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.TailorMadeAssembly,
- SerializableAssessmentType.TailorMadeAssessment,
- serializedSectionResults[1]);
- AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.CombinedAssembly,
- SerializableAssessmentType.CombinedAssessment,
- actualSectionAssemblyResult.CombinedSectionResult);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.SimpleAssembly,
+ SerializableAssessmentType.SimpleAssessment,
+ serializedSectionResults[0]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.TailorMadeAssembly,
+ SerializableAssessmentType.TailorMadeAssessment,
+ serializedSectionResults[1]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(expectedSectionAssemblyResultWithoutProbability.CombinedAssembly,
+ SerializableAssessmentType.CombinedAssessment,
+ actualSectionAssemblyResult.CombinedSectionResult);
}
- private static void AssertAssemblyResult(ExportableSectionAssemblyResult expectedResult,
- SerializableAssessmentType expectedAssessmentType,
- SerializableFailureMechanismSectionAssemblyResult actualResult)
- {
- Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
- actualResult.CategoryGroup);
- Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
- actualResult.AssemblyMethod);
- Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
- Assert.IsNull(actualResult.Probability);
- }
-
- private static void AssertAssemblyResult(ExportableSectionAssemblyResultWithProbability expectedResult,
- SerializableAssessmentType expectedAssessmentType,
- SerializableFailureMechanismSectionAssemblyResult actualResult)
- {
- Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
- actualResult.CategoryGroup);
- Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
- actualResult.AssemblyMethod);
- Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
- Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
- }
-
private static SerializableTotalAssemblyResult CreateSerializableTotalAssembly(string totalAssemblyId)
{
return new SerializableTotalAssemblyResult(totalAssemblyId,
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs
===================================================================
diff -u -rab2dcda9146271b4df1d022a5c513989bbe49d72 -r18de317218ca80545399311fcdbea5ad6b628b2b
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision ab2dcda9146271b4df1d022a5c513989bbe49d72)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision 18de317218ca80545399311fcdbea5ad6b628b2b)
@@ -142,18 +142,18 @@
SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults;
Assert.AreEqual(3, serializedSectionResults.Length);
- AssertAssemblyResult(sectionResult.SimpleAssembly,
- SerializableAssessmentType.SimpleAssessment,
- serializedSectionResults[0]);
- AssertAssemblyResult(sectionResult.DetailedAssembly,
- SerializableAssessmentType.DetailedAssessment,
- serializedSectionResults[1]);
- AssertAssemblyResult(sectionResult.TailorMadeAssembly,
- SerializableAssessmentType.TailorMadeAssessment,
- serializedSectionResults[2]);
- AssertAssemblyResult(sectionResult.CombinedAssembly,
- SerializableAssessmentType.CombinedAssessment,
- failureMechanismSectionAssembly.CombinedSectionResult);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.SimpleAssembly,
+ SerializableAssessmentType.SimpleAssessment,
+ serializedSectionResults[0]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.DetailedAssembly,
+ SerializableAssessmentType.DetailedAssessment,
+ serializedSectionResults[1]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.TailorMadeAssembly,
+ SerializableAssessmentType.TailorMadeAssessment,
+ serializedSectionResults[2]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.CombinedAssembly,
+ SerializableAssessmentType.CombinedAssessment,
+ failureMechanismSectionAssembly.CombinedSectionResult);
SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(sectionResult.FailureMechanismSection,
serializableCollection,
@@ -266,18 +266,18 @@
SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults;
Assert.AreEqual(3, serializedSectionResults.Length);
- AssertAssemblyResult(sectionResult.SimpleAssembly,
- SerializableAssessmentType.SimpleAssessment,
- serializedSectionResults[0]);
- AssertAssemblyResult(sectionResult.DetailedAssembly,
- SerializableAssessmentType.DetailedAssessment,
- serializedSectionResults[1]);
- AssertAssemblyResult(sectionResult.TailorMadeAssembly,
- SerializableAssessmentType.TailorMadeAssessment,
- serializedSectionResults[2]);
- AssertAssemblyResult(sectionResult.CombinedAssembly,
- SerializableAssessmentType.CombinedAssessment,
- failureMechanismSectionAssembly.CombinedSectionResult);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.SimpleAssembly,
+ SerializableAssessmentType.SimpleAssessment,
+ serializedSectionResults[0]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.DetailedAssembly,
+ SerializableAssessmentType.DetailedAssessment,
+ serializedSectionResults[1]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.TailorMadeAssembly,
+ SerializableAssessmentType.TailorMadeAssessment,
+ serializedSectionResults[2]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.CombinedAssembly,
+ SerializableAssessmentType.CombinedAssessment,
+ failureMechanismSectionAssembly.CombinedSectionResult);
SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(sectionResult.FailureMechanismSection,
serializableCollection,
@@ -386,45 +386,21 @@
SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults;
Assert.AreEqual(2, serializedSectionResults.Length);
- AssertAssemblyResult(sectionResult.SimpleAssembly,
- SerializableAssessmentType.SimpleAssessment,
- serializedSectionResults[0]);
- AssertAssemblyResult(sectionResult.TailorMadeAssembly,
- SerializableAssessmentType.TailorMadeAssessment,
- serializedSectionResults[1]);
- AssertAssemblyResult(sectionResult.CombinedAssembly,
- SerializableAssessmentType.CombinedAssessment,
- failureMechanismSectionAssembly.CombinedSectionResult);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.SimpleAssembly,
+ SerializableAssessmentType.SimpleAssessment,
+ serializedSectionResults[0]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.TailorMadeAssembly,
+ SerializableAssessmentType.TailorMadeAssessment,
+ serializedSectionResults[1]);
+ SerializableFailureMechanismSectionAssemblyResultTestHelper.AssertAssemblyResult(sectionResult.CombinedAssembly,
+ SerializableAssessmentType.CombinedAssessment,
+ failureMechanismSectionAssembly.CombinedSectionResult);
SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(sectionResult.FailureMechanismSection,
serializableCollection,
aggregatedSectionAssembly.FailureMechanismSection);
}
- private static void AssertAssemblyResult(ExportableSectionAssemblyResult expectedResult,
- SerializableAssessmentType expectedAssessmentType,
- SerializableFailureMechanismSectionAssemblyResult actualResult)
- {
- Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
- actualResult.CategoryGroup);
- Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
- actualResult.AssemblyMethod);
- Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
- Assert.IsNull(actualResult.Probability);
- }
-
- private static void AssertAssemblyResult(ExportableSectionAssemblyResultWithProbability expectedResult,
- SerializableAssessmentType expectedAssessmentType,
- SerializableFailureMechanismSectionAssemblyResult actualResult)
- {
- Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
- actualResult.CategoryGroup);
- Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
- actualResult.AssemblyMethod);
- Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
- Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
- }
-
private static ExportableSectionAssemblyResult CreateSectionAssemblyResult(int seed)
{
var random = new Random(seed);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/Ringtoets.Integration.IO.TestUtil.csproj
===================================================================
diff -u -r15ac8c34397b5d86d718b4bc1442910e19c9d329 -r18de317218ca80545399311fcdbea5ad6b628b2b
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/Ringtoets.Integration.IO.TestUtil.csproj (.../Ringtoets.Integration.IO.TestUtil.csproj) (revision 15ac8c34397b5d86d718b4bc1442910e19c9d329)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/Ringtoets.Integration.IO.TestUtil.csproj (.../Ringtoets.Integration.IO.TestUtil.csproj) (revision 18de317218ca80545399311fcdbea5ad6b628b2b)
@@ -22,6 +22,7 @@
+
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs (revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs (revision 18de317218ca80545399311fcdbea5ad6b628b2b)
@@ -0,0 +1,89 @@
+// 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 NUnit.Framework;
+using Ringtoets.AssemblyTool.IO.Model.DataTypes;
+using Ringtoets.AssemblyTool.IO.Model.Enums;
+using Ringtoets.Integration.IO.Assembly;
+using Ringtoets.Integration.IO.Creators;
+
+namespace Ringtoets.Integration.IO.TestUtil
+{
+ ///
+ /// Helper class to assert a
+ ///
+ public static class SerializableFailureMechanismSectionAssemblyResultTestHelper
+ {
+ ///
+ /// Asserts a
+ /// against an
+ ///
+ /// The to assert against.
+ /// The expected
+ /// of the .
+ /// The to assert.
+ /// Thrown when:
+ ///
+ /// - The assembly methods do not match,
+ /// - The failure mechanism category group assembly results do not match,
+ /// - The failure mechanism section assembly type do not match,
+ /// - The probability of has a value.
+ ///
+ public static void AssertAssemblyResult(ExportableSectionAssemblyResult expectedResult,
+ SerializableAssessmentType expectedAssessmentType,
+ SerializableFailureMechanismSectionAssemblyResult actualResult)
+ {
+ Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
+ actualResult.CategoryGroup);
+ Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
+ actualResult.AssemblyMethod);
+ Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
+ Assert.IsNull(actualResult.Probability);
+ }
+
+ ///
+ /// Asserts a
+ /// against an
+ ///
+ /// The to assert against.
+ /// The expected
+ /// of the .
+ /// The to assert.
+ /// Thrown when:
+ ///
+ /// - The assembly methods do not match,
+ /// - The failure mechanism category group assembly results do not match,
+ /// - The failure mechanism section assembly type do not match,
+ /// - The probability of does not match.
+ ///
+ public static void AssertAssemblyResult(ExportableSectionAssemblyResultWithProbability expectedResult,
+ SerializableAssessmentType expectedAssessmentType,
+ SerializableFailureMechanismSectionAssemblyResult actualResult)
+ {
+ Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
+ actualResult.CategoryGroup);
+ Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
+ actualResult.AssemblyMethod);
+ Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
+ Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
+ }
+ }
+}
\ No newline at end of file