1 files changed, 22 insertions, 0 deletions

diff --git a/src/TestBA/TestBA.cs b/src/TestBA/TestBA.cs
index 1348ce98..b9f869a6 100644
--- a/src/TestBA/TestBA.cs
+++ b/src/TestBA/TestBA.cs
@@ -28,6 +28,7 @@ namespace WixToolset.Test.BA
 
         private bool immediatelyQuit;
         private bool quitAfterDetect;
+        private bool explicitlyElevateAndPlanFromOnElevateBegin;
         private int redetectRemaining;
         private int sleepDuringCache;
         private int cancelCacheAtProgress;
@@ -122,6 +123,12 @@ namespace WixToolset.Test.BA
                 redetectCount = 0;
             }
 
+            string explicitlyElevateAndPlanFromOnElevateBegin = this.ReadPackageAction(null, "ExplicitlyElevateAndPlanFromOnElevateBegin");
+            if (String.IsNullOrEmpty(explicitlyElevateAndPlanFromOnElevateBegin) || !Boolean.TryParse(explicitlyElevateAndPlanFromOnElevateBegin, out this.explicitlyElevateAndPlanFromOnElevateBegin))
+            {
+                this.explicitlyElevateAndPlanFromOnElevateBegin = false;
+            }
+
             string quitAfterDetect = this.ReadPackageAction(null, "QuitAfterDetect");
             if (String.IsNullOrEmpty(quitAfterDetect) || !Boolean.TryParse(quitAfterDetect, out this.quitAfterDetect))
             {
@@ -214,6 +221,10 @@ namespace WixToolset.Test.BA
                 {
                     this.ShutdownUiThread();
                 }
+                else if (this.explicitlyElevateAndPlanFromOnElevateBegin)
+                {
+                    this.Engine.Elevate(this.windowHandle);
+                }
                 else
                 {
                     this.Engine.Plan(this.action);
@@ -225,6 +236,17 @@ namespace WixToolset.Test.BA
             }
         }
 
+        protected override void OnElevateBegin(ElevateBeginEventArgs args)
+        {
+            if (this.explicitlyElevateAndPlanFromOnElevateBegin)
+            {
+                this.Engine.Plan(this.action);
+
+                // Simulate showing some UI since these tests won't actually show the UAC prompt.
+                MessagePump.ProcessMessages(10);
+            }
+        }
+
         protected override void OnPlanPackageBegin(PlanPackageBeginEventArgs args)
         {
             RequestState state;