From 1c34946a6bf86b4bd04cd9864e22f9359575d85b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 26 Sep 2014 17:48:55 +0200 Subject: [PATCH] Bugs in sequences fixed: Missing CheckUiOp --- .../TestMethods/CameraRoiDetection/RoiDetectionSeq.cs | 3 ++- .../TestMethods/CombinedMeters/CombinedMetersSeq.cs | 5 +++-- .../CombinedWithDetection/CombinedWithDetectionSeq.cs | 4 +++- .../FixedStartMassCollectionSeq.cs | 8 +++----- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 8 +++----- .../FlyingStartCollectionMethodSeq.cs | 8 +++----- .../ReferenceFlowmeterCalibrationSeq.cs | 8 +++----- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs index dc9a3b324..e2e83b902 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs @@ -16,8 +16,9 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - IList e; /// Events from currently running operations + IList e = new List(); /// Events from currently running operations Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state processDataLoggingOp = null; diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 4764c885d..e20ec1dd1 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -30,8 +30,9 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters /// Specific for combined meters int[] lastWMPulses = new int[Program.WMsCount]; - IList e; /// Events from currently running operations - Event retVal = Event.Done; + IList e = new List(); /// Events from currently running operations + Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state ltrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 989d3c737..609b27602 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -22,7 +22,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// Specific for combined meters int[] lastWMPulses = new int[Program.WMsCount]; - IList e; /// Events from currently running operations + IList e = new List(); /// Events from currently running operations + Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state //-------------------------------- State.Create("CombinedWithDetection : stop diverter gate etc") diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 2c30432b6..c60d4004d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -27,11 +27,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - /// Operations running in more then one state - checkUiOp = new Operations.CheckUIOp(true); - - IList e; /// Events from currently running operations - Event retVal = Event.Done; + IList e = new List(); /// Events from currently running operations + Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state ltrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 7a6c2b5b7..4c0f14135 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -27,11 +27,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - /// Operations running in more then one state - checkUiOp = new Operations.CheckUIOp(true); - - IList e; /// Events from currently running operations - Event retVal = Event.Done; + IList e = new List(); /// Events from currently running operations + Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state ltrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs index 429e19c8e..1bf50fb8d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs @@ -27,11 +27,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - /// Operations running in more then one state - checkUiOp = new Operations.CheckUIOp(true); - - IList e; /// Events from currently running operations - Event retVal = Event.Done; + IList e = new List(); /// Events from currently running operations + Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state ltrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index abfcf8a08..7bd583a3b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -27,11 +27,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration { Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - /// Operations running in more then one state - checkUiOp = new Operations.CheckUIOp(true); - - IList e; /// Events from currently running operations - Event retVal = Event.Done; + IList e = new List(); /// Events from currently running operations + Event retVal = Event.Done; + checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state ltrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h]