diff --git a/TestBenchFramework/BenchControl/GenericDevices/ITestMethod.cs b/TestBenchFramework/BenchControl/GenericDevices/ITestMethod.cs
index fd8262cf5..df0f2ebbf 100644
--- a/TestBenchFramework/BenchControl/GenericDevices/ITestMethod.cs
+++ b/TestBenchFramework/BenchControl/GenericDevices/ITestMethod.cs
@@ -5,12 +5,28 @@ namespace TBF.BenchControl.GenericDevices
{
public interface ITestMethod : IComponent
{
+ ///
/// True = use result of the test with this method when evaluating the final result
+ ///
bool Evaluate { get; }
- /// True = use result of the test with this method when publishing (printing, saving) results
+ ///
+ /// True = use result of the test with this method when publishing (printing, saving) results
+ ///
bool Publish { get; }
+ ///
+ /// Check compatibility of the method with the watermeters
+ ///
+ /// Type of watermeters
+ /// true when the watermeters can be tested by this method
+ bool CanTest(Entities.MetersKind meters);
+
+ ///
+ /// Execute the test method
+ ///
+ ///
+ /// Event(s) indicating the result of execution
IList Execute(Entities.Test test);
}
}
diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
index 57e81a403..677902091 100644
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@@ -255,7 +255,8 @@ namespace TBF.BenchControl.Sequences
out outPath, out sensPath,
out transitionStart, out transitionStop))
{
- goto config_error;
+ UiBridge.Bridge.OnError(this, string.Format("Cannot load paths"));
+ goto select_cycle_or_test;
}
}
@@ -267,15 +268,16 @@ namespace TBF.BenchControl.Sequences
out outPath, out sensPath,
out transitionStart, out transitionStop))
{
- goto config_error;
+ UiBridge.Bridge.OnError(this, string.Format("Cannot load paths"));
+ goto select_cycle_or_test;
}
TimeEstimateOneTest = test.TstTime + 10.0f;
//--------------------------------------------------------------
ITestMethod testMethodSequence = TbfComponents.FindComponent(test.Method) as ITestMethod;
- if (testMethodSequence != null)
+ if (testMethodSequence != null && testMethodSequence.CanTest(StateMachine.Procedure.MetersKind))
{
- StateMachine.LoadTestParams(test);
+ StateMachine.LoadTestParams(test);
//--------------------------------------------------------------
e = testMethodSequence.Execute(test);
@@ -286,9 +288,15 @@ namespace TBF.BenchControl.Sequences
if (CloseCycleBeginForm()) goto stop;
}
- if (e.Contains(Event.Error)) goto error;
+ if (e.Contains(Event.ConfigurationError)) goto select_cycle_or_test;
+ if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.OpArgumentError)) goto config_error;
- if (e.Contains(Event.UiCmdStop)) goto stop;
+ if (e.Contains(Event.UiCmdStop)) goto stop;
+ }
+ else
+ {
+ UiBridge.Bridge.OnError(this, string.Format("{0} cannot be used", test.Method));
+ goto select_cycle_or_test;
}
TimeEstimateBeginRpts += (test.Repeats * TimeEstimateOneTest);
@@ -303,8 +311,9 @@ namespace TBF.BenchControl.Sequences
out outPath, out sensPath,
out transitionStart, out transitionStop))
{
- goto config_error;
- }
+ UiBridge.Bridge.OnError(this, string.Format("Cannot load paths"));
+ goto select_cycle_or_test;
+ }
TimeEstimateTotal = test.Repeats * (test.TstTime + 10.0f);
@@ -312,11 +321,11 @@ namespace TBF.BenchControl.Sequences
TimeEstimateBeginRpts = 0;
ITestMethod testMethodSequence = TbfComponents.FindComponent(test.Method) as ITestMethod;
- if (testMethodSequence != null)
- {
- StateMachine.LoadTestParams(test);
+ if (testMethodSequence != null && testMethodSequence.CanTest(StateMachine.Procedure.MetersKind))
+ {
+ StateMachine.LoadTestParams(test);
- //--------------------------------------------------------------
+ //--------------------------------------------------------------
e = testMethodSequence.Execute(test);
if (cycleBeginFormOpened)
@@ -327,7 +336,12 @@ namespace TBF.BenchControl.Sequences
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.OpArgumentError)) goto config_error;
- if (e.Contains(Event.UiCmdStop)) goto stop;
+ if (e.Contains(Event.UiCmdStop)) goto stop;
+ }
+ else
+ {
+ UiBridge.Bridge.OnError(this, string.Format("{0} cannot be used", test.Method));
+ goto select_cycle_or_test;
}
}
@@ -607,93 +621,93 @@ namespace TBF.BenchControl.Sequences
{
CameraTest();
}
- else if (selection == Selection.Stop)
- {
- if (emptying1 || emptying2 || emptying3)
- {
- IList valvesClose = new List();
- if (emptying1) valvesClose.Add(StateMachine.EmptyTankValve1);
- if (emptying2) valvesClose.Add(StateMachine.EmptyTankValve2);
- if (emptying3) valvesClose.Add(StateMachine.EmptyTankValve3);
+ else if (selection == Selection.Stop)
+ {
+ if (emptying1 || emptying2 || emptying3)
+ {
+ IList valvesClose = new List();
+ if (emptying1) valvesClose.Add(StateMachine.EmptyTankValve1);
+ if (emptying2) valvesClose.Add(StateMachine.EmptyTankValve2);
+ if (emptying3) valvesClose.Add(StateMachine.EmptyTankValve3);
- State.Create("MainSeq : Close emptying valve(s)")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, valvesClose))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- emptying1 = emptying2 = emptying3 = false;
- }
- selection = Selection.None;
- }
- else if ((selection == Selection.EmptyTank1) && !emptying1)
- {
- emptying1 = true;
- Bridge.OnActivity(this, Strings.Emptying_tank);
- Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |
- ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
- (emptying2 ? 0 : ButtonsEtc.EmptyTankBtn2En) |
- (emptying3 ? 0 : ButtonsEtc.EmptyTankBtn3En));
- State.Create("MainSeq : Open tank 1")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.EmptyTankValve1, null))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- }
- else if ((selection == Selection.EmptyTank2) && !emptying2)
- {
- emptying2 = true;
- Bridge.OnActivity(this, Strings.Emptying_tank);
- Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |
- ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
- (emptying1 ? 0 : ButtonsEtc.EmptyTankBtn1En) |
- (emptying3 ? 0 : ButtonsEtc.EmptyTankBtn3En));
- State.Create("MainSeq : Open tank 2")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.EmptyTankValve2, null))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- }
- else if ((selection == Selection.EmptyTank3) && !emptying3)
- {
- emptying3 = true;
- Bridge.OnActivity(this, Strings.Emptying_tank);
- Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |
- ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
- (emptying1 ? 0 : ButtonsEtc.EmptyTankBtn1En) |
- (emptying2 ? 0 : ButtonsEtc.EmptyTankBtn2En));
- State.Create("MainSeq : Open tank 3")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.EmptyTankValve3, null))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- }
- else if (selection == Selection.CloseTank1)
- {
- State.Create("MainSeq : Close tank 1")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, StateMachine.EmptyTankValve1))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- emptying1 = false;
- }
- else if (selection == Selection.CloseTank2)
- {
- State.Create("MainSeq : Close tank 2")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, StateMachine.EmptyTankValve2))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- emptying2 = false;
- }
- else if (selection == Selection.CloseTank3)
- {
- State.Create("MainSeq : Close tank 3")
- .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, StateMachine.EmptyTankValve3))
- .EnterState();
- do { e = StateMachine.WaitRunDevsRunOps(); }
- while (!e.Contains(Event.ValvesSet));
- emptying3 = false;
- }
+ State.Create("MainSeq : Close emptying valve(s)")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, valvesClose))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ emptying1 = emptying2 = emptying3 = false;
+ }
+ selection = Selection.None;
+ }
+ else if ((selection == Selection.EmptyTank1) && !emptying1)
+ {
+ emptying1 = true;
+ Bridge.OnActivity(this, Strings.Emptying_tank);
+ Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |
+ ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
+ (emptying2 ? 0 : ButtonsEtc.EmptyTankBtn2En) |
+ (emptying3 ? 0 : ButtonsEtc.EmptyTankBtn3En));
+ State.Create("MainSeq : Open tank 1")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.EmptyTankValve1, null))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ }
+ else if ((selection == Selection.EmptyTank2) && !emptying2)
+ {
+ emptying2 = true;
+ Bridge.OnActivity(this, Strings.Emptying_tank);
+ Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |
+ ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
+ (emptying1 ? 0 : ButtonsEtc.EmptyTankBtn1En) |
+ (emptying3 ? 0 : ButtonsEtc.EmptyTankBtn3En));
+ State.Create("MainSeq : Open tank 2")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.EmptyTankValve2, null))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ }
+ else if ((selection == Selection.EmptyTank3) && !emptying3)
+ {
+ emptying3 = true;
+ Bridge.OnActivity(this, Strings.Emptying_tank);
+ Bridge.Bench2UI(((context == MKSelContext.ProcedureNotSelected) ? ButtonsEtc.ProcedureCmbBoxEn : 0) |
+ ButtonsEtc.TestCmbBoxEn | ButtonsEtc.StopBtnEn |
+ (emptying1 ? 0 : ButtonsEtc.EmptyTankBtn1En) |
+ (emptying2 ? 0 : ButtonsEtc.EmptyTankBtn2En));
+ State.Create("MainSeq : Open tank 3")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.EmptyTankValve3, null))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ }
+ else if (selection == Selection.CloseTank1)
+ {
+ State.Create("MainSeq : Close tank 1")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, StateMachine.EmptyTankValve1))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ emptying1 = false;
+ }
+ else if (selection == Selection.CloseTank2)
+ {
+ State.Create("MainSeq : Close tank 2")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, StateMachine.EmptyTankValve2))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ emptying2 = false;
+ }
+ else if (selection == Selection.CloseTank3)
+ {
+ State.Create("MainSeq : Close tank 3")
+ .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, StateMachine.EmptyTankValve3))
+ .EnterState();
+ do { e = StateMachine.WaitRunDevsRunOps(); }
+ while (!e.Contains(Event.ValvesSet));
+ emptying3 = false;
+ }
}
error:
diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index d79e9638e..81ca4dfd8 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -353,7 +353,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
index 6d15625a7..d309d4c86 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
@@ -12,6 +12,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
public bool Evaluate { get { return false; } }
public bool Publish { get { return false; } }
+ public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs
index c73b0151d..2c97ea601 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs
@@ -12,6 +12,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
public bool Evaluate { get { return false; } }
public bool Publish { get { return false; } }
+ public bool CanTest(Entities.MetersKind meters) { return true; }
public RoiDetection(RoiDetectionCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
index f96335482..87877198e 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
@@ -150,7 +150,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
index 55d35998f..bd7ddf6c4 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
@@ -469,7 +469,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs
index 00ec18574..c64803b6b 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs
@@ -14,6 +14,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
public bool Evaluate { get { return true; } }
public bool Publish { get { return true; } }
+ public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Combined; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index f631c2de1..fd48cb8b8 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -17,6 +17,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
public IList Execute(Entities.Test test, CombinedWithDetTestParams testParams)
{
+ if (test.Part < 1 || test.Part > (Program.WMsCount / 2))
+ {
+ UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Program.WMsCount / 2));
+ IList retval = new List(1);
+ retval.Add(Event.ConfigurationError);
+ return retval;
+ }
+
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
/// Specific for combined meters
@@ -660,9 +668,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
}
/// Create the return value - a list with one event Event.Done - and return
- IList retval = new List();
- retval.Add(Event.Done);
- return retval;
+ IList retval1 = new List(1);
+ retval1.Add(Event.Done);
+ return retval1;
//====================================
stop:
@@ -679,7 +687,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
}
while (!e.Contains(Event.ValvesSet));
- IList retval2 = new List();
+ IList retval2 = new List(1);
retval2.Add(Event.UiCmdStop);
return retval2;
@@ -697,7 +705,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
}
while (!e.Contains(Event.ValvesSet));
- IList retval3 = new List();
+ IList retval3 = new List(1);
retval3.Add(Event.Error);
return retval3;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs
index 056d02f8f..b96b1cb8a 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs
@@ -14,6 +14,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
public bool Evaluate { get { return true; } }
public bool Publish { get { return true; } }
+ public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Combined; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 32fd8241c..f4f58ec89 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -563,7 +563,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
index 46bf791e7..916390455 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
@@ -12,6 +12,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
public bool Evaluate { get { return true; } }
public bool Publish { get { return true; } }
+ public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 9b4eebdd2..a880ec616 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -311,7 +311,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
index 360f53238..a965d4241 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
@@ -12,6 +12,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
public bool Evaluate { get { return true; } }
public bool Publish { get { return true; } }
+ public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index d74c0a6bc..4b8630eea 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -453,7 +453,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
index 05063cb1a..844a48d2c 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
@@ -12,6 +12,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
public bool Evaluate { get { return true; } }
public bool Publish { get { return true; } }
+ public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
index d7163590b..e5fae505c 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
@@ -444,7 +444,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
}
/// Create a list with one item 'retVal' (default is Event.Done) and return it
- IList retList = new List();
+ IList retList = new List(1);
retList.Add(retVal);
return retList;
}
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs
index 8f43b34f4..c33ac2e97 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs
@@ -12,6 +12,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
public bool Evaluate { get { return false; } }
public bool Publish { get { return false; } }
+ public bool CanTest(Entities.MetersKind meters) { return true; }
public TestMethod(TestMethodCfg cfg)
: base(cfg)