From b9b86ecaff9836594d7c06eb67b14c2b9209ba7d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 27 Jun 2019 11:14:26 +0200 Subject: [PATCH] MainSeq : transitionBefore is not executed between 2 repetitions of a test, ver. 2.18.1255 --- TBF/BenchControl/Sequences/MainSeq.cs | 12 ++++++++++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index ae66dc444..bbcfec863 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -778,7 +778,10 @@ namespace TBF.BenchControl.Sequences ///------------------------------------------------------------------------------------------------------------ if (selection == Selection.Cycle || selection == Selection.RestOfCycle) { + /// A sequence of tests will be executed + IList deferredData = new List(); + 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) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 629eb61e3..4b6e0ae00 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -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")]