Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismCreator.cs
===================================================================
diff -u -r9c6a10855fb4ce6a5667226abc5a27308439c842 -r821ea9c9eada82e432462f9be0390dd5b45ffb29
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismCreator.cs (.../AggregatedSerializableFailureMechanismCreator.cs) (revision 9c6a10855fb4ce6a5667226abc5a27308439c842)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismCreator.cs (.../AggregatedSerializableFailureMechanismCreator.cs) (revision 821ea9c9eada82e432462f9be0390dd5b45ffb29)
@@ -21,7 +21,6 @@
using System;
using System.Linq;
-using Ringtoets.AssemblyTool.Data;
using Ringtoets.AssemblyTool.IO.Model;
using Ringtoets.Integration.IO.AggregatedSerializable;
using Ringtoets.Integration.IO.Assembly;
@@ -47,7 +46,7 @@
/// Thrown when any parameter is null.
/// Thrown when the serializable assembly cannot be created.
/// Thrown when the
- /// contains unsupported items in the failure mechanism (section) assembly results.
+ /// contains unsupported items in the failure mechanism section assembly results.
public static AggregatedSerializableFailureMechanism Create(IdentifierGenerator idGenerator,
SerializableTotalAssemblyResult serializableTotalAssemblyResult,
ExportableFailureMechanism failureMechanism)
@@ -67,8 +66,6 @@
throw new ArgumentNullException(nameof(failureMechanism));
}
- ValidateFailureMechanismAssemblyResult(failureMechanism.FailureMechanismAssembly);
-
SerializableFailureMechanism serializableFailureMechanism = SerializableFailureMechanismCreator.Create(idGenerator, serializableTotalAssemblyResult, failureMechanism);
var serializableCollection = new SerializableFailureMechanismSectionCollection(idGenerator.GetNewId(Resources.SerializableFailureMechanismSectionCollection_IdPrefix));
@@ -97,7 +94,7 @@
/// Thrown when any parameter is null.
/// Thrown when the serializable assembly cannot be created.
/// Thrown when the
- /// contains unsupported items in the failure mechanism (section) assembly results.
+ /// contains unsupported items in the failure mechanism section assembly results.
public static AggregatedSerializableFailureMechanism Create(IdentifierGenerator idGenerator,
SerializableTotalAssemblyResult serializableTotalAssemblyResult,
ExportableFailureMechanism failureMechanism)
@@ -117,8 +114,6 @@
throw new ArgumentNullException(nameof(failureMechanism));
}
- ValidateFailureMechanismAssemblyResult(failureMechanism.FailureMechanismAssembly);
-
SerializableFailureMechanism serializableFailureMechanism = SerializableFailureMechanismCreator.Create(idGenerator, serializableTotalAssemblyResult, failureMechanism);
var serializableCollection = new SerializableFailureMechanismSectionCollection(idGenerator.GetNewId(Resources.SerializableFailureMechanismSectionCollection_IdPrefix));
@@ -136,22 +131,7 @@
serializableFailureMechanismSectionAssemblyResults.Select(fmr => fmr.FailureMechanismSectionAssembly));
}
-
///
- /// Validates whether an is valid to be created.
- ///
- /// The to validate.
- /// Thrown when
- /// is invalid to create.
- private static void ValidateFailureMechanismAssemblyResult(ExportableFailureMechanismAssemblyResult assemblyResult)
- {
- if (assemblyResult.AssemblyCategory == FailureMechanismAssemblyCategoryGroup.None)
- {
- throw new AssemblyCreatorException(@"The assembly result is invalid and cannot be created.");
- }
- }
-
- ///
/// Creates an instance of based on its input parameters.
///
/// The id generator to generate the id for the serializable components.
Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs
===================================================================
diff -u -r9c6a10855fb4ce6a5667226abc5a27308439c842 -r821ea9c9eada82e432462f9be0390dd5b45ffb29
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs) (revision 9c6a10855fb4ce6a5667226abc5a27308439c842)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs) (revision 821ea9c9eada82e432462f9be0390dd5b45ffb29)
@@ -198,7 +198,7 @@
}
///
- /// Validates whether an is valid to be created.
+ /// Validates whether an is valid to export.
///
/// The to validate.
/// Thrown when
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -r8d91ecbc49d0293111c03893d1751283e5360039 -r821ea9c9eada82e432462f9be0390dd5b45ffb29
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 8d91ecbc49d0293111c03893d1751283e5360039)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 821ea9c9eada82e432462f9be0390dd5b45ffb29)
@@ -32,7 +32,6 @@
using Ringtoets.Integration.IO.AggregatedSerializable;
using Ringtoets.Integration.IO.Assembly;
using Ringtoets.Integration.IO.Creators;
-using Ringtoets.Integration.IO.Exceptions;
using Ringtoets.Integration.IO.Helpers;
using Ringtoets.Integration.IO.TestUtil;
@@ -122,28 +121,6 @@
}
[Test]
- public void CreateFailureMechanismWithoutProbability_FailureMechanismAssemblyResultNone_ThrowsAssemblyCreatorException()
- {
- // Setup
- var random = new Random(21);
- var failureMechanism = new ExportableFailureMechanism(
- new ExportableFailureMechanismAssemblyResult(random.NextEnumValue(),
- FailureMechanismAssemblyCategoryGroup.None),
- Enumerable.Empty(),
- random.NextEnumValue(),
- random.NextEnumValue());
-
- // Call
- TestDelegate call = () => AggregatedSerializableFailureMechanismCreator.Create(new IdentifierGenerator(),
- new SerializableTotalAssemblyResult(),
- failureMechanism);
-
- // Assert
- var exception = Assert.Throws(call);
- Assert.AreEqual("The assembly result is invalid and cannot be created.", exception.Message);
- }
-
- [Test]
[TestCaseSource(nameof(GetSectionAssemblyConfigurations))]
public void CreateFailureMechanismWithoutProbabilityAndSectionAssemblyResultsWithProbability_WithValidArguments_ReturnsAggregatedSerializableFailureMechanism(
IEnumerable failureMechanismSections,
@@ -269,29 +246,6 @@
}
[Test]
- public void CreateFailureMechanismWithProbability_FailureMechanismAssemblyResultNone_ThrowsAssemblyCreatorException()
- {
- // Setup
- var random = new Random(21);
- var failureMechanism = new ExportableFailureMechanism(
- new ExportableFailureMechanismAssemblyResultWithProbability(random.NextEnumValue(),
- FailureMechanismAssemblyCategoryGroup.None,
- random.NextDouble()),
- Enumerable.Empty(),
- random.NextEnumValue(),
- random.NextEnumValue());
-
- // Call
- TestDelegate call = () => AggregatedSerializableFailureMechanismCreator.Create(new IdentifierGenerator(),
- new SerializableTotalAssemblyResult(),
- failureMechanism);
-
- // Assert
- var exception = Assert.Throws(call);
- Assert.AreEqual("The assembly result is invalid and cannot be created.", exception.Message);
- }
-
- [Test]
[TestCaseSource(nameof(GetSectionAssemblyConfigurations))]
public void CreateFailureMechanismWithProbabilityAndSectionAssemblyResultsWithProbability_WithValidArguments_ReturnsAggregatedSerializableFailureMechanism(
IEnumerable failureMechanismSections,