Switch to vs-extension-testing for integration tests

sharwell · sharwell · commit 3b1082006ec4 · 2021-08-13T09:03:03.000-07:00
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/AbstractIdeIntegrationTest.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/AbstractIdeIntegrationTest.cs
@@ -12,7 +12,6 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
     using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;
     using Xunit;
 
-    [VsTestSettings(UIThread = true)]
     public abstract class AbstractIdeIntegrationTest : IAsyncLifetime, IDisposable
     {
         private JoinableTaskContext _joinableTaskContext;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/IdeFactTest.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/IdeFactTest.cs
@@ -7,40 +7,38 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
     using System.Threading;
     using System.Threading.Tasks;
     using System.Windows;
-    using System.Windows.Threading;
     using Microsoft.VisualStudio.Shell.Interop;
     using Microsoft.VisualStudio.Threading;
-    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;
     using Xunit;
     using _DTE = EnvDTE._DTE;
     using DTE = EnvDTE.DTE;
     using ServiceProvider = Microsoft.VisualStudio.Shell.ServiceProvider;
 
-    public class VsFactTest : AbstractIdeIntegrationTest
+    public class IdeFactTest : AbstractIdeIntegrationTest
     {
-        [VsFact]
+        [IdeFact]
         public void TestOpenAndCloseIDE()
         {
             Assert.Equal("devenv", Process.GetCurrentProcess().ProcessName);
             var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));
             Assert.NotNull(dte);
         }
 
-        [VsFact]
+        [IdeFact]
         public void TestRunsOnUIThread()
         {
             Assert.True(Application.Current.Dispatcher.CheckAccess());
         }
 
-        [VsFact]
+        [IdeFact]
         public async Task TestRunsOnUIThreadAsync()
         {
             Assert.True(Application.Current.Dispatcher.CheckAccess());
             await Task.Yield();
             Assert.True(Application.Current.Dispatcher.CheckAccess());
         }
 
-        [VsFact]
+        [IdeFact]
         public async Task TestYieldsToWorkAsync()
         {
             Assert.True(Application.Current.Dispatcher.CheckAccess());
@@ -52,7 +50,7 @@ public async Task TestYieldsToWorkAsync()
             Assert.True(Application.Current.Dispatcher.CheckAccess());
         }
 
-        [VsFact]
+        [IdeFact]
         public async Task TestJoinableTaskFactoryAsync()
         {
             Assert.NotNull(JoinableTaskContext);
@@ -68,8 +66,7 @@ public async Task TestJoinableTaskFactoryAsync()
             Assert.Equal(Thread.CurrentThread, JoinableTaskContext.MainThread);
         }
 
-#if DEBUG // https://github.com/josetr/VsixTesting/issues/3
-        [VsFact(Version = "2012")]
+        [IdeFact(MinVersion = VisualStudioVersion.VS2012, MaxVersion = VisualStudioVersion.VS2012)]
         public void TestJoinableTaskFactoryProvidedByTest()
         {
             var taskSchedulerServiceObject = ServiceProvider.GetService(typeof(SVsTaskSchedulerService));
@@ -83,9 +80,8 @@ public void TestJoinableTaskFactoryProvidedByTest()
 
             Assert.NotNull(JoinableTaskContext);
         }
-#endif
 
-        [VsFact(Version = "2013-")]
+        [IdeFact(MinVersion = VisualStudioVersion.VS2013)]
         public void TestJoinableTaskFactoryObtainedFromEnvironment()
         {
             var taskSchedulerServiceObject = ServiceProvider.GetService(typeof(SVsTaskSchedulerService));
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/ScrollingIntegrationTest.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/ScrollingIntegrationTest.cs
@@ -42,7 +42,7 @@ private IdeSendKeys SendKeys
             get;
         }
 
-        [VsFact]
+        [IdeFact]
         public async Task BasicScrollingBehaviorAsync()
         {
             var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));
