Add integration test for solution filter support

JoeRobich · JoeRobich · commit 5e8f72831bf6 · 2021-04-06T20:34:45.000-07:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -128,6 +128,31 @@
             ],
             "preLaunchTask": "buildDev"
         },
+        {
+            "name": "Launch slnFilterWithCsproj Workspace Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
+            ],
+            "env": {
+                "CODE_WORKSPACE_ROOT": "${workspaceRoot}",
+                "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
+                "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "OSVC_SUITE": "slnFilterWithCsproj"
+            },
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/dist/*.js"
+            ],
+            "preLaunchTask": "buildDev"
+        },
         {
             "type": "node",
             "request": "launch",
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "test:integration": "gulp test:integration",
     "test:integration:singleCsproj": "gulp test:integration:singleCsproj",
     "test:integration:slnWithCsproj": "gulp test:integration:slnWithCsproj",
+    "test:integration:slnFilterWithCsproj": "gulp test:integration:slnFilterWithCsproj",
     "test:release": "mocha --config ./.mocharc.jsonc test/releaseTests/**/*.test.ts",
     "test:artifacts": "mocha --config ./.mocharc.jsonc test/artifactTests/**/*.test.ts",
     "postinstall": "node ./node_modules/vscode/bin/install",
diff --git a/tasks/testTasks.ts b/tasks/testTasks.ts
@@ -45,6 +45,10 @@ gulp.task("test:integration:slnWithCsproj", async () => {
     return runIntegrationTest("slnWithCsproj");
 });
 
+gulp.task("test:integration:slnFilterWithCsproj", async () => {
+    return runIntegrationTest("slnFilterWithCsproj");
+});
+
 gulp.task("test:integration:BasicRazorApp2_1", async () => {
     return runIntegrationTest("BasicRazorApp2_1");
 });
