aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2019-10-15 10:52:02 +1000
committerSean Hall <r.sean.hall@gmail.com>2019-10-15 11:20:07 +1000
commit868956398ebb9ac6cc47266b185ec39c94b57b6e (patch)
tree16874c92039a742e1f5f3c98a103f34c5cc58965 /src/test
parent9dbf5fbb89d146f1ced4a36072a66b9a24fb9015 (diff)
downloadwix-868956398ebb9ac6cc47266b185ec39c94b57b6e.tar.gz
wix-868956398ebb9ac6cc47266b185ec39c94b57b6e.tar.bz2
wix-868956398ebb9ac6cc47266b185ec39c94b57b6e.zip
Add failing test for TextStyle when Color is null.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs33
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs12
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj1
3 files changed, 46 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index d5dcba54..6fea6e36 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -647,6 +647,39 @@ namespace WixToolsetTest.CoreIntegration
647 } 647 }
648 } 648 }
649 649
650 [Fact(Skip = "Test demonstrates failure")]
651 public void PopulatesTextStyleTableWhenColorIsNull()
652 {
653 var folder = TestData.Get(@"TestData");
654
655 using (var fs = new DisposableFileSystem())
656 {
657 var baseFolder = fs.GetFolder();
658 var intermediateFolder = Path.Combine(baseFolder, "obj");
659 var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
660
661 var result = WixRunner.Execute(new[]
662 {
663 "build",
664 Path.Combine(folder, "TextStyle", "ColorNull.wxs"),
665 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
666 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
667 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
668 "-intermediateFolder", intermediateFolder,
669 "-o", msiPath
670 });
671
672 result.AssertSuccess();
673
674 Assert.True(File.Exists(msiPath));
675 var results = Query.QueryDatabase(msiPath, new[] { "TextStyle" });
676 Assert.Equal(new[]
677 {
678 "TextStyle:FirstTextStyle\tArial\t2\t\t",
679 }, results);
680 }
681 }
682
650 [Fact] 683 [Fact]
651 public void PopulatesUpgradeTableFromManualUpgrade() 684 public void PopulatesUpgradeTableFromManualUpgrade()
652 { 685 {
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs
new file mode 100644
index 00000000..669de6ec
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/TextStyle/ColorNull.wxs
@@ -0,0 +1,12 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Fragment>
4 <ComponentGroup Id="ProductComponents">
5 <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef>
6 </ComponentGroup>
7
8 <UI Id="CustomUI">
9 <TextStyle Id="FirstTextStyle" FaceName="Arial" Size="2" />
10 </UI>
11 </Fragment>
12</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index f0b2e271..0624f6ae 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -113,6 +113,7 @@
113 <Content Include="TestData\OverridableActions\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> 113 <Content Include="TestData\OverridableActions\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
114 <Content Include="TestData\OverridableActions\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> 114 <Content Include="TestData\OverridableActions\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
115 <Content Include="TestData\OverridableActions\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> 115 <Content Include="TestData\OverridableActions\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
116 <Content Include="TestData\TextStyle\ColorNull.wxs" CopyToOutputDirectory="PreserveNewest" />
116 <Content Include="TestData\Wixipl\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> 117 <Content Include="TestData\Wixipl\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
117 <Content Include="TestData\Wixipl\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> 118 <Content Include="TestData\Wixipl\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
118 <Content Include="TestData\Wixipl\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> 119 <Content Include="TestData\Wixipl\Package.wxs" CopyToOutputDirectory="PreserveNewest" />