diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs index a2e5006777c795eaaf363a34cc127817a73b8157..0195929c9589dde448829bd98e769a45616fa19a 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs @@ -59,6 +59,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Impl; using LogManager = NLog.LogManager; using static TUGraz.VectoCore.Models.Simulation.Data.VectoRunData; using static TUGraz.VectoCore.Models.Declaration.PT1; +using TUGraz.VectoCore.Models.Simulation.Impl; [assembly: InternalsVisibleTo("VectoCoreTest")] @@ -341,11 +342,12 @@ namespace TUGraz.VectoCore.OutputData.XML if (result == null) { throw new VectoException("no corresponding simulation result found for generating vtp report"); } - + var verifiedCO2 = declaredCO2 * cVtp.Value(); - + ResultsPart.Add( - new XElement(tns + "Status", cVtp < 1.075 ? "Passed" : "Failed"), + new XElement(tns + "Status", + (cVtp < 1.075) && (vtpResult.Status == VectoRun.Status.Success) ? "Passed" : "Failed"), new XElement( tns + "AverageFanPower", new XAttribute(XMLNames.Report_Results_Unit_Attr, "kW"), diff --git a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs index f4ff6854e39a84909c9fc9787f38a5283cfd5e10..34b87df118d76de3c5be2d3671de5744003c6fb3 100644 --- a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs +++ b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs @@ -144,11 +144,13 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP var declared = vtpXml.Document?.XPathSelectElement("//*[local-name()='Declared']")?.Value.ToDouble(); var cvtp = vtpXml.Document?.XPathSelectElement("//*[local-name()='C_VTP']")?.Value.ToDouble(); + var status = vtpXml.Document?.XPathSelectElement("//*[local-name()='Status']")?.Value; TestContext.WriteLine($"declared CO2 = {declared}, cvtp = {cvtp}"); Assert.AreEqual(expectedDeclaredCO2, declared, 1e-8); Assert.AreEqual(expectedCVTP, cvtp, 1e-4); + Assert.AreEqual(status, "Passed"); } [Category("LongRunning")]