From 461350c09839f1e59fb3dafe1a67e74bf152f803 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Mon, 22 Jun 2020 19:35:34 -0400
Subject: If no Media or MediaTemplate is present, default to a MediaTemplate.

---
 .../WixToolsetTest.CoreIntegration/CabFixture.cs   | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/test/WixToolsetTest.CoreIntegration/CabFixture.cs')

diff --git a/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs
index 79471554..5aef148e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/CabFixture.cs
@@ -49,6 +49,42 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
+        [Fact(Skip = "Sequence number of file from merge module is 0 but should be 1.")]
+        public void CabinetFilesSequencedCorrectlyUsingMergeModule()
+        {
+            var folder = TestData.Get(@"TestData\SimpleMerge");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+                var cabPath = Path.Combine(baseFolder, @"bin\cab1.cab");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, ".data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+                Assert.True(File.Exists(cabPath));
+
+                var fileTable = Query.QueryDatabase(msiPath, new[] { "File" });
+                var fileRows = fileTable.Select(r => new FileRow(r)).OrderBy(f => f.Sequence).ToList();
+
+                Assert.Equal(new[] { 1 }, fileRows.Select(f => f.Sequence).ToArray());
+                Assert.Equal(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray());
+
+                var files = Query.GetCabinetFiles(cabPath);
+                Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray());
+            }
+        }
+
         private class FileRow
         {
             public FileRow(string row)
-- 
cgit v1.2.3-55-g6feb