Convert all tests to use xunit

test/.gitignore

@@ -1 +1,2 @@
-[Dd]ependencies.hiv
+Dependencies.hiv
+TestResults

test/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xunit.runners" version="1.9.2" targetFramework="net40" />
+</packages>

test/src/IntegrationTests/Burn/BasicTests.cs

@@ -27,7 +27,7 @@ public class BasicTests : BurnTestBase
         private BundleBuilder bundleA;
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_InstallUninstall()
         {
             // Build the packages.
@@ -62,11 +62,11 @@ public void Burn_InstallUninstall()
             Assert.False(MsiVerifier.IsPackageInstalled(packageA));
             Assert.False(MsiVerifier.IsPackageInstalled(packageB));
 
-            this.Completed();
+            this.Complete();
         }
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_InstallLockUninstallInstallUninstall()
         {
             // Build.
@@ -106,11 +106,11 @@ public void Burn_InstallLockUninstallInstallUninstall()
             Assert.False(this.TryGetBundleRegistration("5802E2D0-AC39-4486-86FF-D4B7AD012EB5", out registration));
             Assert.Null(registration);
 
-            this.Completed();
+            this.Complete();
         }
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_MajorUpgrade()
         {
             string v2Version = "2.0.0.0";
@@ -142,11 +142,11 @@ public void Burn_MajorUpgrade()
             Assert.False(MsiVerifier.IsPackageInstalled(packageAv1));
             Assert.False(MsiVerifier.IsPackageInstalled(packageAv2));
 
-            this.Completed();
+            this.Complete();
         }
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_MajorUpgradeUsingModify()
         {
             string v2Version = "2.0.0.0";
@@ -176,11 +176,11 @@ public void Burn_MajorUpgradeUsingModify()
             Assert.False(MsiVerifier.IsPackageInstalled(packageAv1));
             //Assert.False(MsiVerifier.IsPackageInstalled(packageAv2));
 
-            this.Completed();
+            this.Complete();
         }
 
         //[NamedFact(Skip="This test is not supported yet.")]
-        //[Trait("RuntimeTest", "true")]
+        //[RuntimeTest]
         //public void Burn_MajorUpgradeSameVersion()
         //{
         //    // Build the packages.
@@ -214,7 +214,7 @@ public void Burn_MajorUpgradeUsingModify()
         //}
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_SharedMinorUpgrade()
         {
             string productCode = Guid.NewGuid().ToString("B").ToUpperInvariant();
@@ -270,11 +270,11 @@ public void Burn_SharedMinorUpgrade()
             installerA.Uninstall();
             Assert.False(MsiVerifier.IsProductInstalled(productCode));
 
-            this.Completed();
+            this.Complete();
         }
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_MajorUpgradeRemovesPackageFixedByRepair()
         {
             string v2Version = "2.0.0.0";
@@ -317,11 +317,11 @@ public void Burn_MajorUpgradeRemovesPackageFixedByRepair()
             Assert.False(MsiVerifier.IsPackageInstalled(packageAv1));
             Assert.False(MsiVerifier.IsPackageInstalled(packageAv2));
 
-            this.Completed();
+            this.Complete();
         }
 
         [NamedFact]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_ValidateMultipleSourcePaths()
         {
             // Build the package.
@@ -354,7 +354,7 @@ public void Burn_ValidateMultipleSourcePaths()
             installerA.Uninstall();
             Assert.False(MsiVerifier.IsPackageInstalled(packageA));
 
-            this.Completed();
+            this.Complete();
         }
 
         private PackageBuilder GetPackageA()

test/src/IntegrationTests/Burn/BurnIntegrationTests.csproj

@@ -22,15 +22,17 @@
     <Compile Include="RestartTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit">
-      <HintPath>..\..\..\..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
+    <Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(XunitPath)\xunit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -43,18 +45,25 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="BasicTests\A.wxs">
+    <Content Include="..\..\..\data\Integration\BurnIntegrationTests\BasicTests\A.wxs">
+      <Link>BasicTests\A.wxs</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="BasicTests\B.wxs">
+    <Content Include="..\..\..\data\Integration\BurnIntegrationTests\BasicTests\B.wxs">
+      <Link>BasicTests\B.wxs</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="BasicTests\BundleA.wxs">
+    <Content Include="..\..\..\data\Integration\BurnIntegrationTests\BasicTests\BundleA.wxs">
+      <Link>BasicTests\BundleA.wxs</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="BasicTests\BundleB.wxs">
+    <Content Include="..\..\..\data\Integration\BurnIntegrationTests\BasicTests\BundleB.wxs">
+      <Link>BasicTests\BundleB.wxs</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
 </Project>

