Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs =================================================================== diff -u -r4b7ea112093d1c9c952fd0b56fe78ba13b4e03e8 -r269a0fc57dea9891fa32f340098c3286395a5b08 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs) (revision 4b7ea112093d1c9c952fd0b56fe78ba13b4e03e8) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreator.cs) (revision 269a0fc57dea9891fa32f340098c3286395a5b08) @@ -75,8 +75,6 @@ throw new ArgumentNullException(nameof(sectionResult)); } - ValidateAssemblyResult(sectionResult.CombinedAssembly); - SerializableFailureMechanismSection failureMechanismSection = SerializableFailureMechanismSectionCreator.Create(idGenerator, serializableCollection, sectionResult.FailureMechanismSection); @@ -128,8 +126,6 @@ throw new ArgumentNullException(nameof(sectionResult)); } - ValidateAssemblyResult(sectionResult.CombinedAssembly); - SerializableFailureMechanismSection failureMechanismSection = SerializableFailureMechanismSectionCreator.Create(idGenerator, serializableCollection, sectionResult.FailureMechanismSection); @@ -181,8 +177,6 @@ throw new ArgumentNullException(nameof(sectionResult)); } - ValidateAssemblyResult(sectionResult.CombinedAssembly); - SerializableFailureMechanismSection failureMechanismSection = SerializableFailureMechanismSectionCreator.Create(idGenerator, serializableCollection, sectionResult.FailureMechanismSection); @@ -198,21 +192,6 @@ } /// - /// Validates whether an is valid to export. - /// - /// The to validate. - /// Thrown when - /// is invalid to create. - private static void ValidateAssemblyResult(ExportableSectionAssemblyResult result) - { - if (result.AssemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None) - { - throw new AssemblyCreatorException(@"The assembly result is invalid and cannot be created."); - } - } - - - /// /// Creates a collection of whether an based on . /// /// The to create a collection of Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs =================================================================== diff -u -ra71b1ceb1838d97cabf3abad83710ce49f9dced9 -r269a0fc57dea9891fa32f340098c3286395a5b08 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision a71b1ceb1838d97cabf3abad83710ce49f9dced9) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision 269a0fc57dea9891fa32f340098c3286395a5b08) @@ -29,7 +29,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; @@ -110,40 +109,6 @@ } [Test] - public void CreateWithoutProbability_WithCombinedAssemblyResultNone_ThrowsAssemblyExportException() - { - // Setup - var idGenerator = new IdentifierGenerator(); - var sectionResult = new ExportableAggregatedFailureMechanismSectionAssemblyResult( - ExportableFailureMechanismSectionTestFactory.CreateExportableFailureMechanismSection(), - CreateSectionAssemblyResult(10), - CreateSectionAssemblyResult(11), - CreateSectionAssemblyResult(12), - CreateSectionAssemblyResult(FailureMechanismSectionAssemblyCategoryGroup.None)); - - var random = new Random(21); - const string serializableFailureMechanismId = "FailureMechanismId"; - var serializableFailureMechanism = new SerializableFailureMechanism(serializableFailureMechanismId, - new SerializableTotalAssemblyResult(), - random.NextEnumValue(), - random.NextEnumValue(), - new SerializableFailureMechanismAssemblyResult()); - - const string serializableSectionCollectionId = "CollectionId"; - var serializableCollection = new SerializableFailureMechanismSectionCollection(serializableSectionCollectionId); - - // Call - TestDelegate call = () => AggregatedSerializableFailureMechanismSectionAssemblyCreator.Create(idGenerator, - serializableCollection, - serializableFailureMechanism, - sectionResult); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("The assembly result is invalid and cannot be created.", exception.Message); - } - - [Test] public void CreateWithoutProbability_WithValidArgumentsAndAllAssemblyTypesHaveResults_ReturnsAggregatedSerializableFailureMechanismSectionAssembly() { // Setup @@ -341,40 +306,6 @@ } [Test] - public void CreateWithProbability_WithCombinedAssemblyResultNone_ThrowsAssemblyExportException() - { - // Setup - var idGenerator = new IdentifierGenerator(); - var sectionResult = new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability( - ExportableFailureMechanismSectionTestFactory.CreateExportableFailureMechanismSection(), - CreateSectionAssemblyResultWithProbability(10), - CreateSectionAssemblyResultWithProbability(11), - CreateSectionAssemblyResultWithProbability(12), - CreateSectionAssemblyResultWithProbability(FailureMechanismSectionAssemblyCategoryGroup.None)); - - var random = new Random(21); - const string serializableFailureMechanismId = "FailureMechanismId"; - var serializableFailureMechanism = new SerializableFailureMechanism(serializableFailureMechanismId, - new SerializableTotalAssemblyResult(), - random.NextEnumValue(), - random.NextEnumValue(), - new SerializableFailureMechanismAssemblyResult()); - - const string serializableSectionCollectionId = "CollectionId"; - var serializableCollection = new SerializableFailureMechanismSectionCollection(serializableSectionCollectionId); - - // Call - TestDelegate call = () => AggregatedSerializableFailureMechanismSectionAssemblyCreator.Create(idGenerator, - serializableCollection, - serializableFailureMechanism, - sectionResult); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("The assembly result is invalid and cannot be created.", exception.Message); - } - - [Test] public void CreateWithProbability_WithValidArgumentsAndAllAssemblyTypesHaveResults_ReturnsAggregatedSerializableFailureMechanismSectionAssembly() { // Setup @@ -569,39 +500,6 @@ } [Test] - public void CreateWithoutDetailedAssembly_WithCombinedAssemblyResultNone_ThrowsAssemblyExportException() - { - // Setup - var idGenerator = new IdentifierGenerator(); - var sectionResult = new ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly( - ExportableFailureMechanismSectionTestFactory.CreateExportableFailureMechanismSection(), - CreateSectionAssemblyResult(10), - CreateSectionAssemblyResult(11), - CreateSectionAssemblyResult(FailureMechanismSectionAssemblyCategoryGroup.None)); - - var random = new Random(21); - const string serializableFailureMechanismId = "FailureMechanismId"; - var serializableFailureMechanism = new SerializableFailureMechanism(serializableFailureMechanismId, - new SerializableTotalAssemblyResult(), - random.NextEnumValue(), - random.NextEnumValue(), - new SerializableFailureMechanismAssemblyResult()); - - const string serializableSectionCollectionId = "CollectionId"; - var serializableCollection = new SerializableFailureMechanismSectionCollection(serializableSectionCollectionId); - - // Call - TestDelegate call = () => AggregatedSerializableFailureMechanismSectionAssemblyCreator.Create(idGenerator, - serializableCollection, - serializableFailureMechanism, - sectionResult); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("The assembly result is invalid and cannot be created.", exception.Message); - } - - [Test] public void CreateWithoutDetailedAssembly_WithValidArgumentsAndAllAssemblyTypesHaveResults_ReturnsAggregatedSerializableFailureMechanismSectionAssembly() { // Setup