aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestBA
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/burn/TestBA')
-rw-r--r--src/test/burn/TestBA/TestBA.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs
index 51fc1cbd..abab863a 100644
--- a/src/test/burn/TestBA/TestBA.cs
+++ b/src/test/burn/TestBA/TestBA.cs
@@ -43,6 +43,7 @@ namespace WixToolset.Test.BA
43 private bool rollingBack; 43 private bool rollingBack;
44 private string forceDownloadSource; 44 private string forceDownloadSource;
45 private string forceUpdateSource; 45 private string forceUpdateSource;
46 private BundleScope bundleScope;
46 47
47 private IBootstrapperCommand Command { get; set; } 48 private IBootstrapperCommand Command { get; set; }
48 49
@@ -160,6 +161,12 @@ namespace WixToolset.Test.BA
160 this.quitAfterDetect = false; 161 this.quitAfterDetect = false;
161 } 162 }
162 163
164 string bundleScope = this.ReadPackageAction(null, "BundleScope");
165 if (String.IsNullOrEmpty(bundleScope) || !Enum.TryParse<BundleScope>(bundleScope, out this.bundleScope))
166 {
167 this.bundleScope = BundleScope.Default;
168 }
169
163 this.ImportContainerSources(); 170 this.ImportContainerSources();
164 this.ImportPayloadSources(); 171 this.ImportPayloadSources();
165 172
@@ -227,7 +234,6 @@ namespace WixToolset.Test.BA
227 { 234 {
228 this.Log(" OnDetectBegin::ForceUpdateSource: {0}", this.forceUpdateSource); 235 this.Log(" OnDetectBegin::ForceUpdateSource: {0}", this.forceUpdateSource);
229 } 236 }
230
231 } 237 }
232 238
233 protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args) 239 protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args)
@@ -294,7 +300,7 @@ namespace WixToolset.Test.BA
294 } 300 }
295 else 301 else
296 { 302 {
297 this.Engine.Plan(this.action); 303 this.Engine.Plan(this.action, this.bundleScope);
298 } 304 }
299 } 305 }
300 else 306 else
@@ -312,7 +318,7 @@ namespace WixToolset.Test.BA
312 { 318 {
313 if (this.explicitlyElevateAndPlanFromOnElevateBegin) 319 if (this.explicitlyElevateAndPlanFromOnElevateBegin)
314 { 320 {
315 this.Engine.Plan(this.action); 321 this.Engine.Plan(this.action, this.bundleScope);
316 322
317 // Simulate showing some UI since these tests won't actually show the UAC prompt. 323 // Simulate showing some UI since these tests won't actually show the UAC prompt.
318 MessagePump.ProcessMessages(10); 324 MessagePump.ProcessMessages(10);