From 9317f7c8ea709da55e4602eaaba06952bbf315b7 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 3 Jun 2020 02:19:16 -0700
Subject: Redesign CustomTable tuples to support resolving binary columns

---
 .../MsiQueryFixture.cs                             | 115 +++++++++++++++++++++
 1 file changed, 115 insertions(+)

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

diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index aa8a0a0d..78a8f0a4 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -472,6 +472,121 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
+        [Fact]
+        public void PopulatesCustomTableWithLocalization()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "CustomTable", "LocalizedCustomTable.wxs"),
+                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                    "-loc", Path.Combine(folder, "CustomTable", "LocalizedCustomTable.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(msiPath));
+                var results = Query.QueryDatabase(msiPath, new[] { "CustomTableLocalized" });
+                Assert.Equal(new[]
+                {
+                    "CustomTableLocalized:Row1\tThis is row one",
+                    "CustomTableLocalized:Row2\tThis is row two",
+                }, results);
+            }
+        }
+
+        [Fact]
+        public void PopulatesCustomTableWithFilePath()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "CustomTable", "CustomTableWithFile.wxs"),
+                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                    "-bindpath", Path.Combine(folder, "CustomTable", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(msiPath));
+                var results = Query.QueryDatabase(msiPath, new[] { "CustomTableWithFile" });
+                Assert.Equal(new[]
+                {
+                    "CustomTableWithFile:Row1\t[Binary data]",
+                    "CustomTableWithFile:Row2\t[Binary data]",
+                }, results);
+            }
+        }
+
+        [Fact]
+        public void PopulatesCustomTableWithFilePathSerialized()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var wixlibPath = Path.Combine(baseFolder, @"bin\test.wixlib");
+                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "CustomTable", "CustomTableWithFile.wxs"),
+                    "-bindpath", Path.Combine(folder, "CustomTable", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", wixlibPath
+                });
+
+                result.AssertSuccess();
+
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
+                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
+                    "-lib", wixlibPath,
+                    "-bindpath", Path.Combine(folder, "CustomTable", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(msiPath));
+                var results = Query.QueryDatabase(msiPath, new[] { "CustomTableWithFile" });
+                Assert.Equal(new[]
+                {
+                    "CustomTableWithFile:Row1\t[Binary data]",
+                    "CustomTableWithFile:Row2\t[Binary data]",
+                }, results);
+            }
+        }
+
         [Fact]
         public void UnrealCustomTableIsNotPresentInMsi()
         {
-- 
cgit v1.2.3-55-g6feb