From 7cc4271c9d78ed60e354f585d03b612a9efb7cf3 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 11 Mar 2021 20:57:52 -0600
Subject: Add tests to verify #4991 and #5702.

---
 src/WixTestTools/BundleInstaller.cs  | 12 ++++++++++++
 src/WixTestTools/BundleVerifier.cs   | 14 ++++++++++++++
 src/WixTestTools/WixTestTools.csproj |  4 ++--
 3 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'src/WixTestTools')

diff --git a/src/WixTestTools/BundleInstaller.cs b/src/WixTestTools/BundleInstaller.cs
index 854c12f0..859656ad 100644
--- a/src/WixTestTools/BundleInstaller.cs
+++ b/src/WixTestTools/BundleInstaller.cs
@@ -36,6 +36,18 @@ namespace WixTestTools
             return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Install, arguments);
         }
 
+        /// <summary>
+        /// Installs the bundle with optional arguments.
+        /// </summary>
+        /// <param name="bundlePath">This should be the bundle in the package cache.</param>
+        /// <param name="expectedExitCode">Expected exit code, defaults to success.</param>
+        /// <param name="arguments">Optional arguments to pass to the tool.</param>
+        /// <returns>Path to the generated log file.</returns>
+        public string Install(string bundlePath, int expectedExitCode = (int)MSIExec.MSIExecReturnCode.SUCCESS, params string[] arguments)
+        {
+            return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Install, arguments, bundlePath: bundlePath);
+        }
+
         /// <summary>
         /// Modify the bundle with optional arguments.
         /// </summary>
diff --git a/src/WixTestTools/BundleVerifier.cs b/src/WixTestTools/BundleVerifier.cs
index 433b6a0a..293da560 100644
--- a/src/WixTestTools/BundleVerifier.cs
+++ b/src/WixTestTools/BundleVerifier.cs
@@ -56,6 +56,20 @@ namespace WixTestTools
             return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
         }
 
+        public string ManuallyCache()
+        {
+            var expectedCachePath = this.GetExpectedCachedBundlePath();
+            Directory.CreateDirectory(Path.GetDirectoryName(expectedCachePath));
+            File.Copy(this.Bundle, expectedCachePath);
+            return expectedCachePath;
+        }
+
+        public void ManuallyUncache()
+        {
+            var expectedCachePath = this.GetExpectedCachedBundlePath();
+            File.Delete(expectedCachePath);
+        }
+
         public bool TryGetRegistration(out BundleRegistration registration)
         {
             var bundleSymbol = this.GetBundleSymbol();
diff --git a/src/WixTestTools/WixTestTools.csproj b/src/WixTestTools/WixTestTools.csproj
index 0c3c4c76..38b2cb35 100644
--- a/src/WixTestTools/WixTestTools.csproj
+++ b/src/WixTestTools/WixTestTools.csproj
@@ -11,8 +11,8 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
-    <PackageReference Include="WixToolset.Data" Version="4.0.198" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.51" />
+    <PackageReference Include="WixToolset.Data" Version="4.0.199" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.52" />
   </ItemGroup>
 
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb