Update LanguageServiceTests to use Workspace

This change updates the LanguageServiceTests class to use Workspace for
managing file operations.  It also re-enables some older tests that were
disabled due to API changes around script references.

Author: daviwil

test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj

@@ -51,10 +51,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="References\FindsReferencesOnFunction.cs" />
     <Compile Include="References\FindsReferencesOnVariable.cs" />
-    <Compile Include="Utility\ResourceFileLoader.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Completion\CompletionExamples.ps1" />
+    <None Include="Completion\CompletionExamples.ps1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj">
@@ -63,14 +64,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="ParameterHints\ParamHints.ps1">
+    <None Include="ParameterHints\ParamHints.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="References\SimpleFile.ps1">
+    <None Include="References\SimpleFile.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
+    </None>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

test/PowerShellEditorServices.Test.Shared/Utility/ResourceFileLoader.cs

@@ -6,31 +6,27 @@
 using Microsoft.PowerShell.EditorServices.Language;
 using Microsoft.PowerShell.EditorServices.Session;
 using Microsoft.PowerShell.EditorServices.Test.Shared.Completion;
-using Microsoft.PowerShell.EditorServices.Test.Shared.Utility;
 using System;
 using System.Management.Automation.Runspaces;
 using System.Threading;
 using System.Linq;
 using Xunit;
 using Microsoft.PowerShell.EditorServices.Test.Shared.ParameterHint;
 using Microsoft.PowerShell.EditorServices.Test.Shared.Definition;
-using Microsoft.PowerShell.EditorServices.Test.Shared.References;
 using Microsoft.PowerShell.EditorServices.Test.Shared.Occurrences;
+using System.IO;
 
 namespace Microsoft.PowerShell.EditorServices.Test.Language
 {
     public class LanguageServiceTests : IDisposable
     {
-        private ResourceFileLoader fileLoader;
+        private Workspace workspace;
         private Runspace languageServiceRunspace;
         private LanguageService languageService;
 
         public LanguageServiceTests()
         {
-            // Load script files from the shared assembly
-            this.fileLoader =
-                new ResourceFileLoader(
-                    typeof(CompleteCommandInFile).Assembly);
+            this.workspace = new Workspace();
 
             this.languageServiceRunspace = RunspaceFactory.CreateRunspace();
             this.languageServiceRunspace.ApartmentState = ApartmentState.STA;
@@ -108,55 +104,31 @@ public void LanguageServiceFindsCommandForParamHintsWithSpaces()
             Assert.Equal(1, paramSignatures.Signatures.Count());
         }
 
-        //[Fact]
-        //public void LanguageServiceFindsFunctionDefinition()
-        //{
-        //    GetDefinitionResult definitionResult =
-        //        this.GetDefinition(
-        //            FindsFunctionDefinition.SourceDetails);
-
-        //    SymbolReference definition = definitionResult.FoundDefinition;
-        //    Assert.Equal(1, definition.ScriptRegion.StartLineNumber);
-        //    Assert.Equal(10, definition.ScriptRegion.StartColumnNumber);
-        //    Assert.Equal("My-Function", definition.SymbolName);
-        //}
-
-        //[Fact]
-        //public void LanguageServiceFindsVariableDefinition()
-        //{
-        //    GetDefinitionResult definitionResult =
-        //        this.GetDefinition(
-        //            FindsVariableDefinition.SourceDetails);
-
-        //    SymbolReference definition = definitionResult.FoundDefinition;
-        //    Assert.Equal(6, definition.ScriptRegion.StartLineNumber);
-        //    Assert.Equal(1, definition.ScriptRegion.StartColumnNumber);
-        //    Assert.Equal("$things", definition.SymbolName);
-        //}
-
-        //[Fact]
-        //public void LanguageServiceFindsFunctionReferences()
-        //{
-        //    FindReferencesResult referencesResult =
-        //        this.GetReferences(
-        //            FindsReferencesOnFunction.SourceDetails);
-
-        //    Assert.Equal(3, referencesResult.FoundReferences.Count());
-        //    Assert.Equal(1, referencesResult.FoundReferences.First().ScriptRegion.StartLineNumber);
-        //    Assert.Equal(10, referencesResult.FoundReferences.First().ScriptRegion.StartColumnNumber);
-        //}
-
-        //[Fact]
-        //public void LanguageServiceFindsVariableReferences()
-        //{
-        //    FindReferencesResult referencesResult =
-        //        this.GetReferences(
-        //            FindsReferencesOnVariable.SourceDetails);
-
-        //    Assert.Equal(3, referencesResult.FoundReferences.Count());
-        //    Assert.Equal(10, referencesResult.FoundReferences.Last().ScriptRegion.StartLineNumber);
-        //    Assert.Equal(13, referencesResult.FoundReferences.Last().ScriptRegion.StartColumnNumber);
-        //}
+        [Fact]
+        public void LanguageServiceFindsFunctionDefinition()
+        {
+            GetDefinitionResult definitionResult =
+                this.GetDefinition(
+                    FindsFunctionDefinition.SourceDetails);
+
+            SymbolReference definition = definitionResult.FoundDefinition;
+            Assert.Equal(1, definition.ScriptRegion.StartLineNumber);
+            Assert.Equal(10, definition.ScriptRegion.StartColumnNumber);
+            Assert.Equal("My-Function", definition.SymbolName);
+        }
+
+        [Fact]
+        public void LanguageServiceFindsVariableDefinition()
+        {
+            GetDefinitionResult definitionResult =
+                this.GetDefinition(
+                    FindsVariableDefinition.SourceDetails);
+
+            SymbolReference definition = definitionResult.FoundDefinition;
+            Assert.Equal(6, definition.ScriptRegion.StartLineNumber);
+            Assert.Equal(1, definition.ScriptRegion.StartColumnNumber);
+            Assert.Equal("$things", definition.SymbolName);
+        }
 
         [Fact]
         public void LanguageServiceFindsOccurrencesOnFunction()
@@ -182,10 +154,18 @@ public void LanguageServiceFindsOccurrencesOnParameter()
             Assert.Equal(3, occurrencesResult.FoundOccurrences.Last().ScriptRegion.StartLineNumber);
         }
 
-        private ScriptFile GetScriptFile(ScriptRegion scriptRegion){
-            return this.fileLoader.LoadFile(scriptRegion.File);
-        }
+        private ScriptFile GetScriptFile(ScriptRegion scriptRegion)
+        {
+            const string baseSharedScriptPath = 
+                @"..\..\..\PowerShellEditorServices.Test.Shared\";
 
+            string resolvedPath =
+                Path.Combine(
+                    baseSharedScriptPath, 
+                    scriptRegion.File);
+
+            return this.workspace.OpenFile(resolvedPath);
+        }
 
         private CompletionResults GetCompletionResults(ScriptRegion scriptRegion)
         {
@@ -206,23 +186,41 @@ private ParameterSetSignatures GetParamSetSignatures(ScriptRegion scriptRegion)
                     scriptRegion.StartColumnNumber);
         }
 
