Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs =================================================================== diff -u -rf6f64085b7704accbc3094848a69af658cd1662d -rab2dcda9146271b4df1d022a5c513989bbe49d72 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision f6f64085b7704accbc3094848a69af658cd1662d) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision ab2dcda9146271b4df1d022a5c513989bbe49d72) @@ -108,7 +108,7 @@ } [Test] - public void CreateWithoutProbability_WithValidArguments_ReturnsSerializableFailureMechanismSectionAssembly() + public void CreateWithoutProbability_WithValidArguments_ReturnsAggregatedSerializableFailureMechanismSectionAssembly() { // Setup var idGenerator = new UniqueIdentifierGenerator(); @@ -132,15 +132,15 @@ serializableFailureMechanism); // Call - SerializableFailureMechanismSectionAssembly serializableSectionAssembly = + AggregatedSerializableFailureMechanismSectionAssembly aggregatedSectionAssembly = AggregatedSerializableFailureMechanismSectionAssemblyCreator.Create(idGenerator, serializableCollection, serializableFailureMechanism, sectionResult); // Assert - Assert.AreEqual("T.0", serializableSectionAssembly.Id); - Assert.AreEqual(serializableFailureMechanism.Id, serializableSectionAssembly.FailureMechanismId); - Assert.AreEqual("Wks.1", serializableSectionAssembly.FailureMechanismSectionId); + SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; + Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); - SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = serializableSectionAssembly.SectionResults; + SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; Assert.AreEqual(3, serializedSectionResults.Length); AssertAssemblyResult(sectionResult.SimpleAssembly, SerializableAssessmentType.SimpleAssessment, @@ -153,7 +153,11 @@ serializedSectionResults[2]); AssertAssemblyResult(sectionResult.CombinedAssembly, SerializableAssessmentType.CombinedAssessment, - serializableSectionAssembly.CombinedSectionResult); + failureMechanismSectionAssembly.CombinedSectionResult); + + SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(sectionResult.FailureMechanismSection, + serializableCollection, + aggregatedSectionAssembly.FailureMechanismSection); } [Test] @@ -228,7 +232,7 @@ } [Test] - public void CreateWithProbability_WithValidArguments_ReturnsSerializableFailureMechanismSectionAssembly() + public void CreateWithProbability_WithValidArguments_ReturnsAggregatedSerializableFailureMechanismSectionAssembly() { // Setup var idGenerator = new UniqueIdentifierGenerator(); @@ -252,15 +256,15 @@ serializableFailureMechanism); // Call - SerializableFailureMechanismSectionAssembly serializableSectionAssembly = + AggregatedSerializableFailureMechanismSectionAssembly aggregatedSectionAssembly = AggregatedSerializableFailureMechanismSectionAssemblyCreator.Create(idGenerator, serializableCollection, serializableFailureMechanism, sectionResult); // Assert - Assert.AreEqual("T.0", serializableSectionAssembly.Id); - Assert.AreEqual(serializableFailureMechanism.Id, serializableSectionAssembly.FailureMechanismId); - Assert.AreEqual("Wks.1", serializableSectionAssembly.FailureMechanismSectionId); + SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; + Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); - SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = serializableSectionAssembly.SectionResults; + SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; Assert.AreEqual(3, serializedSectionResults.Length); AssertAssemblyResult(sectionResult.SimpleAssembly, SerializableAssessmentType.SimpleAssessment, @@ -273,7 +277,11 @@ serializedSectionResults[2]); AssertAssemblyResult(sectionResult.CombinedAssembly, SerializableAssessmentType.CombinedAssessment, - serializableSectionAssembly.CombinedSectionResult); + failureMechanismSectionAssembly.CombinedSectionResult); + + SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(sectionResult.FailureMechanismSection, + serializableCollection, + aggregatedSectionAssembly.FailureMechanismSection); } [Test] @@ -345,7 +353,7 @@ } [Test] - public void CreateWithoutDetailedAssembly_WithValidArguments_ReturnsSerializableFailureMechanismSectionAssembly() + public void CreateWithoutDetailedAssembly_WithValidArguments_ReturnsAggregatedSerializableFailureMechanismSectionAssembly() { // Setup var idGenerator = new UniqueIdentifierGenerator(); @@ -368,15 +376,15 @@ serializableFailureMechanism); // Call - SerializableFailureMechanismSectionAssembly serializableSectionAssembly = + AggregatedSerializableFailureMechanismSectionAssembly aggregatedSectionAssembly = AggregatedSerializableFailureMechanismSectionAssemblyCreator.Create(idGenerator, serializableCollection, serializableFailureMechanism, sectionResult); // Assert - Assert.AreEqual("T.0", serializableSectionAssembly.Id); - Assert.AreEqual(serializableFailureMechanism.Id, serializableSectionAssembly.FailureMechanismId); - Assert.AreEqual("Wks.1", serializableSectionAssembly.FailureMechanismSectionId); + SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; + Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); - SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = serializableSectionAssembly.SectionResults; + SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; Assert.AreEqual(2, serializedSectionResults.Length); AssertAssemblyResult(sectionResult.SimpleAssembly, SerializableAssessmentType.SimpleAssessment, @@ -386,7 +394,11 @@ serializedSectionResults[1]); AssertAssemblyResult(sectionResult.CombinedAssembly, SerializableAssessmentType.CombinedAssessment, - serializableSectionAssembly.CombinedSectionResult); + failureMechanismSectionAssembly.CombinedSectionResult); + + SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(sectionResult.FailureMechanismSection, + serializableCollection, + aggregatedSectionAssembly.FailureMechanismSection); } private static void AssertAssemblyResult(ExportableSectionAssemblyResult expectedResult,