@@ -53,6 +57,7 @@ gulp.task(
     "test:integration", gulp.series(
         "test:integration:singleCsproj",
         "test:integration:slnWithCsproj",
+        "test:integration:slnFilterWithCsproj",
         "test:integration:BasicRazorApp2_1"
     ));
 
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj.ts b/test/integrationTests/testAssets/slnFilterWithCsproj.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITestAssetWorkspace } from "./testAssets";
+
+let workspace: ITestAssetWorkspace = {
+    description: "sln filter with a csproj's",
+    projects: [{
+        relativeFilePath: "src/app/app.csproj"
+    }]
+};
+
+export default workspace;
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/.gitignore b/test/integrationTests/testAssets/slnFilterWithCsproj/.gitignore
@@ -0,0 +1,2 @@
+**/obj/
+**/bin/
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/.vscode/settings.json b/test/integrationTests/testAssets/slnFilterWithCsproj/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "omnisharp.defaultLaunchSolution": "SolutionFilter.slnf",
+    "omnisharp.path": "latest",
+    "omnisharp.enableRoslynAnalyzers": true
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFile.sln b/test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFile.sln
@@ -0,0 +1,68 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D28FC441-C95D-47D2-8D5C-E401ABAD7C64}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "app", "src\app\app.csproj", "{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lib", "src\lib\lib.csproj", "{717BE881-D74C-45FC-B55D-2085499E1BF8}"	
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "test\test.csproj", "{4679428B-0CA0-4228-B8C0-B676B34A1B30}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x64.ActiveCfg = Debug|x64
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x64.Build.0 = Debug|x64
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x86.ActiveCfg = Debug|x86
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Debug|x86.Build.0 = Debug|x86
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x64.ActiveCfg = Release|x64
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x64.Build.0 = Release|x64
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x86.ActiveCfg = Release|x86
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3}.Release|x86.Build.0 = Release|x86
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x64.ActiveCfg = Debug|x64
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x64.Build.0 = Debug|x64
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x86.ActiveCfg = Debug|x86
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Debug|x86.Build.0 = Debug|x86
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x64.ActiveCfg = Release|x64
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x64.Build.0 = Release|x64
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x86.ActiveCfg = Release|x86
+		{717BE881-D74C-45FC-B55D-2085499E1BF8}.Release|x86.Build.0 = Release|x86
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x64.ActiveCfg = Debug|x64
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x64.Build.0 = Debug|x64
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x86.ActiveCfg = Debug|x86
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Debug|x86.Build.0 = Debug|x86
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x64.ActiveCfg = Release|x64
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x64.Build.0 = Release|x64
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x86.ActiveCfg = Release|x86
+		{4679428B-0CA0-4228-B8C0-B676B34A1B30}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{D36E1CC9-62CA-45A3-8BD0-6ADC2767FFB3} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
+		{717BE881-D74C-45FC-B55D-2085499E1BF8} = {D28FC441-C95D-47D2-8D5C-E401ABAD7C64}
+	EndGlobalSection
+EndGlobal
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFilter.slnf b/test/integrationTests/testAssets/slnFilterWithCsproj/SolutionFilter.slnf
@@ -0,0 +1,8 @@
+{
+  "solution": {
+    "path": "SolutionFile.sln",
+    "projects": [
+      "src\\app\\app.csproj"
+    ]
+  }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/A.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/A.cs
@@ -0,0 +1 @@
+class C {}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/DocComments.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/DocComments.cs
@@ -0,0 +1,13 @@
+class DocComments
+{
+    ///
+    string M(int param1, string param2)
+    {
+        return null;
+    }
+
+    /// <summary>
+
+    /// </summary>
+    void M2() {}
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/ISomeInterface.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/ISomeInterface.cs
@@ -0,0 +1,6 @@
+namespace ReAnalyze
+{
+    public interface ISomeInterface
+    {
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/Program.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/Program.cs
@@ -0,0 +1,12 @@
+﻿using System;
+
+namespace app
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/SomeInterfaceImpl.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/SomeInterfaceImpl.cs
@@ -0,0 +1,6 @@
+namespace ReAnalyze
+{
+    public class SomeInterfaceImpl: ISomeInterface
+    {
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/app.csproj b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/app.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <ItemGroup>	
+  <ProjectReference Include="..\lib\lib.csproj" />	
+ </ItemGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/completion.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/completion.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace singleCsproj
+{
+    class Completion
+    {
+        static void shouldHaveCompletions(string[] args)
+        {
+            Completion a = new Completion();
+        }
+
+        // override  // Trailing space is intentional
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/definition.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/definition.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Test
+{
+    public class Definition
+    {
+        public static string Foo { get; set; }
+
+        public void MyMethod()
+        {
+            Console.WriteLine(Foo);
+        }
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/diagnostics.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/diagnostics.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace Foo
+{
+    public class FooBar
+    {
+        public void FooBarBar()
+        {
+            var notUsed = 3;
+        }
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/documentSymbols.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/documentSymbols.cs
@@ -0,0 +1,57 @@
+using System;
+
+namespace Test
+{
+    class C
+    {
+        private int _f;
+        private int _f1, _f2;
+
+        public C() {}
+        ~C() { }
+
+        public void M1(int i, string s, params object[] args)
+        {
+        }
+
+        public int P1 => 42;
+        public int P2 { get => 42; }
+        public int P3 { get { return 42; } }
+
+        public int this[int index] => index++;
+
+        public event EventHandler E1;
+        public event EventHandler E2, E3;
+        public event EventHandler E4
+        {
+            add { }
+            remove { }
+        }
+
+        public static bool operator ==(C c1, int i) { return true; }
+
+        public static bool operator !=(C c1, int i) { return false; }
+
+        public static implicit operator C(int i) { return null; }
+
+        public static explicit operator int(C c1) { return 42 ; }
+    }
+
+    struct S
+    {
+    }
+
+    interface I
+    {
+        void M();
+    }
+
+    delegate void D();
+
+    enum E
+    {
+        One,
+        Two,
+        Three
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/hover.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/hover.cs
@@ -0,0 +1,16 @@
+using System;
+namespace Test
+{
+   class testissue
+   {
+       ///<summary>Checks if object is tagged with the tag.</summary>
+       /// <param name="gameObject">The game object.</param>
+       /// <param name="tagName">Name of the tag.</param>
+       /// <returns>Returns <c>true</c> if object is tagged with tag.</returns>
+       
+       public static bool Compare(int gameObject,string tagName)
+       {
+           return true;
+       }
+   }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/implementation.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/implementation.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace minimal
+{
+    public class BaseClass {}
+    public class SomeClass : BaseClass {}
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/reference.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/reference.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace minimal
+{
+    public class Foo 
+    {
+        public void Baz() {}
+    }
+
+    public class Bar 
+    {
+        public Bar()
+        {
+            new Foo().Baz();
+        }
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remap.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remap.cs
@@ -0,0 +1,12 @@
+namespace Remap
+{
+    public class Foo
+    {
+        public static string Bar { get; set; }
+        
+        public void Baz()
+        {
+            var x = nameof(Bar);
+        }
+    }
+}
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remapped.txt b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/remapped.txt
@@ -0,0 +1 @@
+Hello World
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/secondaryDiagnostics.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/secondaryDiagnostics.cs
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/semantictokens.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/semantictokens.cs
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/sigHelp.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/app/sigHelp.cs
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/Class1.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/Class1.cs
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/lib.csproj b/test/integrationTests/testAssets/slnFilterWithCsproj/src/lib/lib.csproj
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/test/UnitTest1.cs b/test/integrationTests/testAssets/slnFilterWithCsproj/test/UnitTest1.cs
diff --git a/test/integrationTests/testAssets/slnFilterWithCsproj/test/test.csproj b/test/integrationTests/testAssets/slnFilterWithCsproj/test/test.csproj
diff --git a/test/integrationTests/testAssets/testAssetWorkspace.ts b/test/integrationTests/testAssets/testAssetWorkspace.ts
