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

Test method sequences : Correct error message on flow setting timeout.

Browse Source
This commit is contained in:
Milan Hanajik 2019-04-08 10:33:58 +02:00
parent b8a16f1301
commit 3c341d4d97
19 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TBF/BenchControl/Events.cs
View File

@ -164,6 +164,7 @@ namespace TBF.BenchControl
Error, /// Many ops.: Fatal error occurred
OpArgumentError,
ConfigurationError,
RecoverableError, /// Something like flow setting or mass measurement timeout
Yes,
No,
Next, /// To move to the next state when debugging

10
TBF/BenchControl/Sequences/MainSeq.cs
View File

@ -884,9 +884,9 @@ namespace TBF.BenchControl.Sequences
}
currentTestFinished = (rsltTransBefore == Event.Done && !e.Contains(Event.Error)
&& !e.Contains(Event.ConfigurationError)
&& !e.Contains(Event.OpArgumentError)
&& !e.Contains(Event.UiCmdStop));
&& !e.Contains(Event.ConfigurationError)
&& !e.Contains(Event.OpArgumentError)
&& !e.Contains(Event.UiCmdStop));
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, currentTestFinished ? Config.Entities.Progress.Completed
: Config.Entities.Progress.Aborted));
@ -907,7 +907,7 @@ namespace TBF.BenchControl.Sequences
if (currentTestFinished && !isOuterLoopMode && repetNr > test.Repeats) repetNr = 1; /// Reset repetNr
if (testMethod.DoTransitions())
if (testMethod.DoTransitions() && !e.Contains(Event.RecoverableError))
{
/// Make a transition after the last test repetition
TransitionContext endContext = currentTestFinished ? TransitionContext.AfterTest : TransitionContext.Stop;
@ -931,7 +931,7 @@ namespace TBF.BenchControl.Sequences
isOuterLoopMode = false;
goto config_error;
}
else if (rsltTransBefore == Event.UiCmdStop || e.Contains(Event.UiCmdStop))
else if (rsltTransBefore == Event.UiCmdStop || e.Contains(Event.UiCmdStop) || e.Contains(Event.RecoverableError))
{
isOuterLoopMode = false;
goto stop_within_cycle;

2
TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -216,7 +216,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

2
TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
View File

@ -151,7 +151,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

2
TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
View File

@ -321,7 +321,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

6
TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
View File

@ -222,7 +222,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -340,7 +340,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -472,7 +472,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}

6
TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs
View File

@ -350,7 +350,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -490,7 +490,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -775,7 +775,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}

6
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -331,7 +331,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -471,7 +471,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -764,7 +764,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}

2
TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
View File

@ -271,7 +271,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

2
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -212,7 +212,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

6
TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
View File

@ -302,7 +302,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -499,7 +499,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -677,7 +677,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}

10
TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
View File

@ -308,7 +308,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -523,7 +523,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -591,7 +591,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -774,7 +774,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -1150,7 +1150,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
do
{
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) goto stopTest;
if (TestAndLogUiCmdStop(test, e)) break;
}
while (!e.Contains(Event.PreviousStopped));
}

8
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -305,7 +305,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -502,7 +502,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -676,7 +676,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -1006,7 +1006,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
do
{
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) goto stopTest;
if (TestAndLogUiCmdStop(test, e)) break;
}
while (!e.Contains(Event.PreviousStopped));
}

8
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -292,7 +292,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -489,7 +489,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -663,7 +663,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
if (e.Contains(Event.TimerExpired))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.Error;
retVal = Event.RecoverableError;
goto stopTest;
}
}
@ -1039,7 +1039,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
do
{
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) goto stopTest;
if (TestAndLogUiCmdStop(test, e)) break;
}
while (!e.Contains(Event.PreviousStopped));
}

4
TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
View File

@ -234,7 +234,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -751,7 +751,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
do
{
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) goto stopTest;
if (TestAndLogUiCmdStop(test, e)) break;
}
while (!e.Contains(Event.PreviousStopped));
}

2
TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
View File

@ -214,7 +214,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

2
TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
View File

@ -216,7 +216,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;

4
TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
View File

@ -140,7 +140,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
retVal = Event.UiCmdStop;
retVal = Event.RecoverableError;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
@ -265,7 +265,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) goto stopTest;
if (TestAndLogUiCmdStop(test, e)) break;
}
while (!e.Contains(Event.PreviousStopped));
}

2
TBF/Resources/Strings.cs.resx
View File

@ -640,7 +640,7 @@
<value>Prosím, změňte následující nastavení:</value>
</data>
<data name="Please_select_a_cycle_a_test_or_empty" xml:space="preserve">
<value>Prosím, vyberte cyklus, test nebo žádný</value>
<value>Prosím, vyberte cyklus, test nebo vypouštění</value>
</data>
<data name="Please_select_a_procedure" xml:space="preserve">
<value>Prosím zvolte postup</value>