Skip to content

Commit e202e64

Browse files
simaschsimasch
committed
Project renaming. Fixed exception when result grid has no rows.
1 parent f19a000 commit e202e64

19 files changed

+62
-59
lines changed

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ VisualStudioVersion = 16.0.30804.86
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlsqlDeveloperUtPlsqlPlugin", "PlsqlDeveloperUtPlsqlPlugin\PlsqlDeveloperUtPlsqlPlugin.csproj", "{0241FA41-E396-491A-B4EC-772B694EC689}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.Lib.Test", "utPLSQL.Lib.Test\utPLSQL.Lib.Test.csproj", "{8E898B26-0A4C-4DDA-9820-D5D050D2336E}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.Api.Test", "utPLSQL.Api.Test\utPLSQL.Api.Test.csproj", "{8E898B26-0A4C-4DDA-9820-D5D050D2336E}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.Lib", "utPLSQL.Lib\utPLSQL.Lib.csproj", "{DF09EACE-50EC-44EA-849A-80462A219CFC}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.Api", "utPLSQL.Api\utPLSQL.Api.csproj", "{DF09EACE-50EC-44EA-849A-80462A219CFC}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.UI", "utPLSQL.UI\utPLSQL.UI.csproj", "{7669189C-4A58-4E82-9DCB-7956624A719B}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.Ui", "utPLSQL.Ui\utPLSQL.Ui.csproj", "{7669189C-4A58-4E82-9DCB-7956624A719B}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.UI.Standalone", "utPLSQL.UI.Standalone\utPLSQL.UI.Standalone.csproj", "{5D3EA63E-AAFE-47DB-9D48-4BA9C205ADBE}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "utPLSQL.Ui.Standalone", "utPLSQL.Ui.Standalone\utPLSQL.Ui.Standalone.csproj", "{5D3EA63E-AAFE-47DB-9D48-4BA9C205ADBE}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,18 @@
145145
<None Include="packages.config" />
146146
</ItemGroup>
147147
<ItemGroup>
148-
<ProjectReference Include="..\utPLSQL.Lib\utPLSQL.Lib.csproj">
148+
<WCFMetadata Include="Connected Services\" />
149+
</ItemGroup>
150+
<ItemGroup>
151+
<ProjectReference Include="..\utPLSQL.Api\utPLSQL.Api.csproj">
149152
<Project>{df09eace-50ec-44ea-849a-80462a219cfc}</Project>
150-
<Name>utPLSQL.Lib</Name>
153+
<Name>utPLSQL.Api</Name>
151154
</ProjectReference>
152-
<ProjectReference Include="..\utPLSQL.UI\utPLSQL.UI.csproj">
155+
<ProjectReference Include="..\utPLSQL.Ui\utPLSQL.Ui.csproj">
153156
<Project>{7669189c-4a58-4e82-9dcb-7956624a719b}</Project>
154-
<Name>utPLSQL.UI</Name>
157+
<Name>utPLSQL.Ui</Name>
155158
</ProjectReference>
156159
</ItemGroup>
157-
<ItemGroup>
158-
<WCFMetadata Include="Connected Services\" />
159-
</ItemGroup>
160160
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
161161
<Import Project="..\packages\UnmanagedExports.Repack.1.0.4\build\UnmanagedExports.Repack.targets" Condition="Exists('..\packages\UnmanagedExports.Repack.1.0.4\build\UnmanagedExports.Repack.targets')" />
162162
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib.Test/Properties/AssemblyInfo.cs renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api.Test/Properties/AssemblyInfo.cs

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib.Test/RealTimeTestRunnerTest.cs renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api.Test/RealTimeTestRunnerTest.cs

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib.Test/app.config renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api.Test/app.config

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib.Test/packages.config renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api.Test/packages.config

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib.Test/utPLSQL.Lib.Test.csproj renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api.Test/utPLSQL.Api.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ProjectGuid>{8E898B26-0A4C-4DDA-9820-D5D050D2336E}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<RootNamespace>utPLSQL</RootNamespace>
11-
<AssemblyName>utPLSQL.Lib.Test</AssemblyName>
11+
<AssemblyName>utPLSQL.Api.Test</AssemblyName>
1212
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
@@ -64,9 +64,9 @@
6464
<None Include="packages.config" />
6565
</ItemGroup>
6666
<ItemGroup>
67-
<ProjectReference Include="..\utPLSQL.Lib\utPLSQL.Lib.csproj">
67+
<ProjectReference Include="..\utPLSQL.Api\utPLSQL.Api.csproj">
6868
<Project>{df09eace-50ec-44ea-849a-80462a219cfc}</Project>
69-
<Name>utPLSQL.Lib</Name>
69+
<Name>utPLSQL.Api</Name>
7070
</ProjectReference>
7171
</ItemGroup>
7272
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib.Test/utPLSQL.Test.csproj renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api.Test/utPLSQL.Test.csproj

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/App.config renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/App.config

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/Properties/AssemblyInfo.cs renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/Properties/AssemblyInfo.cs

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/RealTimeTestRunner.cs renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/RealTimeTestRunner.cs

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/TestRunner.cs renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/TestRunner.cs

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/packages.config renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/packages.config

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/realtime-report.cs renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/realtime-report.cs

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/realtime-report.xsd renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/realtime-report.xsd