@@ -128,7 +128,7 @@ await SendKeys.SendAsync(inputSimulator =>
         /// <summary>
         /// Verifies that the Ctrl+Scroll operations do not change the zoom level in the editor.
         /// </summary>
-        [VsFact]
+        [IdeFact]
         public async Task ZoomDisabledAsync()
         {
             var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Tvl.VisualStudio.MouseFastScroll.IntegrationTests.csproj b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Tvl.VisualStudio.MouseFastScroll.IntegrationTests.csproj
@@ -10,23 +10,28 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime.Remoting" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="InputSimulatorPlus" Version="1.0.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit.Legacy" Version="0.1.71-beta" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="12.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30111" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="14.3.26929" />
     <PackageReference Include="VSSDK.ComponentModelHost.11" Version="11.0.4" />
     <PackageReference Include="VSSDK.DTE.8" Version="8.0.4" />
     <PackageReference Include="VSSDK.Shell.11" Version="11.0.4" />
     <PackageReference Include="VSSDK.Text" Version="11.0.4" />
-    <PackageReference Include="VsixTesting.Xunit" Version="0.1.54-beta" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="Xunit.Harness.RequireExtensionAttribute">
+      <_Parameter1>Tvl.VisualStudio.MouseFastScroll.vsix</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Tvl.VisualStudio.MouseFastScroll\Tvl.VisualStudio.MouseFastScroll.csproj" ReferenceOutputAssembly="false" CopyVsix="true" />
   </ItemGroup>
@@ -36,9 +41,9 @@
           DependsOnTargets="PrepareProjectReferences">
     <MSBuild
         Projects="@(_MSBuildProjectReferenceExistent)"
-        Targets="Build;VSIXContainerProjectOutputGroup"
+        Targets="VSIXContainerProjectOutputGroup"
         BuildInParallel="$(BuildInParallel)"
-        Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); %(_MSBuildProjectReferenceExistent.SetTargetFramework)"
+        Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); %(_MSBuildProjectReferenceExistent.SetTargetFramework); CreateVsixContainer=true"
         Condition="'%(_MSBuildProjectReferenceExistent.CopyVsix)' == 'true'"
         ContinueOnError="!$(BuildingProject)"
         RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)">
@@ -47,7 +52,7 @@
     </MSBuild>
 
     <ItemGroup>
-      <None Include="@(_ProjectReferenceVsixOutputs)" Condition="Exists('%(Identity)')" CopyToOutputDirectory="PreserveNewest" />
+      <ReferenceCopyLocalPaths Include="@(_ProjectReferenceVsixOutputs)" />
     </ItemGroup>
   </Target>
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -28,20 +28,20 @@ test_script:
         -target:"$env:xunit20\xunit.console.x86.exe" `
         -targetargs:"$unitTestAssembly -appveyor -noshadow"
     if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-    #&$openCoverConsole `
-    #    -register:user `
-    #    -returntargetcode `
-    #    -hideskipped:All `
-    #    -filter:"+[Tvl*]*" `
-    #    -excludebyattribute:*.ExcludeFromCodeCoverage* `
-    #    -excludebyfile:*\*Designer.cs `
-    #    -searchdirs:"Tvl.VisualStudio.MouseFastScroll.UnitTests\bin\$env:CONFIGURATION\net452" `
-    #    -output:OpenCover.MouseFastScroll.IntegrationTests.xml `
-    #    -target:"$env:xunit20\xunit.console.x86.exe" `
-    #    -targetargs:"$integrationTestAssembly -appveyor -noshadow"
-    #if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
+    &$openCoverConsole `
+        -register:user `
+        -returntargetcode `
+        -hideskipped:All `
+        -filter:"+[Tvl*]*" `
+        -excludebyattribute:*.ExcludeFromCodeCoverage* `
+        -excludebyfile:*\*Designer.cs `
+        -searchdirs:"Tvl.VisualStudio.MouseFastScroll.UnitTests\bin\$env:CONFIGURATION\net452" `
+        -output:OpenCover.MouseFastScroll.IntegrationTests.xml `
+        -target:"$env:xunit20\xunit.console.x86.exe" `
+        -targetargs:"$integrationTestAssembly -appveyor -noshadow"
+    if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
     &$codecov -f OpenCover.MouseFastScroll.UnitTests.xml --flag unit
