Skip to content

Commit 71537b3

Browse files
simaschsimasch
committed
Updated utPLSQL.Api version. UI improvements
1 parent f0e1ac5 commit 71537b3

File tree

9 files changed

+55
-32
lines changed

9 files changed

+55
-32
lines changed

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
<Reference Include="System.Xml.Linq" />
106106
<Reference Include="Microsoft.CSharp" />
107107
<Reference Include="System.Xml" />
108-
<Reference Include="utPLSQL.Api, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
109-
<HintPath>..\packages\utPLSQL.Api.1.0.1\lib\net40\utPLSQL.Api.dll</HintPath>
108+
<Reference Include="utPLSQL.Api, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
109+
<HintPath>..\packages\utPLSQL.Api.1.2.1\lib\net40\utPLSQL.Api.dll</HintPath>
110110
</Reference>
111111
</ItemGroup>
112112
<ItemGroup>

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
77
<package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
88
<package id="UnmanagedExports.Repack" version="1.0.4" targetFramework="net40" />
9-
<package id="utPLSQL.Api" version="1.0.1" targetFramework="net40" />
9+
<package id="utPLSQL.Api" version="1.2.1" targetFramework="net40" />
1010
</packages>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
4-
<package id="utPLSQL.Api" version="1.0.1" targetFramework="net40" />
4+
<package id="utPLSQL.Api" version="1.2.1" targetFramework="net40" />
55
</packages>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<Reference Include="System.Drawing" />
4646
<Reference Include="System.Windows.Forms" />
4747
<Reference Include="System.Xml" />
48-
<Reference Include="utPLSQL.Api, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\utPLSQL.Api.1.0.1\lib\net40\utPLSQL.Api.dll</HintPath>
48+
<Reference Include="utPLSQL.Api, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\utPLSQL.Api.1.2.1\lib\net40\utPLSQL.Api.dll</HintPath>
5050
</Reference>
5151
</ItemGroup>
5252
<ItemGroup>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/CodeCoverageReportDialog.Designer.cs

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void RunTestsAsync(string type, string owner, string name, string procedu
5656

5757
if (coverage)
5858
{
59-
var codeCoverageReportDialog = new CodeCoverageReportDialog(GetPath(type, owner, name, procedure));
59+
var codeCoverageReportDialog = new CodeCoverageReportDialog(GetPath(convertToType(type), owner, name, procedure));
6060
var dialogResult = codeCoverageReportDialog.ShowDialog();
6161
if (dialogResult == DialogResult.OK)
6262
{
@@ -66,12 +66,9 @@ public void RunTestsAsync(string type, string owner, string name, string procedu
6666

6767
Show();
6868

69-
CollectResults(totalNumberOfTests > 0);
69+
CollectResults(true);
7070

71-
if (totalNumberOfTests > 0)
72-
{
73-
CollectReport();
74-
}
71+
CollectReport();
7572
}
7673
}
7774
else
@@ -93,17 +90,19 @@ public void RunTestsAsync(string type, string owner, string name, string procedu
9390

9491
private void RunTests(string type, string owner, string name, string procedure)
9592
{
96-
Task.Factory.StartNew(() => testRunner.RunTests(type, owner, name, procedure));
93+
Task.Factory.StartNew(() => testRunner.RunTests(convertToType(type), owner, name, procedure));
9794
Running = true;
9895
}
9996

97+
98+
10099
private void RunWithCoverage(string type, string owner, string name, string procedure, CodeCoverageReportDialog codeCoverageReportDialog)
101100
{
102101
var schemas = ConvertToVarcharList(codeCoverageReportDialog.GetSchemas());
103102
var includes = ConvertToVarcharList(codeCoverageReportDialog.GetIncludes());
104103
var excludes = ConvertToVarcharList(codeCoverageReportDialog.GetExcludes());
105104

106-
Task.Factory.StartNew(() => testRunner.RunTestsWithCoverage(type, owner, name, procedure, schemas, includes, excludes));
105+
Task.Factory.StartNew(() => testRunner.RunTestsWithCoverage(convertToType(type), owner, name, procedure, schemas, includes, excludes));
107106
Running = true;
108107
}
109108

@@ -191,7 +190,17 @@ private void CollectReport()
191190
sw.WriteLine(report);
192191
}
193192

194-
txtStatus.BeginInvoke((MethodInvoker)delegate { txtStatus.Text = "Finished"; });
193+
txtStatus.BeginInvoke((MethodInvoker)delegate
194+
{
195+
if (totalNumberOfTests > 0)
196+
{
197+
txtStatus.Text = "Finished";
198+
}
199+
else
200+
{
201+
txtStatus.Text = "No tests found";
202+
}
203+
});
195204

196205
Running = false;
197206

@@ -275,22 +284,22 @@ private void SetWindowTitle(string type, string owner, string name, string proce
275284
{
276285
var startTime = DateTime.Now.ToString(CultureInfo.CurrentCulture);
277286
txtStart.Text = startTime;
278-
var path = GetPath(type, owner, name, procedure);
287+
var path = GetPath(convertToType(type), owner, name, procedure);
279288
txtPath.Text = path;
280289
this.Text = $"{path} {startTime}";
281290
}
282291

283-
private string GetPath(string type, string owner, string name, string procedure)
292+
private string GetPath(Type type, string owner, string name, string procedure)
284293
{
285294
switch (type)
286295
{
287-
case RealTimeTestRunner.User:
296+
case Type.User:
288297
return name;
289-
case RealTimeTestRunner.Package:
298+
case Type.Package:
290299
return $"{owner}.{name}";
291-
case RealTimeTestRunner.Procedure:
300+
case Type.Procedure:
292301
return $"{owner}.{name}.{procedure}";
293-
case RealTimeTestRunner.All:
302+
case Type.All:
294303
return owner;
295304
default:
296305
return "";
@@ -444,7 +453,20 @@ private void CreateTestResults(test test)
444453
});
445454
}
446455
}
447-
456+
private Type convertToType(string type)
457+
{
458+
switch (type)
459+
{
460+
case "USER":
461+
return Type.User;
462+
case "PACKAGE":
463+
return Type.Package;
464+
case "PROCEDURE":
465+
return Type.Procedure;
466+
default:
467+
return Type.All;
468+
}
469+
}
448470
private void btnClose_Click(object sender, System.EventArgs e)
449471
{
450472
Close();
@@ -529,17 +551,16 @@ private void menuItemRunTests_Click(object sender, EventArgs e)
529551
var testResult = testResults[rowIndexOnRightClick];
530552

531553
var testResultWindow = new TestRunnerWindow(testRunner, pluginIntegration);
532-
testResultWindow.RunTestsAsync(RealTimeTestRunner.Procedure, testResult.Owner, testResult.Package,
533-
testResult.Procedure, false);
554+
testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, false);
534555
}
535556

