Merge branch 'Roald87-code-cleanup'

tcunit · May 15, 2020 · 1af2b96 · 1af2b96
2 parents 6bbbe51 + f70a80b
commit 1af2b96
Show file tree

Hide file tree

Showing 30 changed files with 26 additions and 150 deletions.
diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/AutomationInterface.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/AutomationInterface.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TCatSysManagerLib;
+using TCatSysManagerLib;
 
 namespace TcUnit.Verifier
 {
@@ -19,7 +14,6 @@ class AutomationInterface
         private ITcSmTreeItem plcTreeItem = null;
         private ITcSmTreeItem routesTreeItem = null;
 
-
         public AutomationInterface(EnvDTE.Project project)
         {
             sysManager = (ITcSysManager10)project.Object;

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/Constants.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/Constants.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TcUnit.Verifier
+namespace TcUnit.Verifier
 {
     static class Constants
     {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/ErrorList.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/ErrorList.cs
@@ -1,7 +1,6 @@
 using EnvDTE80;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace TcUnit.Verifier
 {

diff --git a/...it-Verifier_DotNet/TcUnit-Verifier/FB_AdjustAssertFailureMessageToMax253CharLengthTest.cs b/...it-Verifier_DotNet/TcUnit-Verifier/FB_AdjustAssertFailureMessageToMax253CharLengthTest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyPrimitiveTypes.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyPrimitiveTypes.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyToUnionValue.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AnyToUnionValue.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_ArrayPrimitiveTypes.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_ArrayPrimitiveTypes.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwice.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwice.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TcUnit.Verifier
 {

diff --git a/...ifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwiceArrayVersion.cs b/...ifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertEveryFailedTestTwiceArrayVersion.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertTrueFalse.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_AssertTrueFalse.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CheckIfSpecificTestIsFinished.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CheckIfSpecificTestIsFinished.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateDisabledTest.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateDisabledTest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateFourTestsWithSameName.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_CreateFourTestsWithSameName.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_ExtendedTestInformation.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_ExtendedTestInformation.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/...tNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest.cs b/...tNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesAndInSameTest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/...nit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests.cs b/...nit-Verifier/FB_MultipleAssertWithSameParametersInDifferentCyclesButWithDifferentTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/...fier_DotNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInSameCycleWithSameTest.cs b/...fier_DotNet/TcUnit-Verifier/FB_MultipleAssertWithSameParametersInSameCycleWithSameTest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_PrimitiveTypes.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_PrimitiveTypes.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_SkipAssertionsWhenFinished.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_SkipAssertionsWhenFinished.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestFileControl.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestFileControl.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestFinishedNamed.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestFinishedNamed.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/...t-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestNumberOfAssertionsCalculation.cs b/...t-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestNumberOfAssertionsCalculation.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {
@@ -16,7 +12,6 @@ public FB_TestNumberOfAssertionsCalculation(IEnumerable<ErrorList.Error> errors,
             TestWith44FailedAssertions();
             TestWith45SuccessfulArrayAssertions();
             TestWith46FailedArrayAssertions();
-
         }
 
         private void TestMixed33SuccessulAnd9FailedAssertions()

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestStreamBuffer.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestStreamBuffer.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestXmlControl.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_TestXmlControl.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_WriteProtectedFunctions.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/FB_WriteProtectedFunctions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TcUnit.Verifier
 {
@@ -31,7 +27,6 @@ public FB_WriteProtectedFunctions(IEnumerable<ErrorList.Error> errors, string te
             Test_WRITE_PROTECTED_USINT();
             Test_WRITE_PROTECTED_ULINT();
             Test_WRITE_PROTECTED_WORD();
-
         }
 
         private void Test_WRITE_PROTECTED_BOOL()
@@ -152,6 +147,5 @@ private void Test_WRITE_PROTECTED_WORD()
             string testMessage = "PRG_TEST." + _testFunctionBlockInstance + "@Test_WRITE_PROTECTED_WORD";
             AssertDoesNotContainMessage(testMessage, EnvDTE80.vsBuildErrorLevel.vsBuildErrorLevelHigh);
         }
-
     }
 }
diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/MessageFilter.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/MessageFilter.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace TcUnit.Verifier {
+namespace TcUnit.Verifier
+{
     public class MessageFilter : IOleMessageFilter {
         // Class containing the IOleMessageFilter
         // thread error-handling functions.
@@ -23,7 +20,6 @@ public static void Revoke() {
             CoRegisterMessageFilter(null, out oldFilter);
         }
 
-        //
         // IOleMessageFilter functions.
         // Handle incoming thread requests.
         int IOleMessageFilter.HandleInComingCall(int dwCallType,

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/Options.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/Options.cs
@@ -128,7 +128,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Globalization;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
@@ -143,9 +142,10 @@
 using NDesk.Options;
 #endif
 
-namespace NDesk.Options {
+namespace NDesk.Options
+{
 
-	public class OptionValueCollection : IList, IList<string> {
+    public class OptionValueCollection : IList, IList<string> {
 
 		List<string> values = new List<string> ();
 		OptionContext c;

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/Program.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/Program.cs
@@ -1,12 +1,9 @@
 using NDesk.Options;
 using log4net;
-using log4net.Config;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using TCatSysManagerLib;
 using System.Threading;
 using EnvDTE80;

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/TestFunctionBlockAssert.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/TestFunctionBlockAssert.cs
@@ -1,11 +1,7 @@
 using EnvDTE80;
 using log4net;
-using log4net.Config;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TcUnit.Verifier
 {

diff --git a/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/VisualStudioInstance.cs b/TcUnit-Verifier/TcUnit-Verifier_DotNet/TcUnit-Verifier/VisualStudioInstance.cs
@@ -1,12 +1,7 @@
 using EnvDTE80;
 using log4net;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using TCatSysManagerLib;
 
 namespace TcUnit.Verifier
@@ -91,7 +86,6 @@ public void Close()
             loaded = false;
         }
 
-
         /// <summary>
         /// Opens the main *.sln-file and finds the version of VS used for creation of the solution
         /// </summary>
@@ -177,12 +171,6 @@ public EnvDTE80.DTE2 GetDevelopmentToolsEnvironment()
             return this.dte;
         }
 
-        public void CleanAndBuildSolution()
-        {
-            this.visualStudioSolution.SolutionBuild.Clean(true);
-            this.visualStudioSolution.SolutionBuild.Build(true);
-        }
-
         public void CleanSolution()
         {
             visualStudioSolution.SolutionBuild.Clean(true);