From c4b643aac78ecc79f4552ed8dad655e2a5895c3f Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Tue, 10 Mar 2020 08:58:35 +0100
Subject: [PATCH] SensusTetsInfo.CreateFromProcedure() fixed, does not contain
 tests with Evaluate==false, ver. 2.25.1434

---
 Results/Output/SensusTestInfo.cs   | 12 +++++++++---
 Results/Properties/AssemblyInfo.cs |  4 ++--
 TBF/Properties/AssemblyInfo.cs     |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs
index 580ea8e40..81a305248 100644
--- a/Results/Output/SensusTestInfo.cs
+++ b/Results/Output/SensusTestInfo.cs
@@ -417,6 +417,7 @@ namespace Results.Output
             }
         }
 
+
         /// <summary>
         /// Generate a array of SensusTestInfo objects representing the procedure.
         /// Multiple parts of the same test (with the same name) generate only one SensusTestInfo object.
@@ -432,7 +433,7 @@ namespace Results.Output
             IList<string> listOfHydroTests = new List<string>();
             foreach (var test in procedure.Tests)
             {
-                if (!test.Method.ToLower().Contains("iperlcommunication"))
+                if (TestShouldBeIncluded(test))
                 {
                     for (int repNr = 1; repNr <= test.Repeats; repNr++)
                     {
@@ -452,7 +453,7 @@ namespace Results.Output
 
             foreach (var test in procedure.Tests)
             {
-                if (!test.Method.ToLower().Contains("iperlcommunication"))
+                if (TestShouldBeIncluded(test))
                 {
                     for (int repNr = 1; repNr <= test.Repeats; repNr++)
                     {
@@ -468,7 +469,12 @@ namespace Results.Output
 
             return stiArray;
         }
-
+        /// 
+        static bool TestShouldBeIncluded(Config.Entities.Test test)
+        {
+            return test.DoEvaluate && !test.Method.ToLower().Contains("iperlcommunication");
+        }
+        /// 
         public static SensusTestInfo CreateFromTest(Config.Entities.Test test, int repetitionNr, int luID, string fullTestNameWoPart)
         {
             bool isQ4Q3 = test.Name.ToLower().Contains("q4") ||
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index bf1e1483a..475836578 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.25.1429.0")]
-[assembly: AssemblyFileVersion("2.25.1429.0")]
+[assembly: AssemblyVersion("2.25.1434.0")]
+[assembly: AssemblyFileVersion("2.25.1434.0")]
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 803658856..f23f3e9c5 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.25.1430.0")]
-[assembly: AssemblyFileVersion("2.25.1430.0")]
+[assembly: AssemblyVersion("2.25.1434.0")]
+[assembly: AssemblyFileVersion("2.25.1434.0")]