Index: dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r614 -r617 --- dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 614) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 617) @@ -368,7 +368,7 @@ { {PipingModelType.Bligh, InputPipingModelType.Bligh}, {PipingModelType.SellmeijerVnk, InputPipingModelType.SellmeijerVnk}, - {PipingModelType.Sellmeijer4Forces, InputPipingModelType.SellmeijerVnk} + {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces} }; return translationTable[pipingModelType]; } Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r613 -r617 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 613) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 617) @@ -46,12 +46,14 @@ public void CanWriteAndReadDamProjectDataToXml() { const string inputFilename = "InputFile.xml"; + DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); // Write input file - DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); Input input = FillXmlInputFromDam.CreateInput(expectedDamProjectData); DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input); + // Init static that is to be loaded with not expected value + DamProjectCalculationSpecification.SelectedAnalysisType = notExpectedAnalysisType; // Load input file input = DamXmlSerialization.LoadInputFromXmlFile(inputFilename); @@ -62,9 +64,10 @@ [Test] public void CanWriteAndReadDamProjectDataToXmlString() { - string xmlString; - // Write input string DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); + + // Write input string + string xmlString; Input input = FillXmlInputFromDam.CreateInput(expectedDamProjectData); xmlString = DamXmlSerialization.SaveInputAsXmlString(input);