diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs index 29768682d4cbb9fe4badade2725211b329c39ee3..4e082ad46be88001cec9e98b8a20cd20c4c5bc52 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs @@ -137,13 +137,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation jobContainer.Execute(); jobContainer.WaitFinished(); - var validator = new XMLValidator(XmlReader.Create(writer.XMLMultistageReportFileName)); - var valid = validator.ValidateXML(XmlDocumentType.MultistageOutputData); - if (!valid) { - Debug.WriteLine("Invalid Outputfile"); + using (var reader = XmlReader.Create(writer.XMLMultistageReportFileName)) { + var validator = new XMLValidator(reader); + var valid = validator.ValidateXML(XmlDocumentType.MultistageOutputData); + if (!valid) + Debug.WriteLine("Invalid Outputfile"); + Debug.WriteLine($"Written to {writer.XMLMultistageReportFileName}"); } - Debug.WriteLine($"Written to {writer.XMLMultistageReportFileName}"); } private ICommand _saveInputDataCommand; diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs index 1ca03f49f302e8e50a7f62de3ba65bf26f983565..fb4ce9411bd538f80690757be617943bd4ae85cc 100644 --- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs @@ -84,9 +84,11 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage var progress = jobContainer.GetProgress(); Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + using (var xmlReader = XmlReader.Create(writer.XMLMultistageReportFileName)) { + var validator = new XMLValidator(xmlReader); + Assert.IsTrue(validator.ValidateXML(VectoCore.Utils.XmlDocumentType.MultistageOutputData), validator.ValidationError); + } - var validator = new XMLValidator(XmlReader.Create(writer.XMLMultistageReportFileName)); - Assert.IsTrue(validator.ValidateXML(VectoCore.Utils.XmlDocumentType.MultistageOutputData), validator.ValidationError); }