-    #&$codecov -f OpenCover.MouseFastScroll.IntegrationTests.xml --flag integration
+    &$codecov -f OpenCover.MouseFastScroll.IntegrationTests.xml --flag integration
 artifacts:
 - path: 'Tvl.VisualStudio.MouseFastScroll\**\*.vsix'
 - path: '\msbuild.binlog'

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests`
`12`	`12`	`using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;`
`13`	`13`	`using Xunit;`
`14`	`14`
`15`		`- [VsTestSettings(UIThread = true)]`
`16`	`15`	`public abstract class AbstractIdeIntegrationTest : IAsyncLifetime, IDisposable`
`17`	`16`	`{`
`18`	`17`	`private JoinableTaskContext _joinableTaskContext;`
Original file line number	Diff line number	Diff line change
`@@ -7,40 +7,38 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using System.Windows;`
`10`		`- using System.Windows.Threading;`
`11`	`10`	`using Microsoft.VisualStudio.Shell.Interop;`
`12`	`11`	`using Microsoft.VisualStudio.Threading;`
`13`		`- using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;`
`14`	`12`	`using Xunit;`
`15`	`13`	`using _DTE = EnvDTE._DTE;`
`16`	`14`	`using DTE = EnvDTE.DTE;`
`17`	`15`	`using ServiceProvider = Microsoft.VisualStudio.Shell.ServiceProvider;`
`18`	`16`
`19`		`- public class VsFactTest : AbstractIdeIntegrationTest`
	`17`	`+ public class IdeFactTest : AbstractIdeIntegrationTest`
`20`	`18`	`{`
`21`		`- [VsFact]`
	`19`	`+ [IdeFact]`
`22`	`20`	`public void TestOpenAndCloseIDE()`
`23`	`21`	`{`
`24`	`22`	`Assert.Equal("devenv", Process.GetCurrentProcess().ProcessName);`
`25`	`23`	`var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));`
`26`	`24`	`Assert.NotNull(dte);`
`27`	`25`	`}`
`28`	`26`
`29`		`- [VsFact]`
	`27`	`+ [IdeFact]`
`30`	`28`	`public void TestRunsOnUIThread()`
`31`	`29`	`{`
`32`	`30`	`Assert.True(Application.Current.Dispatcher.CheckAccess());`
`33`	`31`	`}`
`34`	`32`
`35`		`- [VsFact]`
	`33`	`+ [IdeFact]`
`36`	`34`	`public async Task TestRunsOnUIThreadAsync()`
`37`	`35`	`{`
`38`	`36`	`Assert.True(Application.Current.Dispatcher.CheckAccess());`
`39`	`37`	`await Task.Yield();`
`40`	`38`	`Assert.True(Application.Current.Dispatcher.CheckAccess());`
`41`	`39`	`}`
`42`	`40`
`43`		`- [VsFact]`
	`41`	`+ [IdeFact]`
`44`	`42`	`public async Task TestYieldsToWorkAsync()`
`45`	`43`	`{`
`46`	`44`	`Assert.True(Application.Current.Dispatcher.CheckAccess());`
`@@ -52,7 +50,7 @@ public async Task TestYieldsToWorkAsync()`
`52`	`50`	`Assert.True(Application.Current.Dispatcher.CheckAccess());`
`53`	`51`	`}`
`54`	`52`
`55`		`- [VsFact]`
	`53`	`+ [IdeFact]`
`56`	`54`	`public async Task TestJoinableTaskFactoryAsync()`
`57`	`55`	`{`
`58`	`56`	`Assert.NotNull(JoinableTaskContext);`
`@@ -68,8 +66,7 @@ public async Task TestJoinableTaskFactoryAsync()`
`68`	`66`	`Assert.Equal(Thread.CurrentThread, JoinableTaskContext.MainThread);`
`69`	`67`	`}`
`70`	`68`
`71`		`-#if DEBUG // https://github.com/josetr/VsixTesting/issues/3`
`72`		`- [VsFact(Version = "2012")]`
	`69`	`+ [IdeFact(MinVersion = VisualStudioVersion.VS2012, MaxVersion = VisualStudioVersion.VS2012)]`
`73`	`70`	`public void TestJoinableTaskFactoryProvidedByTest()`
`74`	`71`	`{`
`75`	`72`	`var taskSchedulerServiceObject = ServiceProvider.GetService(typeof(SVsTaskSchedulerService));`
`@@ -83,9 +80,8 @@ public void TestJoinableTaskFactoryProvidedByTest()`
`83`	`80`
`84`	`81`	`Assert.NotNull(JoinableTaskContext);`
`85`	`82`	`}`
`86`		`-#endif`
`87`	`83`
`88`		`- [VsFact(Version = "2013-")]`
	`84`	`+ [IdeFact(MinVersion = VisualStudioVersion.VS2013)]`
`89`	`85`	`public void TestJoinableTaskFactoryObtainedFromEnvironment()`
`90`	`86`	`{`
`91`	`87`	`var taskSchedulerServiceObject = ServiceProvider.GetService(typeof(SVsTaskSchedulerService));`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private IdeSendKeys SendKeys`
`42`	`42`	`get;`
`43`	`43`	`}`
`44`	`44`
`45`		`- [VsFact]`
	`45`	`+ [IdeFact]`
`46`	`46`	`public async Task BasicScrollingBehaviorAsync()`
`47`	`47`	`{`
`48`	`48`	`var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));`
`@@ -128,7 +128,7 @@ await SendKeys.SendAsync(inputSimulator =>`
`128`	`128`	`/// <summary>`
`129`	`129`	`/// Verifies that the Ctrl+Scroll operations do not change the zoom level in the editor.`
`130`	`130`	`/// </summary>`
`131`		`- [VsFact]`
	`131`	`+ [IdeFact]`
`132`	`132`	`public async Task ZoomDisabledAsync()`
`133`	`133`	`{`
`134`	`134`	`var dte = (DTE)ServiceProvider.GetService(typeof(_DTE));`