diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-05 19:15:44 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-05 21:38:25 +1000 |
commit | fcd88ec3995033bf802f0a637e7fce65e8739006 (patch) | |
tree | b16be33e76eab83377102bb11edd56f0ee368ff1 /src/test/WixToolsetTest.CoreIntegration | |
parent | 05acd26c0dbb86bccb1075e55a77f94da1d22b4f (diff) | |
download | wix-fcd88ec3995033bf802f0a637e7fce65e8739006.tar.gz wix-fcd88ec3995033bf802f0a637e7fce65e8739006.tar.bz2 wix-fcd88ec3995033bf802f0a637e7fce65e8739006.zip |
Add test around ActionText and fix the table definition to get it passing.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration')
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 | ||||
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 6b9f8af6..9462c4ff 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | |||
@@ -313,6 +313,7 @@ namespace WixToolsetTest.CoreIntegration | |||
313 | 313 | ||
314 | Assert.True(File.Exists(msiPath)); | 314 | Assert.True(File.Exists(msiPath)); |
315 | var results = Query.QueryDatabase(msiPath, new[] { | 315 | var results = Query.QueryDatabase(msiPath, new[] { |
316 | "ActionText", | ||
316 | "AdminExecuteSequence", | 317 | "AdminExecuteSequence", |
317 | "AdminUISequence", | 318 | "AdminUISequence", |
318 | "AdvtExecuteSequence", | 319 | "AdvtExecuteSequence", |
@@ -324,6 +325,7 @@ namespace WixToolsetTest.CoreIntegration | |||
324 | }).Where(x => !x.StartsWith("Property:") || x.StartsWith("Property:MsiHiddenProperties\t")).ToArray(); | 325 | }).Where(x => !x.StartsWith("Property:") || x.StartsWith("Property:MsiHiddenProperties\t")).ToArray(); |
325 | Assert.Equal(new[] | 326 | Assert.Equal(new[] |
326 | { | 327 | { |
328 | "ActionText:CustomAction2\tProgess2Text\t", | ||
327 | "AdminExecuteSequence:CostFinalize\t\t1000", | 329 | "AdminExecuteSequence:CostFinalize\t\t1000", |
328 | "AdminExecuteSequence:CostInitialize\t\t800", | 330 | "AdminExecuteSequence:CostInitialize\t\t800", |
329 | "AdminExecuteSequence:CustomAction2\t\t801", | 331 | "AdminExecuteSequence:CustomAction2\t\t801", |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs index 780529d6..2846d16e 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs | |||
@@ -2,10 +2,10 @@ | |||
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
3 | <Fragment> | 3 | <Fragment> |
4 | <ComponentGroup Id="ProductComponents"> | 4 | <ComponentGroup Id="ProductComponents"> |
5 | <ComponentGroupRef Id="MinimalComponentGroup"></ComponentGroupRef> | 5 | <ComponentGroupRef Id="MinimalComponentGroup" /> |
6 | </ComponentGroup> | 6 | </ComponentGroup> |
7 | 7 | ||
8 | <Binary Id="Binary1" SourceFile="test.txt"></Binary> | 8 | <Binary Id="Binary1" SourceFile="test.txt" /> |
9 | <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" /> | 9 | <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" /> |
10 | <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." /> | 10 | <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." /> |
11 | <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" /> | 11 | <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" /> |
@@ -25,5 +25,9 @@ | |||
25 | <InstallUISequence> | 25 | <InstallUISequence> |
26 | <Custom Action="CustomAction2" After="CostInitialize" /> | 26 | <Custom Action="CustomAction2" After="CostInitialize" /> |
27 | </InstallUISequence> | 27 | </InstallUISequence> |
28 | |||
29 | <UI> | ||
30 | <ProgressText Action="CustomAction2">Progess2Text</ProgressText> | ||
31 | </UI> | ||
28 | </Fragment> | 32 | </Fragment> |
29 | </Wix> | 33 | </Wix> |