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

MainSeq : transitionBefore is not executed between 2 repetitions of a test, ver. 2.18.1255

Browse Source
This commit is contained in:
Milan Hanajik 2019-06-27 11:14:26 +02:00
parent 1c5c260a82
commit b9b86ecaff
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,7 +778,10 @@ namespace TBF.BenchControl.Sequences
///------------------------------------------------------------------------------------------------------------
if (selection == Selection.Cycle || selection == Selection.RestOfCycle)
{
/// A sequence of tests will be executed
IList<DeferredTestEvaluationData> deferredData = new List<DeferredTestEvaluationData>();
bool veryFirstTestInTheRestOfCycle = true;
int selsctedTestIx = simultWithPurgingCount; /// Applies when selection == Selection.Cycle
int repetNr = 1;
@ -900,10 +903,12 @@ namespace TBF.BenchControl.Sequences
bool doOneMoreRepetition = false;
do
{
bool isBeforeFirstRepet = (repetNr == 1) || veryFirstTestInTheRestOfCycle;
veryFirstTestInTheRestOfCycle = false;
if (testMethod.DoTransitions())
{
/// Make a transition before a test and before each test repetition
rsltTransBefore = Transition(transitionBefore, TransitionContext.BeforeTest); /// Transition or SetRoute - start of test
rsltTransBefore = Transition(isBeforeFirstRepet ? transitionBefore : null, TransitionContext.BeforeTest); /// Transition or SetRoute - start of test
log.InfoFormat("Test {0}: Transition({1}, BeforeTest) returned {2}", test.Name, (transitionBefore == null ? "null" : transitionBefore.Name), rsltTransBefore);
}
if (rsltTransBefore != Event.Done) break;
@ -1045,8 +1050,11 @@ namespace TBF.BenchControl.Sequences
deferredData.Clear();
}
///------------------------------------------------------------------------------------------------------------
else /// if (selection == Selection.Test or Q1 or Q2 or Q3)
else
{
/// selection == Selection.Test or Selection.Q1 or Selection.Q2 or Selection.Q3
/// Single test will be executed
int repetNr;
Test test = TBF.BenchControl.StateMachine.GetTest(selectedTestName, out repetNr);
if (test == null)

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1254.0")]
[assembly: AssemblyFileVersion("2.18.1254.0")]
[assembly: AssemblyVersion("2.18.1255.0")]
[assembly: AssemblyFileVersion("2.18.1255.0")]