-        //private GetDefinitionResult GetDefinition(ScriptRegion scriptRegion)
-        //{
-        //    return
-        //        this.languageService.GetDefinitionOfSymbol(
-        //            GetScriptFile(scriptRegion),
-        //            scriptRegion.StartLineNumber,
-        //            scriptRegion.StartColumnNumber);
-        //}
-
-        //private FindReferencesResult GetReferences(ScriptRegion scriptRegion)
-        //{
-        //    SymbolReference foundSymbol = 
-        //        this.languageService.FindSymbolAtLocation(
-        //            GetScriptFile(scriptRegion),
-        //            scriptRegion.StartLineNumber,
-        //            scriptRegion.StartColumnNumber);
-        //}
+        private GetDefinitionResult GetDefinition(ScriptRegion scriptRegion)
+        {
+            ScriptFile scriptFile = GetScriptFile(scriptRegion);
+
+            SymbolReference symbolReference =
+                this.languageService.FindSymbolAtLocation(
+                    scriptFile,
+                    scriptRegion.StartLineNumber,
+                    scriptRegion.StartColumnNumber);
+
+            Assert.NotNull(symbolReference);
+
+            return
+                this.languageService.GetDefinitionOfSymbol(
+                    symbolReference,
+                    this.workspace.ExpandScriptReferences(scriptFile));
+        }
+
+        private FindReferencesResult GetReferences(ScriptRegion scriptRegion)
+        {
+            ScriptFile scriptFile = GetScriptFile(scriptRegion);
+
+            SymbolReference symbolReference =
+                this.languageService.FindSymbolAtLocation(
+                    scriptFile,
+                    scriptRegion.StartLineNumber,
+                    scriptRegion.StartColumnNumber);
+
+            Assert.NotNull(symbolReference);
+
+            return
+                this.languageService.FindReferencesOfSymbol(
+                    symbolReference,
+                    this.workspace.ExpandScriptReferences(scriptFile));
+        }
 
         private FindOccurrencesResult GetOccurrences(ScriptRegion scriptRegion)
         {