From 27afde67e4bb9ad06f8722a83984a09236516f69 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 23 May 2020 21:52:37 +1000
Subject: Test more usages of PermissionEx.

---
 .../TestData/PermissionEx/PackageComponents.wxs             | 13 ++++++++++++-
 src/test/WixToolsetTest.Util/UtilExtensionFixture.cs        | 12 +++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
index 22438a2b..4b4dd32e 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
@@ -4,10 +4,21 @@
     <Fragment>
         <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
             <Component>
-                <File Source="example.txt" />
+                <File Source="example.txt">
+                    <util:PermissionEx User="Everyone" GenericAll="yes" />
+                </File>
                 <CreateFolder>
                     <util:PermissionEx User="Everyone" GenericAll="yes" />
                 </CreateFolder>
+                <ServiceInstall Name="testsvc" Type="ownProcess" Start="disabled" ErrorControl="normal">
+                    <util:PermissionEx User="Everyone" GenericAll="yes" />
+                </ServiceInstall>
+                <RegistryKey Id="ExampleRegistryKey" ForceCreateOnInstall="yes" Root="HKLM" Key="TestRegistryKey">
+                    <util:PermissionEx User="Everyone" GenericAll="yes" />
+                </RegistryKey>
+                <RegistryValue Root="HKLM" Key="TestRegistryValueKey" Value="abc">
+                    <util:PermissionEx User="Everyone" GenericAll="yes" />
+                </RegistryValue>
             </Component>
         </ComponentGroup>
     </Fragment>
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index fabef160..eb4588ec 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -96,16 +96,14 @@ namespace WixToolsetTest.Util
             var folder = TestData.Get(@"TestData\PermissionEx");
             var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(BuildX64, "Binary", "CreateFolder", "CustomAction", "Wix4SecureObject");
+            var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject");
             Assert.Equal(new[]
             {
-                "Binary:Wix4UtilCA_X64\t[Binary data]",
-                "CreateFolder:INSTALLFOLDER\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
-                "CustomAction:Wix4ExecSecureObjects_X64\t11265\tWix4UtilCA_X64\tExecSecureObjects\t",
-                "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t",
-                "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t",
-                "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t",
+                "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
+                "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
                 "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
+                "Wix4SecureObject:regO7jgNdgqG_TfURLgXPo2jRcxzx8\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
+                "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
             }, results.OrderBy(s => s).ToArray());
         }
 
-- 
cgit v1.2.3-55-g6feb