Add reload engine and test.

2 files changed, 89 insertions, 0 deletions

diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
index 8ef0320e..8b0a3691 100644
--- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
@@ -78,5 +78,83 @@ namespace WixToolsetTest.ManagedHost
                 Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
             }
         }
+
+        [Fact]
+        public void CanReloadFullFramework2MBA()
+        {
+            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 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 result = testEngine.RunReloadEngine(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]);
+                Assert.Equal("Loading managed bootstrapper application.", logMessages[4]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]);
+                Assert.Equal("FullFramework2BA", logMessages[6]);
+                Assert.Equal("Shutdown,Restart,0", logMessages[7]);
+            }
+        }
+
+        [Fact]
+        public void CanReloadFullFramework4MBA()
+        {
+            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 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 result = testEngine.RunReloadEngine(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]);
+                Assert.Equal("Loading managed bootstrapper application.", logMessages[4]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]);
+                Assert.Equal("FullFramework4BA", logMessages[6]);
+                Assert.Equal("Shutdown,Restart,0", logMessages[7]);
+            }
+        }
     }
 }
diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
index 751ed59c..cda32895 100644
--- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -13,14 +13,25 @@ namespace WixToolsetTest.ManagedHost
         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 RunReloadEngine(string bundleFilePath, string tempFolderPath)
+        {
+            return this.RunTestEngine("reload", bundleFilePath, tempFolderPath);
+        }
+
         public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath)
         {
+            return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath);
+        }
+
+        private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath)
+        {
             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[] {
+                engineMode,
                 '"' + bundleFilePath + '"',
                 '"' + extractResult.GetBAFilePath(baFolderPath) + '"',
             };