Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 43f72767 authored by Harald Martini's avatar Harald Martini
Browse files

added checks for em columns in declaration mode integration tests

parent c0ca1f24
Branches
Tags
No related merge requests found
...@@ -18,6 +18,7 @@ using System.Xml.Schema; ...@@ -18,6 +18,7 @@ using System.Xml.Schema;
using Moq; using Moq;
using Ninject; using Ninject;
using NUnit.Framework; using NUnit.Framework;
using NUnit.Framework.Constraints;
using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData; using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Models;
...@@ -261,7 +262,23 @@ public class LorrySimulation ...@@ -261,7 +262,23 @@ public class LorrySimulation
modData = VectoCSVFile.Read(modFileName, false, true); modData = VectoCSVFile.Read(modFileName, false, true);
} }
public void AssertVSUMElectricMotorFields(string vsumFileName, VectoRunData runData)
{
var sumData = VectoCSVFile.Read(vsumFileName, false, true);
var em_positions = runData.ElectricMachinesData.Select(em => em.Item1);
foreach (var em_pos in runData.ElectricMachinesData.Select(e => e.Item1)) {
Tuple<string, Type>[] columns;
if (em_pos == PowertrainPosition.IEPC) {
columns = SummaryDataContainer.IEPCColumns;
} else {
columns = SummaryDataContainer.ElectricMotorColumns;
}
foreach (var (s, type) in columns) {
var colName = string.Format(s, em_pos.GetLabel());
Assert.IsTrue(sumData.Columns.Contains(colName), $"{colName} missing in sum file");
}
}
}
public void VSUM_order_test(string fileName, VectoRunData runData) public void VSUM_order_test(string fileName, VectoRunData runData)
{ {
...@@ -553,6 +570,8 @@ public class LorrySimulation ...@@ -553,6 +570,8 @@ public class LorrySimulation
jobContainer.Execute(false); jobContainer.Execute(false);
WaitAndAssertSuccess(jobContainer, fileWriter); WaitAndAssertSuccess(jobContainer, fileWriter);
AssertVSUMElectricMotorFields(fileWriter.SumFileName, runs.First().GetContainer().RunData);
} }
...@@ -580,7 +599,7 @@ public class LorrySimulation ...@@ -580,7 +599,7 @@ public class LorrySimulation
var modData = ((ModalDataContainer)((VehicleContainer)runs.Single().GetContainer()).ModData).Data; var modData = ((ModalDataContainer)((VehicleContainer)runs.Single().GetContainer()).ModData).Data;
jobContainer.Execute(false); jobContainer.Execute(false);
WaitAndAssertSuccess(jobContainer, fileWriter); WaitAndAssertSuccess(jobContainer, fileWriter);
AssertVSUMElectricMotorFields(fileWriter.SumFileName, runs.First().GetContainer().RunData);
} }
[TestCase(Group5_HEV_S2_OVC, 12)] [TestCase(Group5_HEV_S2_OVC, 12)]
...@@ -620,6 +639,7 @@ public class LorrySimulation ...@@ -620,6 +639,7 @@ public class LorrySimulation
AssertSHEV_PEV_Conditioning(modDataRow, runs.Single()); AssertSHEV_PEV_Conditioning(modDataRow, runs.Single());
} }
Assert.IsTrue(modData.Rows.Count > 0); Assert.IsTrue(modData.Rows.Count > 0);
AssertVSUMElectricMotorFields(fileWriter.SumFileName, runs.First().GetContainer().RunData);
} }
[TestCase(Group5_HEV_S2_OVC, 12)] [TestCase(Group5_HEV_S2_OVC, 12)]
...@@ -758,12 +778,7 @@ public class LorrySimulation ...@@ -758,12 +778,7 @@ public class LorrySimulation
} }
} }
//foreach (var vectoRun in runs.Where(r => r != run)) AssertVSUMElectricMotorFields(fileWriter.SumFileName, runs.First().GetContainer().RunData);
//{
// var rd = vectoRun.GetContainer().RunData;
// rd.Report.AddResult(rd, modData);
//}
Assert.IsTrue(modData.Rows.Count > 0); Assert.IsTrue(modData.Rows.Count > 0);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment