Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSectionCollection.cs =================================================================== diff -u -rc2889f9bc178f329da2719bf6655334835720c01 -ref87a2a1f2537d2fba2b95c20171d0f27a160670 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSectionCollection.cs (.../SerializableFailureMechanismSectionCollection.cs) (revision c2889f9bc178f329da2719bf6655334835720c01) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSectionCollection.cs (.../SerializableFailureMechanismSectionCollection.cs) (revision ef87a2a1f2537d2fba2b95c20171d0f27a160670) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -40,26 +40,7 @@ /// Creates a new instance of . /// /// The unique ID of the sections. - /// The total assembly result the sections belong to. - /// Thrown when is null. /// Thrown when is invalid. - public SerializableFailureMechanismSectionCollection(string id, - SerializableTotalAssemblyResult totalAssemblyResult) - : this(id) - { - if (totalAssemblyResult == null) - { - throw new ArgumentNullException(nameof(totalAssemblyResult)); - } - - TotalAssemblyResultId = totalAssemblyResult.Id; - } - - /// - /// Creates a new instance of . - /// - /// The unique ID of the sections. - /// Thrown when is invalid. private SerializableFailureMechanismSectionCollection(string id) { if (!SerializableIdValidator.Validate(id)) Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionCollectionTest.cs =================================================================== diff -u -rc2889f9bc178f329da2719bf6655334835720c01 -ref87a2a1f2537d2fba2b95c20171d0f27a160670 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionCollectionTest.cs (.../SerializableFailureMechanismSectionCollectionTest.cs) (revision c2889f9bc178f329da2719bf6655334835720c01) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionCollectionTest.cs (.../SerializableFailureMechanismSectionCollectionTest.cs) (revision ef87a2a1f2537d2fba2b95c20171d0f27a160670) @@ -24,7 +24,6 @@ using NUnit.Framework; using Ringtoets.AssemblyTool.IO.Model; using Ringtoets.AssemblyTool.IO.Model.DataTypes; -using Ringtoets.AssemblyTool.IO.Model.Enums; using Ringtoets.AssemblyTool.IO.TestUtil; namespace Ringtoets.AssemblyTool.IO.Test.Model @@ -53,47 +52,27 @@ [Test] [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))] - public void ConstructorWithTotalAssemblyResult_InvalidId_ThrowsArgumentException(string invalidId) + public void Constructor_WithInvalidId_ThrowsArgumentException(string invalidId) { // Call - TestDelegate call = () => new SerializableFailureMechanismSectionCollection(invalidId, - new SerializableTotalAssemblyResult()); + TestDelegate call = () => new SerializableFailureMechanismSectionCollection(invalidId); // Assert const string expectedMessage = "'id' must have a value and consist only of alphanumerical characters, '-', '_' or '.'."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } [Test] - public void ConstructorWithTotalAssemblyResult_FailureMechanismNull_ThrowsArgumentNullException() + public void Constructor_WithValidData_ReturnsExpectedValues() { - // Call - TestDelegate call = () => new SerializableFailureMechanismSectionCollection("id", null); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("totalAssemblyResult", exception.ParamName); - } - - [Test] - public void ConstructorWithTotalAssemblyResult_WithValidData_ReturnsExpectedValues() - { // Setup const string id = "collectionId"; - var totalAssemblyResult = new SerializableTotalAssemblyResult("resultId", - new SerializableAssessmentProcess(), - new SerializableFailureMechanismAssemblyResult(), - new SerializableFailureMechanismAssemblyResult(), - new SerializableAssessmentSectionAssemblyResult()); - // Call - var collection = new SerializableFailureMechanismSectionCollection(id, - totalAssemblyResult); + var collection = new SerializableFailureMechanismSectionCollection(id); // Assert Assert.AreEqual(id, collection.Id); - Assert.AreEqual(totalAssemblyResult.Id, collection.TotalAssemblyResultId); } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs =================================================================== diff -u -r1aeaee420d2c163dbb591a53f09994d838ef763f -ref87a2a1f2537d2fba2b95c20171d0f27a160670 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 1aeaee420d2c163dbb591a53f09994d838ef763f) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision ef87a2a1f2537d2fba2b95c20171d0f27a160670) @@ -317,7 +317,7 @@ SerializableAssessmentType.CombinedAssessment, SerializableFailureMechanismSectionCategoryGroup.IIIv)); - var sections2 = new SerializableFailureMechanismSectionCollection("vakindeling_gecombineerd", totalAssemblyResult); + var sections2 = new SerializableFailureMechanismSectionCollection("vakindeling_gecombineerd"); var section2 = new SerializableFailureMechanismSection( "vak_gecombineerd_1", sections2, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs =================================================================== diff -u -rc2e1b46490dfdc848647c515e3ea04c1f7f69535 -ref87a2a1f2537d2fba2b95c20171d0f27a160670 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision c2e1b46490dfdc848647c515e3ea04c1f7f69535) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision ef87a2a1f2537d2fba2b95c20171d0f27a160670) @@ -107,7 +107,6 @@ SerializableFailureMechanismSectionCollection serializableFailureMechanismSectionCollection = aggregate.FailureMechanismSectionCollection; Assert.AreEqual("Vi.0", serializableFailureMechanismSectionCollection.Id); Assert.AreEqual(totalAssemblyResult.Id, serializableFailureMechanismSectionCollection.TotalAssemblyResultId); - Assert.IsNull(serializableFailureMechanismSectionCollection.FailureMechanismId); AssertCombinedFailureMechanismSectionAssemblies(combinedSectionAssemblies, serializableFailureMechanismSectionCollection, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs =================================================================== diff -u -r3265c6b7b2cb65fd707b885d698bf106eb2a3307 -ref87a2a1f2537d2fba2b95c20171d0f27a160670 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs) (revision 3265c6b7b2cb65fd707b885d698bf106eb2a3307) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs) (revision ef87a2a1f2537d2fba2b95c20171d0f27a160670) @@ -111,8 +111,7 @@ SerializableTotalAssemblyResult serializableTotalAssembly = CreateSerializableTotalAssembly(serializableTotalAssemblyResultId); const string serializableSectionCollectionId = "serializableSectionCollectionId"; - var serializableSectionCollection = new SerializableFailureMechanismSectionCollection(serializableSectionCollectionId, - new SerializableTotalAssemblyResult()); + var serializableSectionCollection = new SerializableFailureMechanismSectionCollection(serializableSectionCollectionId); var idGenerator = new IdentifierGenerator();