aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2019-11-07 14:59:16 +1000
committerSean Hall <r.sean.hall@gmail.com>2019-11-07 15:55:16 +1000
commitbc085061963069953d609284ab48d16d7e1ccc99 (patch)
tree6c2cf9c9ee324f8defe067e31b0e6d0189958a68 /src/test
parent58cd3477c3ae3d7880991ee1651a862a45371e08 (diff)
downloadwix-bc085061963069953d609284ab48d16d7e1ccc99.tar.gz
wix-bc085061963069953d609284ab48d16d7e1ccc99.tar.bz2
wix-bc085061963069953d609284ab48d16d7e1ccc99.zip
Add failing test for TrueType Font.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs35
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs10
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj1
3 files changed, 45 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index febf3b62..52f57297 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -403,7 +403,7 @@ namespace WixToolsetTest.CoreIntegration
403 } 403 }
404 404
405 [Fact] 405 [Fact]
406 public void PopulatesFontTable() 406 public void PopulatesFontTableFromFontTitle()
407 { 407 {
408 var folder = TestData.Get(@"TestData"); 408 var folder = TestData.Get(@"TestData");
409 409
@@ -435,6 +435,39 @@ namespace WixToolsetTest.CoreIntegration
435 } 435 }
436 } 436 }
437 437
438 [Fact(Skip = "Test demonstrates failure")]
439 public void PopulatesFontTableFromTrueType()
440 {
441 var folder = TestData.Get(@"TestData");
442
443 using (var fs = new DisposableFileSystem())
444 {
445 var baseFolder = fs.GetFolder();
446 var intermediateFolder = Path.Combine(baseFolder, "obj");
447 var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
448
449 var result = WixRunner.Execute(new[]
450 {
451 "build",
452 Path.Combine(folder, "Font", "TrueType.wxs"),
453 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
454 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
455 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
456 "-intermediateFolder", intermediateFolder,
457 "-o", msiPath
458 });
459
460 result.AssertSuccess();
461
462 Assert.True(File.Exists(msiPath));
463 var results = Query.QueryDatabase(msiPath, new[] { "Font" });
464 Assert.Equal(new[]
465 {
466 "Font:TrueTypeFontComp.ttf\t",
467 }, results);
468 }
469 }
470
438 [Fact] 471 [Fact]
439 public void PopulatesInstallExecuteSequenceTable() 472 public void PopulatesInstallExecuteSequenceTable()
440 { 473 {
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
new file mode 100644
index 00000000..ff94ce52
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
@@ -0,0 +1,10 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Fragment>
4 <ComponentGroup Id="ProductComponents">
5 <Component Id="TrueTypeFontComp" Directory="INSTALLFOLDER" Guid="C8116E5E-F731-427C-AF43-6FF8B8D7DA64">
6 <File Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
7 </Component>
8 </ComponentGroup>
9 </Fragment>
10</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index c3a956be..4e0fb0db 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -35,6 +35,7 @@
35 <Content Include="TestData\ErrorsInUI\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> 35 <Content Include="TestData\ErrorsInUI\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
36 <Content Include="TestData\FeatureGroup\FeatureGroup.wxs" CopyToOutputDirectory="PreserveNewest" /> 36 <Content Include="TestData\FeatureGroup\FeatureGroup.wxs" CopyToOutputDirectory="PreserveNewest" />
37 <Content Include="TestData\Font\FontTitle.wxs" CopyToOutputDirectory="PreserveNewest" /> 37 <Content Include="TestData\Font\FontTitle.wxs" CopyToOutputDirectory="PreserveNewest" />
38 <Content Include="TestData\Font\TrueType.wxs" CopyToOutputDirectory="PreserveNewest" />
38 <Content Include="TestData\Icon\SampleIcon.wxs" CopyToOutputDirectory="PreserveNewest" /> 39 <Content Include="TestData\Icon\SampleIcon.wxs" CopyToOutputDirectory="PreserveNewest" />
39 <Content Include="TestData\LockPermissions\EmptyPermissions.wxs" CopyToOutputDirectory="PreserveNewest" /> 40 <Content Include="TestData\LockPermissions\EmptyPermissions.wxs" CopyToOutputDirectory="PreserveNewest" />
40 <Content Include="TestData\SameFileFolders\data\a\test.txt" CopyToOutputDirectory="PreserveNewest" /> 41 <Content Include="TestData\SameFileFolders\data\a\test.txt" CopyToOutputDirectory="PreserveNewest" />