6 files changed, 135 insertions, 2 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs
index 6664b849..5caedacb 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs
@@ -31,6 +31,23 @@ namespace WixToolsetTest.BurnE2E
             this.Installers.Push(installer);
         }
 
+        protected ArpEntryInstaller CreateArpEntryInstaller(string id, bool perMachine = true, bool x64 = false)
+        {
+            var installer = new ArpEntryInstaller(this.TestContext, id, perMachine, x64);
+            this.Installers.Push(installer);
+            return installer;
+        }
+
+        protected ArpEntryInstaller CreateArpEntryInstaller(BundleInstaller bundleInstaller, string packageId)
+        {
+            if (!bundleInstaller.TryGetArpEntryExePackageConfiguration(packageId, out var arpId, out _, out var arpWin64, out var perMachine))
+            {
+                return null;
+            }
+
+            return this.CreateArpEntryInstaller(arpId, perMachine, arpWin64);
+        }
+
         protected BundleInstaller CreateBundleInstaller(string name)
         {
             var installer = new BundleInstaller(this.TestContext, name);
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
index f5a1cda8..e5e3259f 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
@@ -33,12 +33,12 @@ namespace WixToolsetTest.BurnE2E
 
             if (!File.Exists(targetFilePath))
             {
-                var testTool = new TestTool(Path.Combine(TestData.Get(), "win-x86", "TestExe.exe"))
+                var testExeTool = new TestExeTool
                 {
                     Arguments = "/lf \"" + targetFilePath + $"|{FiveGB}\"",
                     ExpectedExitCode = 0,
                 };
-                testTool.Run(true);
+                testExeTool.Run(true);
             }
         }
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
new file mode 100644
index 00000000..dc6515b5
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
@@ -0,0 +1,99 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BurnE2E
+{
+    using WixTestTools;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class ExePackageTests : BurnE2ETests
+    {
+        public ExePackageTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        [RuntimeFact]
+        public void CanInstallAndUninstallPerMachineArpEntryExePackage()
+        {
+            const string arpId = "{4D9EC36A-1E63-4244-875C-3ECB0A2CAE30}";
+            var perMachineArpEntryExePackageBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackage");
+            var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageBundle, "TestExe");
+
+            arpEntryExePackage.VerifyRegistered(false);
+
+            var installLogPath = perMachineArpEntryExePackageBundle.Install();
+            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,\\\"");
+
+            var uninstallLogPath = perMachineArpEntryExePackageBundle.Uninstall();
+            perMachineArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+            arpEntryExePackage.VerifyRegistered(false);
+
+            LogVerifier.MessageInLogFile(uninstallLogPath, $"testexe.exe\" /regd HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{arpId}");
+        }
+
+        [RuntimeFact]
+        public void CanUninstallPerMachineArpEntryExePackageOnRollback()
+        {
+            const string arpId = "{80E90929-EEA5-48A7-A680-A0237A1CAD84}";
+            var perMachineArpEntryExePackageFailureBundle = this.CreateBundleInstaller(@"PerMachineArpEntryExePackageFailure");
+            var arpEntryExePackage = this.CreateArpEntryInstaller(perMachineArpEntryExePackageFailureBundle, "TestExe");
+
+            arpEntryExePackage.VerifyRegistered(false);
+
+            var installLogPath = perMachineArpEntryExePackageFailureBundle.Install((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE);
+            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}");
+        }
+
+        [RuntimeFact]
+        public void CanInstallAndUninstallPerUserArpEntryExePackage()
+        {
+            const string arpId = "{9B5300C7-9B34-4670-9614-185B02AB87EF}";
+            var perUserArpEntryExePackageBundle = this.CreateBundleInstaller(@"PerUserArpEntryExePackage");
+            var arpEntryExePackage = this.CreateArpEntryInstaller(perUserArpEntryExePackageBundle, "TestExe");
+
+            arpEntryExePackage.VerifyRegistered(false);
+
+            var installLogPath = perUserArpEntryExePackageBundle.Install();
+            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,\\\"");
+
+            var uninstallLogPath = perUserArpEntryExePackageBundle.Uninstall();
+            perUserArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+            arpEntryExePackage.VerifyRegistered(false);
+
+            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");
+
+            arpEntryExePackage.VerifyRegistered(false);
+            brokenPerUserArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            var installLogPath = brokenPerUserArpEntryExePackageBundle.Install();
+            brokenPerUserArpEntryExePackageBundle.VerifyRegisteredAndInPackageCache();
+            arpEntryExePackage.VerifyRegistered(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();
+
+            arpEntryExePackage.Unregister();
+
+            brokenPerUserArpEntryExePackageBundle.Uninstall();
+            brokenPerUserArpEntryExePackageBundle.VerifyUnregisteredAndRemovedFromPackageCache();
+        }
+    }
+}
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/IWebServer.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/IWebServer.cs
index a4d46d48..a4d46d48 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/IWebServer.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/IWebServer.cs
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/TestBAController.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
index 8e6611a2..8e6611a2 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/TestBAController.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestExeTool.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestExeTool.cs
new file mode 100644
index 00000000..a02299d7
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestExeTool.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixTestTools
+{
+    using System.IO;
+    using WixBuildTools.TestSupport;
+
+    public class TestExeTool : TestTool
+    {
+        private static readonly string TestExePath32 = Path.Combine(TestData.Get(), "win-x86", "TestExe.exe");
+
+        public TestExeTool()
+            : base(TestExePath32)
+        {
+        }
+    }
+}