From d83762ddec83b52c720a757b056dd5b9d41ad5d8 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 12 Dec 2022 17:36:40 +0100 Subject: [PATCH] Refactorization : Common.Utils.GetTestName(...) replaces Results.Utils.GetTestName(...) --- Results/Entities/TestRslt.cs | 2 +- Results/Utils.cs | 5 ----- TBF/Rig/Sequences/SequenceBase.cs | 6 +++--- TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs | 2 +- .../ChangeFlowDirection/ChangeFlowDirectionSeq.cs | 2 +- .../CombinedWithDetection/CombinedWithDetectionSeq.cs | 4 ++-- TBF/Rig/TestMethods/Counter/CounterSeq.cs | 2 +- TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs | 2 +- TBF/Rig/TestMethods/Dummy/DummySeq.cs | 2 +- TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs | 2 +- TBF/Rig/TestMethods/Evacuation/EvacuationSeq.cs | 2 +- TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs | 2 +- .../TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs | 2 +- .../FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs | 4 ++-- .../FixedStartMassCollDeferredEvalSeq.cs | 4 ++-- .../FixedStartMassCollection/FixedStartMassCollectionSeq.cs | 2 +- .../FixedStartTankCollection/FixedStartTankCollectionSeq.cs | 2 +- TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs | 4 ++-- .../FlyingStartFirstRepetWithMassCollSeq.cs | 6 +++--- .../FlyingStartMassCollComparativeSeq.cs | 2 +- .../FlyingStartMassCollProlongedSeq.cs | 4 ++-- .../FlyingStartMassCollectionSeq.cs | 6 +++--- .../FlyingStartMassCollection/Single/Component.cs | 2 +- .../FlyingStartTankCollectionSeq.cs | 4 ++-- TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs | 2 +- TBF/Rig/TestMethods/LeakTest/TestMethod.cs | 2 +- TBF/Rig/TestMethods/ManualEntry/ManualEntrySeq.cs | 2 +- TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs | 2 +- TBF/Rig/TestMethods/PMaxTest/TestMethod.cs | 2 +- TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs | 2 +- TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs | 2 +- .../TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs | 2 +- TBF/Rig/TestMethods/RoiDetection/RoiDetectionSeq.cs | 2 +- TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs | 2 +- TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs | 2 +- .../TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs | 2 +- TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs | 2 +- TBF/UiBridge/ProcessDataEventArgs.cs | 4 ++-- TBF/UiBridge/TestProgressEventArgs.cs | 2 +- 39 files changed, 51 insertions(+), 56 deletions(-) diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 2985d5955..d561f4980 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -147,7 +147,7 @@ namespace Results.Entities public virtual int Counter5 { get; set; } /// Wrappers - public virtual string Name() { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); } + public virtual string Name() { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); } public virtual int Repeats() { return TestData.Repeats; } public virtual double Qfrom() { return TestData.Qfrom; } public virtual double Qto() { return TestData.Qto; } diff --git a/Results/Utils.cs b/Results/Utils.cs index 4fa018bbc..8ed9312cb 100644 --- a/Results/Utils.cs +++ b/Results/Utils.cs @@ -11,12 +11,7 @@ namespace Results { public static int MaxTestIndex = 0; - public static string GetTestName(string name, int repeats, int repetitionNr) - { - return Common.Utils.GetTestName(name, repeats, repetitionNr); - } - public static int BenchIdOracle2Asc(int benchIdOracle) { switch (benchIdOracle) diff --git a/TBF/Rig/Sequences/SequenceBase.cs b/TBF/Rig/Sequences/SequenceBase.cs index af06e952c..277d43482 100644 --- a/TBF/Rig/Sequences/SequenceBase.cs +++ b/TBF/Rig/Sequences/SequenceBase.cs @@ -1539,7 +1539,7 @@ namespace TBF.Rig.Sequences /// Test result public void MakeSimulatedTrivial(Config.Entities.Test test, int repetitionNr, int part) { - string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string fullTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); @@ -1656,7 +1656,7 @@ namespace TBF.Rig.Sequences /// Test result public void MakeSimulated(Config.Entities.Test test, int repetitionNr, int part, float errorPctBase) { - string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string fullTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters); @@ -1772,7 +1772,7 @@ namespace TBF.Rig.Sequences /// Test result protected void MakeSimulatedCompound(Config.Entities.Test test, int repetitionNr, int part, float errorPct, float mainPart) { - string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string fullTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); diff --git a/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs index 66e736cfb..277b127ea 100644 --- a/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs @@ -125,7 +125,7 @@ namespace TBF.Rig.TestMethods.Adjustment /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// Read pressure and temperature once before calling Bridge.OnTestSelected(...) State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name)) diff --git a/TBF/Rig/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs b/TBF/Rig/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs index 1601b416a..cb59fc8e6 100644 --- a/TBF/Rig/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs +++ b/TBF/Rig/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs @@ -42,7 +42,7 @@ namespace TBF.Rig.TestMethods.ChangeFlowDirection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; diff --git a/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 90b949b49..cf3e1e5d8 100644 --- a/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -145,7 +145,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting)); @@ -880,7 +880,7 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------ diff --git a/TBF/Rig/TestMethods/Counter/CounterSeq.cs b/TBF/Rig/TestMethods/Counter/CounterSeq.cs index faf23d8c0..3171d4f68 100644 --- a/TBF/Rig/TestMethods/Counter/CounterSeq.cs +++ b/TBF/Rig/TestMethods/Counter/CounterSeq.cs @@ -38,7 +38,7 @@ namespace TBF.Rig.TestMethods.Counter TBF.UiBridge.Bridge.OnSaveSettings(this, null); /// Update results - var testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + var testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); var testResults = BatchRslts.GetTestRslt(testName, test.Part); global::Results.Utils.GetCounterStates(testResults, Program.LocalSettings.Counters); if (testResults != null) diff --git a/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs index 55e4ccd92..68b838a85 100644 --- a/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs +++ b/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs @@ -117,7 +117,7 @@ namespace TBF.Rig.TestMethods.DiverterTest /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, null, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; diff --git a/TBF/Rig/TestMethods/Dummy/DummySeq.cs b/TBF/Rig/TestMethods/Dummy/DummySeq.cs index c3a9221b0..bed2b306d 100644 --- a/TBF/Rig/TestMethods/Dummy/DummySeq.cs +++ b/TBF/Rig/TestMethods/Dummy/DummySeq.cs @@ -31,7 +31,7 @@ namespace TBF.Rig.TestMethods.Dummy /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; /// diff --git a/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs b/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs index b06aaf341..121c820ee 100644 --- a/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs +++ b/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs @@ -125,7 +125,7 @@ namespace TBF.Rig.TestMethods.Endurance /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; diff --git a/TBF/Rig/TestMethods/Evacuation/EvacuationSeq.cs b/TBF/Rig/TestMethods/Evacuation/EvacuationSeq.cs index 5770ee05e..a981396e4 100644 --- a/TBF/Rig/TestMethods/Evacuation/EvacuationSeq.cs +++ b/TBF/Rig/TestMethods/Evacuation/EvacuationSeq.cs @@ -51,7 +51,7 @@ namespace TBF.Rig.TestMethods.Evacuation /// /// Populate TestResult data entity with data /// - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) diff --git a/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs index 328b6e7c9..a84fadfaa 100644 --- a/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs +++ b/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs @@ -117,7 +117,7 @@ namespace TBF.Rig.TestMethods.FixedStart /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test diff --git a/TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index d9cad6260..aaa72dedc 100644 --- a/TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TBF/Rig/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -124,7 +124,7 @@ namespace TBF.Rig.TestMethods.FixedStartAdvanced /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; diff --git a/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs index 8752487ca..6f1d4c642 100644 --- a/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs +++ b/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs @@ -40,7 +40,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval intermediateData = new IntermediateData { Compound = compound, - TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr), + TestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr), TestPart = test.Part, }; @@ -136,7 +136,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test diff --git a/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs index bdd40a493..69bc803bb 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs +++ b/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs @@ -40,7 +40,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval intermediateData = new IntermediateData { Compound = compound, - TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr), + TestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr), TestPart = test.Part, }; @@ -152,7 +152,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 93390d014..51a8b3aa9 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -132,7 +132,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// /// Optionally display prompt to emerge temperature meters to appropriate baths for heat meters test diff --git a/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs index f0d2b6b8b..49c6bf367 100644 --- a/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs +++ b/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs @@ -134,7 +134,7 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// diff --git a/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs index 16e4bcb4b..f28e0fcd7 100644 --- a/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -115,7 +115,7 @@ namespace TBF.Rig.TestMethods.FlyingStart /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; /// @@ -796,7 +796,7 @@ namespace TBF.Rig.TestMethods.FlyingStart else MakeSimulated(test, 1, 0, 0.9f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------------------------ diff --git a/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index cf28a16d8..19c94b1cf 100644 --- a/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -137,7 +137,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; bool drainTheTank = (repetitionNr == 1) ? test.DoDraining : false; @@ -784,7 +784,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl } else { - Results.Entities.TestRslt tstResRepet1 = BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, test.Repeats, 1), test.Part); + Results.Entities.TestRslt tstResRepet1 = BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, test.Repeats, 1), test.Part); tstRslt.TimeBtwnMassMsrmnts = 0; tstRslt.MassOfEvapWater = 0; @@ -1125,7 +1125,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------------------------- diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index 601088cf3..14378e9fc 100644 --- a/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -151,7 +151,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index 33465c1dd..babcc9578 100644 --- a/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -138,7 +138,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, targetTotalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; @@ -1249,7 +1249,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------------------------- diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 7ec8480b3..b6aa8be72 100644 --- a/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -133,7 +133,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; @@ -1160,7 +1160,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------------------------- @@ -1235,7 +1235,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection MakeSimulated(test, repetitionNr, test.Part, errorPctBase + repetitionNr * 0.1f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file } diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollection/Single/Component.cs b/TBF/Rig/TestMethods/FlyingStartMassCollection/Single/Component.cs index 18c9de2ba..167245bea 100644 --- a/TBF/Rig/TestMethods/FlyingStartMassCollection/Single/Component.cs +++ b/TBF/Rig/TestMethods/FlyingStartMassCollection/Single/Component.cs @@ -45,7 +45,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection.Single /// DebugLevel == DebugMode.Simulate (new FlyingStartMassCollectionSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); return new List { Event.Done }; } } diff --git a/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs index 03661a256..7a90fa5ff 100644 --- a/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs +++ b/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs @@ -129,7 +129,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; @@ -815,7 +815,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------------------------- diff --git a/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs index 0b70b1f33..ff4052bef 100644 --- a/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TBF/Rig/TestMethods/LeakTest/LeakTestSeq.cs @@ -76,7 +76,7 @@ namespace TBF.Rig.TestMethods.LeakTest /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, 1); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, 1); //------------------------------------------------ Bridge.OnActivity(this, Strings.Starting_the_pump); diff --git a/TBF/Rig/TestMethods/LeakTest/TestMethod.cs b/TBF/Rig/TestMethods/LeakTest/TestMethod.cs index 2e13a1286..c303e1711 100644 --- a/TBF/Rig/TestMethods/LeakTest/TestMethod.cs +++ b/TBF/Rig/TestMethods/LeakTest/TestMethod.cs @@ -46,7 +46,7 @@ namespace TBF.Rig.TestMethods.LeakTest /// DebugLevel == DebugMode.Simulate (new LeakTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); return new List { Event.Done }; } } diff --git a/TBF/Rig/TestMethods/ManualEntry/ManualEntrySeq.cs b/TBF/Rig/TestMethods/ManualEntry/ManualEntrySeq.cs index 342769b8f..bf0ab71ff 100644 --- a/TBF/Rig/TestMethods/ManualEntry/ManualEntrySeq.cs +++ b/TBF/Rig/TestMethods/ManualEntry/ManualEntrySeq.cs @@ -45,7 +45,7 @@ namespace TBF.Rig.TestMethods.ManualEntry /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// /// Populate TestResult data entity with default data diff --git a/TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs index 6c06a9aa7..5f2888ff9 100644 --- a/TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -59,7 +59,7 @@ namespace TBF.Rig.TestMethods.PMaxTest /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, heatMetersPath, 0)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, 1); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, 1); TestStartTime = DateTime.Now; //------------------------------------------------ diff --git a/TBF/Rig/TestMethods/PMaxTest/TestMethod.cs b/TBF/Rig/TestMethods/PMaxTest/TestMethod.cs index 968fc9d11..70bbc0c50 100644 --- a/TBF/Rig/TestMethods/PMaxTest/TestMethod.cs +++ b/TBF/Rig/TestMethods/PMaxTest/TestMethod.cs @@ -49,7 +49,7 @@ namespace TBF.Rig.TestMethods.PMaxTest /// DebugLevel == DebugMode.Simulate (new PMaxTestSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); return new List { Event.Done }; } } diff --git a/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs index 600b10c81..21dc9fb00 100644 --- a/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs +++ b/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs @@ -120,7 +120,7 @@ namespace TBF.Rig.TestMethods.PulsesTest /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); /// Read pressure and temperature once before calling Bridge.OnTestSelected(...) State.Create(string.Format("{0}({1}) : Measuring process data", test.Method, test.Name)) diff --git a/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs index 3934ae561..1a691e7bf 100644 --- a/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs +++ b/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs @@ -134,7 +134,7 @@ namespace TBF.Rig.TestMethods.PulsesTestManual /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting)); diff --git a/TBF/Rig/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs b/TBF/Rig/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs index 36a870f78..4aa049973 100644 --- a/TBF/Rig/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs +++ b/TBF/Rig/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs @@ -45,7 +45,7 @@ namespace TBF.Rig.TestMethods.Q2CorrectionFromHistory /// /// Populate TestResult data entity with data /// - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestRslt tstRslt = BatchRslts.GetTestRslt(testName, test.Part); if (tstRslt != null) { diff --git a/TBF/Rig/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TBF/Rig/TestMethods/RoiDetection/RoiDetectionSeq.cs index 033b928ba..7913f5eef 100644 --- a/TBF/Rig/TestMethods/RoiDetection/RoiDetectionSeq.cs +++ b/TBF/Rig/TestMethods/RoiDetection/RoiDetectionSeq.cs @@ -49,7 +49,7 @@ namespace TBF.Rig.TestMethods.RoiDetection // Start the test //==================== Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; //------------------------------------------------- diff --git a/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs index 0d3422da1..f3f0d0cf1 100644 --- a/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/Rig/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -143,7 +143,7 @@ namespace TBF.Rig.TestMethods.SensitivityTest /// Start the test, initialize test results Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses)); - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + string testName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); TestStartTime = DateTime.Now; Qrise = 0; diff --git a/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs b/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs index 32bbe10a6..8ada5759e 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/TestMethod.cs @@ -115,7 +115,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication /// DebugLevel == DebugMode.Simulate (new iPerlCommunicationSeq()).MakeSimulatedTrivial(test, repetNr, test.Part); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); return new List { Event.Done }; } } diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 01f7a1a3a..f91f8b28d 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -302,7 +302,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication else if (testParams.Activity.Substring(cmd.Length).ToLower() == "compound fall") MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.Completed)); - Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); + Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0))); allResults.Info(TestResult2CsvLine(test.Name, 0)); /// Append the results to the CSV-file //------------------------------------------------ diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs index 35c71c336..4448be6f9 100644 --- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs +++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs @@ -206,7 +206,7 @@ namespace TBF.UI.Procedures.TestWizard { /// This is a regular test, /// not an internal/unpublished test, neither an auto action test - wmTestNames.Add(Results.Utils.GetTestName(t.Name, 1, 1)); + wmTestNames.Add(Common.Utils.GetTestName(t.Name, 1, 1)); } } diff --git a/TBF/UiBridge/ProcessDataEventArgs.cs b/TBF/UiBridge/ProcessDataEventArgs.cs index e7d489eda..0f61cd48c 100644 --- a/TBF/UiBridge/ProcessDataEventArgs.cs +++ b/TBF/UiBridge/ProcessDataEventArgs.cs @@ -27,7 +27,7 @@ namespace TBF.UiBridge public ProcessDataEventArgs(string testName, int testRepeats, int testPart, int repetitionNr, Progress testPhase) { - CompleteTestName = Results.Utils.GetTestName(testName, testRepeats, repetitionNr); + CompleteTestName = Common.Utils.GetTestName(testName, testRepeats, repetitionNr); Part = testPart; Repeats = testRepeats; RepetitionNr = repetitionNr; @@ -42,7 +42,7 @@ namespace TBF.UiBridge public ProcessDataEventArgs(Test test, int repetitionNr, Progress testPhase) { - CompleteTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + CompleteTestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Part = test.Part; Repeats = test.Repeats; RepetitionNr = repetitionNr; diff --git a/TBF/UiBridge/TestProgressEventArgs.cs b/TBF/UiBridge/TestProgressEventArgs.cs index 9023501bd..14e6278a3 100644 --- a/TBF/UiBridge/TestProgressEventArgs.cs +++ b/TBF/UiBridge/TestProgressEventArgs.cs @@ -87,7 +87,7 @@ namespace TBF.UiBridge public TestProgressEventArgs(Test test, int repetitionNr, Progress progress) : this(progress) { - TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); + TestName = Common.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Part = test.Part; Repeats = test.Repeats; RepetitionNr = repetitionNr;