test/src/IntegrationTests/Burn/BurnTestBase.cs

@@ -9,11 +9,12 @@
 
 namespace WixTest.BurnIntegrationTests
 {
-    using System;
-    using System.Linq;
-    using System.IO;
     using Microsoft.Tools.WindowsInstallerXml.Bootstrapper;
     using Microsoft.Win32;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
 
     /// <summary>
     /// Base classs for all Burn tests.
@@ -26,6 +27,62 @@ public class BurnTestBase : WixTestBase
 
         public static string TestValueVerifyArguments = "VerifyArguments";
 
+        /// <summary>
+        /// Creates an instance of a <see cref="PackageBuilder"/>.
+        /// </summary>
+        /// <param name="name">The name of the package to create.</param>
+        /// <param name="bindPaths">Additional bind paths for building the package.</param>
+        /// <param name="preprocessorVariables">Preprocessor variables for building the package.</param>
+        /// <param name="extensions">Extensions for building the package.</param>
+        /// <returns>A new <see cref="PackageBuilder"/> initialized with the given data.</returns>
+        protected PackageBuilder CreatePackage(string name, Dictionary<string, string> bindPaths = null, Dictionary<string, string> preprocessorVariables = null, string[] extensions = null)
+        {
+            string testDataDirectory = Path.Combine(this.TestContext.TestDataDirectory, @"Integration\BurnIntegrationTests\BasicTests");
+            PackageBuilder builder = new PackageBuilder(this.TestContext.TestName, name, testDataDirectory, this.TestArtifacts);
+
+            if (null != bindPaths)
+            {
+                builder.BindPaths = bindPaths;
+            }
+
+            if (null != preprocessorVariables)
+            {
+                builder.PreprocessorVariables = preprocessorVariables;
+            }
+
+            builder.Extensions = extensions ?? WixTestBase.Extensions;
+
+            return builder.Build();
+        }
+
+        /// <summary>
+        /// Creates an instance of a <see cref="BundleBuilder"/>.
+        /// </summary>
+        /// <param name="name">The name of the bundle to create.</param>
+        /// <param name="bindPaths">Additional bind paths for building the bundle.</param>
+        /// <param name="preprocessorVariables">Preprocessor variables for building the bundle.</param>
+        /// <param name="extensions">Extensions for building the bundle.</param>
+        /// <returns>A new <see cref="BundleBuilder"/> initialized with the given data.</returns>
+        protected BundleBuilder CreateBundle(string name, Dictionary<string, string> bindPaths = null, Dictionary<string, string> preprocessorVariables = null, string[] extensions = null)
+        {
+            string testDataDirectory = Path.Combine(this.TestContext.TestDataDirectory, @"Integration\BurnIntegrationTests\BasicTests");
+            BundleBuilder builder = new BundleBuilder(this.TestContext.TestName, name, testDataDirectory, this.TestArtifacts);
+
+            if (null != bindPaths)
+            {
+                builder.BindPaths = bindPaths;
+            }
+
+            if (null != preprocessorVariables)
+            {
+                builder.PreprocessorVariables = preprocessorVariables;
+            }
+
+            builder.Extensions = extensions ?? WixTestBase.Extensions;
+
+            return builder.Build();
+        }
+
         /// <summary>
         /// Tries to load the bundle registration using the upgrade code.
         /// </summary>

test/src/IntegrationTests/Burn/RestartTests.cs

@@ -22,11 +22,9 @@ public class RestartTests : BurnTestBase
         private BundleBuilder bundleA;
 
         [NamedFact(Skip="Disabling this test since it does not consistently lock the file in a way that the Windows Installer sees FilesInUse.")]
-        [Trait("RuntimeTest", "true")]
+        [RuntimeTest]
         public void Burn_RetryThenCancel()
         {
-            this.Initialize(dataFolder: "BasicTests");
-
             this.SetPackageRetryExecuteFilesInUse("PackageA", 1);
 
             string bundleAPath = this.GetBundleA().Output;
@@ -40,7 +38,7 @@ public void Burn_RetryThenCancel()
                 installA.Install(expectedExitCode:(int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_USEREXIT);
             }
 
-            this.Completed();
+            this.Complete();
         }
 
         private PackageBuilder GetPackageA()

test/src/IntegrationTests/Burn/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.9.1.1600" newVersion="1.9.1.1600" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

test/src/IntegrationTests/Burn/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="1.9.1" targetFramework="net40" />
+  <package id="xunit" version="1.9.2" targetFramework="net40" />
 </packages>