diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-01 19:29:10 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-01 22:06:11 -0500 |
| commit | 32602bb04be4a01e4b857d2071e07dd4cc2b38d4 (patch) | |
| tree | bc948a21a7c32d06c1da584b4d198f845969379a /src/test | |
| parent | 8faa28db427119b3541733290d87783dd699d425 (diff) | |
| download | wix-32602bb04be4a01e4b857d2071e07dd4cc2b38d4.tar.gz wix-32602bb04be4a01e4b857d2071e07dd4cc2b38d4.tar.bz2 wix-32602bb04be4a01e4b857d2071e07dd4cc2b38d4.zip | |
Use Burn's parent switch with BundlePackages.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs | 6 | ||||
| -rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs index 4686875a..1bb0c0b6 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace WixToolsetTest.BurnE2E | 3 | namespace WixToolsetTest.BurnE2E |
| 4 | { | 4 | { |
| 5 | using System; | ||
| 5 | using System.IO; | 6 | using System.IO; |
| 6 | using WixTestTools; | 7 | using WixTestTools; |
| 7 | using Xunit; | 8 | using Xunit; |
| @@ -67,8 +68,13 @@ namespace WixToolsetTest.BurnE2E | |||
| 67 | [Fact] | 68 | [Fact] |
| 68 | public void CanInstallV3BundlePackage() | 69 | public void CanInstallV3BundlePackage() |
| 69 | { | 70 | { |
| 71 | var v3BundleName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Package Cache", "{215a70db-ab35-48c7-be51-d66eaac87177}", "CustomV3Theme"); | ||
| 72 | var v3Bundle = new BundleInstaller(this.TestContext, v3BundleName); | ||
| 73 | this.AddBundleInstaller(v3Bundle); | ||
| 70 | var v3BundlePackageBundle = this.CreateBundleInstaller("V3BundlePackageBundle"); | 74 | var v3BundlePackageBundle = this.CreateBundleInstaller("V3BundlePackageBundle"); |
| 71 | 75 | ||
| 76 | Assert.False(File.Exists(v3Bundle.Bundle), "v3bundle.exe was already installed"); | ||
| 77 | |||
| 72 | var logPath = v3BundlePackageBundle.Install(); | 78 | var logPath = v3BundlePackageBundle.Install(); |
| 73 | v3BundlePackageBundle.VerifyRegisteredAndInPackageCache(); | 79 | v3BundlePackageBundle.VerifyRegisteredAndInPackageCache(); |
| 74 | 80 | ||
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs index a7402d94..4f5b40e0 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs | |||
| @@ -22,6 +22,11 @@ namespace WixToolsetTest.BurnE2E | |||
| 22 | false; | 22 | false; |
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | protected void AddBundleInstaller(BundleInstaller installer) | ||
| 26 | { | ||
| 27 | this.Installers.Push(installer); | ||
| 28 | } | ||
| 29 | |||
| 25 | protected BundleInstaller CreateBundleInstaller(string name) | 30 | protected BundleInstaller CreateBundleInstaller(string name) |
| 26 | { | 31 | { |
| 27 | var installer = new BundleInstaller(this.TestContext, name); | 32 | var installer = new BundleInstaller(this.TestContext, name); |
