From d8d8f2484306add5c3aea3fc44cb12491a56d47b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 12 Jan 2016 20:46:37 +0100 Subject: [PATCH] Bug fix in Progress display for a test with parts, version 2.1.186. --- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- TestBenchFramework/TestProgressControls.cs | 4 ++-- TestBenchFramework/UiControls/TestProgressCtrl.cs | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 6cd7c7de1..4fc2e975f 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.185.1")] -[assembly: AssemblyFileVersion("2.1.185.1")] +[assembly: AssemblyVersion("2.1.186.1")] +[assembly: AssemblyFileVersion("2.1.186.1")] diff --git a/TestBenchFramework/TestProgressControls.cs b/TestBenchFramework/TestProgressControls.cs index 3a650c9f5..0cc901811 100644 --- a/TestBenchFramework/TestProgressControls.cs +++ b/TestBenchFramework/TestProgressControls.cs @@ -77,7 +77,7 @@ namespace TBF for (int i = 1; i <= test.Repeats; i++) { UiControls.TestProgressCtrl prgrs = - new UiControls.TestProgressCtrl(test.Id, Results.Utils.GetTestName(test.Name, test.Repeats, i), Utils.TestTitle(test, i), i, test.Repeats); + new UiControls.TestProgressCtrl(test.Id, Results.Utils.GetTestName(test.Name, test.Repeats, i), test.Part, Utils.TestTitle(test, i), i, test.Repeats); progresses.Add(prgrs); parent.Controls.Add(prgrs); } @@ -106,7 +106,7 @@ namespace TBF { foreach (var prgrs in progresses) { - if ((prgrs.TestName == args.TestName)) + if (prgrs.TestName == args.TestName && prgrs.Part == args.Part) { prgrs.Progress = args.Progress; break; diff --git a/TestBenchFramework/UiControls/TestProgressCtrl.cs b/TestBenchFramework/UiControls/TestProgressCtrl.cs index 80aaab6eb..0c2decae9 100644 --- a/TestBenchFramework/UiControls/TestProgressCtrl.cs +++ b/TestBenchFramework/UiControls/TestProgressCtrl.cs @@ -37,6 +37,9 @@ namespace TBF.UiControls string testName; public string TestName { get { return testName; } } + int part; + public int Part { get { return part; } } + string title; public string Title2 { get { return title; } } @@ -55,10 +58,11 @@ namespace TBF.UiControls this.TestResult = UiControls.TestProgressCtrl.Result.NotDone; } - public TestProgressCtrl(int testId, string testName, string title, int repetitionNr, int testRepeats) + public TestProgressCtrl(int testId, string testName, int part, string title, int repetitionNr, int testRepeats) : this() { this.testId = testId; + this.part = part; this.testName = testName; this.title = title; this.repetitionNr = repetitionNr;