File renamed without changes.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Lib/utPLSQL.Lib.csproj renamed to ‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Api/utPLSQL.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>utPLSQL</RootNamespace>
11-
<AssemblyName>UtPLSQL.Lib</AssemblyName>
11+
<AssemblyName>UtPLSQL.Api</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@
7575
</Compile>
7676
</ItemGroup>
7777
<ItemGroup>
78-
<ProjectReference Include="..\utPLSQL.Lib\utPLSQL.Lib.csproj">
78+
<ProjectReference Include="..\utPLSQL.Api\utPLSQL.Api.csproj">
7979
<Project>{df09eace-50ec-44ea-849a-80462a219cfc}</Project>
80-
<Name>utPLSQL.Lib</Name>
80+
<Name>utPLSQL.Api</Name>
8181
</ProjectReference>
82-
<ProjectReference Include="..\utPLSQL.UI\utPLSQL.UI.csproj">
83-
<Project>{7cf5c5d4-3732-4098-a27f-2085d4d84cfe}</Project>
84-
<Name>utPLSQL.UI</Name>
82+
<ProjectReference Include="..\utPLSQL.Ui\utPLSQL.Ui.csproj">
83+
<Project>{7669189c-4a58-4e82-9dcb-7956624a719b}</Project>
84+
<Name>utPLSQL.Ui</Name>
8585
</ProjectReference>
8686
</ItemGroup>
8787
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -106,57 +106,60 @@ private void CollectResults(bool coverage)
106106
{
107107
gridResults.BeginInvoke((MethodInvoker)delegate
108108
{
109-
totalNumberOfTests = @event.totalNumberOfTests;
109+
totalNumberOfTests = @event.totalNumberOfTests;
110110

111-
progressBar.Minimum = 0;
112-
progressBar.Maximum = totalNumberOfTests * Steps;
113-
progressBar.Step = Steps;
114-
CreateTestResults(@event);
111+
progressBar.Minimum = 0;
112+
progressBar.Maximum = totalNumberOfTests * Steps;
113+
progressBar.Step = Steps;
114+
CreateTestResults(@event);
115115

116-
gridResults.Rows[0].Selected = false;
117-
});
116+
if (gridResults.Rows.Count > 0)
117+
{
118+
gridResults.Rows[0].Selected = false;
119+
}
120+
});
118121
}
119122
else if (@event.type.Equals("post-test"))
120123
{
121124
gridResults.BeginInvoke((MethodInvoker)delegate
122125
{
123-
completedTests++;
126+
completedTests++;
124127

125-
txtTests.Text =
126-
(completedTests > totalNumberOfTests ? totalNumberOfTests : completedTests) + "/" +
127-
totalNumberOfTests;
128-
UpdateProgressBar(completedTests);
128+
txtTests.Text =
129+
(completedTests > totalNumberOfTests ? totalNumberOfTests : completedTests) + "/" +
130+
totalNumberOfTests;
131+
UpdateProgressBar(completedTests);
129132

130-
UpdateTestResult(@event);
131-
});
133+
UpdateTestResult(@event);
134+
});
132135
}
133136
else if (@event.type.Equals("post-run"))
134137
{
135138
gridResults.BeginInvoke((MethodInvoker)delegate
136139
{
137-
txtStart.Text = @event.run.startTime.ToString(CultureInfo.CurrentCulture);
138-
txtEnd.Text = @event.run.endTime.ToString(CultureInfo.CurrentCulture);
139-
txtTime.Text = @event.run.executionTime + " s";
140-
141-
txtTests.Text =
142-
(completedTests > totalNumberOfTests ? totalNumberOfTests : completedTests) + "/" +
143-
totalNumberOfTests;
144-
txtFailures.Text = @event.run.counter.failure + "";
145-
txtErrors.Text = @event.run.counter.error + "";
146-
txtDisabled.Text = @event.run.counter.disabled + "";
147-
148-
if (@event.run.counter.failure > 0 || @event.run.counter.error > 0)
149-
{
150-
progressBar.ForeColor = Color.DarkRed;
151-
}
152-
153-
if (!coverage)
154-
{
155-
txtStatus.Text = "Finished";
156-
157-
Running = false;
158-
}
159-
});
140+
txtStart.Text = @event.run.startTime.ToString(CultureInfo.CurrentCulture);
141+
txtEnd.Text = @event.run.endTime.ToString(CultureInfo.CurrentCulture);
142+
txtTime.Text = @event.run.executionTime + " s";
143+
144+
txtTests.Text =
145+
(completedTests > totalNumberOfTests ? totalNumberOfTests : completedTests) + "/" +
146+
totalNumberOfTests;
147+
txtFailures.Text = @event.run.counter.failure + "";
148+
txtErrors.Text = @event.run.counter.error + "";
149+
txtDisabled.Text = @event.run.counter.disabled + "";
150+
151+
if (@event.run.counter.failure > 0 || @event.run.counter.error > 0)
152+
{
153+
progressBar.ForeColor = Color.DarkRed;
154+
}
155+
156+
if (!coverage)
157+
{
158+
txtStatus.Text = "Finished";
159+
160+
Running = false;
161+
}
162+
});
160163
}
161164
}));
162165
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
<None Include="packages.config" />
7878
</ItemGroup>
7979
<ItemGroup>
80-
<ProjectReference Include="..\utPLSQL.Lib\utPLSQL.Lib.csproj">
80+
<ProjectReference Include="..\utPLSQL.Api\utPLSQL.Api.csproj">
8181
<Project>{df09eace-50ec-44ea-849a-80462a219cfc}</Project>
82-
<Name>utPLSQL.Lib</Name>
82+
<Name>utPLSQL.Api</Name>
8383
</ProjectReference>
8484
</ItemGroup>
8585
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

0 commit comments

Comments
 (0)