Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r1993 -r1999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 1993) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 1999) @@ -53,6 +53,10 @@ False ..\..\lib\FailureMechanisms\WbiPipingMerged\Deltares.WTIPiping.Merged.dll + + False + ..\..\lib\FailureMechanisms\Macrostability\Deltares.WTIStability.Data.dll + False ..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll @@ -176,6 +180,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs =================================================================== diff -u -r1998 -r1999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs (.../WTIDeserializer.cs) (revision 1998) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/WTIDeserializer.cs (.../WTIDeserializer.cs) (revision 1999) @@ -82,9 +82,9 @@ XmlDocument document = new XmlDocument(); document.LoadXml(xml); - document.Schemas.Add(GetSchema("Deltares.WTIStability.IO.WTIWaternetDefinition.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.WTIStability.IO.WTIWaternet.xsd", false)); - document.Schemas.Add(GetSchema("Deltares.WTIStability.IO.WTIStabilityModelResult.xsd", true)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIWaternetDefinition.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIWaternet.xsd", false)); + document.Schemas.Add(GetSchema("Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.WTIStabilityModelResult.xsd", true)); // the following call to Validate succeeds. document.Validate(ValidationEventHandler); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r1993 -r1999 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 1993) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 1999) @@ -33,6 +33,7 @@ public class MacroStabilityIoTests { private const string WtiFilesMap = @"KernelWrappers\MacroStabilityCommon\TestFiles"; + [TestCase("Benchmark 1-01b.wti")] [TestCase("Benchmark 2-04a.wti")] public void GivenWtiFileWhenDeserializingAndSerializingThenTheStringsAreEqual(string fileNameIn) @@ -96,6 +97,24 @@ Assert.AreEqual(xmlInput, xmlOutput); } + [TestCase("Result1.xml")] + public void GivenCalculationResultFileWhenDeserializingAndSerializingThenTheStringsAreEqual(string fileNameIn) + { + // Given calculation result file from kernel + string fullFileNameIn = Path.Combine(WtiFilesMap, fileNameIn); + + // When Deserializing and Serializing + string xmlInput = File.ReadAllText(fullFileNameIn); + string fileNameOut = fileNameIn + ".out"; + string fullFileNameOut = Path.Combine(WtiFilesMap, fileNameOut); + var calculationResults = WtiDeserializer.DeserializeResult(xmlInput); + string xmlOutput = WtiSerializer.SerializeResult(calculationResults); + File.WriteAllText(fullFileNameOut, xmlOutput); + + // Then the strings are equal + Assert.AreEqual(xmlInput, xmlOutput); + } + private static void CompareDamProjectData(DamProjectData actual, DamProjectData expected) { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/TestFiles/Result1.xml =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/TestFiles/Result1.xml (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/TestFiles/Result1.xml (revision 1999) @@ -0,0 +1 @@ + \ No newline at end of file