Update ManagedHost tests to run off of a bundle.

5 files changed, 113 insertions, 18 deletions

diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
index 8da42e77..8ef0320e 100644
--- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
@@ -2,7 +2,9 @@
 
 namespace WixToolsetTest.ManagedHost
 {
+    using System.IO;
     using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
     using Xunit;
 
     public class MbaHostFixture
@@ -10,31 +12,71 @@ namespace WixToolsetTest.ManagedHost
         [Fact]
         public void CanLoadFullFramework2MBA()
         {
-            var testEngine = new TestEngine();
-            var baFile = TestData.Get(@"..\examples\Example.FullFramework2MBA\mbahost.dll");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundleFile = Path.Combine(binFolder, "FullFramework2MBA.exe");
+                var baSourceFolder = TestData.Get(@"..\examples");
+                var bundleSourceFolder = TestData.Get(@"TestData\FullFramework2MBA");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
 
-            var result = testEngine.RunShutdownEngine(baFile);
-            Assert.Equal(0, result.ExitCode);
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", baSourceFolder,
+                    "-burnStub", TestEngine.BurnStubFile,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+                var testEngine = new TestEngine();
 
-            var logMessages = result.Output;
-            Assert.Equal(2, logMessages.Count);
-            Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-            Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                var logMessages = result.Output;
+                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
+                Assert.Equal("FullFramework2BA", logMessages[2]);
+                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+            }
         }
 
         [Fact]
         public void CanLoadFullFramework4MBA()
         {
-            var testEngine = new TestEngine();
-            var baFile = TestData.Get(@"..\examples\Example.FullFramework4MBA\net48\mbahost.dll");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundleFile = Path.Combine(binFolder, "FullFramework4MBA.exe");
+                var baSourceFolder = TestData.Get(@"..\examples");
+                var bundleSourceFolder = TestData.Get(@"TestData\FullFramework4MBA");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
 
-            var result = testEngine.RunShutdownEngine(baFile);
-            Assert.Equal(0, result.ExitCode);
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", baSourceFolder,
+                    "-burnStub", TestEngine.BurnStubFile,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+                var testEngine = new TestEngine();
 
-            var logMessages = result.Output;
-            Assert.Equal(2, logMessages.Count);
-            Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-            Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                var logMessages = result.Output;
+                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
+                Assert.Equal("FullFramework4BA", logMessages[2]);
+                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+            }
         }
     }
 }
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs
new file mode 100644
index 00000000..b38e9f6e
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
+        <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
+            <Payload SourceFile="Example.FullFramework2MBA\Example.FullFramework2MBA.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\mbanative.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\WixToolset.Mba.Host.config" />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <PackageGroupRef Id="NetFx462RedistAsPrereq" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs
new file mode 100644
index 00000000..b3072e63
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
+        <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
+            <Payload SourceFile="Example.FullFramework4MBA\net48\Example.FullFramework4MBA.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net48\mbanative.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net48\WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net48\WixToolset.Mba.Host.config" />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <PackageGroupRef Id="NetFx462RedistAsPrereq" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
index 4dd531ad..751ed59c 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -4,15 +4,26 @@ namespace WixToolsetTest.ManagedHost
 {
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.IO;
     using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
 
     public class TestEngine
     {
         private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe");
+        public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe");
 
-        public TestEngineResult RunShutdownEngine(string baFile)
+        public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath)
         {
-            var args = new string[] { '"' + baFile + '"' };
+            var baFolderPath = Path.Combine(tempFolderPath, "ba");
+            var extractFolderPath = Path.Combine(tempFolderPath, "extract");
+            var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFilePath, baFolderPath, extractFolderPath);
+            extractResult.AssertSuccess();
+
+            var args = new string[] {
+                '"' + bundleFilePath + '"',
+                '"' + extractResult.GetBAFilePath(baFolderPath) + '"',
+            };
             return RunProcessCaptureOutput(TestEngineFile, args);
         }
 
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index 02b0b109..5026af85 100644
--- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -12,15 +12,27 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="TestData\FullFramework2MBA\Bundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
+    <Content Include="TestData\FullFramework4MBA\Bundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
   </ItemGroup>
 
+  <Target Name="CopyExtensions" AfterTargets="Build">
+    <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
+  </Target>
+
   <ItemGroup>
     <ProjectReference Include="..\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj" />
+    <ProjectReference Include="..\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj" />
     <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" />
+    <ProjectReference Include="..\..\wixext\WixToolset.Bal.wixext.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" />
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
   </ItemGroup>
 
   <ItemGroup>