diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-01-06 14:54:31 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-01-06 15:04:11 -0500 |
| commit | 69651a71ff2fdc1e9897b878782d79dcc1f9b896 (patch) | |
| tree | 103699cd0d8a3f8887c3f0b04f33f411fde62789 /src/test/WixToolsetTest.CoreIntegration | |
| parent | 427e1a8c65c038e63674503f4f56e53fe00ac7f0 (diff) | |
| download | wix-69651a71ff2fdc1e9897b878782d79dcc1f9b896.tar.gz wix-69651a71ff2fdc1e9897b878782d79dcc1f9b896.tar.bz2 wix-69651a71ff2fdc1e9897b878782d79dcc1f9b896.zip | |
Ensure Errors have ids so they can be referenced.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 6 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index 81289e5a..a12ad469 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |||
| @@ -280,6 +280,12 @@ namespace WixToolsetTest.CoreIntegration | |||
| 280 | var errors = section.Tuples.OfType<ErrorTuple>().ToDictionary(t => t.Error); | 280 | var errors = section.Tuples.OfType<ErrorTuple>().ToDictionary(t => t.Error); |
| 281 | Assert.Equal("Category 55 Emergency Doomsday Crisis", errors[1234].Message.Trim()); | 281 | Assert.Equal("Category 55 Emergency Doomsday Crisis", errors[1234].Message.Trim()); |
| 282 | Assert.Equal(" ", errors[5678].Message); | 282 | Assert.Equal(" ", errors[5678].Message); |
| 283 | |||
| 284 | var customAction1 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single(); | ||
| 285 | Assert.Equal("1234", customAction1.Target); | ||
| 286 | |||
| 287 | var customAction2 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single(); | ||
| 288 | Assert.Equal("If you see this, something went wrong.", customAction2.Target); | ||
| 283 | } | 289 | } |
| 284 | } | 290 | } |
| 285 | 291 | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs index 6da3dcbe..a4c01d7e 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/Package.wxs | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 7 | <MediaTemplate /> | 7 | <MediaTemplate /> |
| 8 | 8 | ||
| 9 | <CustomAction Id="CanWeReferenceAnError_YesWeCan" Error="1234" /> | ||
| 10 | <CustomAction Id="TextErrorsWorkOKToo" Error="If you see this, something went wrong." /> | ||
| 11 | |||
| 9 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 12 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
| 10 | <ComponentGroupRef Id="ProductComponents" /> | 13 | <ComponentGroupRef Id="ProductComponents" /> |
| 11 | </Feature> | 14 | </Feature> |
