Code clean up

simasch · simasch · commit 72864d4c6822 · 2021-01-06T11:43:09.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@
 **/packages
 **/**/bin
 **/**/obj
-/.idea/
+**/.idea/
 **/**/*.nupkg
+**/utPLSQL.Api.sln.DotSettings.user
diff --git a/utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs b/utPLSQL.Api/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs
@@ -113,7 +113,7 @@ public void TestGetVersion()
 
             testRunner.Connect(username: "ut3_tester", password: "ut3", database: "orclpdb1");
 
-            string version = testRunner.GetVersion();
+            var version = testRunner.GetVersion();
 
             Assert.AreEqual("v3.1.11.3469-develop", version);
 
@@ -129,7 +129,7 @@ public void TestGetVersionWhenNotInstalled()
 
             try
             {
-                string version = testRunner.GetVersion();
+                var version = testRunner.GetVersion();
                 Assert.Fail();
             }
             catch (OracleException e)
diff --git a/utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs b/utPLSQL.Api/utPLSQL.Api/RealTimeTestRunner.cs
@@ -17,10 +17,10 @@ public override async Task RunTestsAsync(List<string> paths, Action<@event> cons
         {
             if (paths != null && paths.Count > 0)
             {
-                string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");
+                var realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");
 
-                Task taskRun = Task.Run(() => { UtRun(realtimeReporterId, paths); });
-                Task taskConsume = Task.Run(() => { ConsumeResult(realtimeReporterId, consumer); });
+                var taskRun = Task.Run(() => UtRun(realtimeReporterId, paths));
+                var taskConsume = Task.Run(() => ConsumeResult(realtimeReporterId, consumer));
 
                 await Task.WhenAll(taskRun, taskConsume);
             }
@@ -35,16 +35,16 @@ public override async Task<string> RunTestsWithCoverageAsync(List<string> paths,
         {
             if (paths != null && paths.Count > 0)
             {
-                string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");
-                string coverageReporterId = Guid.NewGuid().ToString().Replace("-", "");
+                var realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");
+                var coverageReporterId = Guid.NewGuid().ToString().Replace("-", "");
 
-                Task taskRun = Task.Run(() => { UtRunWithCoverage(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects); });
-                Task taskConsume = Task.Run(() => { ConsumeResult(realtimeReporterId, consumer); });
-                Task<string> taskCoverateReport = Task.Run(() => { return GetCoverageReport(coverageReporterId); });
+                var taskRun = Task.Run(() => UtRunWithCoverage(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects));
+                var taskConsume = Task.Run(() => ConsumeResult(realtimeReporterId, consumer));
+                var taskCoverageReport = Task.Run(() => GetCoverageReport(coverageReporterId));
 
-                await Task.WhenAll(taskRun, taskConsume, taskCoverateReport);
+                await Task.WhenAll(taskRun, taskConsume, taskCoverageReport);
 
-                return taskCoverateReport.Result;
+                return taskCoverageReport.Result;
             }
             else
             {
diff --git a/utPLSQL.Api/utPLSQL.Api/TestRunner.cs b/utPLSQL.Api/utPLSQL.Api/TestRunner.cs
@@ -16,7 +16,7 @@ public abstract class TestRunner<T>
         internal OracleConnection produceConnection;
         internal OracleConnection consumeConnection;
 
-        protected List<OracleCommand> runningCommands = new List<OracleCommand>();
+        protected readonly List<OracleCommand> runningCommands = new List<OracleCommand>();
 
         /// <summary>
         /// Connects to the database. 
@@ -38,7 +38,7 @@ public void Connect(string username, string password, string database, string co
                 connectionString = $"User Id={username};DBA Privilege={connectAs};Password={password};Data Source={database}";
             }
 
-            foreach (OracleCommand command in runningCommands)
+            foreach (var command in runningCommands)
             {
                 command.Cancel();
             }
@@ -62,7 +62,7 @@ public void Close()
         /// Returns the installed utPLSQL version
         /// </summary>
         /// <returns>Version as string</returns>
-        public String GetVersion()
+        public string GetVersion()
         {
             var cmd = new OracleCommand("select ut.version() from dual", produceConnection);
             runningCommands.Add(cmd);
@@ -155,7 +155,7 @@ protected string GetCoverageReport(string id)
         protected string ConvertToUtVarchar2List(List<string> elements)
         {
             var sb = new StringBuilder();
-            bool first = true;
+            var first = true;
             foreach (var element in elements)
             {
                 if (!first)

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void TestGetVersion()`
`113`	`113`
`114`	`114`	`testRunner.Connect(username: "ut3_tester", password: "ut3", database: "orclpdb1");`
`115`	`115`
`116`		`- string version = testRunner.GetVersion();`
	`116`	`+ var version = testRunner.GetVersion();`
`117`	`117`
`118`	`118`	`Assert.AreEqual("v3.1.11.3469-develop", version);`
`119`	`119`
`@@ -129,7 +129,7 @@ public void TestGetVersionWhenNotInstalled()`
`129`	`129`
`130`	`130`	`try`
`131`	`131`	`{`
`132`		`- string version = testRunner.GetVersion();`
	`132`	`+ var version = testRunner.GetVersion();`
`133`	`133`	`Assert.Fail();`
`134`	`134`	`}`
`135`	`135`	`catch (OracleException e)`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public override async Task RunTestsAsync(List<string> paths, Action<@event> cons`
`17`	`17`	`{`
`18`	`18`	`if (paths != null && paths.Count > 0)`
`19`	`19`	`{`
`20`		`- string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");`
	`20`	`+ var realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");`
`21`	`21`
`22`		`- Task taskRun = Task.Run(() => { UtRun(realtimeReporterId, paths); });`
`23`		`- Task taskConsume = Task.Run(() => { ConsumeResult(realtimeReporterId, consumer); });`
	`22`	`+ var taskRun = Task.Run(() => UtRun(realtimeReporterId, paths));`
	`23`	`+ var taskConsume = Task.Run(() => ConsumeResult(realtimeReporterId, consumer));`
`24`	`24`
`25`	`25`	`await Task.WhenAll(taskRun, taskConsume);`
`26`	`26`	`}`
`@@ -35,16 +35,16 @@ public override async Task<string> RunTestsWithCoverageAsync(List<string> paths,`
`35`	`35`	`{`
`36`	`36`	`if (paths != null && paths.Count > 0)`
`37`	`37`	`{`
`38`		`- string realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");`
`39`		`- string coverageReporterId = Guid.NewGuid().ToString().Replace("-", "");`
	`38`	`+ var realtimeReporterId = Guid.NewGuid().ToString().Replace("-", "");`
	`39`	`+ var coverageReporterId = Guid.NewGuid().ToString().Replace("-", "");`
`40`	`40`
`41`		`- Task taskRun = Task.Run(() => { UtRunWithCoverage(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects); });`
`42`		`- Task taskConsume = Task.Run(() => { ConsumeResult(realtimeReporterId, consumer); });`
`43`		`- Task<string> taskCoverateReport = Task.Run(() => { return GetCoverageReport(coverageReporterId); });`
	`41`	`+ var taskRun = Task.Run(() => UtRunWithCoverage(realtimeReporterId, coverageReporterId, paths, coverageSchemas, includeObjects, excludeObjects));`
	`42`	`+ var taskConsume = Task.Run(() => ConsumeResult(realtimeReporterId, consumer));`
	`43`	`+ var taskCoverageReport = Task.Run(() => GetCoverageReport(coverageReporterId));`
`44`	`44`
`45`		`- await Task.WhenAll(taskRun, taskConsume, taskCoverateReport);`
	`45`	`+ await Task.WhenAll(taskRun, taskConsume, taskCoverageReport);`
`46`	`46`
`47`		`- return taskCoverateReport.Result;`
	`47`	`+ return taskCoverageReport.Result;`
`48`	`48`	`}`
`49`	`49`	`else`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public abstract class TestRunner<T>`
`16`	`16`	`internal OracleConnection produceConnection;`
`17`	`17`	`internal OracleConnection consumeConnection;`
`18`	`18`
`19`		`- protected List<OracleCommand> runningCommands = new List<OracleCommand>();`
	`19`	`+ protected readonly List<OracleCommand> runningCommands = new List<OracleCommand>();`
`20`	`20`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Connects to the database.`
`@@ -38,7 +38,7 @@ public void Connect(string username, string password, string database, string co`
`38`	`38`	`connectionString = $"User Id={username};DBA Privilege={connectAs};Password={password};Data Source={database}";`
`39`	`39`	`}`
`40`	`40`
`41`		`- foreach (OracleCommand command in runningCommands)`
	`41`	`+ foreach (var command in runningCommands)`
`42`	`42`	`{`
`43`	`43`	`command.Cancel();`
`44`	`44`	`}`
`@@ -62,7 +62,7 @@ public void Close()`
`62`	`62`	`/// Returns the installed utPLSQL version`
`63`	`63`	`/// </summary>`
`64`	`64`	`/// <returns>Version as string</returns>`
`65`		`- public String GetVersion()`
	`65`	`+ public string GetVersion()`
`66`	`66`	`{`
`67`	`67`	`var cmd = new OracleCommand("select ut.version() from dual", produceConnection);`
`68`	`68`	`runningCommands.Add(cmd);`
`@@ -155,7 +155,7 @@ protected string GetCoverageReport(string id)`
`155`	`155`	`protected string ConvertToUtVarchar2List(List<string> elements)`
`156`	`156`	`{`
`157`	`157`	`var sb = new StringBuilder();`
`158`		`- bool first = true;`
	`158`	`+ var first = true;`
`159`	`159`	`foreach (var element in elements)`
`160`	`160`	`{`
`161`	`161`	`if (!first)`