Test more usages of PermissionEx.
Sean Hall committed
May 23, 2020 at 21:52 UTC
27afde67e4bb9ad06f8722a83984a09236516f69
2 files changed
+17
-8
src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
+12
-1
@@ -4,10 +4,21 @@
4
<Fragment>
5
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
6
<Component>
7
- <File Source="example.txt" />
7
+ <File Source="example.txt">
8
+ <util:PermissionEx User="Everyone" GenericAll="yes" />
9
+ </File>
10
<CreateFolder>
11
<util:PermissionEx User="Everyone" GenericAll="yes" />
12
</CreateFolder>
13
+ <ServiceInstall Name="testsvc" Type="ownProcess" Start="disabled" ErrorControl="normal">
14
+ <util:PermissionEx User="Everyone" GenericAll="yes" />
15
+ </ServiceInstall>
16
+ <RegistryKey Id="ExampleRegistryKey" ForceCreateOnInstall="yes" Root="HKLM" Key="TestRegistryKey">
17
+ <util:PermissionEx User="Everyone" GenericAll="yes" />
18
+ </RegistryKey>
19
+ <RegistryValue Root="HKLM" Key="TestRegistryValueKey" Value="abc">
20
+ <util:PermissionEx User="Everyone" GenericAll="yes" />
21
+ </RegistryValue>
22
</Component>
23
</ComponentGroup>
24
</Fragment>
src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+5
-7
@@ -96,16 +96,14 @@ namespace WixToolsetTest.Util
96
var folder = TestData.Get(@"TestData\PermissionEx");
97
var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder });
98
99
- var results = build.BuildAndQuery(BuildX64, "Binary", "CreateFolder", "CustomAction", "Wix4SecureObject");
99
+ var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject");
100
Assert.Equal(new[]
101
{
102
- "Binary:Wix4UtilCA_X64\t[Binary data]",
103
- "CreateFolder:INSTALLFOLDER\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
104
- "CustomAction:Wix4ExecSecureObjects_X64\t11265\tWix4UtilCA_X64\tExecSecureObjects\t",
105
- "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t",
106
- "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t",
107
- "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t",
102
+ "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
103
+ "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
104
"Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
105
+ "Wix4SecureObject:regO7jgNdgqG_TfURLgXPo2jRcxzx8\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
106
+ "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
107
}, results.OrderBy(s => s).ToArray());
108
}
109