Merge branch 'release/1.1.1' into main

simasch · simasch · commit 3e1b0eae5383 · 2021-01-11T08:56:35.000+01:00
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs
@@ -10,6 +10,9 @@
 
 namespace utPLSQL
 {
+    //*FUNC: 4*/ extern char *(*SYS_OracleHome)();
+    internal delegate IntPtr SysOracleHome();
+
     //*FUNC: 11*/ BOOL (*IDE_Connected)();
     internal delegate bool IdeConnected();
 
@@ -23,8 +26,7 @@ namespace utPLSQL
     internal delegate void IdeCreatePopupItem(int id, int index, string name, string objectType);
 
     //*FUNC: 74*/ int (*IDE_GetPopupObject)(char **ObjectType, char **ObjectOwner, char **ObjectName, char **SubObject);
-    internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr objectOwner, out IntPtr objectName,
-        out IntPtr subObject);
+    internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr objectOwner, out IntPtr objectName, out IntPtr subObject);
 
     //*FUNC: 79*/ char *(*IDE_GetObjectSource)(char *ObjectType, char *ObjectOwner, char *ObjectName);
     internal delegate IntPtr IdeGetObjectSource(string objectType, string objectOwner, string objectName);
@@ -44,6 +46,8 @@ public class PlsqlDeveloperUtPlsqlPlugin
         private const int PluginPopupIndex = 1;
         private const int PluginPopupIndexWithCoverage = 2;
 
+        private static SysOracleHome sysOracleHome;
+
         private static IdeConnected connected;
         private static IdeGetConnectionInfo getConnectionInfo;
 
@@ -59,9 +63,9 @@ public class PlsqlDeveloperUtPlsqlPlugin
         private static string password;
         private static string database;
         private static string connectAs;
+        private static string oracleHome;
 
         private static PlsqlDeveloperUtPlsqlPlugin _plugin;
-
         private static readonly List<TestRunnerWindow> Windows = new List<TestRunnerWindow>();
 
         #region DLL exported API
