Updated to utPLSQL.Api 1.3.0

simasch · simasch · commit 1c1493b42524 · 2021-01-02T17:27:56.000+01:00
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj
@@ -105,8 +105,8 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
-    <Reference Include="utPLSQL.Api, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\utPLSQL.Api.1.2.1\lib\net40\utPLSQL.Api.dll</HintPath>
+    <Reference Include="utPLSQL.Api, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\utPLSQL.Api.1.3.0\lib\net40\utPLSQL.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config
@@ -6,5 +6,5 @@
   <package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
   <package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
   <package id="UnmanagedExports.Repack" version="1.0.4" targetFramework="net40" />
-  <package id="utPLSQL.Api" version="1.2.1" targetFramework="net40" />
+  <package id="utPLSQL.Api" version="1.3.0" targetFramework="net40" />
 </packages>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.Designer.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.Designer.cs
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs
@@ -18,5 +18,14 @@ private void BtnRunTests_Click(object sender, EventArgs e)
             var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);
         }
+
+        private void btnCodeCoverage_Click(object sender, EventArgs e)
+        {
+            var realTimeTestRunner = new RealTimeTestRunner();
+            realTimeTestRunner.Connect(txtUsername.Text, txtPassword.Text, txtDatabase.Text);
+
+            var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);
+            testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);
+        }
     }
 }
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/packages.config b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
-  <package id="utPLSQL.Api" version="1.2.1" targetFramework="net40" />
+  <package id="utPLSQL.Api" version="1.3.0" targetFramework="net40" />
 </packages>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj
