From 430e8974292b3a713e37cfa1c766799fedd2bed1 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 27 Jun 2019 21:05:21 +0200 Subject: [PATCH] MainSeq : transitionBefore : case of outer loops handled correctly, ver. 2.18.1256 --- TBF/BenchControl/Sequences/MainSeq.cs | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index bbcfec863..394b56eb7 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -903,12 +903,12 @@ namespace TBF.BenchControl.Sequences bool doOneMoreRepetition = false; do { - bool isBeforeFirstRepet = (repetNr == 1) || veryFirstTestInTheRestOfCycle; + bool doExecuteTransitionBefore = isOuterLoopMode || (repetNr == 1) || veryFirstTestInTheRestOfCycle; veryFirstTestInTheRestOfCycle = false; if (testMethod.DoTransitions()) { /// Make a transition before a test and before each test repetition - rsltTransBefore = Transition(isBeforeFirstRepet ? transitionBefore : null, TransitionContext.BeforeTest); /// Transition or SetRoute - start of test + rsltTransBefore = Transition(doExecuteTransitionBefore ? 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; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 4b6e0ae00..cc1586247 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.1255.0")] -[assembly: AssemblyFileVersion("2.18.1255.0")] +[assembly: AssemblyVersion("2.18.1256.0")] +[assembly: AssemblyFileVersion("2.18.1256.0")]