2 files changed, 120 insertions, 12 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
index dc6515b5..e76461f3 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
@@ -3,6 +3,7 @@
 namespace WixToolsetTest.BurnE2E
 {
     using WixTestTools;
+    using WixToolset.Mba.Core;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -13,9 +14,9 @@ namespace WixToolsetTest.BurnE2E
         [RuntimeFact]
         public void CanInstallAndUninstallPerMachineArpEntryExePackage()
         {
-            const string arpId = "{4D9EC36A-1E63-4244-875C-3ECB0A2CAE30}";
             var perMachineArpEntryExePackageBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackage");
             var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
 
             arpEntryExePackage.VerifyRegistered(false);
 
@@ -23,21 +24,113 @@ namespace WixToolsetTest.BurnE2E
             perMachineArpEntryExePackageBundle.VerifyRegisteredAndInPackageCache();
             arpEntryExePackage.VerifyRegistered(true);
 
-            LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\"");
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
 
             var uninstallLogPath = perMachineArpEntryExePackageBundle.Uninstall();
             perMachineArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
             arpEntryExePackage.VerifyRegistered(false);
 
-            LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}");
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}"));
         }
 
         [RuntimeFact]
-        public void CanUninstallPerMachineArpEntryExePackageOnRollback()
+        public void CanRecacheAndReinstallPerMachineArpEntryExePackageOnUninstallRollback()
+        {
+            var packageTestExe = this.CreatePackageInstaller("PackageTestExe");
+            var perMachineArpEntryExePackageUninstallFailureBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackageUninstallFailure");
+            var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageUninstallFailureBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
+            var testBAController = this.CreateTestBAController();
+
+            arpEntryExePackage.VerifyRegistered(false);
+            packageTestExe.VerifyInstalled(false);
+
+            testBAController.SetPackageRequestedCacheType("TestExe", BOOTSTRAPPER_CACHE_TYPE.Remove);
+
+            var installLogPath = perMachineArpEntryExePackageUninstallFailureBundle.Install();
+            perMachineArpEntryExePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(true);
+            packageTestExe.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
+
+            testBAController.ResetPackageStates("TestExe");
+            testBAController.SetAllowAcquireAfterValidationFailure();
+
+            var uninstallLogPath = perMachineArpEntryExePackageUninstallFailureBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "FAILWHENDEFERRED=1");
+            perMachineArpEntryExePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(true);
+            packageTestExe.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, "TESTBA: OnCachePackageNonVitalValidationFailure() - id: TestExe, default: None, requested: Acquire"));
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}"));
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
+        }
+
+        [RuntimeFact]
+        public void CanReinstallPerMachineArpEntryExePackageOnUninstallRollback()
+        {
+            var packageTestExe = this.CreatePackageInstaller("PackageTestExe");
+            var perMachineArpEntryExePackageUninstallFailureBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackageUninstallFailure");
+            var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageUninstallFailureBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
+
+            arpEntryExePackage.VerifyRegistered(false);
+            packageTestExe.VerifyInstalled(false);
+
+            var installLogPath = perMachineArpEntryExePackageUninstallFailureBundle.Install();
+            perMachineArpEntryExePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(true);
+            packageTestExe.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
+
+            var uninstallLogPath = perMachineArpEntryExePackageUninstallFailureBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "FAILWHENDEFERRED=1");
+            perMachineArpEntryExePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(true);
+            packageTestExe.VerifyInstalled(true);
+
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, "TESTBA: OnCachePackageNonVitalValidationFailure() - id: TestExe"));
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}"));
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
+        }
+
+        [RuntimeFact]
+        public void CanSkipReinstallPerMachineArpEntryExePackageOnUninstallRollback()
+        {
+            var packageTestExe = this.CreatePackageInstaller("PackageTestExe");
+            var perMachineArpEntryExePackageUninstallFailureBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackageUninstallFailure");
+            var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageUninstallFailureBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
+            var testBAController = this.CreateTestBAController();
+
+            arpEntryExePackage.VerifyRegistered(false);
+            packageTestExe.VerifyInstalled(false);
+
+            testBAController.SetPackageRequestedCacheType("TestExe", BOOTSTRAPPER_CACHE_TYPE.Remove);
+
+            var installLogPath = perMachineArpEntryExePackageUninstallFailureBundle.Install();
+            perMachineArpEntryExePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(true);
+            packageTestExe.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
+
+            var uninstallLogPath = perMachineArpEntryExePackageUninstallFailureBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "FAILWHENDEFERRED=1");
+            perMachineArpEntryExePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(false);
+            packageTestExe.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, "TESTBA: OnCachePackageNonVitalValidationFailure() - id: TestExe, default: None, requested: None"));
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}"));
+        }
+
+        [RuntimeFact]
+        public void CanUninstallPerMachineArpEntryExePackageOnInstallRollback()
         {
-            const string arpId = "{80E90929-EEA5-48A7-A680-A0237A1CAD84}";
             var perMachineArpEntryExePackageFailureBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackageFailure");
             var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageFailureBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
 
             arpEntryExePackage.VerifyRegistered(false);
 
@@ -45,16 +138,16 @@ namespace WixToolsetTest.BurnE2E
             perMachineArpEntryExePackageFailureBundle.VerifyUnregisteredAndRemovedFromPackageCache();
             arpEntryExePackage.VerifyRegistered(false);
 
-            LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\"");
-            LogVerifier.MessageInLogFile(installLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}");
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}"));
         }
 
         [RuntimeFact]
         public void CanInstallAndUninstallPerUserArpEntryExePackage()
         {
-            const string arpId = "{9B5300C7-9B34-4670-9614-185B02AB87EF}";
             var perUserArpEntryExePackageBundle = this.CreateBundleInstaller(@"PerUserArpEntryExePackage");
             var arpEntryExePackage = this.CreateArpEntryInstaller(perUserArpEntryExePackageBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
 
             arpEntryExePackage.VerifyRegistered(false);
 
@@ -62,21 +155,21 @@ namespace WixToolsetTest.BurnE2E
             perUserArpEntryExePackageBundle.VerifyRegisteredAndInPackageCache();
             arpEntryExePackage.VerifyRegistered(true);
 
-            LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\"");
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\" /regw \"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},QuietUninstallString,String,\\\""));
 
             var uninstallLogPath = perUserArpEntryExePackageBundle.Uninstall();
             perUserArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
             arpEntryExePackage.VerifyRegistered(false);
 
