logging and debugs for null reference exceptions

Ed Elliot · Ed Elliot · commit 0c7ced923d54 · 2017-10-03T12:40:38.000+01:00
diff --git a/AgileSQLClub.tSQLtTestController/AgileSQLClub.tSQLtTestController.csproj b/AgileSQLClub.tSQLtTestController/AgileSQLClub.tSQLtTestController.csproj
@@ -62,7 +62,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestWindow.Core">
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
+      <HintPath>..\lib\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/XMLTestAdapterVSIX/source.extension.vsixmanifest b/XMLTestAdapterVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="AgileSQLClub.tSQLtTestAdapter15" Version="0.80" Language="en-US" Publisher="EdElliott" />
+    <Identity Id="AgileSQLClub.tSQLtTestAdapter15" Version="0.90" Language="en-US" Publisher="EdElliott" />
     <DisplayName>tSQLt Test Adapter for Visual Studio 2017</DisplayName>
     <Description xml:space="preserve">Unit Test Adapter for tSQLt Tests</Description>
     <MoreInfo>https://the.agilsql.club/projects/tSQLt-Test-Adapter</MoreInfo>
diff --git a/XmlTestAdapter/Helpers/RunSettings.cs b/XmlTestAdapter/Helpers/RunSettings.cs
@@ -16,7 +16,7 @@ class RunSettings
         public RunSettings(IRunSettings runSettings)
         {
 
-            if (String.IsNullOrEmpty(runSettings.SettingsXml))
+            if (runSettings == null || runSettings.SettingsXml == null || String.IsNullOrEmpty(runSettings.SettingsXml))
             {
                 return;
             }
diff --git a/XmlTestAdapter/tSQLtTestAdapter.csproj b/XmlTestAdapter/tSQLtTestAdapter.csproj
@@ -71,18 +71,15 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
@@ -91,19 +88,19 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestWindow, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.dll</HintPath>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestWindow.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
+      <HintPath>..\lib\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
diff --git a/XmlTestAdapter/tSQLtTestDiscoverer.cs b/XmlTestAdapter/tSQLtTestDiscoverer.cs
@@ -17,6 +17,7 @@ public class XmlTestDiscoverer : ITestDiscoverer
         private static readonly TestCache _tests = new TestCache();
 
         private static readonly List<Regex> _includePaths = new List<Regex>();
+        
 
         public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
@@ -29,7 +30,7 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
             logger.SendMessage(TestMessageLevel.Informational, "tSQLt Test Adapter, searching for tests...");
             
             var includePath = new RunSettings(discoveryContext.RunSettings).GetSetting("IncludePath");
-            SetPathFilter(includePath);
+            SetPathFilter(includePath, logger);
 
             lock (_lock)
             {
@@ -42,23 +43,31 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
                 logger.SendMessage(TestMessageLevel.Informational, "tSQLt Test Adapter, searching for tests...done - none found");
         }
 
-        public static void SetPathFilter(string includePath)
+        public static void SetPathFilter(string includePath, IMessageLogger logger)
         {
-            _includePaths.Clear();
-
-            if (!string.IsNullOrEmpty(includePath))
+            try
             {
-                if (includePath.IndexOf(";", StringComparison.Ordinal) >= 0)
+                _includePaths.Clear();
+
+                if (!string.IsNullOrEmpty(includePath))
                 {
-                    foreach (var part in includePath.Split(';'))
+                    if (includePath.IndexOf(";", StringComparison.Ordinal) >= 0)
                     {
-                        _includePaths.Add(new Regex(part));
+                        foreach (var part in includePath.Split(';'))
+                        {
+                            logger.SendMessage(TestMessageLevel.Informational, string.Format("tSQLt Test Adapter, adding filter...- {0}", part));
+                            _includePaths.Add(new Regex(part));
+                        }
+                    }
+                    else
+                    {
+                        logger.SendMessage(TestMessageLevel.Informational, string.Format("tSQLt Test Adapter, adding filter...- {0}", includePath));
+                        _includePaths.Add(new Regex(includePath));
                     }
                 }
-                else
-                {
-                    _includePaths.Add(new Regex(includePath));
-                }
+            }catch(Exception e)
+            {
+                logger.SendMessage(TestMessageLevel.Informational, string.Format("tSQLt Test Adapter, *ERROR* adding filter...- {0}", includePath));
             }
         }
 
diff --git a/XmlTestAdapter/tSQLtTestExecutor.cs b/XmlTestAdapter/tSQLtTestExecutor.cs
@@ -16,7 +16,7 @@ public class tSQLtTestExecutor : ITestExecutor
     {
         public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
-            XmlTestDiscoverer.SetPathFilter(new RunSettings(runContext.RunSettings).GetSetting("IncludePath"));
+            XmlTestDiscoverer.SetPathFilter(new RunSettings(runContext.RunSettings).GetSetting("IncludePath"), frameworkHandle);
             IEnumerable<TestCase> tests = XmlTestDiscoverer.GetTests(sources, null);
             RunTests(tests, runContext, frameworkHandle);
         }
@@ -71,7 +71,7 @@ public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrame
 
         private static TestSuites Run(tSQLtTestRunner testSession, TestCase test)
         {
-            if(test.DisplayName.Contains("."))
+            if(test != null && test.DisplayName != null && test.DisplayName.Contains("."))
                 return testSession.Run(test.DisplayName.Split('.')[0], test.DisplayName.Split('.')[1]);
             return null;
         }
diff --git a/lib/tSQLt.Client.Net.dll b/lib/tSQLt.Client.Net.dll

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class RunSettings`
`16`	`16`	`public RunSettings(IRunSettings runSettings)`
`17`	`17`	`{`
`18`	`18`
`19`		`- if (String.IsNullOrEmpty(runSettings.SettingsXml))`
	`19`	`+ if (runSettings == null \|\| runSettings.SettingsXml == null \|\| String.IsNullOrEmpty(runSettings.SettingsXml))`
`20`	`20`	`{`
`21`	`21`	`return;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public class XmlTestDiscoverer : ITestDiscoverer`
`17`	`17`	`private static readonly TestCache _tests = new TestCache();`
`18`	`18`
`19`	`19`	`private static readonly List<Regex> _includePaths = new List<Regex>();`
	`20`	`+`
`20`	`21`
`21`	`22`	`public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)`
`22`	`23`	`{`
`@@ -29,7 +30,7 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove`
`29`	`30`	`logger.SendMessage(TestMessageLevel.Informational, "tSQLt Test Adapter, searching for tests...");`
`30`	`31`
`31`	`32`	`var includePath = new RunSettings(discoveryContext.RunSettings).GetSetting("IncludePath");`
`32`		`- SetPathFilter(includePath);`
	`33`	`+ SetPathFilter(includePath, logger);`
`33`	`34`
`34`	`35`	`lock (_lock)`
`35`	`36`	`{`
`@@ -42,23 +43,31 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove`
`42`	`43`	`logger.SendMessage(TestMessageLevel.Informational, "tSQLt Test Adapter, searching for tests...done - none found");`
`43`	`44`	`}`
`44`	`45`
`45`		`- public static void SetPathFilter(string includePath)`
	`46`	`+ public static void SetPathFilter(string includePath, IMessageLogger logger)`
`46`	`47`	`{`
`47`		`- _includePaths.Clear();`
`48`		`-`
`49`		`- if (!string.IsNullOrEmpty(includePath))`
	`48`	`+ try`
`50`	`49`	`{`
`51`		`- if (includePath.IndexOf(";", StringComparison.Ordinal) >= 0)`
	`50`	`+ _includePaths.Clear();`
	`51`	`+`
	`52`	`+ if (!string.IsNullOrEmpty(includePath))`
`52`	`53`	`{`
`53`		`- foreach (var part in includePath.Split(';'))`
	`54`	`+ if (includePath.IndexOf(";", StringComparison.Ordinal) >= 0)`
`54`	`55`	`{`
`55`		`- _includePaths.Add(new Regex(part));`
	`56`	`+ foreach (var part in includePath.Split(';'))`
	`57`	`+ {`
	`58`	`+ logger.SendMessage(TestMessageLevel.Informational, string.Format("tSQLt Test Adapter, adding filter...- {0}", part));`
	`59`	`+ _includePaths.Add(new Regex(part));`
	`60`	`+ }`
	`61`	`+ }`
	`62`	`+ else`
	`63`	`+ {`
	`64`	`+ logger.SendMessage(TestMessageLevel.Informational, string.Format("tSQLt Test Adapter, adding filter...- {0}", includePath));`
	`65`	`+ _includePaths.Add(new Regex(includePath));`
`56`	`66`	`}`
`57`	`67`	`}`
`58`		`- else`
`59`		`- {`
`60`		`- _includePaths.Add(new Regex(includePath));`
`61`		`- }`
	`68`	`+ }catch(Exception e)`
	`69`	`+ {`
	`70`	`+ logger.SendMessage(TestMessageLevel.Informational, string.Format("tSQLt Test Adapter, ERROR adding filter...- {0}", includePath));`
`62`	`71`	`}`
`63`	`72`	`}`
`64`	`73`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class tSQLtTestExecutor : ITestExecutor`
`16`	`16`	`{`
`17`	`17`	`public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)`
`18`	`18`	`{`
`19`		`- XmlTestDiscoverer.SetPathFilter(new RunSettings(runContext.RunSettings).GetSetting("IncludePath"));`
	`19`	`+ XmlTestDiscoverer.SetPathFilter(new RunSettings(runContext.RunSettings).GetSetting("IncludePath"), frameworkHandle);`
`20`	`20`	`IEnumerable<TestCase> tests = XmlTestDiscoverer.GetTests(sources, null);`
`21`	`21`	`RunTests(tests, runContext, frameworkHandle);`
`22`	`22`	`}`
`@@ -71,7 +71,7 @@ public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrame`
`71`	`71`
`72`	`72`	`private static TestSuites Run(tSQLtTestRunner testSession, TestCase test)`
`73`	`73`	`{`
`74`		`- if(test.DisplayName.Contains("."))`
	`74`	`+ if(test != null && test.DisplayName != null && test.DisplayName.Contains("."))`
`75`	`75`	`return testSession.Run(test.DisplayName.Split('.')[0], test.DisplayName.Split('.')[1]);`
`76`	`76`	`return null;`
`77`	`77`	`}`