From c3d5e157eccfec1c646502925b990f0e0d3217ee Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 15 Aug 2019 17:10:09 +0200 Subject: [PATCH] TestMethods.Q2CorrectionFromHistory slightly modified, no State.Create() and do {} while loop, ver. 2.18.1297 --- .../Q2CorrectionFromHistory/FromHistorySeq.cs | 31 ++----------------- .../iPerlCommunicationForm.cs | 8 ++--- TBF/Properties/AssemblyInfo.cs | 4 +-- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs index 3f5912d4f..871271131 100644 --- a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs +++ b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using NHibernate; -using NHibernate.Criterion; using log4net; using Results.Entities; using TBF.UiBridge; @@ -19,36 +18,10 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory public IList Execute(Config.Entities.Test test, FromHistoryCfg cfg) { - IList e; - Event retVal = Event.Done; - - /// Operations - checkUiOp = new Operations.CheckUIOp(true); - - //------------------------------------------------ - Bridge.OnActivity(this, test.Method); - //------------------------------------------------ - State.Create(string.Format("{0}({1}) : Q2 correction from history", test.Method, test.Name)) - .AddOperation(checkUiOp) - .EnterState(); - - /// Read database here + Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test)); bool success = ReadCorrectionsFromLocalDB(cfg); - - { - e = StateMachine.WaitRunDevsRunOps(); - - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test)); - - if (e.Contains(Event.Error)) - retVal = Event.Error; - else if (TestAndLogUiCmdStop(test, e)) - retVal = Event.UiCmdStop; - } - - Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed)); - return new List { retVal }; + return new List { success ? Event.Done : Event.RecoverableError }; } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index eb0b1b058..e18a914f9 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -1754,17 +1754,15 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication (rdData != null) && (rdData.Length == 2) && (rdData[0] == 0) && (rdData[1] == 0)) { error = CommErr.None; - resultStr = "Q2 correction factors reset to 0"; - ihead.Q2CorrectionFactor = 0; + resultStr = string.Format("Q2 correction set to LR={0}, RL={1}", factorLR, factorRL); break; } } } #else - if (error == CommErr.None) + if (error == CommErr.None) { - resultStr = "Q2 corrections reset to 0"; - ihead.Q2CorrRL = 0; + resultStr = string.Format("Q2 correction set to LR={0}, RL={1}", factorLR, factorRL); } #endif diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 079330003..abdbeddab 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.1295.0")] -[assembly: AssemblyFileVersion("2.18.1295.0")] +[assembly: AssemblyVersion("2.18.1297.0")] +[assembly: AssemblyFileVersion("2.18.1297.0")]