536557
private void menuItemCoverage_Click(object sender, EventArgs e)
537558
{
538559
var testResult = testResults[rowIndexOnRightClick];
539560

540561
var testResultWindow = new TestRunnerWindow(testRunner, pluginIntegration);
541-
testResultWindow.RunTestsAsync(RealTimeTestRunner.Procedure, testResult.Owner, testResult.Package,
542-
testResult.Procedure, true);
562+
testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, true);
543563
}
564+
544565
}
545566
}

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="FontAwesome.Sharp" version="5.15.3" targetFramework="net40" />
44
<package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
5-
<package id="utPLSQL.Api" version="1.0.1" targetFramework="net40" />
5+
<package id="utPLSQL.Api" version="1.2.1" targetFramework="net40" />
66
</packages>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/utPLSQL.UI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<Reference Include="Microsoft.CSharp" />
4747
<Reference Include="System.Data" />
4848
<Reference Include="System.Xml" />
49-
<Reference Include="utPLSQL.Api, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\utPLSQL.Api.1.0.1\lib\net40\utPLSQL.Api.dll</HintPath>
49+
<Reference Include="utPLSQL.Api, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\utPLSQL.Api.1.2.1\lib\net40\utPLSQL.Api.dll</HintPath>
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>

0 commit comments

Comments
 (0)