aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-19 14:44:23 +1000
committerRob Mensching <rob@firegiant.com>2020-06-19 00:53:14 -0700
commit89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a (patch)
tree23bb1c1c6a4af551b8edd465ba491089ebf6239d /src/test
parent00e4ccb89b3e2450ad95e298588d80e90b6f8742 (diff)
downloadwix-89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a.tar.gz
wix-89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a.tar.bz2
wix-89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a.zip
Restore Unreal to CustomTable.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs30
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs13
2 files changed, 43 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
index afba1cbc..0a45c914 100644
--- a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
@@ -159,6 +159,36 @@ namespace WixToolsetTest.CoreIntegration
159 } 159 }
160 160
161 [Fact] 161 [Fact]
162 public void UnrealCustomTableIsNotPresentInMsi()
163 {
164 var folder = TestData.Get(@"TestData");
165
166 using (var fs = new DisposableFileSystem())
167 {
168 var baseFolder = fs.GetFolder();
169 var intermediateFolder = Path.Combine(baseFolder, "obj");
170 var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
171
172 var result = WixRunner.Execute(new[]
173 {
174 "build",
175 Path.Combine(folder, "CustomTable", "CustomTable.wxs"),
176 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
177 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
178 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
179 "-intermediateFolder", intermediateFolder,
180 "-o", msiPath
181 });
182
183 result.AssertSuccess();
184
185 Assert.True(File.Exists(msiPath));
186 var results = Query.QueryDatabase(msiPath, new[] { "CustomTable2" });
187 Assert.Empty(results);
188 }
189 }
190
191 [Fact]
162 public void CanCompileAndDecompile() 192 public void CanCompileAndDecompile()
163 { 193 {
164 var folder = TestData.Get(@"TestData"); 194 var folder = TestData.Get(@"TestData");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
index d6a2521e..51aee5f2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
@@ -17,5 +17,18 @@
17 <Data Column="Component_">test.txt</Data> 17 <Data Column="Component_">test.txt</Data>
18 </Row> 18 </Row>
19 </CustomTable> 19 </CustomTable>
20
21 <CustomTable Id="CustomTable2" Unreal="yes">
22 <Column Id="ColumnA" Type="string" PrimaryKey="yes" />
23 <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" />
24 <Row>
25 <Data Column="ColumnA">RowA</Data>
26 <Data Column="Component_">test.txt</Data>
27 </Row>
28 <Row>
29 <Data Column="ColumnA">RowB</Data>
30 <Data Column="Component_">test.txt</Data>
31 </Row>
32 </CustomTable>
20 </Fragment> 33 </Fragment>
21</Wix> 34</Wix>