-            LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}");
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}"));
         }
 
         [RuntimeFact]
         public void FailsUninstallWhenPerUserArpEntryExePackageMissingQuietUninstallString()
         {
-            const string arpId = "{DE9F8594-5856-4454-AB10-3C01ED246D7D}";
             var brokenPerUserArpEntryExePackageBundle = this.CreateBundleInstaller(@"BrokenPerUserArpEntryExePackage");
             var arpEntryExePackage = this.CreateArpEntryInstaller(brokenPerUserArpEntryExePackageBundle, "TestExe");
+            var arpId = arpEntryExePackage.ArpId;
 
             arpEntryExePackage.VerifyRegistered(false);
             brokenPerUserArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
@@ -85,7 +178,7 @@ namespace WixToolsetTest.BurnE2E
             brokenPerUserArpEntryExePackageBundle.VerifyRegisteredAndInPackageCache();
             arpEntryExePackage.VerifyRegistered(true);
 
-            LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\"");
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"TestExe.exe\" /regw \"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId},DisplayVersion,String,1.0.0.0\""));
 
             brokenPerUserArpEntryExePackageBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INVALID_PARAMETER);
             brokenPerUserArpEntryExePackageBundle.VerifyRegisteredAndInPackageCache();
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
index 8e6611a2..3f9d76b8 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
@@ -42,6 +42,11 @@ namespace WixToolsetTest.BurnE2E
             }
         }
 
+        public void SetAllowAcquireAfterValidationFailure(string value = "true")
+        {
+            this.SetBurnTestValue("AllowAcquireAfterValidationFailure", value);
+        }
+
         public void SetExplicitlyElevateAndPlanFromOnElevateBegin(string value = "true")
         {
             this.SetBurnTestValue("ExplicitlyElevateAndPlanFromOnElevateBegin", value);
@@ -133,6 +138,16 @@ namespace WixToolsetTest.BurnE2E
         }
 
         /// <summary>
+        /// Sets the requested cache type for a package that the TestBA will return to the engine during plan.
+        /// </summary>
+        /// <param name="packageId">Package identity.</param>
+        /// <param name="type">Cache type to request.</param>
+        public void SetPackageRequestedCacheType(string packageId, BOOTSTRAPPER_CACHE_TYPE type)
+        {
+            this.SetPackageState(packageId, "CacheRequested", type.ToString());
+        }
+
+        /// <summary>
         /// Sets the requested state for a package that the TestBA will return to the engine during plan.
         /// </summary>
         /// <param name="packageId">Package identity.</param>