aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-02-24 20:44:34 -0500
committerBob Arnson <bob@firegiant.com>2020-02-24 20:48:08 -0500
commitf56ab787834ce5ecb1b40f71fb7c7f6b470ab1e3 (patch)
tree52ef7a6f28a267961198cd84efabecbc8a622268 /src/test
parent8f642efb64859802c98e72676d48ac10b448bd0f (diff)
downloadwix-f56ab787834ce5ecb1b40f71fb7c7f6b470ab1e3.tar.gz
wix-f56ab787834ce5ecb1b40f71fb7c7f6b470ab1e3.tar.bz2
wix-f56ab787834ce5ecb1b40f71fb7c7f6b470ab1e3.zip
Fix File/@TrueType.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs4
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 6fd02d5f..d93b3d54 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -594,7 +594,7 @@ namespace WixToolsetTest.CoreIntegration
594 } 594 }
595 } 595 }
596 596
597 [Fact(Skip = "Test demonstrates failure")] 597 [Fact]
598 public void PopulatesFontTableFromTrueType() 598 public void PopulatesFontTableFromTrueType()
599 { 599 {
600 var folder = TestData.Get(@"TestData"); 600 var folder = TestData.Get(@"TestData");
@@ -622,7 +622,7 @@ namespace WixToolsetTest.CoreIntegration
622 var results = Query.QueryDatabase(msiPath, new[] { "Font" }); 622 var results = Query.QueryDatabase(msiPath, new[] { "Font" });
623 Assert.Equal(new[] 623 Assert.Equal(new[]
624 { 624 {
625 "Font:TrueTypeFontComp.ttf\t", 625 "Font:TrueTypeFontFile\t",
626 }, results); 626 }, results);
627 } 627 }
628 } 628 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
index ff94ce52..6ac48963 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
@@ -3,7 +3,7 @@
3 <Fragment> 3 <Fragment>
4 <ComponentGroup Id="ProductComponents"> 4 <ComponentGroup Id="ProductComponents">
5 <Component Id="TrueTypeFontComp" Directory="INSTALLFOLDER" Guid="C8116E5E-F731-427C-AF43-6FF8B8D7DA64"> 5 <Component Id="TrueTypeFontComp" Directory="INSTALLFOLDER" Guid="C8116E5E-F731-427C-AF43-6FF8B8D7DA64">
6 <File Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" /> 6 <File Id="TrueTypeFontFile" Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
7 </Component> 7 </Component>
8 </ComponentGroup> 8 </ComponentGroup>
9 </Fragment> 9 </Fragment>