2 files changed, 91 insertions, 0 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
index 5b6bbeb5..9bd33eac 100644
--- a/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
@@ -6,6 +6,7 @@ namespace WixToolsetTest.CoreIntegration
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Xml;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
@@ -141,5 +142,65 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.InRange(result.ExitCode, 2, int.MaxValue);
             }
         }
+
+        [Fact(Skip = "Test demonstrates failure")]
+        public void ReplacesDownloadUrlPlaceholders()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
+                var baFolderPath = Path.Combine(baseFolder, "ba");
+                var extractFolderPath = Path.Combine(baseFolder, "extract");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Payload", "DownloadUrlPlaceholdersBundle.wxs"),
+                    Path.Combine(folder, "SimpleBundle", "MultiFileBootstrapperApplication.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-bindpath", Path.Combine(folder, ".Data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", bundlePath,
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(bundlePath));
+
+                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
+                extractResult.AssertSuccess();
+
+                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
+                {
+                    { "Container", new List<string> { "FileSize", "Hash" } },
+                    { "Payload", new List<string> { "FileSize", "Hash" } },
+                };
+                var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload")
+                                            .Cast<XmlElement>()
+                                            .Select(e => e.GetTestXml(ignoreAttributesByElementName))
+                                            .ToArray();
+                WixAssert.CompareLineByLine(new string[]
+                {
+                    "<Payload Id='burn.exe' FilePath='burn.exe' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a0' Container='PackagesContainer' />",
+                    "<Payload Id='test.msi' FilePath='test.msi' FileSize='*' Hash='*' DownloadUrl='http://example.com/id/test.msi/test.msi' Packaging='external' SourcePath='test.msi' />",
+                    "<Payload Id='LayoutOnlyPayload' FilePath='DownloadUrlPlaceholdersBundle.wxs' FileSize='*' Hash='*' LayoutOnly='yes' DownloadUrl='http://example.com/id/LayoutOnlyPayload/DownloadUrlPlaceholdersBundle.wxs' Packaging='external' SourcePath='DownloadUrlPlaceholdersBundle.wxs' />",
+                   @"<Payload Id='fhuZsOcBDTuIX8rF96kswqI6SnuI' FilePath='MsiPackage\test.txt' FileSize='*' Hash='*' Packaging='external' SourcePath='MsiPackage\test.txt' />",
+                   @"<Payload Id='faf_OZ741BG7SJ6ZkcIvivZ2Yzo8' FilePath='MsiPackage\Shared.dll' FileSize='*' Hash='*' Packaging='external' SourcePath='MsiPackage\Shared.dll' />",
+                }, payloads);
+
+                var containers = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Container")
+                                              .Cast<XmlElement>()
+                                              .Select(e => e.GetTestXml(ignoreAttributesByElementName))
+                                              .ToArray();
+                WixAssert.CompareLineByLine(new string[]
+                {
+                    "<Container Id='PackagesContainer' FileSize='*' Hash='*' DownloadUrl='http://example.com/id/PackagesContainer/packages.cab' FilePath='packages.cab' />",
+                }, containers);
+            }
+        }
     }
 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/DownloadUrlPlaceholdersBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/DownloadUrlPlaceholdersBundle.wxs
new file mode 100644
index 00000000..87bb79f9
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/DownloadUrlPlaceholdersBundle.wxs
@@ -0,0 +1,30 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Bundle Name="DownloadUrlPlaceholders" Version="1.0.0.0" Manufacturer="test" UpgradeCode="{B04C20B8-70C3-4DE1-8D91-4F11C7C68DED}">
+        <BootstrapperApplicationRef Id="fakeba" />
+
+        <Chain>
+            <PackageGroupRef Id="ContainerPackages" />
+            <PackageGroupRef Id="UncompressedPackages" />
+        </Chain>
+
+        <PayloadGroupRef Id="LayoutOnlyPayloads" />
+        <Container Id="PackagesContainer" Name="packages.cab" DownloadUrl="http://example.com/{0}id/{1}/{2}">
+            <PackageGroupRef Id="ContainerPackages" />
+        </Container>
+    </Bundle>
+    <Fragment>
+        <PackageGroup Id="ContainerPackages">
+            <ExePackage SourceFile="burn.exe" DetectCondition="none" />
+        </PackageGroup>
+    </Fragment>
+    <Fragment>
+        <PackageGroup Id="UncompressedPackages">
+            <MsiPackage SourceFile="test.msi" DownloadUrl="http://example.com/{0}id/{1}/{2}" Compressed="no" />
+        </PackageGroup>
+    </Fragment>
+    <Fragment>
+        <PayloadGroup Id="LayoutOnlyPayloads">
+            <Payload Id="LayoutOnlyPayload" SourceFile="$(sys.SOURCEFILEPATH)" DownloadUrl="http://example.com/{0}id/{1}/{2}" Compressed="no" />
+        </PayloadGroup>
+    </Fragment>
+</Wix>