Fix running tests

Author: SeeminglyScience

EditorServicesCommandSuite.build.ps1

@@ -2,7 +2,9 @@
 [CmdletBinding()]
 param(
     [ValidateSet('Debug', 'Release')]
-    [string] $Configuration = 'Debug'
+    [string] $Configuration = 'Debug',
+
+    [version] $TestRuntimeVersion
 )
 
 $moduleName = 'EditorServicesCommandSuite'
@@ -27,16 +29,17 @@ $script:Folders  = @{
 $script:Discovery = @{
     HasDocs       = Test-Path ('{0}\{1}\*.md' -f $Folders.Docs, $PSCulture)
     HasTests      = Test-Path ('{0}\*.Test.ps1' -f $Folders.Test)
+    IsUnix        = $PSEdition -eq 'Core' -and -not $IsWindows
 }
 
 task Clean {
     $releaseFolder = $Folders.Release
     if (Test-Path $releaseFolder) {
         Remove-Item $releaseFolder -Recurse
     }
+
     New-Item -ItemType Directory $releaseFolder | Out-Null
     New-Item -ItemType Directory $releaseFolder/RefactorCmdlets | Out-Null
-
 }
 
 task BuildDocs -If { $Discovery.HasDocs } {
@@ -83,7 +86,7 @@ task ResGenImpl {
 }
 
 task BuildManaged {
-    $script:dotnet = $dotnet = & $PSScriptRoot\tools\GetDotNet.ps1 -Unix:$Discover.IsUnix
+    $script:dotnet = $dotnet = & $PSScriptRoot\tools\GetDotNet.ps1 -Unix:$Discovery.IsUnix
 
     & $dotnet publish --framework netstandard2.0 --configuration $Configuration --verbosity q -nologo
 }
@@ -128,8 +131,32 @@ task Analyze -If { $Settings.ShouldAnalyze } {
     Invoke-ScriptAnalyzer -Path $Folders.Release -Settings $PSScriptRoot\ScriptAnalyzerSettings.psd1 -Recurse
 }
 
-task Test -If { $Discovery.HasTests -and $Settings.ShouldTest } {
-    Invoke-Pester -PesterOption @{ IncludeVSCodeMarker = $true }
+task DoTest {
+    Push-Location $PSScriptRoot\test\EditorServicesCommandSuite.Tests
+    try {
+        if (-not $TestRuntimeVersion) {
+            if ($Discovery.IsUnix) {
+                throw 'Unable to automatically determine installed runtime version on Unix, please supply your installed runtime version and try again.'
+            }
+
+            if ([string]::IsNullOrEmpty($dotnet.Source)) {
+                throw 'Unable to automatically determine installed runtime version, please supply your installed runtime version and try again.'
+            }
+
+            $dotnetFolder = Split-Path $dotnet.Source
+            $runtimes = Resolve-Path ('{0}/shared/Microsoft.NETCore.App' -f $dotnetFolder) -ErrorAction Stop
+            $TestRuntimeVersion = Get-ChildItem $runtimes.Path -Directory |
+                Select-Object -First 1 -ExpandProperty Name
+        }
+
+        & $dotnet xunit `
+            -framework netcoreapp2.0 `
+            -configuration Test `
+            -fxversion $TestRuntimeVersion `
+            -nologo
+    } finally {
+        Pop-Location
+    }
 }
 
 task DoInstall {
@@ -157,11 +184,11 @@ task ResGen -Jobs AssertPSResGen, ResGenImpl
 
 task Build -Jobs Clean, AssertDependencies, ResGen, BuildManaged, BuildRefactorModule, CopyToRelease, BuildDocs
 
-task PreRelease -Jobs Build, Analyze, Test
+task Test -Jobs Build, DoTest
 
-task Install -Jobs PreRelease, DoInstall
+task Install -Jobs Test, DoInstall
 
-task Publish -Jobs PreRelease, DoPublish
+task Publish -Jobs Test, DoPublish
 
 task . Build
 

EditorServicesCommandSuite.sln

@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorServicesCommandSuite.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorServicesCommandSuite.PSReadLine", "src\EditorServicesCommandSuite.PSReadLine\EditorServicesCommandSuite.PSReadLine.csproj", "{BC09FB7E-60AD-4D14-82B3-32751A88C5AE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorServicesCommandSuite.Tests", "src\EditorServicesCommandSuite.Tests\EditorServicesCommandSuite.Tests.csproj", "{79A27D11-3604-4123-81D8-100F96A206C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorServicesCommandSuite.Tests", "test\EditorServicesCommandSuite.Tests\EditorServicesCommandSuite.Tests.csproj", "{79A27D11-3604-4123-81D8-100F96A206C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/EditorServicesCommandSuite.Common.props

@@ -6,28 +6,19 @@
     <Configurations>Debug;Release;Test</Configurations>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <LangVersion>7.2</LangVersion>
+    <TargetFrameworks>netstandard2.0;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\EditorServicesCommandSuite\stylecop.json" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004" PrivateAssets="All" />
   </ItemGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)' != 'Test' ">
-      <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-      </PropertyGroup>
-      <ItemGroup>
-        <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-04" PrivateAssets="All" />
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(Configuration)' == 'Test' ">
-      <PropertyGroup>
-        <DefineConstants>TEST</DefineConstants>
-        <TargetFramework>netcoreapp2.0</TargetFramework>
-      </PropertyGroup>
-      <ItemGroup>
-        <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.2" PrivateAssets="All" />
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-04" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.2" PrivateAssets="All" />
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Test' ">
+    <DefineConstants>TEST</DefineConstants>
+  </PropertyGroup>
 </Project>

src/EditorServicesCommandSuite/Internal/CommandSuite.cs

@@ -74,6 +74,12 @@ protected internal static CommandSuite Instance
             }
         }
 
+        internal static bool TryGetInstance(out CommandSuite instance)
+        {
+            instance = s_instance;
+            return s_instance != null;
+        }
+
         /// <summary>
         /// Gets the diagnostics provider.
         /// </summary>

src/EditorServicesCommandSuite/Utility/Settings.cs

@@ -103,11 +103,22 @@ internal static string GetPathFromScope(SettingsScope scope)
                         "EditorServicesCommandSuite",
                         "ESCSSettings.psd1");
                 case SettingsScope.Workspace:
-                    return string.IsNullOrWhiteSpace(CommandSuite.Instance?.DocumentContext?.Workspace)
-                        ? string.Empty
-                        : Path.Combine(
-                            CommandSuite.Instance.DocumentContext.Workspace,
-                            "ESCSSettings.psd1");
+                {
+                    CommandSuite commandSuite;
+                    if (!CommandSuite.TryGetInstance(out commandSuite))
+                    {
+                        return string.Empty;
+                    }
+
+                    if (commandSuite.Workspace.IsUntitledWorkspace())
+                    {
+                        return string.Empty;
+                    }
+
+                    return Path.Combine(
+                        commandSuite.Workspace.GetWorkspacePath(),
+                        "ESCSSettings.psd1");
+                }
             }
 
             return string.Empty;

test/EditorServicesCommandSuite.Tests/ImplementAbstractMethodsTests.cs

@@ -63,7 +63,7 @@ private async Task<string> GetRefactoredTextAsync(
             return await MockContext.GetRefactoredTextAsync(
                 testString,
                 context => Task.FromResult(
-                    ImplementAbstractMethodsRefactorProvider.GetEdits(
+                    ImplementAbstractMethodsRefactor.GetEdits(
                         context.Ast.FindParent<TypeDefinitionAst>(),
                         context.Ast.FindParent<TypeConstraintAst>(),
                         context.Token,
@@ -102,6 +102,12 @@ internal static MemberOfType Property()
                 return new MemberOfType() { _memberType = MemberTypes.Property };
             }
 
+            internal MemberOfType Static()
+            {
+                _isStatic = true;
+                return this;
+            }
+
             internal MemberOfType Named(string name)
             {
                 _name = name;

test/EditorServicesCommandSuite.Tests/MockContext.cs

@@ -18,7 +18,7 @@ public static async Task<string> GetRefactoredTextAsync(
             string testString,
             Func<DocumentContextBase, Task<IEnumerable<DocumentEdit>>> editFactory)
         {
-            Settings.SetSetting("NewLineCharacter", "\n");
+            Settings.SetSetting("NewLine", "\n");
             Settings.SetSetting("TabString", "\t");
             var context = GetContext(testString);
             var sb = new StringBuilder(context.RootAst.Extent.Text);