aboutsummaryrefslogtreecommitdiff
path: root/src/test/msi/TestData
diff options
context:
space:
mode:
authorBevan Weiss <bevan.weiss@gmail.com>2024-08-04 21:13:44 +1000
committerRob Mensching <rob@firegiant.com>2025-02-11 23:14:49 -0800
commit5b4a6538ee06988c75b717bd905197fb670e6142 (patch)
treeeb078854f258ebdabaf206282d56cbdcf87759ef /src/test/msi/TestData
parent2c5bb89424b12de812498d568bc1aae2d4098e60 (diff)
downloadwix-5b4a6538ee06988c75b717bd905197fb670e6142.tar.gz
wix-5b4a6538ee06988c75b717bd905197fb670e6142.tar.bz2
wix-5b4a6538ee06988c75b717bd905197fb670e6142.zip
Add/Remove Group Membership rollback handled.
Fixups to a few test cases. Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src/test/msi/TestData')
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductA/product.wxs9
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/product.wxs9
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/product.wxs4
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/product_fail.wxs4
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/product_fail.wxs2
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/FailIfExists.wxs2
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/product.wxs7
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/product.wxs9
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/NonVitalUserGroup.wxs2
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/RestrictedDomain.wxs4
-rw-r--r--src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs11
11 files changed, 33 insertions, 30 deletions
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/product.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/product.wxs
index e3c143e6..f7f60fdb 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/product.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/product.wxs
@@ -7,19 +7,18 @@
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9 9
10 <Property Id="TEMPDOMAIN" Secure="yes" /> 10 <Property Id="TESTDOMAIN" Secure="yes" />
11 <Property Id="TEMPGROUPNAME" Secure="yes" />
12 </Fragment> 11 </Fragment>
13 12
14 <Fragment> 13 <Fragment>
15 <Component Id="Component1" Guid="09624A9A-4BBC-4126-BBF9-0713C5217DB1" Directory="INSTALLFOLDER"> 14 <Component Id="Component1" Guid="09624A9A-4BBC-4126-BBF9-0713C5217DB1" Directory="INSTALLFOLDER">
16 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> 15 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
17 16
18 <util:Group Id="TEST_GROUP1" Name="testName1" Comment="Group1" CreateGroup="yes" RemoveOnUninstall="yes" /> 17 <util:Group Id="TEST_GROUP1" Name="testName1" Domain="[TESTDOMAIN]" Comment="Group1" CreateGroup="yes" RemoveOnUninstall="yes" />
19 18
20 <util:Group Id="TEST_GROUP2" Name="testName2" Comment="Group2" RemoveOnUninstall="no" UpdateIfExists="yes" /> 19 <util:Group Id="TEST_GROUP2" Name="testName2" Domain="[TESTDOMAIN]" Comment="Group2" RemoveOnUninstall="no" UpdateIfExists="yes" />
21 20
22 <util:Group Id="TEST_GROUP3" Name="testName3" Comment="Group3" CreateGroup="no" /> 21 <util:Group Id="TEST_GROUP3" Name="testName3" Domain="[TESTDOMAIN]" Comment="Group3" CreateGroup="no" />
23 </Component> 22 </Component>
24 </Fragment> 23 </Fragment>
25</Wix> 24</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/product.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/product.wxs
index e0170746..6c9d3be3 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/product.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/product.wxs
@@ -6,18 +6,15 @@
6 <ComponentGroup Id="ProductComponents"> 6 <ComponentGroup Id="ProductComponents">
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9
10 <Property Id="TESTDOMAIN" Secure="yes" />
9 </Fragment> 11 </Fragment>
10 12
11 <Fragment> 13 <Fragment>
12 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> 14 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
13 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> 15 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
14 16
15 <util:Group Id="TEST_GROUP1" 17 <util:Group Id="TEST_GROUP1" Name="testName1" Domain="[TESTDOMAIN]" CreateGroup="yes" UpdateIfExists="yes" RemoveOnUninstall="yes" Comment="testComment1"/>
16 Name="testName1"
17 CreateGroup="yes"
18 UpdateIfExists="yes"
19 RemoveOnUninstall="yes"
20 Comment="testComment1"/>
21 </Component> 18 </Component>
22 </Fragment> 19 </Fragment>
23</Wix> 20</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/product.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/product.wxs
index d1824890..a34a276b 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/product.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/product.wxs
@@ -6,13 +6,15 @@
6 <ComponentGroup Id="ProductComponents"> 6 <ComponentGroup Id="ProductComponents">
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9
10 <Property Id="TESTDOMAIN" Secure="yes" />
9 </Fragment> 11 </Fragment>
10 12
11 <Fragment> 13 <Fragment>
12 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> 14 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
13 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> 15 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
14 16
15 <util:Group Id="TEST_GROUP1" Name="testName1" UpdateIfExists="yes" RemoveOnUninstall="yes" RemoveComment="yes"/> 17 <util:Group Id="TEST_GROUP1" Name="testName1" Domain="[TESTDOMAIN]" UpdateIfExists="yes" RemoveOnUninstall="yes" RemoveComment="yes"/>
16 </Component> 18 </Component>
17 </Fragment> 19 </Fragment>
18</Wix> 20</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/product_fail.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/product_fail.wxs
index 4e70717f..79396882 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/product_fail.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/product_fail.wxs
@@ -10,13 +10,15 @@
10 <InstallExecuteSequence> 10 <InstallExecuteSequence>
11 <Custom Action="CaFail" After="Wix6ConfigureGroups_X86" /> 11 <Custom Action="CaFail" After="Wix6ConfigureGroups_X86" />
12 </InstallExecuteSequence> 12 </InstallExecuteSequence>
13
14 <Property Id="TESTDOMAIN" Secure="yes" />
13 </Fragment> 15 </Fragment>
14 16
15 <Fragment> 17 <Fragment>
16 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> 18 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
17 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> 19 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
18 20
19 <util:Group Id="TEST_GROUP1" Name="testName1" CreateGroup="yes" RemoveOnUninstall="yes" Comment="testComment1"/> 21 <util:Group Id="TEST_GROUP1" Name="testName1" Domain="[TESTDOMAIN]" CreateGroup="yes" RemoveOnUninstall="yes" Comment="testComment1"/>
20 </Component> 22 </Component>
21 </Fragment> 23 </Fragment>
22</Wix> 24</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/product_fail.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/product_fail.wxs
index 3013e5a0..148f26ca 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/product_fail.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/product_fail.wxs
@@ -13,6 +13,8 @@
13 <InstallExecuteSequence> 13 <InstallExecuteSequence>
14 <Custom Action="CaFail" After="Wix6ConfigureGroups_X86" /> 14 <Custom Action="CaFail" After="Wix6ConfigureGroups_X86" />
15 </InstallExecuteSequence> 15 </InstallExecuteSequence>
16
17 <Property Id="TESTDOMAIN" Secure="yes" />
16 </Fragment> 18 </Fragment>
17 19
18 <Fragment> 20 <Fragment>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/FailIfExists.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/FailIfExists.wxs
index 00f8e12d..e7acb5e0 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/FailIfExists.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/FailIfExists.wxs
@@ -6,6 +6,8 @@
6 <ComponentGroup Id="ProductComponents"> 6 <ComponentGroup Id="ProductComponents">
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9
10 <Property Id="TESTDOMAIN" Secure="yes" />
9 </Fragment> 11 </Fragment>
10 12
11 <Fragment> 13 <Fragment>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/product.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/product.wxs
index c27eb27a..f513e7c6 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/product.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/product.wxs
@@ -7,13 +7,14 @@
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9 9
10 <Property Id="TEMPDOMAIN" Secure="yes" Value="TESTDOMAIN" /> 10 <Property Id="TESTDOMAIN" Secure="yes" />
11 </Fragment> 11 </Fragment>
12 12
13 <Fragment> 13 <Fragment>
14 <util:Group Id="AUTH_USERS" Name="Authenticated Users" Domain="[TEMPDOMAIN]" > 14 <util:Group Id="DOMAIN_USERS" Name="Domain Users" Domain="[TESTDOMAIN]" >
15 <util:GroupRef Id="TEST_GROUP1" /> 15 <util:GroupRef Id="TEST_GROUP1" />
16 <util:GroupRef Id="TEST_GROUP2" /> 16 <util:GroupRef Id="TEST_GROUP2" />
17 <util:GroupRef Id="TEST_GROUP3" />
17 </util:Group> 18 </util:Group>
18 <util:Group Id="EVERYONE" Name="Everyone" > 19 <util:Group Id="EVERYONE" Name="Everyone" >
19 <util:GroupRef Id="TEST_GROUP1" /> 20 <util:GroupRef Id="TEST_GROUP1" />
@@ -25,6 +26,8 @@
25 <util:Group Id="TEST_GROUP1" Name="testName1" Comment="Group1" CreateGroup="yes" RemoveOnUninstall="yes" /> 26 <util:Group Id="TEST_GROUP1" Name="testName1" Comment="Group1" CreateGroup="yes" RemoveOnUninstall="yes" />
26 27
27 <util:Group Id="TEST_GROUP2" Name="testName2" Comment="Group2" RemoveOnUninstall="no" UpdateIfExists="yes" /> 28 <util:Group Id="TEST_GROUP2" Name="testName2" Comment="Group2" RemoveOnUninstall="no" UpdateIfExists="yes" />
29
30 <util:Group Id="TEST_GROUP3" Name="testName3" Domain="[TESTDOMAIN]" Comment="Group3" RemoveOnUninstall="no" UpdateIfExists="yes" />
28 </Component> 31 </Component>
29 </Fragment> 32 </Fragment>
30</Wix> 33</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/product.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/product.wxs
index 2d012b23..2305a80b 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/product.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/product.wxs
@@ -6,18 +6,15 @@
6 <ComponentGroup Id="ProductComponents"> 6 <ComponentGroup Id="ProductComponents">
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9
10 <Property Id="TESTDOMAIN" Secure="yes" />
9 </Fragment> 11 </Fragment>
10 12
11 <Fragment> 13 <Fragment>
12 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> 14 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
13 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> 15 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
14 <util:Group 16 <util:Group
15 Id="TEST_GROUP1" 17 Id="TEST_GROUP1" Name="testName1" CreateGroup="yes" UpdateIfExists="yes" RemoveOnUninstall="yes" Comment="testComment1" />
16 Name="testName1"
17 CreateGroup="yes"
18 UpdateIfExists="yes"
19 RemoveOnUninstall="yes"
20 Comment="testComment1" />
21 </Component> 18 </Component>
22 </Fragment> 19 </Fragment>
23</Wix> 20</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/NonVitalUserGroup.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/NonVitalUserGroup.wxs
index a834c76b..4922fcef 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/NonVitalUserGroup.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/NonVitalUserGroup.wxs
@@ -6,6 +6,8 @@
6 <ComponentGroup Id="ProductComponents"> 6 <ComponentGroup Id="ProductComponents">
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9
10 <Property Id="TESTDOMAIN" Secure="yes" />
9 </Fragment> 11 </Fragment>
10 12
11 <Fragment> 13 <Fragment>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/RestrictedDomain.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/RestrictedDomain.wxs
index edb3387c..04a1ac4e 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/RestrictedDomain.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/RestrictedDomain.wxs
@@ -7,14 +7,14 @@
7 <ComponentRef Id="Component1" /> 7 <ComponentRef Id="Component1" />
8 </ComponentGroup> 8 </ComponentGroup>
9 9
10 <Property Id="TEMPDOMAIN" Secure="yes" /> 10 <Property Id="TESTDOMAIN" Secure="yes" />
11 </Fragment> 11 </Fragment>
12 12
13 <Fragment> 13 <Fragment>
14 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> 14 <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
15 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> 15 <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
16 16
17 <util:Group Id="TEST_GROUP_test" Name="testName1" Domain="[TEMPDOMAIN]" /> 17 <util:Group Id="TEST_GROUP_test" Name="testName1" Domain="[TESTDOMAIN]" />
18 </Component> 18 </Component>
19 </Fragment> 19 </Fragment>
20</Wix> 20</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs b/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs
index 059ecee8..36d10aa3 100644
--- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs
+++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs
@@ -4,16 +4,13 @@
4 <ComponentGroup Id="ProductComponents"> 4 <ComponentGroup Id="ProductComponents">
5 <ComponentRef Id="Component1" /> 5 <ComponentRef Id="Component1" />
6 </ComponentGroup> 6 </ComponentGroup>
7
8 <Property Id="TESTDOMAIN" Secure="yes" />
7 </Fragment> 9 </Fragment>
8 10
9 <Fragment> 11 <Fragment>
10 <Component Id="Component1" 12 <Component Id="Component1" Guid="1FDC6C4D-7741-4BF1-A4F0-4231879CEC45" Directory="INSTALLFOLDER">
11 Guid="1FDC6C4D-7741-4BF1-A4F0-4231879CEC45" 13 <util:Group Id="TEST_GROUP1" Name="[TESTPARAMETER1]" Domain="[TESTDOMAIN]" CreateGroup="yes" RemoveOnUninstall="yes" />
12 Directory="INSTALLFOLDER">
13 <util:Group Id="TEST_GROUP1"
14 Name="[TESTPARAMETER1]"
15 CreateGroup="yes"
16 RemoveOnUninstall="yes" />
17 </Component> 14 </Component>
18 </Fragment> 15 </Fragment>
19</Wix> 16</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-05 07:48:59 +0000