Add failing test for getting Shortcut/@Name from wixlib.
Sean Hall committed
Nov 8, 2019 at 14:46 UTC
8a7d727f1ab0dfef956db726d64985311291505e
3 files changed
+33
-2
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+2
-1
@@ -672,10 +672,11 @@ namespace WixToolsetTest.CoreIntegration
672
result.AssertSuccess();
673
674
Assert.True(File.Exists(msiPath));
675
- var results = Query.QueryDatabase(msiPath, new[] { "MsiShortcutProperty" });
675
+ var results = Query.QueryDatabase(msiPath, new[] { "MsiShortcutProperty", "Shortcut" });
676
Assert.Equal(new[]
677
{
678
"MsiShortcutProperty:scp4GOCIx4Eskci4nBG1MV_vSUOZt4\tTheShortcut\tCustomShortcutKey\tCustomShortcutValue",
679
+ "Shortcut:TheShortcut\tINSTALLFOLDER\td|\tShortcutComp\t[#filcV1yrx0x8wJWj4qMzcH21jwkPko]\t\t\t\t\t\t\t\t\t\t\t",
680
}, results);
681
}
682
}
src/test/WixToolsetTest.CoreIntegration/TestData/Shortcut/ShortcutProperty.wxs
+1
-1
@@ -4,7 +4,7 @@
4
<ComponentGroup Id="ProductComponents">
5
<Component Id="ShortcutComp" Directory="INSTALLFOLDER" Guid="5B3B3FC1-533D-4C29-BFB3-0E88B51E59D8">
6
<File Source="test.txt">
7
- <Shortcut Id="TheShortcut" Name="TestShortcut" Directory="INSTALLFOLDER">
7
+ <Shortcut Id="TheShortcut" Name="d" Directory="INSTALLFOLDER">
8
<ShortcutProperty Key="CustomShortcutKey" Value="CustomShortcutValue"></ShortcutProperty>
9
</Shortcut>
10
</File>
src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
+30
@@ -12,6 +12,36 @@ namespace WixToolsetTest.CoreIntegration
12
13
public class WixlibQueryFixture
14
{
15
+ [Fact(Skip = "Test demonstrates failure")]
16
+ public void ShortcutNameWithPreprocessorVariableIsResolved()
17
+ {
18
+ var folder = TestData.Get(@"TestData\Shortcut");
19
+
20
+ using (var fs = new DisposableFileSystem())
21
+ {
22
+ var baseFolder = fs.GetFolder();
23
+ var intermediateFolder = Path.Combine(baseFolder, "obj");
24
+ var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
25
+
26
+ var result = WixRunner.Execute(new[]
27
+ {
28
+ "build",
29
+ Path.Combine(folder, "ShortcutProperty.wxs"),
30
+ "-intermediateFolder", intermediateFolder,
31
+ "-o", wixlibPath
32
+ });
33
+
34
+ result.AssertSuccess();
35
+
36
+ var intermediate = Intermediate.Load(wixlibPath);
37
+ var allTuples = intermediate.Sections.SelectMany(s => s.Tuples);
38
+ var shortcutTuple = allTuples.OfType<ShortcutTuple>()
39
+ .SingleOrDefault();
40
+ Assert.NotNull(shortcutTuple);
41
+ Assert.Equal("d", shortcutTuple.Name);
42
+ }
43
+ }
44
+
45
[Fact]
46
public void UpgradeProducesReferenceToRemoveExistingProducts()
47
{