michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test methods for standard watermeter use IWatermeter.Disabled flag to remove non-existing meter results

Browse Source
This commit is contained in:
Milan Hanajik
2015-03-24 10:11:20 +01:00
parent d1e9537610
commit dc9577eaa0
4 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+11 -2
View File
@@ -308,7 +308,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.TimerExpired));
LogProcessHeader(processDataLogger, "End mass");
//------------------------------------------------
@@ -392,7 +392,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
tstRslt.TimeDivEnd5 = 0;
for (int i = 0; i < Program.WMsCount; i++)
{
if (sensPath.RegisterReaders[i] != null)
if ((sensPath.RegisterReaders[i] != null) && (WaterMeters.Count > i) && !WaterMeters[i].Disabled)
{
tstRslt.Meters[i].SerialNr = (WaterMeters.Count > i) ? WaterMeters[i].SerialNr : string.Empty;
tstRslt.Meters[i].VolumeStart = 0; /// liter
@@ -417,6 +417,15 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
}
}
/// Add data - end
/// Remove diasabled watermeters
for (int i = Program.WMsCount; i >= 0; i--)
{
if (WaterMeters.Count <= i || WaterMeters[i].Disabled)
{
tstRslt.Meters.RemoveAt(i);
}
}
AddOrOverwriteResult(tstRslt);