Merge branch 'Bertec-feature/speed-up'

Bertec · Dec 8, 2019 · e4dfebd · e4dfebd
2 parents ff33d4c + 9836717
commit e4dfebd
Show file tree

Hide file tree

Showing 22 changed files with 153 additions and 145 deletions.
diff --git a/README.md b/README.md
@@ -104,17 +104,28 @@ This is an example of how it can look running the TcUnit-Verifier_DotNet:
 
 ```
 C:\Code\TcUnit\TcUnit-Verifier\TcUnit-Verifier_DotNet\TcUnit-Verifier\bin\Debug>TcUnit-Verifier.exe -v "C:\Code\TcUnit\TcUnit-Verifier\TcUnit-Verifier_TwinCAT\TcUnit-Verifier_TwinCAT.sln"
-2019-07-31 14:35:05 - Starting TcUnit-Verifier...
-2019-07-31 14:35:05 - Loading the Visual Studio Development Tools Environment (DTE)...
-2019-07-31 14:35:38 - Cleaning and building TcUnit-Verifier_TwinCAT solution...
-2019-07-31 14:35:39 - Generating TcUnit-Verifier_TwinCAT boot project...
-2019-07-31 14:35:59 - Activating TcUnit-Verifier_TwinCAT configuration...
-2019-07-31 14:35:59 - Restaring TwinCAT...
-2019-07-31 14:35:59 - Waiting for TcUnit-Verifier_TwinCAT to finish running tests...
-2019-07-31 14:36:12 - Asserting results...
-2019-07-31 14:36:31 - Done.
-2019-07-31 14:36:31 - Closing the Visual Studio Development Tools Environment (DTE), please wait...
-2019-07-31 14:36:51 - Exiting application...
+2019-12-05 16:23:23 - Starting TcUnit-Verifier...
+2019-12-05 16:23:23 - Loading the Visual Studio Development Tools Environment (DTE)...
+2019-12-05 16:23:49 - Cleaning and building TcUnit-Verifier_TwinCAT solution...
+2019-12-05 16:23:49 - Generating TcUnit-Verifier_TwinCAT boot project...
+2019-12-05 16:24:03 - Activating TcUnit-Verifier_TwinCAT configuration...
+2019-12-05 16:24:07 - Restarting TwinCAT...
+2019-12-05 16:24:07 - Waiting for TcUnit-Verifier_TwinCAT to finish running tests...
+2019-12-05 16:24:08 - ... got 5 report lines so far.
+2019-12-05 16:24:10 - ... got 5 report lines so far.
+2019-12-05 16:24:11 - ... got 26 report lines so far.
+2019-12-05 16:24:12 - ... got 51 report lines so far.
+2019-12-05 16:24:14 - ... got 76 report lines so far.
+2019-12-05 16:24:15 - ... got 93 report lines so far.
+2019-12-05 16:24:16 - ... got 118 report lines so far.
+2019-12-05 16:24:17 - ... got 134 report lines so far.
+2019-12-05 16:24:18 - ... got 151 report lines so far.
+2019-12-05 16:24:20 - ... got 176 report lines so far.
+2019-12-05 16:24:21 - ... got 184 report lines so far.
+2019-12-05 16:24:21 - Asserting results...
+2019-12-05 16:24:21 - Done.
+2019-12-05 16:24:21 - Closing the Visual Studio Development Tools Environment (DTE), please wait...
+2019-12-05 16:24:24 - Exiting application...
 ```
 If there was an error in the TcUnit framework this would be shown between the
 lines `Asserting results...` and `Done.`. If nothing is shown between these

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/ErrorList.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/ErrorList.cs
@@ -0,0 +1,45 @@
+using EnvDTE80;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace TcUnit.Verifier
+{
+    class ErrorList : IEnumerable<ErrorList.Error>, IEnumerable
+    {
+        protected List<Error> _errors = new List<Error>();
+
+        public struct Error
+        {
+            public string Description;
+            public vsBuildErrorLevel ErrorLevel;
+
+            public Error(ErrorItem item)
+            {
+                Description = item.Description.ToUpper();
+                ErrorLevel = item.ErrorLevel;
+            }
+        }
+
+        public IEnumerable<Error> AddNew(ErrorItems errorItems)
+        {
+            int N1 = _errors.Count + 1;
+            int N2 = errorItems.Count;
+            for (int i = N1; i <= N2; i++)
+            {
+                var item = errorItems.Item(i);
+                _errors.Add(new Error(item));
+            }
+            return _errors.GetRange(N1 - 1, N2 + 1 - N1);
+        }
+
+        IEnumerator<Error> IEnumerable<Error>.GetEnumerator() {
+            return _errors.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _errors.GetEnumerator();
+        }
+    }
+}
diff --git a/...it-Verifier_DotNet/TcUnit-Verifier/FB_AdjustAssertFailureMessageToMax252CharLengthTest.cs b/...it-Verifier_DotNet/TcUnit-Verifier/FB_AdjustAssertFailureMessageToMax252CharLengthTest.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_AdjustAssertFailureMessageToMax252CharLengthTest : TestFunctionBlockAssert
     {
-        public FB_AdjustAssertFailureMessageToMax252CharLengthTest(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_AdjustAssertFailureMessageToMax252CharLengthTest(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             TestInstancePath252CharsExpectTooLongTestInstancePath();
             TestInstancePath220CharsExpectShortenedTestInstancePath();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyPrimitiveTypes.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyPrimitiveTypes.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_AnyPrimitiveTypes : TestFunctionBlockAssert
     {
-        public FB_AnyPrimitiveTypes(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_AnyPrimitiveTypes(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             Test_ANY_BYTE_Equals();
             Test_ANY_BYTE_Differ();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyToUnionValue.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyToUnionValue.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_AnyToUnionValue : TestFunctionBlockAssert
     {
-        public FB_AnyToUnionValue(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_AnyToUnionValue(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             Test_BOOL();
             Test_BIT();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_ArrayPrimitiveTypes.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_ArrayPrimitiveTypes.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_ArrayPrimitiveTypes : TestFunctionBlockAssert
     {
-        public FB_ArrayPrimitiveTypes(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_ArrayPrimitiveTypes(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             Test_BOOL_Array_Equals();
             Test_BOOL_Array_DifferInSize();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwice.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwice.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_AssertEveryFailedTestTwice : TestFunctionBlockAssert
     {
-        public FB_AssertEveryFailedTestTwice(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_AssertEveryFailedTestTwice(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             TwiceAssertCall();
         }

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwiceArrayVersion.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwiceArrayVersion.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_AssertEveryFailedTestTwiceArrayVersion : TestFunctionBlockAssert
     {
-        public FB_AssertEveryFailedTestTwiceArrayVersion(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_AssertEveryFailedTestTwiceArrayVersion(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             TwiceAssertCall_Arrays();
         }

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertTrueFalse.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertTrueFalse.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_AssertTrueFalse : TestFunctionBlockAssert
     {
-        public FB_AssertTrueFalse(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_AssertTrueFalse(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             AssertThatINTsAreEqual();
             AssertThatINTsAreNotEqual();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CheckIfSpecificTestIsFinished.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CheckIfSpecificTestIsFinished.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_CheckIfSpecificTestIsFinished : TestFunctionBlockAssert
     {
-        public FB_CheckIfSpecificTestIsFinished(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_CheckIfSpecificTestIsFinished(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             TestThatInstantlyFinishes();
         }

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateDisabledTest.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateDisabledTest.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_CreateDisabledTest : TestFunctionBlockAssert
     {
-        public FB_CreateDisabledTest(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_CreateDisabledTest(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             TestEnabled();
             TestDisabled();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateFourTestsWithSameName.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateFourTestsWithSameName.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_CreateFourTestsWithSameName : TestFunctionBlockAssert
     {
-        public FB_CreateFourTestsWithSameName(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_CreateFourTestsWithSameName(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             TestOne();
         }

diff --git a/...tNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest.cs b/...tNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest : TestFunctionBlockAssert
     {
-        public FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             Assert_SeveralTimes();
         }

diff --git a/...nit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests.cs b/...nit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests : TestFunctionBlockAssert
     {
-        public FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             Assert_SeveralTimes();
             Assert_SeveralTimesAgain();

diff --git a/...fier_DotNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInSameCycleWithSameTest.cs b/...fier_DotNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInSameCycleWithSameTest.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_MultipleAssertWithSameParametersInSameCycleWithSameTest : TestFunctionBlockAssert
     {
-        public FB_MultipleAssertWithSameParametersInSameCycleWithSameTest(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_MultipleAssertWithSameParametersInSameCycleWithSameTest(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             Assert_SeveralTimes();
         }

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_PrimitiveTypes.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_PrimitiveTypes.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +8,7 @@ namespace TcUnit.Verifier
 {
     class FB_PrimitiveTypes : TestFunctionBlockAssert
     {
-        public FB_PrimitiveTypes(ErrorItems errorItems, string testFunctionBlockInstance = null) : base(errorItems, testFunctionBlockInstance)
+        public FB_PrimitiveTypes(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null) : base(errors, testFunctionBlockInstance)
         {
             Test_ANY_Equals();
             Test_ANY_Differ_DataType();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_SkipAssertionsWhenFinished.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_SkipAssertionsWhenFinished.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,8 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_SkipAssertionsWhenFinished : TestFunctionBlockAssert
     {
-        public FB_SkipAssertionsWhenFinished(ErrorItems errorItems, string testFunctionBlockInstance = null)
-            : base(errorItems, testFunctionBlockInstance)
+        public FB_SkipAssertionsWhenFinished(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             Test_LongTest();
             Test_ShortTest();

diff --git a/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestFinishedNamed.cs b/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestFinishedNamed.cs
@@ -1,5 +1,4 @@
-using EnvDTE80;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,8 +8,8 @@ namespace TcUnit.Verifier
 {
     class FB_TestFinishedNamed : TestFunctionBlockAssert
     {
-        public FB_TestFinishedNamed(ErrorItems errorItems, string testFunctionBlockInstance = null)
-            : base(errorItems, testFunctionBlockInstance)
+        public FB_TestFinishedNamed(IEnumerable<ErrorList.Error> errors, string testFunctionBlockInstance = null)
+            : base(errors, testFunctionBlockInstance)
         {
             Test_FinishedNamed();
         }