@@ -45,8 +45,8 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="utPLSQL.Api, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\utPLSQL.Api.1.2.1\lib\net40\utPLSQL.Api.dll</HintPath>
+    <Reference Include="utPLSQL.Api, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\utPLSQL.Api.1.3.0\lib\net40\utPLSQL.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/CodeCoverageReportDialog.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/CodeCoverageReportDialog.cs
@@ -1,14 +1,15 @@
-﻿using System.Windows.Forms;
+﻿using System.Collections.Generic;
+using System.Windows.Forms;
 
 namespace utPLSQL
 {
     public partial class CodeCoverageReportDialog : Form
     {
-        public CodeCoverageReportDialog(string path)
+        public CodeCoverageReportDialog(List<string> paths)
         {
             InitializeComponent();
 
-            txtPaths.Text = path;
+            txtPaths.Text = paths[0];
         }
 
         public string GetSchemas()
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs
@@ -1,5 +1,6 @@
 ﻿using FontAwesome.Sharp;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
@@ -56,7 +57,7 @@ public void RunTestsAsync(string type, string owner, string name, string procedu
 
                 if (coverage)
                 {
-                    var codeCoverageReportDialog = new CodeCoverageReportDialog(GetPath(convertToType(type), owner, name, procedure));
+                    var codeCoverageReportDialog = new CodeCoverageReportDialog(GetPath(type, owner, name, procedure));
                     var dialogResult = codeCoverageReportDialog.ShowDialog();
                     if (dialogResult == DialogResult.OK)
                     {
@@ -90,19 +91,19 @@ public void RunTestsAsync(string type, string owner, string name, string procedu
 
         private void RunTests(string type, string owner, string name, string procedure)
         {
-            Task.Factory.StartNew(() => testRunner.RunTests(convertToType(type), owner, name, procedure));
+            Task.Factory.StartNew(() => testRunner.RunTests(GetPath(type, owner, name, procedure)));
             Running = true;
         }
 
 
 
         private void RunWithCoverage(string type, string owner, string name, string procedure, CodeCoverageReportDialog codeCoverageReportDialog)
         {
-            var schemas = ConvertToVarcharList(codeCoverageReportDialog.GetSchemas());
-            var includes = ConvertToVarcharList(codeCoverageReportDialog.GetIncludes());
-            var excludes = ConvertToVarcharList(codeCoverageReportDialog.GetExcludes());
+            var schemas = ConvertToList(codeCoverageReportDialog.GetSchemas());
+            var includes = ConvertToList(codeCoverageReportDialog.GetIncludes());
+            var excludes = ConvertToList(codeCoverageReportDialog.GetExcludes());
 
-            Task.Factory.StartNew(() => testRunner.RunTestsWithCoverage(convertToType(type), owner, name, procedure, schemas, includes, excludes));
+            Task.Factory.StartNew(() => testRunner.RunTestsWithCoverage(GetPath(type, owner, name, procedure), schemas, includes, excludes));
             Running = true;
         }
 
@@ -208,7 +209,7 @@ private void CollectReport()
             });
         }
 
-        private string ConvertToVarcharList(string listValue)
+        private List<string> ConvertToList(string listValue)
         {
             if (string.IsNullOrWhiteSpace(listValue))
             {
@@ -219,51 +220,29 @@ private string ConvertToVarcharList(string listValue)
                 if (listValue.Contains(" "))
                 {
                     var parts = listValue.Split(' ');
-                    return JoinParts(parts);
+                    return new List<string>(parts);
                 }
                 else if (listValue.Contains(","))
                 {
                     var parts = listValue.Split(',');
-                    return JoinParts(parts);
+                    return new List<string>(parts);
                 }
                 else if (listValue.Contains("\n"))
                 {
                     var parts = listValue.Split('\n');
-                    return JoinParts(parts);
+                    return new List<string>(parts);
                 }
                 else
                 {
-                    return $"'{listValue}'";
+                    return new List<string>() { listValue };
                 }
             }
         }
 
-        private static string JoinParts(string[] parts)
-        {
-            var sb = new StringBuilder();
-            var first = true;
-            foreach (var part in parts)
-            {
-                if (!string.IsNullOrEmpty(part))
-                {
-                    if (!first)
-                    {
-                        sb.Append(",");
-                    }
-
-                    sb.Append("'").Append(part).Append("'");
-
-                    first = false;
-                }
-            }
-
-            return sb.ToString();
-        }
-
         /*
-         * Workaround for the progressbar animation that produces lagging
-         * https://stackoverflow.com/questions/5332616/disabling-net-progressbar-animation-when-changing-value
-         */
+        * Workaround for the progressbar animation that produces lagging
+        * https://stackoverflow.com/questions/5332616/disabling-net-progressbar-animation-when-changing-value
+        */
         private void UpdateProgressBar(int completedTests)
         {
             int newValue = completedTests * Steps + 1;
@@ -284,25 +263,23 @@ private void SetWindowTitle(string type, string owner, string name, string proce
         {
             var startTime = DateTime.Now.ToString(CultureInfo.CurrentCulture);
             txtStart.Text = startTime;
-            var path = GetPath(convertToType(type), owner, name, procedure);
-            txtPath.Text = path;
+            var path = GetPath(type, owner, name, procedure);
+            txtPath.Text = path[0];
             this.Text = $"{path} {startTime}";
         }
 
-        private string GetPath(Type type, string owner, string name, string procedure)
+        private List<string> GetPath(string type, string owner, string name, string procedure)
         {
             switch (type)
             {
-                case Type.User:
-                    return name;
-                case Type.Package:
-                    return $"{owner}.{name}";
-                case Type.Procedure:
-                    return $"{owner}.{name}.{procedure}";
-                case Type.All:
-                    return owner;
+                case "USER":
+                    return new List<string>() { name };
+                case "PACKAGE":
+                    return new List<string>() { $"{owner}.{name}" };
+                case "PROCEDURE":
+                    return new List<string>() { $"{owner}.{name}.{procedure}" };
                 default:
-                    return "";
+                    return new List<string>() { owner };
             }
         }
 
@@ -453,20 +430,7 @@ private void CreateTestResults(test test)
                 });
             }
         }
-        private Type convertToType(string type)
-        {
-            switch (type)
-            {
-                case "USER":
-                    return Type.User;
-                case "PACKAGE":
-                    return Type.Package;
-                case "PROCEDURE":
-                    return Type.Procedure;
-                default:
-                    return Type.All;
-            }
-        }
+
         private void btnClose_Click(object sender, System.EventArgs e)
         {
             Close();
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/packages.config b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="FontAwesome.Sharp" version="5.15.3" targetFramework="net40" />
   <package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
-  <package id="utPLSQL.Api" version="1.2.1" targetFramework="net40" />
+  <package id="utPLSQL.Api" version="1.3.0" targetFramework="net40" />
 </packages>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/utPLSQL.UI.csproj b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/utPLSQL.UI.csproj
@@ -46,8 +46,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="utPLSQL.Api, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\utPLSQL.Api.1.2.1\lib\net40\utPLSQL.Api.dll</HintPath>
+    <Reference Include="utPLSQL.Api, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\utPLSQL.Api.1.3.0\lib\net40\utPLSQL.Api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,14 @@ private void BtnRunTests_Click(object sender, EventArgs e)`
`18`	`18`	`var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);`
`19`	`19`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ private void btnCodeCoverage_Click(object sender, EventArgs e)`
	`23`	`+ {`
	`24`	`+ var realTimeTestRunner = new RealTimeTestRunner();`
	`25`	`+ realTimeTestRunner.Connect(txtUsername.Text, txtPassword.Text, txtDatabase.Text);`
	`26`	`+`
	`27`	`+ var testRunnerWindow = new TestRunnerWindow(realTimeTestRunner, null);`
	`28`	`+ testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);`
	`29`	`+ }`
`21`	`30`	`}`
`22`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`		`-using System.Windows.Forms;`
	`1`	`+using System.Collections.Generic;`
	`2`	`+using System.Windows.Forms;`
`2`	`3`
`3`	`4`	`namespace utPLSQL`
`4`	`5`	`{`
`5`	`6`	`public partial class CodeCoverageReportDialog : Form`
`6`	`7`	`{`
`7`		`- public CodeCoverageReportDialog(string path)`
	`8`	`+ public CodeCoverageReportDialog(List<string> paths)`
`8`	`9`	`{`
`9`	`10`	`InitializeComponent();`
`10`	`11`
`11`		`- txtPaths.Text = path;`
	`12`	`+ txtPaths.Text = paths[0];`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`public string GetSchemas()`