Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r6873 -r6964 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6873) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6964) @@ -84,7 +84,7 @@ output = DamXmlSerialization.LoadOutputFromXmlString(outputString); var actualDamProjectData = new DamProjectData(); actualDamProjectData.Dike = new Dike(); - actualDamProjectData.DamProjectCalculationSpecification.CurrentSpecification = new DamFailureMechanismeCalculationSpecification(); + actualDamProjectData.DamProjectCalculationSpecification.DamStabilityParameters = new DamStabilityParameters(); Assert.That(() => FillDamUiFromXmlOutput.AddOutputToDamProjectData(actualDamProjectData, output), Throws.InstanceOf()); } @@ -100,8 +100,8 @@ output = DamXmlSerialization.LoadOutputFromXmlString(outputString); var actualDamProjectData = new DamProjectData(); actualDamProjectData.Dike = new Dike(); - actualDamProjectData.DamProjectCalculationSpecification.CurrentSpecification = - new DamFailureMechanismeCalculationSpecification(); + actualDamProjectData.DamProjectCalculationSpecification.DamStabilityParameters = + new DamStabilityParameters(); actualDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(actualDamProjectData, output); Assert.That(string.IsNullOrEmpty(actualDamProjectData.DesignCalculations.First().BaseFileName), Is.False, "BaseFileName should be reset"); @@ -272,7 +272,7 @@ private DamProjectData CreateInputProjectDataForPiping() { - var spec = new DamFailureMechanismeCalculationSpecification + var spec = new DamProjectCalculationSpecification { FailureMechanismSystemType = FailureMechanismSystemType.Piping, PipingModelType = PipingModelType.Bligh @@ -282,22 +282,19 @@ private DamProjectData CreateInputProjectDataForStability(StabilityModelType stabilityModelType) { - var spec = new DamFailureMechanismeCalculationSpecification + var spec = new DamProjectCalculationSpecification { FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside, CalculationModel = stabilityModelType }; return CreateInputProjectData(spec); } - private static DamProjectData CreateInputProjectData(DamFailureMechanismeCalculationSpecification spec) + private static DamProjectData CreateInputProjectData(DamProjectCalculationSpecification spec) { var project = new DamProjectData { - DamProjectCalculationSpecification = - { - CurrentSpecification = spec - } + DamProjectCalculationSpecification = spec }; project.Dike = new Dike();