Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -re2f91813f3aae8eb2daef6ff1ffac61d197148a8 -r82bd489a2b49af2c1cd898b7944b3c4f5db8a808 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision e2f91813f3aae8eb2daef6ff1ffac61d197148a8) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 82bd489a2b49af2c1cd898b7944b3c4f5db8a808) @@ -37,7 +37,6 @@ using Ringtoets.ClosingStructures.Service; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs =================================================================== diff -u -racfa9d23d1770ca3171668552ddbe6d63fdd0dcd -r82bd489a2b49af2c1cd898b7944b3c4f5db8a808 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision acfa9d23d1770ca3171668552ddbe6d63fdd0dcd) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision 82bd489a2b49af2c1cd898b7944b3c4f5db8a808) @@ -318,13 +318,16 @@ ClosingStructuresFailureMechanismSectionResult[] sectionResultsWithStructure = failureMechanism.SectionResults .Where(sr => calculationsWithStructure.Contains(sr.Calculation)) .ToArray(); + StructuresCalculation[] calculationsWithOutput = calculationsWithStructure.Where(c => c.HasOutput) + .ToArray(); int originalNumberOfSectionResultAssignments = failureMechanism.SectionResults.Count(sr => sr.Calculation != null); ClosingStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults .Where(sr => calculationsWithStructure.Contains(sr.Calculation)) .ToArray(); // Precondition + CollectionAssert.IsNotEmpty(calculationsWithOutput); CollectionAssert.IsNotEmpty(calculationsWithStructure); CollectionAssert.IsNotEmpty(sectionResultsWithStructure); @@ -339,19 +342,27 @@ { Assert.IsNull(calculation.InputParameters.Structure); } + foreach (StructuresCalculation calculation in calculationsWithOutput) + { + Assert.IsFalse(calculation.HasOutput); + } foreach (ClosingStructuresFailureMechanismSectionResult sectionResult in sectionResultsWithStructure) { Assert.IsNull(sectionResult.Calculation); } IObservable[] array = affectedObjects.ToArray(); - Assert.AreEqual(1 + calculationsWithStructure.Length + sectionResultsWithStructure.Length, + Assert.AreEqual(1 + calculationsWithOutput.Length + calculationsWithStructure.Length + sectionResultsWithStructure.Length, array.Length); CollectionAssert.Contains(array, failureMechanism.ClosingStructures); foreach (StructuresCalculation calculation in calculationsWithStructure) { CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (StructuresCalculation calculation in calculationsWithOutput) + { + CollectionAssert.Contains(array, calculation); + } foreach (ClosingStructuresFailureMechanismSectionResult result in sectionResultsWithStructure) { CollectionAssert.Contains(array, result); @@ -381,7 +392,8 @@ { ForeshoreProfile = profile, Structure = structure1 - } + }, + Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0) }; StructuresCalculation calculation2 = new TestClosingStructuresCalculation {