Add CanExtractBundleWithDetachedContainer test.

2 files changed, 28 insertions, 1 deletions

diff --git a/src/WixToolset.Core.TestPackage/BundleExtractor.cs b/src/WixToolset.Core.TestPackage/BundleExtractor.cs
index ad97f113..8c9f31e6 100644
--- a/src/WixToolset.Core.TestPackage/BundleExtractor.cs
+++ b/src/WixToolset.Core.TestPackage/BundleExtractor.cs
@@ -45,6 +45,23 @@ namespace WixToolset.Core.TestPackage
         }
 
         /// <summary>
+        /// Extracts the attached container.
+        /// </summary>
+        /// <param name="messaging"></param>
+        /// <param name="bundleFilePath">Path to the bundle.</param>
+        /// <param name="destinationFolderPath">Path to extract to.</param>
+        /// <param name="tempFolderPath">Temp path for extraction.</param>
+        /// <returns>True if there was an attached container.</returns>
+        public static bool ExtractAttachedContainer(IMessaging messaging, string bundleFilePath, string destinationFolderPath, string tempFolderPath)
+        {
+            Directory.CreateDirectory(tempFolderPath);
+            using (var burnReader = BurnReader.Open(messaging, bundleFilePath))
+            {
+                return burnReader.ExtractAttachedContainer(destinationFolderPath, tempFolderPath);
+            }
+        }
+
+        /// <summary>
         /// Gets an <see cref="XmlNamespaceManager"/> for BootstrapperApplicationData.xml with the given prefix assigned to the root namespace.
         /// </summary>
         /// <param name="document"></param>
diff --git a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
index 13e3a9e0..6a3d714c 100644
--- a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs
@@ -28,10 +28,20 @@ namespace WixToolset.Core.TestPackage
         /// <returns></returns>
         public WixRunnerResult AssertSuccess()
         {
-            Assert.True(0 == this.ExitCode, $"\r\n\r\nWixRunner failed with exit code: {this.ExitCode}\r\n   Output: {String.Join("\r\n           ", FormatMessages(this.Messages))}\r\n");
+            AssertSuccess(this.ExitCode, this.Messages);
             return this;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="exitCode"></param>
+        /// <param name="messages"></param>
+        public static void AssertSuccess(int exitCode, IEnumerable<Message> messages)
+        {
+            Assert.True(0 == exitCode, $"\r\n\r\nWixRunner failed with exit code: {exitCode}\r\n   Output: {String.Join("\r\n           ", FormatMessages(messages))}\r\n");
+        }
+
         private static IEnumerable<string> FormatMessages(IEnumerable<Message> messages)
         {
             foreach (var message in messages)