@@ -83,7 +87,7 @@ public static void OnActivate()
         {
             try
             {
-                ConnectToDatabase();
+                getDatabaseInformation();
 
                 // Separate streams are needed!
                 var assembly = Assembly.GetExecutingAssembly();
@@ -150,6 +154,9 @@ public static void RegisterCallback(int index, IntPtr function)
         {
             switch (index)
             {
+                case 4:
+                    sysOracleHome = (SysOracleHome)Marshal.GetDelegateForFunctionPointer(function, typeof(SysOracleHome));
+                    break;
                 case 11:
                     connected = (IdeConnected)Marshal.GetDelegateForFunctionPointer(function, typeof(IdeConnected));
                     break;
@@ -181,7 +188,7 @@ public static void RegisterCallback(int index, IntPtr function)
         [DllExport("OnConnectionChange", CallingConvention = CallingConvention.Cdecl)]
         public static void OnConnectionChange()
         {
-            ConnectToDatabase();
+            getDatabaseInformation();
         }
 
         [DllExport("CreateMenuItem", CallingConvention = CallingConvention.Cdecl)]
@@ -205,48 +212,55 @@ public static string CreateMenuItem(int index)
         [DllExport("OnMenuClick", CallingConvention = CallingConvention.Cdecl)]
         public static void OnMenuClick(int index)
         {
-            if (index == PluginMenuIndexAllTests)
+            try
             {
-                if (connected() && !Sydba())
+                if (index == PluginMenuIndexAllTests)
                 {
-                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
-                    Windows.Add(testResultWindow);
-                    testResultWindow.RunTestsAsync("_ALL", username, null, null, false);
+                    if (isConnected() && !isSydba())
+                    {
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
+                        Windows.Add(testResultWindow);
+                        testResultWindow.RunTestsAsync("_ALL", username, null, null, false);
+                    }
                 }
-            }
-            else if (index == PluginMenuIndexAllTestsWithCoverage)
-            {
-                if (connected() && !Sydba())
+                else if (index == PluginMenuIndexAllTestsWithCoverage)
                 {
-                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
-                    Windows.Add(testResultWindow);
-                    testResultWindow.RunTestsAsync("_ALL", username, null, null, true);
+                    if (isConnected() && !isSydba())
+                    {
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
+                        Windows.Add(testResultWindow);
+                        testResultWindow.RunTestsAsync("_ALL", username, null, null, true);
+                    }
                 }
-            }
-            else if (index == PluginPopupIndex)
-            {
-                if (connected() && !Sydba())
+                else if (index == PluginPopupIndex)
                 {
-                    getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
+                    if (isConnected() && !isSydba())
+                    {
+                        getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
 
-                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
-                    Windows.Add(testResultWindow);
-                    testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
-                        Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
+                        Windows.Add(testResultWindow);
+                        testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
+                            Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);
+                    }
                 }
-            }
-            else if (index == PluginPopupIndexWithCoverage)
-            {
-                if (connected() && !Sydba())
+                else if (index == PluginPopupIndexWithCoverage)
                 {
-                    getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
+                    if (isConnected() && !isSydba())
+                    {
+                        getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
 
-                    var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
-                    Windows.Add(testResultWindow);
-                    testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
-                        Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
+                        Windows.Add(testResultWindow);
+                        testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
+                            Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                MessageBox.Show($"{e.Message}\n\n{e.StackTrace}", "Unexpected Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
 
         [DllExport("About", CallingConvention = CallingConvention.Cdecl)]
@@ -263,16 +277,27 @@ public void OpenPackageBody(string owner, string name)
             var source = getObjectSource("PACKAGE BODY", owner, name);
             createWindow(3, Marshal.PtrToStringAnsi(source), false);
         }
-        private static bool Sydba()
+        private static bool isSydba()
         {
-            if (connectAs.ToLower().Equals("sysdba")) {
+            if (connectAs.ToLower().Equals("sysdba"))
+            {
                 MessageBox.Show("You shouldn't run utPLSQL as SYSDBA.\n\nTest will not run.", "Connected as SYSDBA", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return true;
             }
             return false;
         }
 
-        private static void ConnectToDatabase()
+        private static bool isConnected()
+        {
+            if (!connected())
+            {
+                MessageBox.Show("Please connect before running tests!", "No connection", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return false;
+            }
+            return true;
+        }
+
+        private static void getDatabaseInformation()
         {
             try
             {
@@ -287,6 +312,10 @@ private static void ConnectToDatabase()
                     IntPtr ptrConnectAs = getConnectAs();
 
                     connectAs = Marshal.PtrToStringAnsi(ptrConnectAs);
+
+                    IntPtr ptrOracleHome = sysOracleHome();
+
+                    oracleHome = Marshal.PtrToStringAnsi(ptrOracleHome);
                 }
             }
             catch (Exception e)
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/AssemblyInfo.cs b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs
@@ -12,13 +12,13 @@ public LoginForm()
 
         private void BtnRunTests_Click(object sender, EventArgs e)
         {
-            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);
+            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);
         }
 
         private void btnCodeCoverage_Click(object sender, EventArgs e)
         {
-            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);
+            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);
         }
     }
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/Properties/AssemblyInfo.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj
@@ -1,5 +1,6 @@
 &#65279;<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,6 +38,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -69,6 +75,7 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -86,4 +93,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.6.0.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.0\build\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.6.0.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.0\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
+  </Target>
 </Project>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/Properties/AssemblyInfo.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs
@@ -28,6 +28,7 @@ public partial class TestRunnerWindow : Form
         private readonly string password;
         private readonly string database;
         private readonly string connectAs;
+        private readonly string oracleHome;
 
         private readonly List<TestResult> testResults = new List<TestResult>();
 
@@ -39,13 +40,14 @@ public partial class TestRunnerWindow : Form
         private int rowIndexOnRightClick;
         private int completedTests;
 
-        public TestRunnerWindow(object pluginIntegration, string username, string password, string database, string connectAs)
+        public TestRunnerWindow(object pluginIntegration, string username, string password, string database, string connectAs, string oracleHome)
         {
             this.pluginIntegration = pluginIntegration;
             this.username = username;
             this.password = password;
             this.database = database;
             this.connectAs = connectAs;
+            this.oracleHome = oracleHome;
 
             InitializeComponent();
         }
@@ -72,8 +74,20 @@ public async Task RunTestsAsync(string type, string owner, string name, string p
             SetWindowTitle(type, owner, name, procedure);
 
             testRunner = new RealTimeTestRunner();
-            testRunner.Connect(username, password, database);
 
+            try
+            {
+                if (oracleHome != null)
+                {
+                    Environment.SetEnvironmentVariable("ORACLE_HOME", oracleHome);
+                }
+                testRunner.Connect(username, password, database);
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(e.Message, "Connect failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             try
             {
                 testRunner.GetVersion();
@@ -599,15 +613,15 @@ private async void menuItemRunTests_ClickAsync(object sender, EventArgs e)
         {
             var testResult = testResults[rowIndexOnRightClick];
 
-            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs);
+            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs, oracleHome);
             await testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, false);
         }
 
         private async void menuItemCoverage_ClickAsync(object sender, EventArgs e)
         {
             var testResult = testResults[rowIndexOnRightClick];
 
-            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs);
+            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs, oracleHome);
             await testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, true);
         }
 
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/FodyWeavers.xml b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/FodyWeavers.xml
@@ -0,0 +1,3 @@
+&#65279;<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura />
+</Weavers>
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/FodyWeavers.xsd b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/FodyWeavers.xsd
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/packages.config b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/packages.config
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/utPLSQL.Ui.Standalone.csproj b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.Ui.Standalone/utPLSQL.Ui.Standalone.csproj

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ public LoginForm()`
`12`	`12`
`13`	`13`	`private void BtnRunTests_Click(object sender, EventArgs e)`
`14`	`14`	`{`
`15`		`- var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);`
	`15`	`+ var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);`
`16`	`16`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`private void btnCodeCoverage_Click(object sender, EventArgs e)`
`20`	`20`	`{`
`21`		`- var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);`
	`21`	`+ var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);`
`22`	`22`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">`
	`2`	`+ <Costura />`
	`3`	`+</Weavers>`