From 32602bb04be4a01e4b857d2071e07dd4cc2b38d4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 1 Apr 2022 19:29:10 -0500 Subject: Use Burn's parent switch with BundlePackages. --- src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs | 6 ++++++ src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'src/test') 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 @@ namespace WixToolsetTest.BurnE2E { + using System; using System.IO; using WixTestTools; using Xunit; @@ -67,8 +68,13 @@ namespace WixToolsetTest.BurnE2E [Fact] public void CanInstallV3BundlePackage() { + var v3BundleName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Package Cache", "{215a70db-ab35-48c7-be51-d66eaac87177}", "CustomV3Theme"); + var v3Bundle = new BundleInstaller(this.TestContext, v3BundleName); + this.AddBundleInstaller(v3Bundle); var v3BundlePackageBundle = this.CreateBundleInstaller("V3BundlePackageBundle"); + Assert.False(File.Exists(v3Bundle.Bundle), "v3bundle.exe was already installed"); + var logPath = v3BundlePackageBundle.Install(); v3BundlePackageBundle.VerifyRegisteredAndInPackageCache(); 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 false; #endif + protected void AddBundleInstaller(BundleInstaller installer) + { + this.Installers.Push(installer); + } + protected BundleInstaller CreateBundleInstaller(string name) { var installer = new BundleInstaller(this.TestContext, name); -- cgit v1.2.3-55-g6feb